devel July 2017

devel@libdivecomputer.org

6 participants
5 discussions

[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

[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/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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

devel July 2017