- devel - libdivecomputer.org

[PATCH 1/2] Cochran: Added warning when we process an incomplete dive.
by John Van Ostrand 06 Feb '16

06 Feb '16

--- src/cochran_cmdr_parser.c | 2 ++ src/cochran_emc_parser.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/cochran_cmdr_parser.c b/src/cochran_cmdr_parser.c index a7db1cd..4e2915b 100644 --- a/src/cochran_cmdr_parser.c +++ b/src/cochran_cmdr_parser.c @@ -140,6 +140,8 @@ cochran_cmdr_parser_samples_foreach (dc_parser_t *abstract, if (array_uint32_le(log + COCHRAN_CMDR_LOG_SIZE / 2) == 0xFFFFFFFF) { corrupt_dive = 1; + WARNING(abstract->context, "Incomplete dive on %02d/%02d/%02d at %02d:%02d:%02d, trying to parse samples", log[CMD_YEAR], log[CMD_MON], log[CMD_DAY], log[CMD_HOUR], log[CMD_MIN], log[CMD_SEC]); + // Eliminate inter-dive events size = cochran_backparse(abstract, samples, size, &cmdr_event_bytes); } diff --git a/src/cochran_emc_parser.c b/src/cochran_emc_parser.c index 322f3d4..c891a2a 100644 --- a/src/cochran_emc_parser.c +++ b/src/cochran_emc_parser.c @@ -167,6 +167,8 @@ cochran_emc_parser_samples_foreach (dc_parser_t *abstract, if (array_uint32_le(log + COCHRAN_EMC_LOG_SIZE / 2) == 0xFFFFFFFF) { corrupt_dive = 1; + WARNING(abstract->context, "Incomplete dive on %02d/%02d/%02d at %02d:%02d:%02d, trying to parse samples\n", log[EMC_YEAR], log[EMC_MON], log[EMC_DAY], log[EMC_HOUR], log[EMC_MIN], log[EMC_SEC]); + // Eliminate inter-dive events size = cochran_backparse(abstract, samples, size, &emc_event_bytes); } -- 2.4.3

1 1

Cochran Simulator, tools and data
by John Van Ostrand 06 Feb '16

06 Feb '16

Jef, You may be interested in these files if you want to work with the Cochran code. simcochran.c is a simulator that now uses ptys so I can avoid having to use some serial port emulator. It's as easy as running: simcochran -e emc emc.tar.bz and cmdr.tar.bz are data files for use with simcochran and list. These include some incomplete dives. list.c is a program to list the dives from a memory file. This is handy for finding corrupt dives. list -c cmdr/memory -- John Van Ostrand At large on sabbatical

1 0

[PATCH] Cochran: Added back-parser to eliminate inter-dive events on incomplete dives.
by John Van Ostrand 06 Feb '16

06 Feb '16

Incomplete dives may have profile data but since we don't have an end-pointer, we have to use the next dive's pointer or ringbuffer head point in config to get close to the end of the dive. This often includes inter-dive events. We can eliminate those by parsing backwards. --- src/cochran_cmdr_parser.c | 14 ++++++++++++-- src/cochran_commander.c | 9 +++++++-- src/cochran_commander_parser.c | 26 +++++++++++++++++++++++++- src/cochran_commander_parser.h | 2 ++ src/cochran_emc_parser.c | 19 ++++++++++++++++--- 5 files changed, 62 insertions(+), 8 deletions(-) diff --git a/src/cochran_cmdr_parser.c b/src/cochran_cmdr_parser.c index 73b344f..a7db1cd 100644 --- a/src/cochran_cmdr_parser.c +++ b/src/cochran_cmdr_parser.c @@ -130,10 +130,20 @@ cochran_cmdr_parser_samples_foreach (dc_parser_t *abstract, double depth; double ascent_rate; unsigned char corrupt_dive = 0; - - if (array_uint32_le(log + COCHRAN_CMDR_LOG_SIZE / 2) == 0xFFFFFFFF) + int cmdr_event_bytes[15][2] = { {0x00, 17}, {0x01, 21}, {0x02, 18}, + {0x03, 17}, {0x06, 19}, {0x07, 19}, + {0x08, 19}, {0x09, 19}, {0x0a, 19}, + {0x0b, 21}, {0x0c, 19}, {0x0d, 19}, + {0x0e, 19}, {0x10, 21}, + { -1, 1} }; + + if (array_uint32_le(log + COCHRAN_CMDR_LOG_SIZE / 2) == 0xFFFFFFFF) { corrupt_dive = 1; + // Eliminate inter-dive events + size = cochran_backparse(abstract, samples, size, &cmdr_event_bytes); + } + // Cochran samples depth every second and varies between ascent rate // and temp ever other second. diff --git a/src/cochran_commander.c b/src/cochran_commander.c index a8b2f4a..ae2dc45 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -195,8 +195,13 @@ cochran_packet (cochran_device_t *device, dc_event_progress_t *progress, rc = serial_configure(device->port, layout->high_baud_rate, 8, SERIAL_PARITY_NONE, 2, SERIAL_FLOWCONTROL_NONE); if (rc == -1) { - ERROR (abstract->context, "Failed to set the high baud rate."); - return DC_STATUS_IO; + // Assume we are talking to a pty, a simulator + rc = serial_configure(device->port, 115200, 8, SERIAL_PARITY_NONE, + 2, SERIAL_FLOWCONTROL_NONE); + if (rc == -1) { + ERROR (abstract->context, "Failed to set the high baud rate."); + return DC_STATUS_IO; + } } } diff --git a/src/cochran_commander_parser.c b/src/cochran_commander_parser.c index 955dba0..e2b854c 100644 --- a/src/cochran_commander_parser.c +++ b/src/cochran_commander_parser.c @@ -100,7 +100,7 @@ cochran_commander_parser_set_data (dc_parser_t *abstract, parser->layout = cochran_commander_get_layout(data); return DC_STATUS_SUCCESS; -} +} // There are two date formats used by Cochran @@ -236,3 +236,27 @@ cochran_commander_handle_event (dc_parser_t *abstract, return event.data_bytes; } + +/* +* cochran_backparse +* +* Used to find the end of a dive that has an incomplete dive-end +* block. It parses backwards past inter-dive events. +*/ + +int cochran_backparse(dc_parser_t *abstract, const char *samples, int size, int (*event_bytes)[15][2]) { + int result = size, best_result = size; + + for (int x = 0; (*event_bytes)[x][0] != -1; x++) { + int ptr = size - (*event_bytes)[x][1]; + if (ptr > 0 && samples[ptr] == (*event_bytes)[x][0]) { + result = cochran_backparse(abstract, samples, ptr, event_bytes); + } + + if (result < best_result) { + best_result = result; + } + } + + return best_result; +} diff --git a/src/cochran_commander_parser.h b/src/cochran_commander_parser.h index 4e9fc01..730edf7 100644 --- a/src/cochran_commander_parser.h +++ b/src/cochran_commander_parser.h @@ -102,6 +102,8 @@ void cochran_commander_get_event_info(const unsigned char code, int cochran_commander_handle_event (dc_parser_t *abstract, dc_sample_callback_t callback, void *userdata, unsigned char code, unsigned int offset, unsigned int time); +int cochran_backparse(dc_parser_t *abstract, const char *samples, int size, int (*event_bytes)[15][2]); + // EMC FAMILY dc_status_t cochran_emc_parser_get_field (dc_parser_t *abstract, diff --git a/src/cochran_emc_parser.c b/src/cochran_emc_parser.c index 884f8aa..322f3d4 100644 --- a/src/cochran_emc_parser.c +++ b/src/cochran_emc_parser.c @@ -43,6 +43,12 @@ struct dive_stats { float max_temp; }; +// Size of inter-dive events +int emc_event_bytes[15][2] = { {0x00, 19}, {0x01, 23}, {0x02, 20}, + {0x03, 19}, {0x06, 21}, {0x07, 21}, + {0x0a, 21}, {0x0b, 21}, {0x0f, 19}, + {0x10, 21}, + { -1, 1} }; static void cochran_emc_parse_dive_stats (dc_parser_t *abstract, struct dive_stats *stats); @@ -158,10 +164,13 @@ cochran_emc_parser_samples_foreach (dc_parser_t *abstract, unsigned int deco_time; unsigned char corrupt_dive = 0; - - if (array_uint32_le(log + COCHRAN_EMC_LOG_SIZE / 2) == 0xFFFFFFFF) + if (array_uint32_le(log + COCHRAN_EMC_LOG_SIZE / 2) == 0xFFFFFFFF) { corrupt_dive = 1; + // Eliminate inter-dive events + size = cochran_backparse(abstract, samples, size, &emc_event_bytes); + } + /* * Cochran samples depth every second and varies between ascent rate * and temp ever other second. @@ -330,9 +339,13 @@ void cochran_emc_parse_dive_stats (dc_parser_t *abstract, unsigned int time = 0; unsigned char corrupt_dive = 0; - if (array_uint32_le(log + COCHRAN_EMC_LOG_SIZE / 2) == 0xFFFFFFFF) + if (array_uint32_le(log + COCHRAN_EMC_LOG_SIZE / 2) == 0xFFFFFFFF) { corrupt_dive = 1; + // Eliminate inter-dive events + size = cochran_backparse(abstract, samples, size, &emc_event_bytes); + } + // Prime with values from the dive log section depth = array_uint16_le (log + EMC_START_DEPTH) / 256; -- 2.4.3

1 0

Missing Patch
by John Van Ostrand 04 Feb '16

04 Feb '16

You may have notice there isn't a [PATCH 2/3]. That's because I messed up my branch and got a blank patch when I created a new branch. I think I may have deleted the main branch when I was experimenting with creating and removing branches. -- John Van Ostrand At large on sabbatical

1 0

[PATCH 1/3] Cochran Commander: get_field would return bad values (xFF) when dive was incomplete.
by John Van Ostrand 04 Feb '16

04 Feb '16

The commander parser wasn't detecting when dives were incomplete (i.e. dive end block would be set to all 0xFF). So it returned large max depths, temps and other fields. --- src/cochran_cmdr_parser.c | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/src/cochran_cmdr_parser.c b/src/cochran_cmdr_parser.c index b4e8fb7..73b344f 100644 --- a/src/cochran_cmdr_parser.c +++ b/src/cochran_cmdr_parser.c @@ -49,22 +49,40 @@ cochran_cmdr_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, switch (type) { case DC_FIELD_TEMPERATURE_SURFACE: *((unsigned int*) value) = ((float) log[CMD_START_TEMP] - 32) / 1.8; + break; case DC_FIELD_TEMPERATURE_MINIMUM: - *((unsigned int*) value) = ((float) log[CMD_MIN_TEMP] / 2 - + 20 - 32) / 1.8; + if (array_uint16_le(log + CMD_MIN_TEMP) == 0xFFFF) + *((double *) value) = 0; + else + *((unsigned int*) value) = ((float) log[CMD_MIN_TEMP] / 2 + + 20 - 32) / 1.8; + break; case DC_FIELD_TEMPERATURE_MAXIMUM: - *((unsigned int*) value) = ((float) log[CMD_MAX_TEMP] / 2 - + 20 - 32) / 1.8; + if (array_uint16_le(log + CMD_MAX_TEMP) == 0xFFFF) + *((double *) value) = 0; + else + *((unsigned int*) value) = ((float) log[CMD_MAX_TEMP] / 2 + + 20 - 32) / 1.8; + break; case DC_FIELD_DIVETIME: - *((unsigned int *) value) = array_uint16_le (log + CMD_BT) * 60; + if (array_uint16_le(log + CMD_BT) == 0xFFFF) + *((double *) value) = 0; + else + *((unsigned int *) value) = array_uint16_le (log + CMD_BT) * 60; break; case DC_FIELD_MAXDEPTH: - *((double *) value) = (float) array_uint16_le (log + CMD_MAX_DEPTH) - / 4 * FEET; + if (array_uint16_le(log + CMD_MAX_DEPTH) == 0xFFFF) + *((double *) value) = 0; + else + *((double *) value) = (float) array_uint16_le (log + + CMD_MAX_DEPTH) / 4 * FEET; break; case DC_FIELD_AVGDEPTH: - *((double *) value) = (float) array_uint16_le (log + CMD_AVG_DEPTH) - / 4 * FEET; + if (array_uint16_le(log + CMD_AVG_DEPTH) == 0xFFFF) + *((double *) value) = 0; + else + *((double *) value) = (float) array_uint16_le (log + + CMD_AVG_DEPTH) / 4 * FEET; break; case DC_FIELD_GASMIX_COUNT: *((unsigned int *) value) = 2; -- 2.4.3

1 1

Re: Sentinel (and rEvo)
by "Paul-Erik Törrönen" 29 Jan '16

29 Jan '16

> The D<n> command is multiple bytes, right? Yes. As I wrote, I tried the single char commands from the terminal software, and they did not work. > I think you are trying to re-use a bit too much from the backend that > you used as an example. How to best read the response depends on how the > protocol works. Is the length fixed or variable, do we known it in > advance or not, etc. Ok. As I may have mentioned in the beginning, this is totally unknown territory for me. From my understanding though, the code logic should be pretty simple: We do some base assumptions about buffer size, then attempt to read it full, and if the data from the device i less, then we should resize the buffer to match the actual data amount. Going back here: When I successfully get the universal to send (even this seems to be unstable at times) the request byte, it does receive what seems to be an appropriate response. But I think I understand your point, it could be that the chipset on the USB-cable pretending to be a serial device has some assumptions when the client is reading off it, and this has to be matched by the client software? FWIW is it meaningful that the portmon log seems to indicate single byte read most of the time, or is it just an artifact of how portmon logs the communication? Here's a snippet of the portmon log (I grep IRP_MJ for clarity): 87 0.00000698 ProLink2010oct. IRP_MJ_READ Silabser0 SUCCESS Length 3: 50 50 50 92 0.00001509 ProLink2010oct. IRP_MJ_CLEANUP Silabser0 SUCCESS 93 0.00320152 ProLink2010oct. IRP_MJ_CLOSE Silabser0 SUCCESS 94 0.02598515 ProLink2010oct. IRP_MJ_CREATE Silabser0 SUCCESS Options: Open 121 0.00000503 ProLink2010oct. IRP_MJ_READ Silabser0 SUCCESS Length 1: 50 130 0.00000531 ProLink2010oct. IRP_MJ_READ Silabser0 SUCCESS Length 1: 50 139 0.00000531 ProLink2010oct. IRP_MJ_READ Silabser0 SUCCESS Length 1: 50 145 0.00093783 ProLink2010oct. IRP_MJ_WRITE Silabser0 SUCCESS Length 1: 4D 155 0.00000559 ProLink2010oct. IRP_MJ_READ Silabser0 SUCCESS Length 1: 64 164 0.00000363 ProLink2010oct. IRP_MJ_READ Silabser0 SUCCESS Length 1: 0D 173 0.00000363 ProLink2010oct. IRP_MJ_READ Silabser0 SUCCESS Length 1: 0A 182 0.00000363 ProLink2010oct. IRP_MJ_READ Silabser0 SUCCESS Length 1: 76 0x50 equals P and seems to be the standby byte sent periodically. So this equals to: read: PPP read: P read: P read: P send: M read: d read: \r read: \n read: v ... Poltsi -- Paul-Erik Törrönen poltsi(a)777-team.org +358 40 703 1231 http://poltsi.fi/ Science, it reduces the stupid

2 4

Cochran Changes
by John Van Ostrand 29 Jan '16

29 Jan '16

Hi, Now that our branches match I went through last year's thread on Cochran development, "Cochran_commander refactoring". I think this is a summary of where we left of: 1. dc_context_t pointer doesn't need to be passed to cochran serial open a setup functions. (fixed with patch pending.) 2. Cochran can store more log entries than profiles. So when the profile ring buffer wraps earlier logs will point to profile data from other dives. Jef suggests processing dives in reverse chronological order, adding up profile data used and not processing profiles after it's processed a full ring-buffer of data. I have yet to work on this or consider alternatives. 3. Corrupt dive handling. In some cases (like a low battery especially in cold water) the computer resets during a dive. This results in a "start-dive" block written but no valid "end-dive" block written. We know information from the start of a dive (like date/time, gasses, profile start pointer, etc.) but we don't know information accumulated during or at the end of a dive (like end-profile pointer, max depth, min temp, etc.) I've taken to guessing the end of a dive by starting with the next dive's pre-dive-profile-pointer and backing up until we think we have the previous dive's end. We haven't resolved our differences on this. It seems to down to the question: Do we present a partial or broken profile in the interest of giving the diver something or do we give nothing in the interest of being accurate? -- John Van Ostrand At large on sabbatical

3 4

[PATCH 1/3] Cochran: Remove uneeded "context" argument to serial functions.
by John Van Ostrand 23 Jan '16

23 Jan '16

It was extraneous becaue it's included in the dc_device_t struct. --- src/cochran_commander.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index 9fb8c6b..97e0531 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -221,7 +221,7 @@ cochran_packet (cochran_device_t *device, dc_event_progress_t *progress, static dc_status_t -cochran_commander_serial_setup (cochran_device_t *device, dc_context_t *context) +cochran_commander_serial_setup (cochran_device_t *device) { int rc; @@ -229,7 +229,7 @@ cochran_commander_serial_setup (cochran_device_t *device, dc_context_t *context) rc = serial_configure (device->port, 9600, 8, SERIAL_PARITY_NONE, 2, SERIAL_FLOWCONTROL_NONE); if (rc == -1) { - ERROR (context, "Failed to set the terminal attributes."); + ERROR (device->base.context, "Failed to set the terminal attributes."); serial_close (device->port); return DC_STATUS_IO; } @@ -247,7 +247,7 @@ cochran_commander_serial_setup (cochran_device_t *device, dc_context_t *context) // Set the timeout for receiving data (5000 ms). if (serial_set_timeout (device->port, 5000) == -1) { - ERROR (context, "Failed to set the timeout."); + ERROR (device->base.context, "Failed to set the timeout."); serial_close (device->port); return DC_STATUS_IO; } @@ -256,7 +256,7 @@ cochran_commander_serial_setup (cochran_device_t *device, dc_context_t *context) char answer[1]; int n = serial_read(device->port, answer, 1); if (n != 1) { - ERROR (context, "Failed to receive device heartbeat."); + ERROR (device->base.context, "Failed to receive device heartbeat."); return EXITCODE (n); } @@ -265,16 +265,16 @@ cochran_commander_serial_setup (cochran_device_t *device, dc_context_t *context) dc_status_t -cochran_commander_serial_open(cochran_device_t *device, dc_context_t *context) +cochran_commander_serial_open(cochran_device_t *device) { // Open the device. - int rc = serial_open (&device->port, context, device->name); + int rc = serial_open (&device->port, device->base.context, device->name); if (rc == -1) { - ERROR (context, "Failed to open the serial port."); + ERROR (device->base.context, "Failed to open the serial port."); return DC_STATUS_IO; } - return cochran_commander_serial_setup(device, context); + return cochran_commander_serial_setup(device); } @@ -304,7 +304,7 @@ cochran_commander_device_open (dc_device_t **out, dc_context_t *context, cochran_commander_device_set_fingerprint((dc_device_t *) device, NULL, 0); - rc = cochran_commander_serial_open(device, context); + rc = cochran_commander_serial_open(device); if (rc != DC_STATUS_SUCCESS) { dc_device_deallocate((dc_device_t *) device); return rc; @@ -586,7 +586,7 @@ cochran_read_logbook (dc_device_t *abstract, dc_event_progress_t *progress) serial_sleep(device->port, 800); // set back to 9600 baud - cochran_commander_serial_setup(device, abstract->context); + cochran_commander_serial_setup(device); // Request log book rc = cochran_commander_read(abstract, progress, 0, d->logbook, @@ -686,7 +686,7 @@ cochran_read_samples(dc_device_t *abstract, dc_event_progress_t *progress) serial_sleep(device->port, 800); // set back to 9600 baud - cochran_commander_serial_setup(device, abstract->context); + cochran_commander_serial_setup(device); // Read the sample data rc = cochran_commander_read (abstract, progress, d->sample_data_offset, @@ -817,7 +817,7 @@ cochran_commander_device_dump (dc_device_t *abstract, dc_buffer_t *data) serial_sleep(device->port, 800); // set back to 9600 baud - cochran_commander_serial_setup(device, abstract->context); + cochran_commander_serial_setup(device); // Read the sample data, from 0 to sample end will include logbook rc = cochran_commander_read (abstract, &progress, 0, -- 2.4.3

1 2

[PATCH 1/6] Fixed rounding error with ascent rates.
by John Van Ostrand 11 Jan '16

11 Jan '16

--- src/cochran_emc_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cochran_emc_parser.c b/src/cochran_emc_parser.c index 635f050..5d430f4 100644 --- a/src/cochran_emc_parser.c +++ b/src/cochran_emc_parser.c @@ -246,7 +246,7 @@ cochran_emc_parser_samples_foreach (dc_parser_t *abstract, // Ascent rate is logged in the 0th sample, temp in the 1st, repeat. if (time % 2 == 0) { // Ascent rate - ascent_rate = (s[1] & 0x7f) / 4 * (s[1] & 0x80 ? 1 : -1); + ascent_rate = (float) (s[1] & 0x7f) / 4 * (s[1] & 0x80 ? 1 : -1); sample.ascent_rate = ascent_rate * FEET; if (callback) callback (DC_SAMPLE_ASCENT_RATE, sample, userdata); } else { -- 2.4.3

1 5

[PATCH 001/007] Missed a conflict in the last pull.
by John Van Ostrand 08 Jan '16

08 Jan '16

--- src/libdivecomputer.symbols | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols index fd8f44a..a870a22 100644 --- a/src/libdivecomputer.symbols +++ b/src/libdivecomputer.symbols @@ -170,8 +170,5 @@ shearwater_predator_extract_dives shearwater_petrel_device_open diverite_nitekq_device_open diverite_nitekq_extract_dives -<<<<<<< HEAD cochran_commander_device_open -======= citizen_aqualand_device_open ->>>>>>> 134da18190b5ea1581d789564979e3e4c73cd243 -- 2.4.3

1 6