- devel - libdivecomputer.org

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

[PATCH] Cochran: Added three event codes
by John Van Ostrand 13 Aug '17

13 Aug '17

I found three previously undiscovered event codes. --- src/cochran_commander_parser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cochran_commander_parser.c b/src/cochran_commander_parser.c index 60a1b31..c3dad26 100644 --- a/src/cochran_commander_parser.c +++ b/src/cochran_commander_parser.c @@ -222,7 +222,9 @@ static const cochran_events_t cochran_events[] = { {0xA9, 1, SAMPLE_EVENT_SURFACE, SAMPLE_FLAGS_END}, // Exited PDI mode {0xAB, 5, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_NONE}, // Ceiling decrease {0xAD, 5, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_NONE}, // Ceiling increase + {0xB5, 1, SAMPLE_EVENT_AIRTIME, SAMPLE_FLAGS_BEGIN}, // Air < 5 mins deco {0xBD, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_NONE}, // Switched to nomal PO2 setting + {0xBE, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_NONE}, // Ceiling > 60 ft {0xC0, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_NONE}, // Switched to FO2 21% mode {0xC1, 1, SAMPLE_EVENT_ASCENT, SAMPLE_FLAGS_BEGIN}, // Ascent rate greater than limit {0xC2, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_NONE}, // Low battery warning @@ -233,6 +235,7 @@ static const cochran_events_t cochran_events[] = { {0xC8, 1, SAMPLE_EVENT_PO2, SAMPLE_FLAGS_BEGIN}, // PO2 too high {0xCC, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_BEGIN}, // Low Cylinder 1 pressure {0xCE, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_BEGIN}, // Non-decompression warning + {0xCF, 1, SAMPLE_EVENT_OLF, SAMPLE_FLAGS_BEGIN}, // O2 Toxicity {0xCD, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_NONE}, // Switched to deco blend {0xD0, 1, SAMPLE_EVENT_WORKLOAD, SAMPLE_FLAGS_BEGIN}, // Breathing rate alarm {0xD3, 1, SAMPLE_EVENT_NONE, SAMPLE_FLAGS_NONE}, // Low gas 1 flow rate -- 2.4.11

1 0

[PATCH 1/6] Cochran: Remove uneeded cochran_commander_get_sample_parms function
by John Van Ostrand 11 Aug '17

11 Aug '17

Since moving to per-dive download of profile data (and now rbstream download) the data->sample_data_offset and data->sample_size variables aren't used so calculating them doesn't make sense. --- src/cochran_commander.c | 68 ------------------------------------------------- 1 file changed, 68 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index e517027..3e125bb 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -59,9 +59,6 @@ typedef struct cochran_data_t { int invalid_profile_dive_num; unsigned int logbook_size; - - unsigned int sample_data_offset; - unsigned int sample_size; } cochran_data_t; typedef struct cochran_device_layout_t { @@ -608,69 +605,6 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d } - -static void -cochran_commander_get_sample_parms(cochran_commander_device_t *device, cochran_data_t *data) -{ - dc_device_t *abstract = (dc_device_t *) device; - unsigned int pre_dive_offset = 0, end_dive_offset = 0; - - unsigned int dive_count = 0; - if (data->dive_count < device->layout->rb_logbook_entry_count) - dive_count = data->dive_count; - else - dive_count = device->layout->rb_logbook_entry_count; - - // Find lowest and highest offsets into sample data - unsigned int low_offset = 0xFFFFFFFF; - unsigned int high_offset = 0; - - for (unsigned int i = data->fp_dive_num + 1; i < dive_count; i++) { - pre_dive_offset = array_uint32_le (data->logbook + i * device->layout->rb_logbook_entry_size - + device->layout->pt_profile_pre); - end_dive_offset = array_uint32_le (data->logbook + i * device->layout->rb_logbook_entry_size - + device->layout->pt_profile_end); - - // Validate offsets, allow 0xFFFFFFF for end_dive_offset - // because we handle that as a special case. - if (pre_dive_offset < device->layout->rb_profile_begin || - pre_dive_offset > device->layout->rb_profile_end) { - ERROR(abstract->context, "Invalid pre-dive offset (%08x) on dive %d.", pre_dive_offset, i); - continue; - } - - if (end_dive_offset < device->layout->rb_profile_begin || - (end_dive_offset > device->layout->rb_profile_end && - end_dive_offset != 0xFFFFFFFF)) { - ERROR(abstract->context, "Invalid end-dive offset (%08x) on dive %d.", end_dive_offset, i); - continue; - } - - // Check for ring buffer wrap-around. - if (pre_dive_offset > end_dive_offset) - break; - - if (pre_dive_offset < low_offset) - low_offset = pre_dive_offset; - if (end_dive_offset > high_offset && end_dive_offset != 0xFFFFFFFF ) - high_offset = end_dive_offset; - } - - if (pre_dive_offset > end_dive_offset) { - high_offset = device->layout->rb_profile_end; - low_offset = device->layout->rb_profile_begin; - data->sample_data_offset = low_offset; - data->sample_size = high_offset - low_offset; - } else if (low_offset < 0xFFFFFFFF && high_offset > 0) { - data->sample_data_offset = low_offset; - data->sample_size = high_offset - data->sample_data_offset; - } else { - data->sample_data_offset = 0; - data->sample_size = 0; - } -} - - dc_status_t cochran_commander_device_open (dc_device_t **out, dc_context_t *context, const char *name) { @@ -907,8 +841,6 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call progress.maximum -= (max_sample - profile_read_size); device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); - cochran_commander_get_sample_parms(device, &data); - // Emit a device info event. dc_event_devinfo_t devinfo; devinfo.model = layout->model; -- 2.4.11

2 15

[PATCH 1/3] Cochran: Add a size parameter to cochran_commander_read_config().
by John Van Ostrand 11 Aug '17

11 Aug '17

Responded to a code review. --- src/cochran_commander.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index f7d2e91..068fd04 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -429,12 +429,24 @@ cochran_commander_read_id (cochran_commander_device_t *device, unsigned char id[ static dc_status_t -cochran_commander_read_config (cochran_commander_device_t *device, dc_event_progress_t *progress, unsigned char data[]) +cochran_commander_read_config (cochran_commander_device_t *device, dc_event_progress_t *progress, unsigned char data[], int data_size) { dc_device_t *abstract = (dc_device_t *) device; dc_status_t rc = DC_STATUS_SUCCESS; - unsigned int pages = 2; + unsigned int pages = 0; + + switch (data_size) { + case 512: + pages = 1; + break; + case 1024: + pages = 2; + break; + default: + return DC_STATUS_INVALIDARGS; + break; + } if (device->layout->model == COCHRAN_MODEL_COMMANDER_TM) pages = 1; @@ -816,7 +828,7 @@ cochran_commander_device_dump (dc_device_t *abstract, dc_buffer_t *buffer) vendor.size = sizeof (device->id); device_event_emit (abstract, DC_EVENT_VENDOR, &vendor); - rc = cochran_commander_read_config (device, &progress, config); + rc = cochran_commander_read_config (device, &progress, config, config_size); if (rc != DC_STATUS_SUCCESS) return rc; @@ -867,7 +879,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call // Read config dc_status_t rc = DC_STATUS_SUCCESS; - rc = cochran_commander_read_config(device, &progress, data.config); + rc = cochran_commander_read_config(device, &progress, data.config, max_config); if (rc != DC_STATUS_SUCCESS) return rc; -- 2.4.11

1 2

[PATCH 1/2] Cochran: Fixed late declaration/initialization of rbstream
by John Van Ostrand 14 Jul '17

14 Jul '17

An error could cause code to jump past initialiation resulting in freeing an undefined variable. --- src/cochran_commander.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index 5020792..a21478d 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -834,6 +834,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call cochran_data_t data; data.logbook = NULL; + dc_rbstream_t *rbstream = NULL; // Often used variables unsigned int rb_logbook_entry_count = layout->rb_logbook_entry_count; @@ -933,7 +934,6 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call // Create rbstream unsigned int last_start_address = array_uint32_le( data.logbook + ((head_dive - 1) * layout->rb_logbook_entry_size) + layout->pt_profile_end ); - dc_rbstream_t *rbstream = NULL; rc = dc_rbstream_new (&rbstream, abstract, 1, 131072, layout->rb_profile_begin, layout->rb_profile_end, last_start_address ); int invalid_profile_flag = 0; -- 2.4.11

1 1

[PATCH 1/2] Cochran: Small cleanup
by John Van Ostrand 03 Jul '17

03 Jul '17

Changed var to unsigned int. Removed unused code. --- src/cochran_commander.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index ac4c596..ef9c5e4 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -553,7 +553,7 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d data->invalid_profile_dive_num = -1; // Remove the pre-dive events that occur after the last dive - int rb_head_ptr; + unsigned int rb_head_ptr; if (device->layout->endian == ENDIAN_WORD_BE) rb_head_ptr = (array_uint32_word_be(data->config + device->layout->cf_last_log) & 0xfffff000) + 0x2000; else @@ -931,20 +931,6 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call device_event_emit (abstract, DC_EVENT_DEVINFO, &devinfo); - // Calculate profile RB effective head pointer - // Cochran seems to erase 8K chunks so round up. - unsigned int last_start_address; - if (layout->endian == ENDIAN_WORD_BE) - last_start_address = (array_uint32_word_be(data.config + layout->cf_last_interdive) & 0xfffff000) + 0x2000; - else - last_start_address = (array_uint32_le(data.config + layout->cf_last_interdive) & 0xfffff000) + 0x2000; - - if (last_start_address < layout->rb_profile_begin || last_start_address > layout->rb_profile_end) { - ERROR(abstract->context, "Invalid profile ringbuffer head pointer in Cochran config block."); - status = DC_STATUS_DATAFORMAT; - goto error; - } - unsigned int head_dive = 0, tail_dive = 0, dive_count = 0; if (data.dive_count <= rb_logbook_entry_count) { -- 2.4.11

1 1

[PATCH] Cochran: Fixed duplicate gasmix event reports
by John Van Ostrand 02 Jul '17

02 Jul '17

Newer cochran DCs record a gas change event at the begining of a dive. The code creates a gas change before processing samples so with newer DCs this resulted in duplicate events. --- src/cochran_commander_parser.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/cochran_commander_parser.c b/src/cochran_commander_parser.c index 9340d01..b58a6c4 100644 --- a/src/cochran_commander_parser.c +++ b/src/cochran_commander_parser.c @@ -568,6 +568,7 @@ cochran_commander_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callb sample.gasmix = 0; if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata); + unsigned int last_gasmix = sample.gasmix; while (offset < size) { const unsigned char *s = samples + offset; @@ -631,12 +632,18 @@ cochran_commander_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callb break; case 0xCD: // Switched to deco blend case 0xEF: // Switched to gas blend 2 - sample.gasmix = 1; - if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata); + if (last_gasmix != 1) { + sample.gasmix = 1; + if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata); + last_gasmix = sample.gasmix; + } break; case 0xF3: // Switched to gas blend 1 - sample.gasmix = 0; - if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata); + if (last_gasmix != 0) { + sample.gasmix = 0; + if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata); + last_gasmix = sample.gasmix; + } break; } -- 2.4.11

1 0

[PATCH 1/4] Cochran: Fixed location and encoding of CmdrII pointers
by John Van Ostrand 30 Jun '17

30 Jun '17

Commander II pointers to profile ringbuffer data was wrong. After seeing the Commander I encoding I realized the Commander II encoding of RB pointers was in a flipped word big endian format. It only appeared to be in normal big endian format because of an adjacent pointer that usually shared the same first two bytes. --- src/cochran_commander.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index 27ed67d..3f084d3 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -147,11 +147,11 @@ static const cochran_device_layout_t cochran_cmdr_1_device_layout = { static const cochran_device_layout_t cochran_cmdr_device_layout = { COCHRAN_MODEL_COMMANDER_AIR_NITROX, // model 24, // address_bits - ENDIAN_BE, // endian + ENDIAN_WORD_BE, // endian 115200, // baudrate 0x046, // cf_dive_count - 0x06E, // cf_last_log - 0x200, // cf_last_interdive + 0x070, // cf_last_log + 0x06C, // cf_last_interdive 0x0AA, // cf_serial_number 0x00000000, // rb_logbook_begin 0x00020000, // rb_logbook_end -- 2.4.11

1 3

Re: Scubapro Galileo 2 (G2)
by Linus Torvalds 27 Jun '17

27 Jun '17

On Wed, Jun 7, 2017 at 8:17 AM, CZS <charles.z.stover(a)gmail.com> wrote: > > Thanks for the reply, it's never a bad thing when the developer is diving > the same computer ;) Great to hear you're working towards a USB download > first, as frankly I find the BLE support a mere luxury! So it turns out that the Scubapro G2 support looks really straightforward, helped by the fact that the USB HID part of the thing is very similar to what the Suunto EON Steel does (and I did the reverse engineering for that one, and wrote the downloader), and the actual commands and data parsing appears pretty much exactly the same as the Galileo Sol. So if you actually build your own, here's a patch to libdivecomputer that should get things into testable territory. I *have* actually tested it myself, but right now my only "dive" is me dropping the dive computer into the neighbors pool for four minutes. So my test data is very very limited. I'll have more test data in a week, but for now this might be good enough to do at least some initial trial downloads. Linus

4 13