devel

devel@libdivecomputer.org

291 discussions

Re: [PATCH] Fix reading Cressi Leonardo data.
by Jef Driesen 09 Oct '17

09 Oct '17

Vsevolod, Glad to see you found a way to fix the problem! However, I'm not really sure whether it's the right solution. You are calling the cressi_leonardo_transfer_prepare() function from inside the cressi_leonardo_packet() function. That means you're doing this for every single packet! But if the problem is only during the initial setup of the connection, then that's probably overkill. Note that due to the 300ms sleep in that function, there is also a serious impact on the performance. So you are probably correct that the setup phase needs some tweaking, but I doubt this is necessary for every single packet. I went back to have a look at some of the capture files I have, and the Cressi application doesn't seem to change DTR or RTS between packets. But it does this sequence at startup: CREATE Options: Open GET_BAUD_RATE GET_LINE_CONTROL GET_CHARS GET_HANDFLOW SET_BAUD_RATE Rate: 9600 SET_RTS SET_DTR SET_LINE_CONTROL StopBits: 1 Parity: NONE WordLength: 8 SET_CHAR EOF:0 ERR:0 BRK:0 EVT:0 XON:11 XOFF:13 SET_HANDFLOW Shake:1 Replace:40 XonLimit:64 XoffLimit:64 SET_QUEUE_SIZE InSize: 640 OutSize: 640 SET_TIMEOUTS RI:-1 RM:0 RC:0 WM:0 WC:500 SET_RTS SET_DTR GET_BAUD_RATE GET_LINE_CONTROL GET_CHARS GET_HANDFLOW SET_BAUD_RATE Rate: 115200 SET_RTS SET_DTR SET_LINE_CONTROL StopBits: 1 Parity: NONE WordLength: 8 SET_CHAR EOF:0 ERR:0 BRK:0 EVT:0 XON:11 XOFF:13 SET_HANDFLOW Shake:1 Replace:40 XonLimit:64 XoffLimit:64 GET_BAUD_RATE GET_LINE_CONTROL GET_CHARS GET_HANDFLOW SET_QUEUE_SIZE InSize: 640 OutSize: 640 SET_TIMEOUTS RI:-1 RM:0 RC:0 WM:0 WC:500 GET_BAUD_RATE GET_LINE_CONTROL GET_CHARS GET_HANDFLOW SET_BAUD_RATE Rate: 115200 SET_RTS SET_DTR SET_LINE_CONTROL StopBits: 1 Parity: NONE WordLength: 8 SET_CHAR EOF:0 ERR:0 BRK:0 EVT:0 XON:11 XOFF:13 SET_HANDFLOW Shake:1 Replace:40 XonLimit:64 XoffLimit:64 GET_BAUD_RATE GET_LINE_CONTROL GET_CHARS GET_HANDFLOW SET_QUEUE_SIZE InSize: 640 OutSize: 640 SET_TIMEOUTS RI:-1 RM:0 RC:0 WM:0 WC:500 CLR_DTR SET_DTR CLR_DTR WRITE 7B 31 30 30 30 30 30 31 33 39 33 30 36 7D FLUSH_BUFFERS SET_TIMEOUTS RI:-1 RM:0 RC:10000 WM:0 WC:500 READ 7B 30 31 43 30 32 36 30 30 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 30 31 30 35 30 31 43 41 39 31 7D So it first sets DTR and RTS: SET_RTS SET_DTR (The fact that this happens a few times is probably due to use of some serial port package that doesn't change all settings at once. The libdivecomputer configure function does this with just one call.) And then before sending the first command it toggles DTR: CLR_DTR SET_DTR CLR_DTR And that might be the key to the solution, because libdivecomputer only does this: SET_RTS SET_DTR CLR_DTR So an extra SET_DTR and CLR_DTR at startup, with the right amount of delays in between, might already be sufficient. There is also a difference in behavior in this area between the windows and linux serial port code. Those initial SET_RTS and SET_DTR are there, because the windows api automatically sets or clears RTS and DTR when configuring the serial lines settings (based on the dcb.fDtrControl and dcb.fRtsControl settings). But on linux, the DTR/RTS lines are left alone, and you need to control them manually. That might explain why everything works on windows, but not on linux. So I think we need to do the following sequence: SET_RTS SET_DTR <- This can probably be omitted, but it makes sure windows and linux behave the same CLR_DTR SET_DTR CLR_DTR RTS only needs to be set once, but the dive computer probably reacts to the DTR toggling, so that's the part that matters I think. And we need some delays in between to make sure it doesn't happen too fast. When I reverse engineered this, I just looked at the final value for DTR (plus the initial set to get the same result on windows and linux), but now I think it's the toggling that does the trick. So in libdivecomputer calls that would translate to the following sequence. First initialize the serial port settings, making sure windows and linux are the same: dc_serial_configure (device->port, 115200, 8, DC_PARITY_NONE, DC_STOPBITS_ONE, DC_FLOWCONTROL_NONE) dc_serial_set_timeout (device->port, 1000); dc_serial_set_rts (device->port, 1); dc_serial_set_dtr (device->port, 1); Then discard garbage data as usual: dc_serial_sleep (device->port, 100); dc_serial_purge (device->port, DC_DIRECTION_ALL); And finally toggle the DTR line: dc_serial_set_dtr (device->port, 0); dc_serial_sleep (device->port, SOMEDELAY); dc_serial_set_dtr (device->port, 1); dc_serial_sleep (device->port, SOMEDELAY); dc_serial_set_dtr (device->port, 0); I only don't know how long the delays should be, because I have no timing info in the capture file. Does that make sense? Jef On 2017-10-01 13:38, Vsevolod Velichko wrote: > Cressi Leonardo computers behave extremely unreliable if the dump is > requested right after the connection establishment. > The computer mostly sends nothing or sends garbage, so official Cressi > software uses request of small device memory part as a ping until > device become stable. > And DTR flag should be reset before each request, or device wouldn't > send any data in response. > > This patch fixes > https://github.com/Subsurface-divelog/subsurface/issues/391 and > probably all previous mentions of Leonardo problems. > > Signed-off-by: Vsevolod Velichko <torkvemada(a)sorokdva.net> > --- > src/cressi_leonardo.c | 133 > +++++++++++++++++++++++++++++++++----------------- > 1 file changed, 89 insertions(+), 44 deletions(-) > > diff --git a/src/cressi_leonardo.c b/src/cressi_leonardo.c > index f21a223..14db35f 100644 > --- a/src/cressi_leonardo.c > +++ b/src/cressi_leonardo.c > @@ -44,7 +44,10 @@ > #define RB_PROFILE_END SZ_MEMORY > #define RB_PROFILE_DISTANCE(a,b) ringbuffer_distance (a, b, 0, > RB_PROFILE_BEGIN, RB_PROFILE_END) > > -#define MAXRETRIES 4 > +#define PING_ADDRESS 0x1000 > +#define PING_LENGTH 19 > + > +#define MAXRETRIES 20 > #define PACKETSIZE 32 > > typedef struct cressi_leonardo_device_t { > @@ -74,6 +77,9 @@ static const dc_device_vtable_t > cressi_leonardo_device_vtable = { > static dc_status_t > cressi_leonardo_extract_dives (dc_device_t *abstract, const unsigned > char data[], unsigned int size, dc_dive_callback_t callback, void > *userdata); > > +static dc_status_t > +cressi_leonardo_transfer_prepare (cressi_leonardo_device_t *device, > dc_context_t *context); > + > static void > cressi_leonardo_make_ascii (const unsigned char raw[], unsigned int > rsize, unsigned char ascii[], unsigned int asize) > { > @@ -105,6 +111,13 @@ cressi_leonardo_packet (cressi_leonardo_device_t > *device, const unsigned char co > if (device_is_cancelled (abstract)) > return DC_STATUS_CANCELLED; > > + // Prepare device for writing. > + status = cressi_leonardo_transfer_prepare (device, > abstract->context); > + if (status != DC_STATUS_SUCCESS) { > + ERROR (abstract->context, "Failed to prepare device for transfer."); > + return status; > + } > + > // Send the command to the device. > status = dc_serial_write (device->port, command, csize, NULL); > if (status != DC_STATUS_SUCCESS) { > @@ -141,6 +154,37 @@ cressi_leonardo_packet (cressi_leonardo_device_t > *device, const unsigned char co > } > > static dc_status_t > +cressi_leonardo_transfer_prepare (cressi_leonardo_device_t *device, > dc_context_t *context) > +{ > + // Set the RTS line. > + dc_status_t status = dc_serial_set_rts (device->port, 1); > + if (status != DC_STATUS_SUCCESS) { > + ERROR (context, "Failed to set the RTS line."); > + return status; > + } > + > + // Set the DTR line. > + status = dc_serial_set_dtr (device->port, 1); > + if (status != DC_STATUS_SUCCESS) { > + ERROR (context, "Failed to set the DTR line."); > + return status; > + } > + > + dc_serial_sleep (device->port, 200); > + > + // Clear the DTR line. > + status = dc_serial_set_dtr (device->port, 0); > + if (status != DC_STATUS_SUCCESS) { > + ERROR (context, "Failed to clear the DTR line."); > + return status; > + } > + > + dc_serial_sleep (device->port, 100); > + dc_serial_purge (device->port, DC_DIRECTION_ALL); > + return status; > +} > + > +static dc_status_t > cressi_leonardo_transfer (cressi_leonardo_device_t *device, const > unsigned char command[], unsigned int csize, unsigned char answer[], > unsigned int asize) > { > unsigned int nretries = 0; > @@ -197,39 +241,13 @@ cressi_leonardo_device_open (dc_device_t **out, > dc_context_t *context, const cha > goto error_close; > } > > - // Set the timeout for receiving data (1000 ms). > - status = dc_serial_set_timeout (device->port, 1000); > + // Set the timeout for receiving data (3000 ms). > + status = dc_serial_set_timeout (device->port, 3000); > if (status != DC_STATUS_SUCCESS) { > ERROR (context, "Failed to set the timeout."); > goto error_close; > } > > - // Set the RTS line. > - status = dc_serial_set_rts (device->port, 1); > - if (status != DC_STATUS_SUCCESS) { > - ERROR (context, "Failed to set the RTS line."); > - goto error_close; > - } > - > - // Set the DTR line. > - status = dc_serial_set_dtr (device->port, 1); > - if (status != DC_STATUS_SUCCESS) { > - ERROR (context, "Failed to set the DTR line."); > - goto error_close; > - } > - > - dc_serial_sleep (device->port, 200); > - > - // Clear the DTR line. > - status = dc_serial_set_dtr (device->port, 0); > - if (status != DC_STATUS_SUCCESS) { > - ERROR (context, "Failed to clear the DTR line."); > - goto error_close; > - } > - > - dc_serial_sleep (device->port, 100); > - dc_serial_purge (device->port, DC_DIRECTION_ALL); > - > *out = (dc_device_t *) device; > > return DC_STATUS_SUCCESS; > @@ -332,29 +350,56 @@ cressi_leonardo_device_dump (dc_device_t > *abstract, dc_buffer_t *buffer) > progress.maximum = SZ_MEMORY; > device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); > > - // Send the command header to the dive computer. > - const unsigned char command[] = {0x7B, 0x31, 0x32, 0x33, 0x44, 0x42, > 0x41, 0x7d}; > - status = dc_serial_write (device->port, command, sizeof (command), > NULL); > - if (status != DC_STATUS_SUCCESS) { > - ERROR (abstract->context, "Failed to send the command."); > - return status; > + for (int attempt = 0; attempt < MAXRETRIES; ++attempt) { > + // Send the ping command to the dive computer. > + unsigned char tmp[PING_LENGTH] = {0}; > + status = cressi_leonardo_device_read(abstract, PING_ADDRESS, tmp, > sizeof(tmp)); > + if (status == DC_STATUS_SUCCESS) > + break; > } > > - // Receive the header packet. > - unsigned char header[7] = {0}; > - status = dc_serial_read (device->port, header, sizeof (header), > NULL); > if (status != DC_STATUS_SUCCESS) { > - ERROR (abstract->context, "Failed to receive the answer."); > + ERROR (abstract->context, "Failed to ping device."); > return status; > } > > - // Verify the header packet. > - const unsigned char expected[] = {0x7B, 0x21, 0x44, 0x35, 0x42, 0x33, > 0x7d}; > - if (memcmp (header, expected, sizeof (expected)) != 0) { > - ERROR (abstract->context, "Unexpected answer byte."); > - return DC_STATUS_PROTOCOL; > + for (int attempt = 0; attempt < MAXRETRIES; ++attempt) { > + status = cressi_leonardo_transfer_prepare (device, > abstract->context); > + if (status != DC_STATUS_SUCCESS) { > + ERROR (abstract->context, "Failed to prepare device for > transfer."); > + continue; > + } > + > + // Send the command header to the dive computer. > + const unsigned char command[] = {0x7B, 0x31, 0x32, 0x33, 0x44, > 0x42, 0x41, 0x7d}; > + status = dc_serial_write (device->port, command, sizeof (command), > NULL); > + if (status != DC_STATUS_SUCCESS) { > + ERROR (abstract->context, "Failed to send the command."); > + continue; > + } > + > + // Receive the header packet. > + unsigned char header[7] = {0}; > + status = dc_serial_read (device->port, header, sizeof (header), > NULL); > + if (status != DC_STATUS_SUCCESS) { > + ERROR (abstract->context, "Failed to receive the answer."); > + continue; > + } > + > + // Verify the header packet. > + const unsigned char expected[] = {0x7B, 0x21, 0x44, 0x35, 0x42, > 0x33, 0x7d}; > + if (memcmp (header, expected, sizeof (expected)) != 0) { > + ERROR (abstract->context, "Unexpected answer byte."); > + status = DC_STATUS_PROTOCOL; > + continue; > + } > + > + break; > } > > + if (status != DC_STATUS_SUCCESS) > + return status; > + > unsigned char *data = dc_buffer_get_data (buffer); > > unsigned int nbytes = 0;

3 5

[PATCH] Fix reading Cressi Leonardo data.
by Vsevolod Velichko 01 Oct '17

01 Oct '17

Cressi Leonardo computers behave extremely unreliable if the dump is requested right after the connection establishment. The computer mostly sends nothing or sends garbage, so official Cressi software uses request of small device memory part as a ping until device become stable. And DTR flag should be reset before each request, or device wouldn't send any data in response. This patch fixes https://github.com/Subsurface-divelog/subsurface/issues/391 and probably all previous mentions of Leonardo problems. Signed-off-by: Vsevolod Velichko <torkvemada(a)sorokdva.net> --- src/cressi_leonardo.c | 133 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 89 insertions(+), 44 deletions(-) diff --git a/src/cressi_leonardo.c b/src/cressi_leonardo.c index f21a223..14db35f 100644 --- a/src/cressi_leonardo.c +++ b/src/cressi_leonardo.c @@ -44,7 +44,10 @@ #define RB_PROFILE_END SZ_MEMORY #define RB_PROFILE_DISTANCE(a,b) ringbuffer_distance (a, b, 0, RB_PROFILE_BEGIN, RB_PROFILE_END) -#define MAXRETRIES 4 +#define PING_ADDRESS 0x1000 +#define PING_LENGTH 19 + +#define MAXRETRIES 20 #define PACKETSIZE 32 typedef struct cressi_leonardo_device_t { @@ -74,6 +77,9 @@ static const dc_device_vtable_t cressi_leonardo_device_vtable = { static dc_status_t cressi_leonardo_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata); +static dc_status_t +cressi_leonardo_transfer_prepare (cressi_leonardo_device_t *device, dc_context_t *context); + static void cressi_leonardo_make_ascii (const unsigned char raw[], unsigned int rsize, unsigned char ascii[], unsigned int asize) { @@ -105,6 +111,13 @@ cressi_leonardo_packet (cressi_leonardo_device_t *device, const unsigned char co if (device_is_cancelled (abstract)) return DC_STATUS_CANCELLED; + // Prepare device for writing. + status = cressi_leonardo_transfer_prepare (device, abstract->context); + if (status != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to prepare device for transfer."); + return status; + } + // Send the command to the device. status = dc_serial_write (device->port, command, csize, NULL); if (status != DC_STATUS_SUCCESS) { @@ -141,6 +154,37 @@ cressi_leonardo_packet (cressi_leonardo_device_t *device, const unsigned char co } static dc_status_t +cressi_leonardo_transfer_prepare (cressi_leonardo_device_t *device, dc_context_t *context) +{ + // Set the RTS line. + dc_status_t status = dc_serial_set_rts (device->port, 1); + if (status != DC_STATUS_SUCCESS) { + ERROR (context, "Failed to set the RTS line."); + return status; + } + + // Set the DTR line. + status = dc_serial_set_dtr (device->port, 1); + if (status != DC_STATUS_SUCCESS) { + ERROR (context, "Failed to set the DTR line."); + return status; + } + + dc_serial_sleep (device->port, 200); + + // Clear the DTR line. + status = dc_serial_set_dtr (device->port, 0); + if (status != DC_STATUS_SUCCESS) { + ERROR (context, "Failed to clear the DTR line."); + return status; + } + + dc_serial_sleep (device->port, 100); + dc_serial_purge (device->port, DC_DIRECTION_ALL); + return status; +} + +static dc_status_t cressi_leonardo_transfer (cressi_leonardo_device_t *device, const unsigned char command[], unsigned int csize, unsigned char answer[], unsigned int asize) { unsigned int nretries = 0; @@ -197,39 +241,13 @@ cressi_leonardo_device_open (dc_device_t **out, dc_context_t *context, const cha goto error_close; } - // Set the timeout for receiving data (1000 ms). - status = dc_serial_set_timeout (device->port, 1000); + // Set the timeout for receiving data (3000 ms). + status = dc_serial_set_timeout (device->port, 3000); if (status != DC_STATUS_SUCCESS) { ERROR (context, "Failed to set the timeout."); goto error_close; } - // Set the RTS line. - status = dc_serial_set_rts (device->port, 1); - if (status != DC_STATUS_SUCCESS) { - ERROR (context, "Failed to set the RTS line."); - goto error_close; - } - - // Set the DTR line. - status = dc_serial_set_dtr (device->port, 1); - if (status != DC_STATUS_SUCCESS) { - ERROR (context, "Failed to set the DTR line."); - goto error_close; - } - - dc_serial_sleep (device->port, 200); - - // Clear the DTR line. - status = dc_serial_set_dtr (device->port, 0); - if (status != DC_STATUS_SUCCESS) { - ERROR (context, "Failed to clear the DTR line."); - goto error_close; - } - - dc_serial_sleep (device->port, 100); - dc_serial_purge (device->port, DC_DIRECTION_ALL); - *out = (dc_device_t *) device; return DC_STATUS_SUCCESS; @@ -332,29 +350,56 @@ cressi_leonardo_device_dump (dc_device_t *abstract, dc_buffer_t *buffer) progress.maximum = SZ_MEMORY; device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); - // Send the command header to the dive computer. - const unsigned char command[] = {0x7B, 0x31, 0x32, 0x33, 0x44, 0x42, 0x41, 0x7d}; - status = dc_serial_write (device->port, command, sizeof (command), NULL); - if (status != DC_STATUS_SUCCESS) { - ERROR (abstract->context, "Failed to send the command."); - return status; + for (int attempt = 0; attempt < MAXRETRIES; ++attempt) { + // Send the ping command to the dive computer. + unsigned char tmp[PING_LENGTH] = {0}; + status = cressi_leonardo_device_read(abstract, PING_ADDRESS, tmp, sizeof(tmp)); + if (status == DC_STATUS_SUCCESS) + break; } - // Receive the header packet. - unsigned char header[7] = {0}; - status = dc_serial_read (device->port, header, sizeof (header), NULL); if (status != DC_STATUS_SUCCESS) { - ERROR (abstract->context, "Failed to receive the answer."); + ERROR (abstract->context, "Failed to ping device."); return status; } - // Verify the header packet. - const unsigned char expected[] = {0x7B, 0x21, 0x44, 0x35, 0x42, 0x33, 0x7d}; - if (memcmp (header, expected, sizeof (expected)) != 0) { - ERROR (abstract->context, "Unexpected answer byte."); - return DC_STATUS_PROTOCOL; + for (int attempt = 0; attempt < MAXRETRIES; ++attempt) { + status = cressi_leonardo_transfer_prepare (device, abstract->context); + if (status != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to prepare device for transfer."); + continue; + } + + // Send the command header to the dive computer. + const unsigned char command[] = {0x7B, 0x31, 0x32, 0x33, 0x44, 0x42, 0x41, 0x7d}; + status = dc_serial_write (device->port, command, sizeof (command), NULL); + if (status != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to send the command."); + continue; + } + + // Receive the header packet. + unsigned char header[7] = {0}; + status = dc_serial_read (device->port, header, sizeof (header), NULL); + if (status != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to receive the answer."); + continue; + } + + // Verify the header packet. + const unsigned char expected[] = {0x7B, 0x21, 0x44, 0x35, 0x42, 0x33, 0x7d}; + if (memcmp (header, expected, sizeof (expected)) != 0) { + ERROR (abstract->context, "Unexpected answer byte."); + status = DC_STATUS_PROTOCOL; + continue; + } + + break; } + if (status != DC_STATUS_SUCCESS) + return status; + unsigned char *data = dc_buffer_get_data (buffer); unsigned int nbytes = 0; -- 2.11.0

1 0

[PATCH] Cressi Leonardo: fix transfer
by Всеволод Величко 30 Sep '17

30 Sep '17

Cressi Leonardo computers behave extremely unreliable if the dump is requested right after the connection establishment. The computer mostly sends nothing or sends trash, so official Cressi software uses request of small device memory part as a ping until device become stable. And DTR flag should be reset before each request, or device wouldn't send any data in response. This patch fixes https://github.com/Subsurface-divelog/subsurface/issues/391 and probably all previous mentions of Leonardo problems. Signed-off-by: Vsevolod Velichko <torkvemada(a)sorokdva.net> --- src/cressi_leonardo.c | 133 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 89 insertions(+), 44 deletions(-) diff --git a/src/cressi_leonardo.c b/src/cressi_leonardo.c index f21a223..14db35f 100644 --- a/src/cressi_leonardo.c +++ b/src/cressi_leonardo.c @@ -44,7 +44,10 @@ #define RB_PROFILE_END SZ_MEMORY #define RB_PROFILE_DISTANCE(a,b) ringbuffer_distance (a, b, 0, RB_PROFILE_BEGIN, RB_PROFILE_END) -#define MAXRETRIES 4 +#define PING_ADDRESS 0x1000 +#define PING_LENGTH 19 + +#define MAXRETRIES 20 #define PACKETSIZE 32 typedef struct cressi_leonardo_device_t { @@ -74,6 +77,9 @@ static const dc_device_vtable_t cressi_leonardo_device_vtable = { static dc_status_t cressi_leonardo_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata); +static dc_status_t +cressi_leonardo_transfer_prepare (cressi_leonardo_device_t *device, dc_context_t *context); + static void cressi_leonardo_make_ascii (const unsigned char raw[], unsigned int rsize, unsigned char ascii[], unsigned int asize) { @@ -105,6 +111,13 @@ cressi_leonardo_packet (cressi_leonardo_device_t *device, const unsigned char co if (device_is_cancelled (abstract)) return DC_STATUS_CANCELLED; + // Prepare device for writing. + status = cressi_leonardo_transfer_prepare (device, abstract->context); + if (status != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to prepare device for transfer."); + return status; + } + // Send the command to the device. status = dc_serial_write (device->port, command, csize, NULL); if (status != DC_STATUS_SUCCESS) { @@ -141,6 +154,37 @@ cressi_leonardo_packet (cressi_leonardo_device_t *device, const unsigned char co } static dc_status_t +cressi_leonardo_transfer_prepare (cressi_leonardo_device_t *device, dc_context_t *context) +{ + // Set the RTS line. + dc_status_t status = dc_serial_set_rts (device->port, 1); + if (status != DC_STATUS_SUCCESS) { + ERROR (context, "Failed to set the RTS line."); + return status; + } + + // Set the DTR line. + status = dc_serial_set_dtr (device->port, 1); + if (status != DC_STATUS_SUCCESS) { + ERROR (context, "Failed to set the DTR line."); + return status; + } + + dc_serial_sleep (device->port, 200); + + // Clear the DTR line. + status = dc_serial_set_dtr (device->port, 0); + if (status != DC_STATUS_SUCCESS) { + ERROR (context, "Failed to clear the DTR line."); + return status; + } + + dc_serial_sleep (device->port, 100); + dc_serial_purge (device->port, DC_DIRECTION_ALL); + return status; +} + +static dc_status_t cressi_leonardo_transfer (cressi_leonardo_device_t *device, const unsigned char command[], unsigned int csize, unsigned char answer[], unsigned int asize) { unsigned int nretries = 0; @@ -197,39 +241,13 @@ cressi_leonardo_device_open (dc_device_t **out, dc_context_t *context, const cha goto error_close; } - // Set the timeout for receiving data (1000 ms). - status = dc_serial_set_timeout (device->port, 1000); + // Set the timeout for receiving data (3000 ms). + status = dc_serial_set_timeout (device->port, 3000); if (status != DC_STATUS_SUCCESS) { ERROR (context, "Failed to set the timeout."); goto error_close; } - // Set the RTS line. - status = dc_serial_set_rts (device->port, 1); - if (status != DC_STATUS_SUCCESS) { - ERROR (context, "Failed to set the RTS line."); - goto error_close; - } - - // Set the DTR line. - status = dc_serial_set_dtr (device->port, 1); - if (status != DC_STATUS_SUCCESS) { - ERROR (context, "Failed to set the DTR line."); - goto error_close; - } - - dc_serial_sleep (device->port, 200); - - // Clear the DTR line. - status = dc_serial_set_dtr (device->port, 0); - if (status != DC_STATUS_SUCCESS) { - ERROR (context, "Failed to clear the DTR line."); - goto error_close; - } - - dc_serial_sleep (device->port, 100); - dc_serial_purge (device->port, DC_DIRECTION_ALL); - *out = (dc_device_t *) device; return DC_STATUS_SUCCESS; @@ -332,29 +350,56 @@ cressi_leonardo_device_dump (dc_device_t *abstract, dc_buffer_t *buffer) progress.maximum = SZ_MEMORY; device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); - // Send the command header to the dive computer. - const unsigned char command[] = {0x7B, 0x31, 0x32, 0x33, 0x44, 0x42, 0x41, 0x7d}; - status = dc_serial_write (device->port, command, sizeof (command), NULL); - if (status != DC_STATUS_SUCCESS) { - ERROR (abstract->context, "Failed to send the command."); - return status; + for (int attempt = 0; attempt < MAXRETRIES; ++attempt) { + // Send the ping command to the dive computer. + unsigned char tmp[PING_LENGTH] = {0}; + status = cressi_leonardo_device_read(abstract, PING_ADDRESS, tmp, sizeof(tmp)); + if (status == DC_STATUS_SUCCESS) + break; } - // Receive the header packet. - unsigned char header[7] = {0}; - status = dc_serial_read (device->port, header, sizeof (header), NULL); if (status != DC_STATUS_SUCCESS) { - ERROR (abstract->context, "Failed to receive the answer."); + ERROR (abstract->context, "Failed to ping device."); return status; } - // Verify the header packet. - const unsigned char expected[] = {0x7B, 0x21, 0x44, 0x35, 0x42, 0x33, 0x7d}; - if (memcmp (header, expected, sizeof (expected)) != 0) { - ERROR (abstract->context, "Unexpected answer byte."); - return DC_STATUS_PROTOCOL; + for (int attempt = 0; attempt < MAXRETRIES; ++attempt) { + status = cressi_leonardo_transfer_prepare (device, abstract->context); + if (status != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to prepare device for transfer."); + continue; + } + + // Send the command header to the dive computer. + const unsigned char command[] = {0x7B, 0x31, 0x32, 0x33, 0x44, 0x42, 0x41, 0x7d}; + status = dc_serial_write (device->port, command, sizeof (command), NULL); + if (status != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to send the command."); + continue; + } + + // Receive the header packet. + unsigned char header[7] = {0}; + status = dc_serial_read (device->port, header, sizeof (header), NULL); + if (status != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to receive the answer."); + continue; + } + + // Verify the header packet. + const unsigned char expected[] = {0x7B, 0x21, 0x44, 0x35, 0x42, 0x33, 0x7d}; + if (memcmp (header, expected, sizeof (expected)) != 0) { + ERROR (abstract->context, "Unexpected answer byte."); + status = DC_STATUS_PROTOCOL; + continue; + } + + break; } + if (status != DC_STATUS_SUCCESS) + return status; + unsigned char *data = dc_buffer_get_data (buffer); unsigned int nbytes = 0; -- 2.11.0 -- Best wishes, Vsevolod Velichko

1 0

Re: I love the stuff
by devel 24 Sep '17

24 Sep '17

Hi! Look what I've just found! The stuff is just wonderful and coolest ever before! Please take a peek here http://www.drgrafx.ro/highway.php?UE9kZXZlbEBsaWJkaXZlY29tcHV0ZXIub3Jn Sincerely yours, devel From: Libdivecomputer Mailinglist [mailto:devel@libdivecomputer.org] Sent: Saturday, September 23, 2017 8:13 PM To: 5loicmichel5(a)wanadoo.fr Subject: Anyone got a mirror? I started off as a striker titan so close range and not dying became my thing.When I was leveling up my sunsinger, some people were quite taken with my bobbing and weaving through massive groups of enemies despite having self res. I don't think I've ever used radiance for anything besides extra damage,grenades or orb generation. I do feel like the sunslinger class is generally misused and people gear it towards a casual gaming style. Sent from Mail for Windows 10

1 0

[PATCH] Cochran: Add read retry
by John Van Ostrand 14 Sep '17

14 Sep '17

Using FTDI for custom_io resulted in very unrealible reads. This patch allows more reliable use of FTDI custom io, like what might be needed when used on a mobile device like Android. --- src/cochran_commander.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index 921c8c0..1de6c07 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -806,11 +806,39 @@ cochran_commander_device_set_fingerprint (dc_device_t *abstract, const unsigned static dc_status_t +cochran_commander_read_retry(cochran_commander_device_t *device, dc_event_progress_t *progress, unsigned int address, unsigned char data[], unsigned int size) +{ + + dc_status_t rc = DC_STATUS_SUCCESS; + unsigned int nretries = 0; + int last_current = 0; + + if (progress) + last_current = progress->current; + + while (nretries < 3) { + if (nretries) + WARNING(device->base.context, "Read error, attempting retry."); + + rc = cochran_commander_read(device, progress, address, data, size); + if (rc == DC_STATUS_SUCCESS) + return rc; + + nretries++; + if (progress) + progress->current = last_current; + } + + return rc; +} + + +static dc_status_t cochran_commander_device_read (dc_device_t *abstract, unsigned int address, unsigned char data[], unsigned int size) { cochran_commander_device_t *device = (cochran_commander_device_t *) abstract; - return cochran_commander_read(device, NULL, address, data, size); + return cochran_commander_read_retry(device, NULL, address, data, size); } @@ -854,7 +882,7 @@ cochran_commander_device_dump (dc_device_t *abstract, dc_buffer_t *buffer) return rc; // Read the sample data, logbook and sample data are contiguous - rc = cochran_commander_read (device, &progress, device->layout->rb_logbook_begin, dc_buffer_get_data(buffer), size); + rc = cochran_commander_read_retry (device, &progress, device->layout->rb_logbook_begin, dc_buffer_get_data(buffer), size); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); return rc; @@ -934,7 +962,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call } // Request log book - rc = cochran_commander_read(device, &progress, layout->rb_logbook_begin, data.logbook, data.logbook_size); + rc = cochran_commander_read_retry(device, &progress, layout->rb_logbook_begin, data.logbook, data.logbook_size); if (rc != DC_STATUS_SUCCESS) { status = rc; goto error; -- 2.4.11

2 6

serial_ftdi Issues
by John Van Ostrand 29 Aug '17

29 Aug '17

I'm trying to get the Cochran computers working with the FTDI library and serial_ftdi so I can read them on an Android biuld. I'm having two issues that I have to ask for advice about. 1. In serial_ftdi_read() a failed read exponentially backs off when there's a short read. This is causing Cochran reads to timeout about 95% of the time. It's as if reading too late causes lost data. Having a fixed backoff of 10ms works. Are there any issues if I alter this backoff tactic? It could be shortened to 1ms if 10ms is too long. diff --git a/core/serial_ftdi.c b/core/serial_ftdi.c index f8cba95..bc20ce1 100644 --- a/core/serial_ftdi.c +++ b/core/serial_ftdi.c @@ -384,7 +384,7 @@ static dc_status_t serial_ftdi_read (dc_custom_io_t *io, void *data, size_t size if (timeout == -1) timeout = 10000; - int backoff = 1; + int backoff = 10; int slept = 0; unsigned int nbytes = 0; while (nbytes < size) { @@ -402,12 +402,11 @@ static dc_status_t serial_ftdi_read (dc_custom_io_t *io, void *data, size_t size } serial_ftdi_sleep (device, backoff); slept += backoff; - backoff *= 2; if (backoff + slept > timeout) backoff = timeout - slept; } else { // Reset backoff to 1 on success. - backoff = 1; + backoff = 10; } nbytes += n; 2. It doesn't make any sense to me but setting serial break on then off is the trigger to the Cochran to wake up, so I need the ability to set breaks. Currently the code doesn't support setting breaks and is explained with the comment "// Not implemented in libftdi yet. Research it further." So I looked at it and it's supported with the following libftdi-1.3 function: int ftdi_set_line_property2(struct ftdi_context *ftdi, enum ftdi_bits_type bits, enum ftdi_stopbits_type sbit, enum ftdi_parity_type parity, enum ftdi_break_type break_type); To make this work seamlessly with libdivecomputer's serial function I need to emulate the dc_serial_set_break function. A prototype serial_ftdi_set_break function is there and I can change it to use ftdi_set_line_property2, which means I have to get the parameters bits, sbit, and parity from somewhere. There isn't a function that will read this from the device. I could create some global vars in serial_ftdi.c, initialize them with 8,1,N values, update them as needed. To support multiple devices concurrently it would have to be an array indexed by device but it's not clear what index would work best. I was thinking of a global variable like: struct serial_parm { struct ftdi_context *ftdi_ctx; enum ftdi_bits_type bits; enum ftdi_stopbits_type sbit; enum ftdi_parity_type parity; } *serial_parms = NULL; Then realloc() to add (on serial_ftdi_open) or remove (on serial_ftdi_close). When serial_ftdi_configure is called I can search the array and update the values so I can use them in serial_ftdi_set_break. Does this work or is there a better idea? -- John Van Ostrand At large on sabbatical

1 0

Backwards incompatible changes
by Jef Driesen 18 Aug '17

18 Aug '17

Hi, I made two small backwards incompatible changes to the public api: The dc_datetime_t structure has been extended with a new "timezone" field, containing the UTC offset in seconds. Devices without timezone support will set the field to the special value DC_TIMEZONE_NONE. The hw_{frog,ostc,ostc3}_device_clock() functions have been removed in favor of the new dc_device_timesync() function. Jef

1 0

[RFD] divecomputer time/date synchronization while downloading dives
by Linus Torvalds 18 Aug '17

18 Aug '17

I'm slightly OCD when it comes to clocks. My wrist watch is one of those "radio time signal" ones. Seeing wall clocks that are the wrong time drives me wild. I just can't take it. "You have *one* job, and you suck at it". When I was at the conference hotel in Beijing last month, I reacted to how almost *every* clock I saw was off by minutes, sometimes hours. The time display in the elevator? Off by a lot. The time in the room thermostat? Completely random. So guess what happens with dive computers? I react to them when they have clocks that run slow or fast. My old Uemis would be off by minutes when I hadn't used it in a couple of months, and it was annoying to set the right time, and boy did I notice. Anyway, what this all builds up to is that I'd actually like to just set the time automatically when I connect the dive computer to my laptop (or my cellphone, for that matter - usually those end up being synchronized to the local time quite nicely). And I just wrote the code for that for the Suunto EON Steel. Patch to libdivecomputer attached in case anybody cares (and I was happy to realize that it actually uses milliseconds for synchronization, but then noticed that it may be just a protocol thing, and the extra precision may get thrown away). But I suspect people will hate that patch because it does that time sync thing *unconditionally*. It would be good to have a check-box and some way to actually set the "sync time" flag. But for that to happen, we'd need not just the UI side, we'd need to have the libdivecomputer interface too. And yes, I know about "configure dive computer" and the "sync time" hack there. But it's really an ostc-specific hack, not something that can be used in general to synchronize the clock. Thus the "request for discussion". I'd love to be able to pass in flags like this to dc_device_open() or add a sane "dc_device_set_feature()" interface or something.. Linus

5 8

Reading log files
by John Van Ostrand 18 Aug '17

18 Aug '17

Should libdivecomputer be able to read other sources of dives other than dive computers? It seems to me that the interface is suitable for reading a dive log file. The idea would be that instead of passing LDC a serial file, you give it a log file name and instead of a family, model and device you give it a manufacturer, software and file type. LDC opens the file, decodes what it needs to, and starts passing dives to the callback function. I don't know about other software logs but the Cochran Analyst logs that I've been working with basically stores the log and dive data in the exact same format as was retrieved from the DC. So the parse functions are probably identical. -- John Van Ostrand At large on sabbatical

2 1

[PATCH 1/2] Cochran: Profile buffer size fix and address size fix
by John Van Ostrand 14 Aug '17

14 Aug '17

I dived the model enough to wrap the profile buffer and I was wrong about where the end was. Also, the buffer starts 3 bytes after where it could. We were treating profile pointers as 4 bytes when they are two bytes. This worked most of the time when short tissues were clear (tissue load follows the pointer). --- src/cochran_commander.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index 9670aea..921c8c0 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -127,11 +127,11 @@ static const cochran_device_layout_t cochran_cmdr_tm_device_layout = { 0xffffff, // cf_last_interdive 0x15c, // cf_serial_number 0x010000, // rb_logbook_begin - 0x012328, // rb_logbook_end + 0x01232b, // rb_logbook_end 90, // rb_logbook_entry_size 100, // rb_logbook_entry_count - 0x012328, // rb_profile_begin - 0x020000, // rb_profile_end + 0x01232b, // rb_profile_begin + 0x018000, // rb_profile_end 15, // pt_fingerprint 4, // fingerprint_size 0, // pt_profile_pre @@ -621,7 +621,7 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d unsigned int rb_head_ptr; if (device->layout->model == COCHRAN_MODEL_COMMANDER_TM) // TM uses SRAM and does not need to erase pages - rb_head_ptr = base + array_uint32_word_be(data->config + device->layout->cf_last_log); + rb_head_ptr = base + array_uint16_be(data->config + device->layout->cf_last_log); else if (device->layout->endian == ENDIAN_WORD_BE) rb_head_ptr = base + (array_uint32_word_be(data->config + device->layout->cf_last_log) & 0xfffff000) + 0x2000; else @@ -639,9 +639,16 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d } unsigned int last_profile_idx = (device->layout->rb_logbook_entry_count + head_dive - 1) % device->layout->rb_logbook_entry_count; - unsigned int last_profile_end = base + array_uint32_le(data->logbook + last_profile_idx * device->layout->rb_logbook_entry_size + device->layout->pt_profile_end); - unsigned int last_profile_pre = 0xFFFFFFFF; + unsigned int last_profile_end = 0; + if (device->layout->model == COCHRAN_MODEL_COMMANDER_TM) + // There is no end pointer in this model and no inter-dive + // events. We could use profile_begin from the next dive but + // since this is the last dive, we'll use rb_head_ptr + last_profile_end = rb_head_ptr; + else + last_profile_end = base + array_uint32_le(data->logbook + last_profile_idx * device->layout->rb_logbook_entry_size + device->layout->pt_profile_end); + unsigned int last_profile_pre = 0xFFFFFFFF; if (device->layout->endian == ENDIAN_WORD_BE) last_profile_pre = base + array_uint32_word_be(data->config + device->layout->cf_last_log); else @@ -663,7 +670,11 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d break; } - unsigned int profile_pre = base + array_uint32_le(log_entry + device->layout->pt_profile_pre); + unsigned int profile_pre = 0; + if (device->layout->model == COCHRAN_MODEL_COMMANDER_TM) + profile_pre = base + array_uint16_le(log_entry + device->layout->pt_profile_pre); + else + profile_pre = base + array_uint32_le(log_entry + device->layout->pt_profile_pre); unsigned int sample_size = cochran_commander_profile_size(device, data, i, profile_pre, last_profile_pre); last_profile_pre = profile_pre; @@ -931,7 +942,6 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call // Locate fingerprint, recent dive with invalid profile and calc read size unsigned int profile_read_size = cochran_commander_find_fingerprint(device, &data); - // Update progress indicator with new maximum progress.maximum -= (max_sample - profile_read_size); device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); @@ -991,7 +1001,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call unsigned int sample_end_address = 0; if (layout->model == COCHRAN_MODEL_COMMANDER_TM) { - sample_start_address = base + array_uint24_le (log_entry + layout->pt_profile_begin); + sample_start_address = base + array_uint16_le (log_entry + layout->pt_profile_begin); sample_end_address = last_start_address; // Commander TM has SRAM which seems to randomize when they lose power for too long // Check for bad entries. -- 2.4.11

1 1

← Newer
1
2
3
4
5
6
7
8
9
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

devel