- devel - libdivecomputer.org

Brave people - look at and test BLE downloads
by Linus Torvalds 24 Jun '17

24 Jun '17

So I currently have the BLE GATT downloading working on both my Suunto EON Steel and the Scubapro G2. This is to see if anybody else wants to play with the code, but before looking at the code, a few faily big caveats: (a) BLE is not fast. Just be warned. You *will* be happier with a USB cable if you have that option. (b) divecomputers are odd, and not a lot of people seem to play with them over bluetooth. At least Suunto seems to consider the BLE to be mobile-only. On desktop systems, bluetooth seems to be pretty hit and miss outside of legacy mouse/keyboard/audio things. Odd BLE devices? Yeah, bugs will happen. (c) I only work with Linux, and I don't do mobile. End result: right now the code only works on Linux laptops and desktops with bluetooth. A regular BT-4.0 USB dongle works fine for me on my desktop, and my laptop has Intel wireless with BT that also works. So as long as it's LE-capable (and not all BT dongles are), it probably works. (d) ...but I found several "features" due to (b), and you'll not only need a fairly up-to-date Qt installation, you may need to literally build your own due to Qt bugs (the EON Steel in particular is very picky, and Qt/Bluez didn't connect to it without patches). (e) my BLE code is not pretty. It's scary. In fact, it can probably be used to make small timid pets pee on the floor in fright. You have been warned. With those encouraging words, here's the scoop: If using Qt, use at least 5.9.1, and if you want to play with the EON Steel, make it work on some non-Bluez platform (which has so far never been tested - Bluez is what the Linux desktop environments use), and use the patch from here: https://codereview.qt-project.org/#/c/198202/ You also need to make sure that you have "device privacy" enabled, at least in order to pair with the EON Steel. It will not talk to you unless you have a device identity key ("IRK"). With Bluez (ie Linux desktop environment), this involves making sure that you have Privacy = device in your bluetooth config file (normally /etc/bluetooth/main.conf, and normally it it set to "off"). Also, make sure that you have the current libdivecomputer Subsurface-branch, which has the code for the EON Steel and the Scubapro G2 to know the differences between a USB HID download and a BLE GATT download. And if y ou do all that, and if you apply the attached patch to the current subsurface source base, and if you walk around three times widdershins around your computer while you build it all, you *may* just get working BLE GATT downloads. I'll hopefully look at the Shearwater Perdix AI next. Since BLE is the *only* way to download from that dive computer, it would be really nice if I can make this work for that too. We'll see. Linus

1 0

New to libdivecomputer. Where do I begin?
by Ryan January 21 Jun '17

21 Jun '17

Hello, I've been a libdivecomputer user (through subsurface) for a number of years. I'm in possession of a dive computer that is undergoing user testing now. I've been looking for an area I may be able to contribute to for a few years and feel this may be an interesting opportunity. My biggest issue is that I'm not sure where to begin the development process. The computer exposes itself as a USB mass storage device. Dive logs are located in a known folder, and are stored in a file format which is well documented. Considering I'm not seeing any currently supported computers exposed as storage devices, is this support something that would even be desired and/or possible? As I understand it there is an IO refactoring that's potentially in the works. If desired, is now a bad time to start this process? Thank you, Ryan

4 5

Support for Omer / Sporasub apnea computer
by Soenke Schippmann 14 Jun '17

14 Jun '17

Hi, is there any support for the Sporasub / Omer apnea computers so far? I would be happy to help with any data to get these devices working. The attached logfile shows the initial communication between the vendors software and an Omer UP-X1, with no dives logged so far. The UP-X1 should be similar to the UP-X1R and the Sporasub SP2. More about the devices: http://www.omersub.com/eng/upx1_eng.asp http://www.sporasub.com/eng/sp2_eng.asp Thanks, Soenke -- ** sönke schippmann ** email: soenke(a)tjosso.net

2 1

[PATCH] Cochran: Code review changes
by John Van Ostrand 12 Jun '17

12 Jun '17

Changed loops from do..while to for. Changed time-related variable names to more customary names. Changed datetime handling to streamline a clock-tick datetime decoding. Create cochran_commander_read_retry() function to perform reads. Correct device model strings. Non-code review related: Added new EMC device model string. Created shorter variables for commonly used structure elements. --- src/cochran_commander.c | 128 ++++++++++++++++++++++------------------- src/cochran_commander_parser.c | 72 ++++++++++++----------- 2 files changed, 108 insertions(+), 92 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index 1c1009f..27ed67d 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -244,7 +244,10 @@ cochran_commander_get_model (cochran_commander_device_t *device) {"\x11""21", COCHRAN_MODEL_COMMANDER_PRE21000}, {"\x11""22", COCHRAN_MODEL_COMMANDER_AIR_NITROX}, {"730", COCHRAN_MODEL_EMC_14}, + {"731", COCHRAN_MODEL_EMC_14}, + {"\x40""30", COCHRAN_MODEL_EMC_20}, {"A30", COCHRAN_MODEL_EMC_16}, + {"A31", COCHRAN_MODEL_EMC_16}, {"230", COCHRAN_MODEL_EMC_20}, {"231", COCHRAN_MODEL_EMC_20}, }; @@ -473,6 +476,22 @@ cochran_commander_read (cochran_commander_device_t *device, dc_event_progress_t return DC_STATUS_SUCCESS; } +static unsigned int +cochran_commander_read_retry (cochran_commander_device_t *device, dc_event_progress_t *progress, unsigned int address, unsigned char data[], unsigned int size) +{ + unsigned int saved_current = progress->current; + dc_status_t rc; + + for (unsigned int tries = 0; tries < 3; tries++) { + rc = cochran_commander_read (device, progress, address, data, size); + if (rc != DC_STATUS_SUCCESS) + progress->current = saved_current; + else + break; + } + return rc; +} + /* * For corrupt dives the end-of-samples pointer is 0xFFFFFFFF @@ -574,9 +593,8 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d // Loop through dives to find FP, Accumulate profile data size, // and find the last dive with invalid profile - unsigned int i = head_dive; - do { - i = ringbuffer_decrement(i, 1, 0, device->layout->rb_logbook_entry_count); + for (int x = dive_count; x >= 0; x--) { + unsigned int i = (device->layout->rb_logbook_entry_count + head_dive - (dive_count - x + 1)) % device->layout->rb_logbook_entry_count; unsigned char *log_entry = data->logbook + i * device->layout->rb_logbook_entry_size; @@ -600,7 +618,7 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d // Accumulate read size for progress bar sample_read_size += read_size; } - } while (i != tail_dive); + } return sample_read_size; } @@ -623,7 +641,7 @@ cochran_commander_get_sample_parms(cochran_commander_device_t *device, cochran_d unsigned int low_offset = 0xFFFFFFFF; unsigned int high_offset = 0; - for (int i = data->fp_dive_num + 1; i < dive_count; i++) { + 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 @@ -833,15 +851,19 @@ static dc_status_t cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, void *userdata) { cochran_commander_device_t *device = (cochran_commander_device_t *) abstract; + const cochran_device_layout_t *layout = device->layout; dc_status_t status = DC_STATUS_SUCCESS; cochran_data_t data; data.logbook = NULL; + // Often used variables + unsigned int rb_logbook_entry_count = layout->rb_logbook_entry_count; + // Calculate max data sizes unsigned int max_config = sizeof(data.config); - unsigned int max_logbook = device->layout->rb_logbook_end - device->layout->rb_logbook_begin; - unsigned int max_sample = device->layout->rb_profile_end - device->layout->rb_profile_begin; + unsigned int max_logbook = layout->rb_logbook_end - layout->rb_logbook_begin; + unsigned int max_sample = layout->rb_profile_end - layout->rb_profile_begin; // setup progress indication dc_event_progress_t progress = EVENT_PROGRESS_INITIALIZER; @@ -861,19 +883,19 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call return rc; // Determine size of dive list to read. - if (device->layout->endian == ENDIAN_LE) - data.dive_count = array_uint16_le (data.config + device->layout->cf_dive_count); + if (layout->endian == ENDIAN_LE) + data.dive_count = array_uint16_le (data.config + layout->cf_dive_count); else - data.dive_count = array_uint16_be (data.config + device->layout->cf_dive_count); + data.dive_count = array_uint16_be (data.config + layout->cf_dive_count); if (data.dive_count == 0) // No dives to read return DC_STATUS_SUCCESS; - if (data.dive_count > device->layout->rb_logbook_entry_count) { - data.logbook_size = device->layout->rb_logbook_entry_count * device->layout->rb_logbook_entry_size; + if (data.dive_count > rb_logbook_entry_count) { + data.logbook_size = rb_logbook_entry_count * layout->rb_logbook_entry_size; } else { - data.logbook_size = data.dive_count * device->layout->rb_logbook_entry_size; + data.logbook_size = data.dive_count * layout->rb_logbook_entry_size; } // Update progress indicator with new maximum @@ -904,53 +926,57 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call // Emit a device info event. dc_event_devinfo_t devinfo; - devinfo.model = device->layout->model; + devinfo.model = layout->model; devinfo.firmware = 0; // unknown - if (device->layout->endian == ENDIAN_WORD_BE) - devinfo.serial = array_uint32_word_be(data.config + device->layout->cf_serial_number); + if (layout->endian == ENDIAN_WORD_BE) + devinfo.serial = array_uint32_word_be(data.config + layout->cf_serial_number); else - devinfo.serial = array_uint32_le(data.config + device->layout->cf_serial_number); + devinfo.serial = array_uint32_le(data.config + layout->cf_serial_number); 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 (device->layout->endian == ENDIAN_WORD_BE) - last_start_address = (array_uint32_word_be(data.config + device->layout->cf_last_interdive) & 0xfffff000) + 0x2000; + 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 + device->layout->cf_last_interdive) & 0xfffff000) + 0x2000; + last_start_address = (array_uint32_le(data.config + layout->cf_last_interdive) & 0xfffff000) + 0x2000; - if (last_start_address < device->layout->rb_profile_begin || last_start_address > device->layout->rb_profile_end) { + 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; + unsigned int head_dive = 0, tail_dive = 0, dive_count = 0; - if (data.dive_count <= device->layout->rb_logbook_entry_count) { + if (data.dive_count <= rb_logbook_entry_count) { head_dive = data.dive_count; tail_dive = 0; } else { // Log wrapped - tail_dive = data.dive_count % device->layout->rb_logbook_entry_count; + tail_dive = data.dive_count % rb_logbook_entry_count; head_dive = tail_dive; } + + // Change tail to dive following the fingerprint dive. if (data.fp_dive_num > -1) - tail_dive = data.fp_dive_num + 1; + tail_dive = (data.fp_dive_num + 1) % rb_logbook_entry_count; + + // Number of dives to read + dive_count = (rb_logbook_entry_count + head_dive - tail_dive) % rb_logbook_entry_count; int invalid_profile_flag = 0; // Loop through each dive - unsigned int i = head_dive; - do { - i = ringbuffer_decrement(i, 1, 0, device->layout->rb_logbook_entry_count); + for (unsigned int x = dive_count; x > 0; x--) { + unsigned int i = (rb_logbook_entry_count + head_dive - (dive_count - x + 1)) % rb_logbook_entry_count; - unsigned char *log_entry = data.logbook + i * device->layout->rb_logbook_entry_size; + unsigned char *log_entry = data.logbook + i * layout->rb_logbook_entry_size; - unsigned int sample_start_address = array_uint32_le (log_entry + device->layout->pt_profile_begin); - unsigned int sample_end_address = array_uint32_le (log_entry + device->layout->pt_profile_end); + unsigned int sample_start_address = array_uint32_le (log_entry + layout->pt_profile_begin); + unsigned int sample_end_address = array_uint32_le (log_entry + layout->pt_profile_end); int sample_size = 0; @@ -962,16 +988,15 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call sample_size = cochran_commander_profile_size(device, &data, i, PROFILE_SIZE_READ); // Build dive blob - unsigned int dive_size = device->layout->rb_logbook_entry_size + sample_size; + unsigned int dive_size = layout->rb_logbook_entry_size + sample_size; unsigned char *dive = (unsigned char *) malloc(dive_size); if (dive == NULL) { status = DC_STATUS_NOMEMORY; goto error; } - memcpy(dive, log_entry, device->layout->rb_logbook_entry_size); // log + memcpy(dive, log_entry, layout->rb_logbook_entry_size); // log - int tries = 0; // Read profile data if (sample_size) { if (sample_end_address == 0xFFFFFFFF) @@ -979,55 +1004,42 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call sample_end_address = cochran_commander_guess_sample_end_address(device, &data, i); if (sample_start_address <= sample_end_address) { - do { - int saved_progress = progress.current; - rc = cochran_commander_read (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, sample_size); - if (rc != DC_STATUS_SUCCESS) - progress.current = saved_progress; - } while (rc != DC_STATUS_SUCCESS && tries++ < 3); + rc = cochran_commander_read_retry (device, &progress, sample_start_address, dive + layout->rb_logbook_entry_size, sample_size); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); status = rc; + free(dive); goto error; } } else { // It wrapped the buffer, copy two sections - unsigned int size = device->layout->rb_profile_end - sample_start_address; - - tries = 0; - do { - int saved_progress = progress.current; - rc = cochran_commander_read (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, size); - if (rc != DC_STATUS_SUCCESS) - progress.current = saved_progress; - } while (rc != DC_STATUS_SUCCESS && tries++ < 3); + unsigned int size = layout->rb_profile_end - sample_start_address; + + rc = cochran_commander_read_retry (device, &progress, sample_start_address, dive + layout->rb_logbook_entry_size, size); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); status = rc; + free(dive); goto error; } - tries = 0; - do { - int saved_progress = progress.current; - rc = cochran_commander_read (device, &progress, device->layout->rb_profile_begin, dive + device->layout->rb_logbook_entry_size + size, sample_end_address - device->layout->rb_profile_begin); - if (rc != DC_STATUS_SUCCESS) - progress.current = saved_progress; - } while (rc != DC_STATUS_SUCCESS && tries++ < 3); + + rc = cochran_commander_read_retry (device, &progress, layout->rb_profile_begin, dive + layout->rb_logbook_entry_size + size, sample_end_address - layout->rb_profile_begin); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); status = rc; + free(dive); goto error; } } } - if (callback && !callback (dive, dive_size, dive + device->layout->pt_fingerprint, device->layout->fingerprint_size, userdata)) { + if (callback && !callback (dive, dive_size, dive + layout->pt_fingerprint, layout->fingerprint_size, userdata)) { free(dive); break; } free(dive); - } while (i != tail_dive); + } error: free(data.logbook); diff --git a/src/cochran_commander_parser.c b/src/cochran_commander_parser.c index d9521c0..484b195 100644 --- a/src/cochran_commander_parser.c +++ b/src/cochran_commander_parser.c @@ -39,7 +39,7 @@ #define COCHRAN_MODEL_EMC_20 4 // Cochran time stamps start at Jan 1, 1992 -#define COCHRAN_TIME_SHIFT 694242000 +#define COCHRAN_EPOCH 694242000 #define UNSUPPORTED 0xFFFFFFFF @@ -50,8 +50,9 @@ typedef enum cochran_sample_format_t { typedef enum cochran_date_encoding_t { - DATE_ENCODING_ELEMENTAL, - DATE_ENCODING_SECONDS_SINCE, + DATE_ENCODING_MSDHYM, + DATE_ENCODING_SMHDMY, + DATE_ENCODING_TICKS, } cochran_date_encoding_t; typedef struct cochran_parser_layout_t { @@ -59,8 +60,7 @@ typedef struct cochran_parser_layout_t { unsigned int headersize; unsigned int samplesize; cochran_date_encoding_t date_encoding; - unsigned int second, minute, hour, day, month, year; - unsigned int timestamp; + unsigned int datetime; unsigned int pt_profile_begin; unsigned int water_conductivity; unsigned int pt_profile_pre; @@ -118,9 +118,8 @@ static const cochran_parser_layout_t cochran_cmdr_1_parser_layout = { SAMPLE_CMDR, // type 256, // headersize 2, // samplesize - DATE_ENCODING_SECONDS_SINCE, // date_encoding - 1, 0, 3, 2, 5, 4, // second, minute, hour, day, month, year, 1 byte each - 8, // timestamp, 4 bytes + DATE_ENCODING_TICKS, // date_encoding + 8, // datetime, 4 bytes 0, // pt_profile_begin, 4 bytes 24, // water_conductivity, 1 byte, 0=low(fresh), 2=high(sea) 28, // pt_profile_pre, 4 bytes @@ -143,9 +142,8 @@ static const cochran_parser_layout_t cochran_cmdr_parser_layout = { SAMPLE_CMDR, // type 256, // headersize 2, // samplesize - DATE_ENCODING_ELEMENTAL, // date_encoding - 1, 0, 3, 2, 5, 4, // second, minute, hour, day, month, year, 1 byte each - 0, // timestamp, 4 bytes + DATE_ENCODING_MSDHYM, // date_encoding + 0, // datetime, 6 bytes 6, // pt_profile_begin, 4 bytes 24, // water_conductivity, 1 byte, 0=low(fresh), 2=high(sea) 30, // pt_profile_pre, 4 bytes @@ -168,9 +166,8 @@ static const cochran_parser_layout_t cochran_emc_parser_layout = { SAMPLE_EMC, // type 512, // headersize 3, // samplesize - DATE_ENCODING_ELEMENTAL, // date_encoding - 0, 1, 2, 3, 4, 5, // second, minute, hour, day, month, year, 1 byte each - 0, // timestamp, 4 bytes + DATE_ENCODING_SMHDMY, // date_encoding + 0, // datetime, 6 bytes 6, // pt_profile_begin, 4 bytes 24, // water_conductivity, 1 byte 0=low(fresh), 2=high(sea) 30, // pt_profile_pre, 4 bytes @@ -387,25 +384,31 @@ cochran_commander_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *dat if (abstract->size < layout->headersize) return DC_STATUS_DATAFORMAT; + time_t ts; + if (datetime) { - if (layout->date_encoding == DATE_ENCODING_SECONDS_SINCE) { - time_t ts; - struct tm *t; - ts = array_uint32_le(data + layout->timestamp) + COCHRAN_TIME_SHIFT; - t = localtime(&ts); - datetime->second = t->tm_sec; - datetime->minute = t->tm_min; - datetime->hour = t->tm_hour; - datetime->day = t->tm_mday; - datetime->month = t->tm_mon + 1; - datetime->year = 1900 + t->tm_year; - } else { - datetime->second = data[layout->second]; - datetime->minute = data[layout->minute]; - datetime->hour = data[layout->hour]; - datetime->day = data[layout->day]; - datetime->month = data[layout->month]; - datetime->year = data[layout->year] + (data[layout->year] > 91 ? 1900 : 2000); + switch (layout->date_encoding) + { + case DATE_ENCODING_MSDHYM: + datetime->second = data[layout->datetime + 1]; + datetime->minute = data[layout->datetime + 0]; + datetime->hour = data[layout->datetime + 3]; + datetime->day = data[layout->datetime + 2]; + datetime->month = data[layout->datetime + 5]; + datetime->year = data[layout->datetime + 4] + (data[layout->datetime + 4] > 91 ? 1900 : 2000); + break; + case DATE_ENCODING_SMHDMY: + datetime->second = data[layout->datetime + 0]; + datetime->minute = data[layout->datetime + 1]; + datetime->hour = data[layout->datetime + 2]; + datetime->day = data[layout->datetime + 3]; + datetime->month = data[layout->datetime + 4]; + datetime->year = data[layout->datetime + 5] + (data[layout->datetime + 5] > 91 ? 1900 : 2000); + break; + case DATE_ENCODING_TICKS: + ts = array_uint32_le(data + layout->datetime) + COCHRAN_EPOCH; + dc_datetime_localtime(datetime, ts); + break; } } @@ -531,10 +534,11 @@ cochran_commander_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callb // know what the dive summary values are (i.e. max depth, min temp) if (array_uint32_le(data + layout->pt_profile_end) == 0xFFFFFFFF) { corrupt_dive = 1; + dc_datetime_t d; + cochran_commander_parser_get_datetime(abstract, &d); WARNING(abstract->context, "Incomplete dive on %02d/%02d/%02d at %02d:%02d:%02d, trying to parse samples", - data[layout->year], data[layout->month], data[layout->day], - data[layout->hour], data[layout->minute], data[layout->second]); + d.year, d.month, d.day, d.hour, d.minute, d.second); // Eliminate inter-dive events size = cochran_commander_backparse(parser, samples, size); -- 2.4.11

1 0

[PATCH] Cochran: Added support for Pre-21000 s/n Commander dive computers
by John Van Ostrand 08 Jun '17

08 Jun '17

This adds support for older Cochran Commander dive computers, specifically Commanders with serial numbers prior to 21000. This also renames "Commander" model to "Commander II" and adds "Commander I" to refer to pre-21000 models. This commit also fixes problems with dive computers where the log ringbuffer has wrapped. --- src/array.c | 7 ++ src/array.h | 3 + src/cochran_commander.c | 155 +++++++++++++++++++++++++++++++++-------- src/cochran_commander_parser.c | 83 +++++++++++++++++++--- src/descriptor.c | 9 +-- 5 files changed, 213 insertions(+), 44 deletions(-) diff --git a/src/array.c b/src/array.c index 13a73e5..5574083 100644 --- a/src/array.c +++ b/src/array.c @@ -198,6 +198,13 @@ array_uint32_le (const unsigned char data[]) } +unsigned int +array_uint32_word_be (const unsigned char data[]) +{ + return data[1] + (data[0] << 8) + (data[3] << 16) + (data[2] << 24); +} + + void array_uint32_le_set (unsigned char data[], const unsigned int input) { diff --git a/src/array.h b/src/array.h index cd0a3a1..da70efa 100644 --- a/src/array.h +++ b/src/array.h @@ -64,6 +64,9 @@ array_uint32_be (const unsigned char data[]); unsigned int array_uint32_le (const unsigned char data[]); +unsigned int +array_uint32_word_be (const unsigned char data[]); + void array_uint32_le_set (unsigned char data[], const unsigned int input); diff --git a/src/cochran_commander.c b/src/cochran_commander.c index b3e5fed..1c1009f 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -32,14 +32,16 @@ #define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array)) -#define COCHRAN_MODEL_COMMANDER_AIR_NITROX 0 -#define COCHRAN_MODEL_EMC_14 1 -#define COCHRAN_MODEL_EMC_16 2 -#define COCHRAN_MODEL_EMC_20 3 +#define COCHRAN_MODEL_COMMANDER_PRE21000 0 +#define COCHRAN_MODEL_COMMANDER_AIR_NITROX 1 +#define COCHRAN_MODEL_EMC_14 2 +#define COCHRAN_MODEL_EMC_16 3 +#define COCHRAN_MODEL_EMC_20 4 typedef enum cochran_endian_t { ENDIAN_LE, ENDIAN_BE, + ENDIAN_WORD_BE, } cochran_endian_t; typedef enum cochran_profile_size_t { @@ -48,7 +50,7 @@ typedef enum cochran_profile_size_t { } cochran_profile_size_t; typedef struct cochran_commander_model_t { - unsigned char id[2 + 1]; + unsigned char id[3 + 1]; unsigned int model; } cochran_commander_model_t; @@ -84,7 +86,9 @@ typedef struct cochran_device_layout_t { // Profile ringbuffer. unsigned int rb_profile_begin; unsigned int rb_profile_end; - // Profile pointers. + // pointers. + unsigned int pt_fingerprint; + unsigned int fingerprint_size; unsigned int pt_profile_pre; unsigned int pt_profile_begin; unsigned int pt_profile_end; @@ -115,6 +119,30 @@ static const dc_device_vtable_t cochran_commander_device_vtable = { cochran_commander_device_close /* close */ }; +// Cochran Commander pre-21000 s/n +static const cochran_device_layout_t cochran_cmdr_1_device_layout = { + COCHRAN_MODEL_COMMANDER_PRE21000, // model + 24, // address_bits + ENDIAN_WORD_BE, // endian + 115200, // baudrate + 0x046, // cf_dive_count + 0x6c, // cf_last_log + 0x70, // cf_last_interdive + 0x0AA, // cf_serial_number + 0x00000000, // rb_logbook_begin + 0x00020000, // rb_logbook_end + 256, // rb_logbook_entry_size + 512, // rb_logbook_entry_count + 0x00020000, // rb_profile_begin + 0x00100000, // rb_profile_end + 12, // pt_fingerprint + 4, // fingerprint_size + 28, // pt_profile_pre + 0, // pt_profile_begin + 128, // pt_profile_end +}; + + // Cochran Commander Nitrox static const cochran_device_layout_t cochran_cmdr_device_layout = { COCHRAN_MODEL_COMMANDER_AIR_NITROX, // model @@ -131,6 +159,8 @@ static const cochran_device_layout_t cochran_cmdr_device_layout = { 512, // rb_logbook_entry_count 0x00020000, // rb_profile_begin 0x00100000, // rb_profile_end + 0, // pt_fingerprint + 6, // fingerprint_size 30, // pt_profile_pre 6, // pt_profile_begin 128, // pt_profile_end @@ -152,6 +182,8 @@ static const cochran_device_layout_t cochran_emc14_device_layout = { 256, // rb_logbook_entry_count 0x00022000, // rb_profile_begin 0x00200000, // rb_profile_end + 0, // pt_fingerprint + 6, // fingerprint_size 30, // pt_profile_pre 6, // pt_profile_begin 256, // pt_profile_end @@ -173,6 +205,8 @@ static const cochran_device_layout_t cochran_emc16_device_layout = { 1024, // rb_logbook_entry_count 0x00094000, // rb_profile_begin 0x00800000, // rb_profile_end + 0, // pt_fingerprint + 6, // fingerprint_size 30, // pt_profile_pre 6, // pt_profile_begin 256, // pt_profile_end @@ -194,6 +228,8 @@ static const cochran_device_layout_t cochran_emc20_device_layout = { 1024, // rb_logbook_entry_count 0x00094000, // rb_profile_begin 0x01000000, // rb_profile_end + 0, // pt_fingerprint + 6, // fingerprint_size 30, // pt_profile_pre 6, // pt_profile_begin 256, // pt_profile_end @@ -205,10 +241,12 @@ static unsigned int cochran_commander_get_model (cochran_commander_device_t *device) { const cochran_commander_model_t models[] = { - {"\x11""2", COCHRAN_MODEL_COMMANDER_AIR_NITROX}, - {"73", COCHRAN_MODEL_EMC_14}, - {"A3", COCHRAN_MODEL_EMC_16}, - {"23", COCHRAN_MODEL_EMC_20}, + {"\x11""21", COCHRAN_MODEL_COMMANDER_PRE21000}, + {"\x11""22", COCHRAN_MODEL_COMMANDER_AIR_NITROX}, + {"730", COCHRAN_MODEL_EMC_14}, + {"A30", COCHRAN_MODEL_EMC_16}, + {"230", COCHRAN_MODEL_EMC_20}, + {"231", COCHRAN_MODEL_EMC_20}, }; unsigned int model = 0xFFFFFFFF; @@ -501,6 +539,7 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d int profile_capacity_remaining = device->layout->rb_profile_end - device->layout->rb_profile_begin; int dive_count = -1; + data->fp_dive_num = -1; // Start at end of log if (data->dive_count < device->layout->rb_logbook_entry_count) @@ -513,18 +552,36 @@ 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 = (array_uint32_le(data->config + device->layout->cf_last_interdive) & 0xfffff000) + 0x2000; + int rb_head_ptr; + if (device->layout->endian == ENDIAN_WORD_BE) + rb_head_ptr = (array_uint32_word_be(data->config + device->layout->cf_last_interdive) & 0xfffff000) + 0x2000; + else + rb_head_ptr = (array_uint32_le(data->config + device->layout->cf_last_interdive) & 0xfffff000) + 0x2000; int last_dive_end_address = array_uint32_le(data->logbook + dive_count * device->layout->rb_logbook_entry_size + device->layout->pt_profile_end); if (rb_head_ptr > last_dive_end_address) profile_capacity_remaining -= rb_head_ptr - last_dive_end_address; + unsigned int head_dive = 0, tail_dive = 0; + + if (data->dive_count <= device->layout->rb_logbook_entry_count) { + head_dive = data->dive_count; + tail_dive = 0; + } else { + // Log wrapped + tail_dive = data->dive_count % device->layout->rb_logbook_entry_count; + head_dive = tail_dive; + } + // Loop through dives to find FP, Accumulate profile data size, // and find the last dive with invalid profile - for (int i = dive_count; i > 0; i--) { + unsigned int i = head_dive; + do { + i = ringbuffer_decrement(i, 1, 0, device->layout->rb_logbook_entry_count); + unsigned char *log_entry = data->logbook + i * device->layout->rb_logbook_entry_size; // We're done if we find the fingerprint - if (!memcmp(device->fingerprint, log_entry, sizeof(device->fingerprint))) { + if (!memcmp(device->fingerprint, log_entry + device->layout->pt_fingerprint, device->layout->fingerprint_size)) { data->fp_dive_num = i; break; } @@ -543,7 +600,7 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d // Accumulate read size for progress bar sample_read_size += read_size; } - } + } while (i != tail_dive); return sample_read_size; } @@ -653,6 +710,9 @@ cochran_commander_device_open (dc_device_t **out, dc_context_t *context, const c unsigned int model = cochran_commander_get_model(device); switch (model) { + case COCHRAN_MODEL_COMMANDER_PRE21000: + device->layout = &cochran_cmdr_1_device_layout; + break; case COCHRAN_MODEL_COMMANDER_AIR_NITROX: device->layout = &cochran_cmdr_device_layout; break; @@ -703,13 +763,13 @@ cochran_commander_device_set_fingerprint (dc_device_t *abstract, const unsigned { cochran_commander_device_t *device = (cochran_commander_device_t *) abstract; - if (size && size != sizeof (device->fingerprint)) + if (size && size != device->layout->fingerprint_size) return DC_STATUS_INVALIDARGS; if (size) - memcpy (device->fingerprint, data, sizeof (device->fingerprint)); + memcpy (device->fingerprint, data, device->layout->fingerprint_size); else - memset (device->fingerprint, 0xFF, sizeof (device->fingerprint)); + memset (device->fingerprint, 0xFF, sizeof(device->fingerprint)); return DC_STATUS_SUCCESS; } @@ -806,9 +866,13 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call else data.dive_count = array_uint16_be (data.config + device->layout->cf_dive_count); + if (data.dive_count == 0) + // No dives to read + return DC_STATUS_SUCCESS; + if (data.dive_count > device->layout->rb_logbook_entry_count) { data.logbook_size = device->layout->rb_logbook_entry_count * device->layout->rb_logbook_entry_size; - } else { + } else { data.logbook_size = data.dive_count * device->layout->rb_logbook_entry_size; } @@ -842,26 +906,47 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call dc_event_devinfo_t devinfo; devinfo.model = device->layout->model; devinfo.firmware = 0; // unknown - devinfo.serial = array_uint32_le(data.config + device->layout->cf_serial_number); + if (device->layout->endian == ENDIAN_WORD_BE) + devinfo.serial = array_uint32_word_be(data.config + device->layout->cf_serial_number); + else + devinfo.serial = array_uint32_le(data.config + device->layout->cf_serial_number); + 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 = (array_uint32_le(data.config + device->layout->cf_last_interdive) & 0xfffff000) + 0x2000; + unsigned int last_start_address; + if (device->layout->endian == ENDIAN_WORD_BE) + last_start_address = (array_uint32_word_be(data.config + device->layout->cf_last_interdive) & 0xfffff000) + 0x2000; + else + last_start_address = (array_uint32_le(data.config + device->layout->cf_last_interdive) & 0xfffff000) + 0x2000; + if (last_start_address < device->layout->rb_profile_begin || last_start_address > device->layout->rb_profile_end) { ERROR(abstract->context, "Invalid profile ringbuffer head pointer in Cochran config block."); status = DC_STATUS_DATAFORMAT; goto error; } - 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; + unsigned int head_dive = 0, tail_dive = 0; + + if (data.dive_count <= device->layout->rb_logbook_entry_count) { + head_dive = data.dive_count; + tail_dive = 0; + } else { + // Log wrapped + tail_dive = data.dive_count % device->layout->rb_logbook_entry_count; + head_dive = tail_dive; + } + if (data.fp_dive_num > -1) + tail_dive = data.fp_dive_num + 1; + + int invalid_profile_flag = 0; // Loop through each dive - for (int i = dive_count - 1; i > data.fp_dive_num; i--) { + unsigned int i = head_dive; + do { + i = ringbuffer_decrement(i, 1, 0, device->layout->rb_logbook_entry_count); + unsigned char *log_entry = data.logbook + i * device->layout->rb_logbook_entry_size; unsigned int sample_start_address = array_uint32_le (log_entry + device->layout->pt_profile_begin); @@ -870,7 +955,10 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call int sample_size = 0; // Determine if profile exists - if (i > data.invalid_profile_dive_num) + if (i == data.invalid_profile_dive_num) + invalid_profile_flag = 1; + + if (!invalid_profile_flag) sample_size = cochran_commander_profile_size(device, &data, i, PROFILE_SIZE_READ); // Build dive blob @@ -892,7 +980,10 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call if (sample_start_address <= sample_end_address) { do { + int saved_progress = progress.current; rc = cochran_commander_read (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, sample_size); + if (rc != DC_STATUS_SUCCESS) + progress.current = saved_progress; } while (rc != DC_STATUS_SUCCESS && tries++ < 3); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); @@ -905,7 +996,10 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call tries = 0; do { + int saved_progress = progress.current; rc = cochran_commander_read (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, size); + if (rc != DC_STATUS_SUCCESS) + progress.current = saved_progress; } while (rc != DC_STATUS_SUCCESS && tries++ < 3); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); @@ -914,7 +1008,10 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call } tries = 0; do { + int saved_progress = progress.current; rc = cochran_commander_read (device, &progress, device->layout->rb_profile_begin, dive + device->layout->rb_logbook_entry_size + size, sample_end_address - device->layout->rb_profile_begin); + if (rc != DC_STATUS_SUCCESS) + progress.current = saved_progress; } while (rc != DC_STATUS_SUCCESS && tries++ < 3); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); @@ -924,13 +1021,13 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call } } - if (callback && !callback (dive, dive_size, dive, sizeof(device->fingerprint), userdata)) { + if (callback && !callback (dive, dive_size, dive + device->layout->pt_fingerprint, device->layout->fingerprint_size, userdata)) { free(dive); break; } free(dive); - } + } while (i != tail_dive); error: free(data.logbook); diff --git a/src/cochran_commander_parser.c b/src/cochran_commander_parser.c index ab854ad..d9521c0 100644 --- a/src/cochran_commander_parser.c +++ b/src/cochran_commander_parser.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <math.h> +#include <time.h> #include <libdivecomputer/units.h> @@ -31,10 +32,14 @@ #define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array)) -#define COCHRAN_MODEL_COMMANDER_AIR_NITROX 0 -#define COCHRAN_MODEL_EMC_14 1 -#define COCHRAN_MODEL_EMC_16 2 -#define COCHRAN_MODEL_EMC_20 3 +#define COCHRAN_MODEL_COMMANDER_PRE21000 0 +#define COCHRAN_MODEL_COMMANDER_AIR_NITROX 1 +#define COCHRAN_MODEL_EMC_14 2 +#define COCHRAN_MODEL_EMC_16 3 +#define COCHRAN_MODEL_EMC_20 4 + +// Cochran time stamps start at Jan 1, 1992 +#define COCHRAN_TIME_SHIFT 694242000 #define UNSUPPORTED 0xFFFFFFFF @@ -43,11 +48,19 @@ typedef enum cochran_sample_format_t { SAMPLE_EMC, } cochran_sample_format_t; + +typedef enum cochran_date_encoding_t { + DATE_ENCODING_ELEMENTAL, + DATE_ENCODING_SECONDS_SINCE, +} cochran_date_encoding_t; + typedef struct cochran_parser_layout_t { cochran_sample_format_t format; unsigned int headersize; unsigned int samplesize; + cochran_date_encoding_t date_encoding; unsigned int second, minute, hour, day, month, year; + unsigned int timestamp; unsigned int pt_profile_begin; unsigned int water_conductivity; unsigned int pt_profile_pre; @@ -101,11 +114,38 @@ static const dc_parser_vtable_t cochran_commander_parser_vtable = { NULL /* destroy */ }; +static const cochran_parser_layout_t cochran_cmdr_1_parser_layout = { + SAMPLE_CMDR, // type + 256, // headersize + 2, // samplesize + DATE_ENCODING_SECONDS_SINCE, // date_encoding + 1, 0, 3, 2, 5, 4, // second, minute, hour, day, month, year, 1 byte each + 8, // timestamp, 4 bytes + 0, // pt_profile_begin, 4 bytes + 24, // water_conductivity, 1 byte, 0=low(fresh), 2=high(sea) + 28, // pt_profile_pre, 4 bytes + 43, // start_temp, 1 byte, F + 54, // start_depth, 2 bytes, /4=ft + 68, // dive_number, 2 bytes + 73, // altitude, 1 byte, /4=kilofeet + 128, // pt_profile_end, 4 bytes + 153, // end_temp, 1 byte F + 166, // divetime, 2 bytes, minutes + 168, // max_depth, 2 bytes, /4=ft + 170, // avg_depth, 2 bytes, /4=ft + 210, // oxygen, 4 bytes (2 of) 2 bytes, /256=% + UNSUPPORTED, // helium, 4 bytes (2 of) 2 bytes, /256=% + 232, // min_temp, 1 byte, /2+20=F + 233, // max_temp, 1 byte, /2+20=F +}; + static const cochran_parser_layout_t cochran_cmdr_parser_layout = { SAMPLE_CMDR, // type 256, // headersize 2, // samplesize + DATE_ENCODING_ELEMENTAL, // date_encoding 1, 0, 3, 2, 5, 4, // second, minute, hour, day, month, year, 1 byte each + 0, // timestamp, 4 bytes 6, // pt_profile_begin, 4 bytes 24, // water_conductivity, 1 byte, 0=low(fresh), 2=high(sea) 30, // pt_profile_pre, 4 bytes @@ -128,7 +168,9 @@ static const cochran_parser_layout_t cochran_emc_parser_layout = { SAMPLE_EMC, // type 512, // headersize 3, // samplesize + DATE_ENCODING_ELEMENTAL, // date_encoding 0, 1, 2, 3, 4, 5, // second, minute, hour, day, month, year, 1 byte each + 0, // timestamp, 4 bytes 6, // pt_profile_begin, 4 bytes 24, // water_conductivity, 1 byte 0=low(fresh), 2=high(sea) 30, // pt_profile_pre, 4 bytes @@ -296,6 +338,11 @@ cochran_commander_parser_create (dc_parser_t **out, dc_context_t *context, unsig parser->model = model; switch (model) { + case COCHRAN_MODEL_COMMANDER_PRE21000: + parser->layout = &cochran_cmdr_1_parser_layout; + parser->events = cochran_cmdr_event_bytes; + parser->nevents = C_ARRAY_SIZE(cochran_cmdr_event_bytes); + break; case COCHRAN_MODEL_COMMANDER_AIR_NITROX: parser->layout = &cochran_cmdr_parser_layout; parser->events = cochran_cmdr_event_bytes; @@ -341,12 +388,25 @@ cochran_commander_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *dat return DC_STATUS_DATAFORMAT; if (datetime) { - datetime->second = data[layout->second]; - datetime->minute = data[layout->minute]; - datetime->hour = data[layout->hour]; - datetime->day = data[layout->day]; - datetime->month = data[layout->month]; - datetime->year = data[layout->year] + (data[layout->year] > 91 ? 1900 : 2000); + if (layout->date_encoding == DATE_ENCODING_SECONDS_SINCE) { + time_t ts; + struct tm *t; + ts = array_uint32_le(data + layout->timestamp) + COCHRAN_TIME_SHIFT; + t = localtime(&ts); + datetime->second = t->tm_sec; + datetime->minute = t->tm_min; + datetime->hour = t->tm_hour; + datetime->day = t->tm_mday; + datetime->month = t->tm_mon + 1; + datetime->year = 1900 + t->tm_year; + } else { + datetime->second = data[layout->second]; + datetime->minute = data[layout->minute]; + datetime->hour = data[layout->hour]; + datetime->day = data[layout->day]; + datetime->month = data[layout->month]; + datetime->year = data[layout->year] + (data[layout->year] > 91 ? 1900 : 2000); + } } return DC_STATUS_SUCCESS; @@ -484,7 +544,8 @@ cochran_commander_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callb // and temp every other second. // Prime values from the dive log section - if (parser->model == COCHRAN_MODEL_COMMANDER_AIR_NITROX) { + if (parser->model == COCHRAN_MODEL_COMMANDER_AIR_NITROX || + parser->model == COCHRAN_MODEL_COMMANDER_PRE21000) { // Commander stores start depth in quarter-feet start_depth = array_uint16_le (data + layout->start_depth) / 4.0; } else { diff --git a/src/descriptor.c b/src/descriptor.c index b59ea45..76157da 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -292,10 +292,11 @@ static const dc_descriptor_t g_descriptors[] = { {"DiveSystem", "iX3M Deep", DC_FAMILY_DIVESYSTEM_IDIVE, 0x23}, {"DiveSystem", "iX3M Tec", DC_FAMILY_DIVESYSTEM_IDIVE, 0x24}, {"DiveSystem", "iX3M Reb", DC_FAMILY_DIVESYSTEM_IDIVE, 0x25}, - {"Cochran", "Commander", DC_FAMILY_COCHRAN_COMMANDER, 0}, - {"Cochran", "EMC-14", DC_FAMILY_COCHRAN_COMMANDER, 1}, - {"Cochran", "EMC-16", DC_FAMILY_COCHRAN_COMMANDER, 2}, - {"Cochran", "EMC-20H", DC_FAMILY_COCHRAN_COMMANDER, 3}, + {"Cochran", "Commander I", DC_FAMILY_COCHRAN_COMMANDER, 0}, + {"Cochran", "Commander II", DC_FAMILY_COCHRAN_COMMANDER, 1}, + {"Cochran", "EMC-14", DC_FAMILY_COCHRAN_COMMANDER, 2}, + {"Cochran", "EMC-16", DC_FAMILY_COCHRAN_COMMANDER, 3}, + {"Cochran", "EMC-20H", DC_FAMILY_COCHRAN_COMMANDER, 4}, }; typedef struct dc_descriptor_iterator_t { -- 2.4.11

2 1

[PATCH] Cochran: Changed profile download to be incremental. It will result in a 30 minute download for full computers but it significantly reduces the time to download partial dives.
by John Van Ostrand 08 Jun '17

08 Jun '17

--- src/cochran_commander.c | 366 ++++++++++++++++++++++++++++-------------------- 1 file changed, 212 insertions(+), 154 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index 83dd14a..4c15541 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -41,6 +41,11 @@ typedef enum cochran_endian_t { ENDIAN_BE, } cochran_endian_t; +typedef enum cochran_profile_size_t { + PROFILE_FULL_SIZE, + PROFILE_READ_SIZE, +} cochran_profile_size_t; + typedef struct cochran_commander_model_t { unsigned char id[2 + 1]; unsigned int model; @@ -53,6 +58,7 @@ typedef struct cochran_data_t { unsigned short int dive_count; int fp_dive_num; + int invalid_profile_dive_num; unsigned int logbook_size; @@ -430,23 +436,133 @@ cochran_commander_read (cochran_commander_device_t *device, dc_event_progress_t } -static void +/* + * For corrupt dives the end-of-samples pointer is 0xFFFFFFFF + * search for a reasonable size, e.g. using next dive start sample + * or end-of-samples to limit searching for recoverable samples + */ +static unsigned int +cochran_commander_guess_sample_end_address(cochran_commander_device_t *device, cochran_data_t *data, unsigned int log_num) +{ + const unsigned char *log_entry = data->logbook + device->layout->rb_logbook_entry_size * log_num; + + if (log_num == data->dive_count) + // Return next usable address from config page + return array_uint32_le(data->config + device->layout->rb_profile_end); + + // Next log's start address + return array_uint32_le(log_entry + device->layout->rb_logbook_entry_size + device->layout->pt_profile_begin); +} + + +static int +cochran_commander_profile_size(cochran_commander_device_t *device, cochran_data_t *data, int dive_num, cochran_profile_size_t type) +{ + + const unsigned char *log_entry = data->logbook + dive_num * device->layout->rb_logbook_entry_size; + unsigned int sample_start_address = -1; + unsigned int sample_end_address = array_uint32_le (log_entry + device->layout->pt_profile_end); + + if (type == PROFILE_FULL_SIZE) { + // actual size, includes pre-dive events + sample_start_address = array_uint32_le (log_entry + device->layout->pt_profile_pre); + } else if (type == PROFILE_READ_SIZE) { + // read size, only include dive profile + sample_start_address = array_uint32_le (log_entry + device->layout->pt_profile_begin); + } + + // Validate addresses + if (sample_start_address < device->layout->rb_profile_begin || + sample_start_address > device->layout->rb_profile_end || + sample_end_address < device->layout->rb_profile_begin || + (sample_end_address > device->layout->rb_profile_end && + sample_end_address != 0xFFFFFFFF)) { + return 0; + } + + if (sample_end_address == 0xFFFFFFFF) + // Corrupt dive, guess the end address + sample_end_address = cochran_commander_guess_sample_end_address(device, data, dive_num); + + // Calculate the size of the profile only + int sample_size = sample_end_address - sample_start_address; + + if (sample_size < 0) + // Adjust for ring buffer wrap-around + sample_size += device->layout->rb_profile_end - device->layout->rb_profile_begin; + + return sample_size; +} + + +/* + * Do several things. Find the log that matches the fingerprint, + * calculate the total read size for progress indicator, + * Determine the most recent dive without profile data. + */ + +static int cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_data_t *data) { - // Skip to fingerprint to reduce time + // We track profile ringbuffer usage to determine which dives have profile data + int profile_capacity_remaining = device->layout->rb_profile_end - device->layout->rb_profile_begin; + + int dive_count = -1; + + // Start at end of log if (data->dive_count < device->layout->rb_logbook_entry_count) - data->fp_dive_num = data->dive_count; + dive_count = data->dive_count; else - data->fp_dive_num = device->layout->rb_logbook_entry_count; - data->fp_dive_num--; + dive_count = device->layout->rb_logbook_entry_count; + dive_count--; + + int sample_read_size = 0; + data->invalid_profile_dive_num = -1; + + // Remove the pre-dive events that occur after the last dive + int rb_head_ptr = (array_uint32_le(data->config + device->layout->cf_last_interdive) & 0xfffff000) + 0x2000; + int last_dive_end_address = array_uint32_le(data->logbook + dive_count * device->layout->rb_logbook_entry_size + device->layout->pt_profile_end); + if (rb_head_ptr > last_dive_end_address) + profile_capacity_remaining -= rb_head_ptr - last_dive_end_address; + + // Loop through dives to find FP, Accumulate profile data size, + // and find the last dive with invalid profile + for (int i = dive_count; i > 0; i--) { + unsigned char *log_entry = data->logbook + i * device->layout->rb_logbook_entry_size; + + // We're done if we find the fingerprint + if (!memcmp(device->fingerprint, log_entry, sizeof(device->fingerprint))) { + data->fp_dive_num = i; + break; + } - while (data->fp_dive_num >= 0 && memcmp(device->fingerprint, - data->logbook + data->fp_dive_num * device->layout->rb_logbook_entry_size, - sizeof(device->fingerprint))) - data->fp_dive_num--; + int sample_size = cochran_commander_profile_size(device, data, i, PROFILE_FULL_SIZE); + int read_size = cochran_commander_profile_size(device, data, i, PROFILE_READ_SIZE); + + // Determine if sample exists + if (profile_capacity_remaining > 0) { + // Subtract this dive's profile size including post-dive events + profile_capacity_remaining -= sample_size; + if (profile_capacity_remaining < 0) { + // Save the last dive that is missing profile data + data->invalid_profile_dive_num = i; + } + // Accumulate read size for progress bar + sample_read_size += read_size; + } + + if (profile_capacity_remaining < 0) { + // There is no profile for this dive + sample_size = 0; + } + + } + + return sample_read_size; } + static void cochran_commander_get_sample_parms(cochran_commander_device_t *device, cochran_data_t *data) { @@ -509,103 +625,6 @@ cochran_commander_get_sample_parms(cochran_commander_device_t *device, cochran_d } -/* - * For corrupt dives the end-of-samples pointer is 0xFFFFFFFF - * search for a reasonable size, e.g. using next dive start sample - * or end-of-samples to limit searching for recoverable samples - */ -static unsigned int -cochran_commander_guess_sample_end_address(cochran_commander_device_t *device, cochran_data_t *data, unsigned int log_num) -{ - const unsigned char *log_entry = data->logbook + device->layout->rb_logbook_entry_size * log_num; - - if (log_num == data->dive_count) - // Return next usable address from config page - return array_uint32_le(data->config + device->layout->rb_profile_end); - - // Next log's start address - return array_uint32_le(log_entry + device->layout->rb_logbook_entry_size + device->layout->pt_profile_begin); -} - - -static dc_status_t -cochran_commander_read_all (cochran_commander_device_t *device, cochran_data_t *data) -{ - dc_device_t *abstract = (dc_device_t *) device; - dc_status_t rc = DC_STATUS_SUCCESS; - - // Calculate max data sizes - unsigned int max_config = sizeof(data->config); - unsigned int max_logbook = device->layout->rb_logbook_end - device->layout->rb_logbook_begin; - unsigned int max_sample = device->layout->rb_profile_end - device->layout->rb_profile_begin; - - dc_event_progress_t progress = EVENT_PROGRESS_INITIALIZER; - progress.maximum = max_config + max_logbook + max_sample; - device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); - - // Emit ID block - dc_event_vendor_t vendor; - vendor.data = device->id; - vendor.size = sizeof (device->id); - device_event_emit (abstract, DC_EVENT_VENDOR, &vendor); - - // Read config - rc = cochran_commander_read_config(device, &progress, data->config, sizeof(data->config)); - if (rc != DC_STATUS_SUCCESS) - return rc; - - // Determine size of dive list to read. - if (device->layout->endian == ENDIAN_LE) - data->dive_count = array_uint16_le (data->config + device->layout->cf_dive_count); - else - data->dive_count = array_uint16_be (data->config + device->layout->cf_dive_count); - - if (data->dive_count > device->layout->rb_logbook_entry_count) { - data->logbook_size = device->layout->rb_logbook_entry_count * device->layout->rb_logbook_entry_size; - } else { - data->logbook_size = data->dive_count * device->layout->rb_logbook_entry_size; - } - - progress.maximum -= max_logbook - data->logbook_size; - device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); - - // Allocate space for log book. - data->logbook = (unsigned char *) malloc(data->logbook_size); - if (data->logbook == NULL) { - ERROR (abstract->context, "Failed to allocate memory."); - return DC_STATUS_NOMEMORY; - } - - // Request log book - rc = cochran_commander_read(device, &progress, 0, data->logbook, data->logbook_size); - if (rc != DC_STATUS_SUCCESS) - return rc; - - // Determine sample memory to read - cochran_commander_find_fingerprint(device, data); - cochran_commander_get_sample_parms(device, data); - - progress.maximum -= max_sample - data->sample_size; - device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); - - if (data->sample_size > 0) { - data->sample = (unsigned char *) malloc(data->sample_size); - if (data->sample == NULL) { - ERROR (abstract->context, "Failed to allocate memory."); - return DC_STATUS_NOMEMORY; - } - - // Read the sample data - rc = cochran_commander_read (device, &progress, data->sample_data_offset, data->sample, data->sample_size); - if (rc != DC_STATUS_SUCCESS) { - ERROR (abstract->context, "Failed to read the sample data."); - return rc; - } - } - - return DC_STATUS_SUCCESS; -} - dc_status_t cochran_commander_device_open (dc_device_t **out, dc_context_t *context, const char *name) { @@ -772,9 +791,64 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call cochran_data_t data; data.logbook = NULL; data.sample = NULL; - status = cochran_commander_read_all (device, &data); - if (status != DC_STATUS_SUCCESS) - goto error; + + // Calculate max data sizes + unsigned int max_config = sizeof(data.config); + unsigned int max_logbook = device->layout->rb_logbook_end - device->layout->rb_logbook_begin; + unsigned int max_sample = device->layout->rb_profile_end - device->layout->rb_profile_begin; + + // setup progress indication + dc_event_progress_t progress = EVENT_PROGRESS_INITIALIZER; + progress.maximum = max_config + max_logbook + max_sample; + device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); + + // Emit ID block + dc_event_vendor_t vendor; + vendor.data = device->id; + vendor.size = sizeof (device->id); + device_event_emit (abstract, DC_EVENT_VENDOR, &vendor); + + // Read config + dc_status_t rc = DC_STATUS_SUCCESS; + rc = cochran_commander_read_config(device, &progress, data.config, sizeof(data.config)); + if (rc != DC_STATUS_SUCCESS) + return rc; + + // Determine size of dive list to read. + if (device->layout->endian == ENDIAN_LE) + data.dive_count = array_uint16_le (data.config + device->layout->cf_dive_count); + else + data.dive_count = array_uint16_be (data.config + device->layout->cf_dive_count); + + if (data.dive_count > device->layout->rb_logbook_entry_count) { + data.logbook_size = device->layout->rb_logbook_entry_count * device->layout->rb_logbook_entry_size; + } else { + data.logbook_size = data.dive_count * device->layout->rb_logbook_entry_size; + } + + // Update progress indicator with new maximum + progress.maximum -= max_logbook - data.logbook_size; + device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); + + // Allocate space for log book. + data.logbook = (unsigned char *) malloc(data.logbook_size); + if (data.logbook == NULL) { + ERROR (abstract->context, "Failed to allocate memory."); + return DC_STATUS_NOMEMORY; + } + + // Request log book + rc = cochran_commander_read(device, &progress, 0, data.logbook, data.logbook_size); + if (rc != DC_STATUS_SUCCESS) + return rc; + + // Locate fingerprint, recent dive with invalid profile and calc read size + 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); + + cochran_commander_get_sample_parms(device, &data); // Emit a device info event. dc_event_devinfo_t devinfo; @@ -792,9 +866,6 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call goto error; } - // We track profile ringbuffer usage to determine which dives have profile data - int profile_capacity_remaining = device->layout->rb_profile_end - device->layout->rb_profile_begin; - unsigned int dive_count = 0; if (data.dive_count < device->layout->rb_logbook_entry_count) dive_count = data.dive_count; @@ -808,44 +879,11 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call unsigned int sample_start_address = array_uint32_le (log_entry + device->layout->pt_profile_begin); unsigned int sample_end_address = array_uint32_le (log_entry + device->layout->pt_profile_end); - // Validate - if (sample_start_address < device->layout->rb_profile_begin || - sample_start_address > device->layout->rb_profile_end || - sample_end_address < device->layout->rb_profile_begin || - (sample_end_address > device->layout->rb_profile_end && - sample_end_address != 0xFFFFFFFF)) { - continue; - } - - if (sample_end_address == 0xFFFFFFFF) - // Corrupt dive, guess the end address - sample_end_address = cochran_commander_guess_sample_end_address(device, &data, i); - - // Determine if sample exists - if (profile_capacity_remaining > 0) { - // Subtract this dive's profile size including post-dive events - profile_capacity_remaining -= (last_start_address - sample_start_address); - // Adjust for a dive that wraps the buffer - if (sample_start_address > last_start_address) - profile_capacity_remaining -= device->layout->rb_profile_end - device->layout->rb_profile_begin; - } - last_start_address = sample_start_address; - - unsigned char *sample = NULL; int sample_size = 0; - if (profile_capacity_remaining < 0) { - // There is no profile for this dive - sample = NULL; - sample_size = 0; - } else { - // Calculate the size of the profile only - sample = data.sample + sample_start_address - data.sample_data_offset; - sample_size = sample_end_address - sample_start_address; - - if (sample_size < 0) - // Adjust for ring buffer wrap-around - sample_size += device->layout->rb_profile_end - device->layout->rb_profile_begin; - } + + // Determine if profile exists + if (i > data.invalid_profile_dive_num) + sample_size = cochran_commander_profile_size(device, &data, i, PROFILE_READ_SIZE); // Build dive blob unsigned int dive_size = device->layout->rb_logbook_entry_size + sample_size; @@ -857,17 +895,37 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call memcpy(dive, log_entry, device->layout->rb_logbook_entry_size); // log - // Copy profile data + int tries = 0; + // Read profile data if (sample_size) { if (sample_start_address <= sample_end_address) { - memcpy(dive + device->layout->rb_logbook_entry_size, sample, sample_size); + do { + rc = cochran_commander_read (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, sample_size); + } while (rc != DC_STATUS_SUCCESS && tries++ < 3); + if (rc != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to read the sample data."); + return rc; + } } else { // It wrapped the buffer, copy two sections unsigned int size = device->layout->rb_profile_end - sample_start_address; - memcpy(dive + device->layout->rb_logbook_entry_size, sample, size); - memcpy(dive + device->layout->rb_logbook_entry_size + size, - data.sample, sample_end_address - device->layout->rb_profile_begin); + tries = 0; + do { + rc = cochran_commander_read (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, size); + } while (rc != DC_STATUS_SUCCESS && tries++ < 3); + if (rc != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to read the sample data."); + return rc; + } + tries = 0; + do { + rc = cochran_commander_read (device, &progress, device->layout->rb_profile_begin, dive + device->layout->rb_logbook_entry_size + size, sample_end_address - device->layout->rb_profile_begin); + } while (rc != DC_STATUS_SUCCESS && tries++ < 3); + if (rc != DC_STATUS_SUCCESS) { + ERROR (abstract->context, "Failed to read the sample data."); + return rc; + } } } -- 2.4.11

2 3

I/O layer refactoring
by Jef Driesen 03 Jun '17

03 Jun '17

Hi, I'm planning some major non-backwards compatible changes for the next release. The first one is a refactoring of the I/O layer to support bluetooth communication (and more). The remainder of this email contains a description of the problem and a proposal for how I would like to address this. Libdivecomputer's low-level I/O layer was pretty much designed with only serial communication in mind. This is very obvious if you look at the signature of the dc_device_open function: dc_status_t dc_device_open (dc_device_t **device, dc_context_t *context, dc_descriptor_t *descriptor, const char *name); That last parameter is the name of the serial port to open. But nowadays libdivecomputer does not only support serial communication, but also IrDA, USB and USB HID. So far we have been able to work around this api limitation. Because for these communication protocols, we can autodetect the device based on the IrDA device name, or the USB VID/PID numbers. Simply pass NULL as name, and libdivecomputer will take care of doing the device enumeration internally. Unfortunately, that workaround isn't entirely foolproof. For example if you have multiple devices connected, libdivecomputer will always pick the first device it recognizes as a dive computer. Thus you won't be able to connect to the other one(s). And if our heuristic to recognize a dive computer is wrong, it won't be able to pick a device at all. In practice, this won't cause any trouble because this is pretty rare corner case. Indeed, very few users will have two dive computers connected at the same time, and the heuristics are reasonably solid (e.g. the IrDA device name and the USB VID/PID numbers of the dive computer never change). But if we're going to add support for bluetooth communication, I wouldn't be surprised if the above assumption breaks. Since bluetooth is a very popular technology, it's no longer very unlikely to have multiple bluetooth devices connected at the same time (e.g. mouse/keyboard, phone, speakers, etc). On top of that, the bluetooth device name is often configurable by the user, and thus autodetection based on simple heuristics won't work anymore. The only way to fix that, is to move the device discovery to the application, and let the end-user select the correct device. That will require to expose the low-level I/O layer in the public api. But that alone isn't enough. We also need some way to pass the result of the discovery back to the dc_device_open function. Thus the "name" parameter needs to replaced with something more generic. The easiest solution would be to just pass a void pointer: dc_status_t dc_device_open (dc_device_t **device, dc_context_t *context, dc_descriptor_t *descriptor, void *iostream); And then the actual data type can depend on the communication mechanism: a string for serial, a 32bit address with lsap number or service name for IrDA, a 48bit address and port number for bluetooth, and so on. But if we're going to modify the api, we can also take it one step further. Why not move the opening and closing of the underlying I/O channel to the application, and pass the open connection as the parameter? If we make sure that each such I/O channel implements a common interface, then the dive computer backends are no longer tied to a specific I/O implementation. This has several advantages: * For bluetooth enabled devices, the application can offer the choice of using native bluetooth communication, or the legacy serial communication (e.g. the bluetooth serial port emulation mode of the operating system we are relying on today). * We can easily implement new I/O layers. For example a user-space driver for usb-serial chipsets (ftdi, pl2303, cp210x, cdc-acm) for use on mobile platforms (android, ios), where the kernel drivers are usually not available. Or a custom I/O layer, where the actual communication is implemented by the application. For the simulator we could a tcp/ip (or pipe) based implementation. There are a few disadvantages as well. First of all, this will of course require some extra code on the application side. The bare minimum would be something like this: dc_iostream_t *iostream = NULL; dc_device_t *device = NULL /* Open the communication channel. */ switch (type) case SERIAL: dc_serial_enumerate(...); dc_serial_open(&iostream, context, name); break; case IRDA: dc_irda_open(&iostream, context); dc_irda_discover(iostream, ...); dc_irda_connect_lsap(iostream, address, lsap); break; case BLUETOOTH: dc_bluetooth_open(&iostream, context); dc_bluetooth_discover(iostream, ...); dc_bluetooth_connect(iostream, address, port); break; case CUSTOM: dc_custom_open(&iostream, context, ...); break; } /* Download dives as usual. */ dc_device_open(&device, context, descriptor, iostream); dc_device_foreach(device, ...); dc_device_close(device); /* Close the communication channel. */ dc_iostream_close(iostream); As you can see in the above pseudo code, it will certainly add some extra complexity, because suddenly the application will need some knowledge about internal details like the IrDA lsap number and the bluetooth port number. The interface of this new common iostream api would be modeled after the serial communication api (see the attached header file). This may seem a bit awkward, considered that most of the serial api is meaningless for the other implementations. But I don't see any alternative (*). Internally, in the dive computer backends, I just want to be able to call the function unconditionally, without having to check the type of the underlying I/O stream. Other implementations can just leave those functions unimplemented (causing the call to fail with DC_STATUS_UNSUPPORTED), or implement it as a no-op (always return DC_STATUS_SUCCESS). For IrDA and USB the first option will be the obvious choice. But for bluetooth the second option will be required in order to support dual serial/bluetooth devices. (*) I considered moving the serial communication specific functions (baudrate, dtr, rts, etc) to an intermediate interface. That would remove those functions from implementations where they don't make sense (IrDA and USB). But if we want dual serial/bluetooth support, then bluetooth will still need to implement that serial interface. So if we need it there anyway, then I think it's not worth the extra complexity. The only I/O implementation that doesn't really fit into this model is USB communication. USB support three different types of transfers (control, bulk and interrupt), while the iostream interface supports only a single set of read/write functions. Currently the cobalt is the only backend using USB, and it uses a combination of control and bulk transfers. We don't even have an abstraction layer and use libusb directly there. I'm not sure what would be the best way to deal with that, but maybe we can just leave this as-is for now? This will also have an impact on the list of supported devices. At the moment, libdivecomputer will exclude devices for which the underlying I/O layer isn't available. For example on Mac OS X, the Uwatec Smart dive computers are excluded because IrDA isn't supported. But with custom I/O layers, that's no longer possible and libdivecomputer will always have to report all models. Thus it will be up to the application to restrict the list if necessary. The only thing we can do is provide some new api that lets the application query whether a built-in I/O layer is available or not. Comments and feedback on the above proposal are welcome! Jef

1 1

[PATCH] Cochran: Fix compile errors
by John Van Ostrand 02 Jun '17

02 Jun '17

I really should stop being so excited that i forget to compile. --- src/cochran_commander.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index 5ff46a5..b3e5fed 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -28,6 +28,7 @@ #include "device-private.h" #include "serial.h" #include "array.h" +#include "ringbuffer.h" #define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array)) @@ -483,7 +484,7 @@ cochran_commander_profile_size(cochran_commander_device_t *device, cochran_data_ // Corrupt dive, guess the end address sample_end_address = cochran_commander_guess_sample_end_address(device, data, dive_num); - return ringbuffer_distance(sample_start_address, sample_end_address, 0, device->layout->rb_profile_end - device->layout->rb_profile_begin); + return ringbuffer_distance(sample_start_address, sample_end_address, 0, device->layout->rb_profile_begin, device->layout->rb_profile_end); } @@ -528,8 +529,8 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d break; } - unsigned int sample_size = cochran_commander_profile_size(device, data, i, PROFILE_FULL_SIZE); - unsigned int read_size = cochran_commander_profile_size(device, data, i, PROFILE_READ_SIZE); + unsigned int sample_size = cochran_commander_profile_size(device, data, i, PROFILE_SIZE_FULL); + unsigned int read_size = cochran_commander_profile_size(device, data, i, PROFILE_SIZE_READ); // Determine if sample exists if (profile_capacity_remaining > 0) { @@ -870,7 +871,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call // Determine if profile exists if (i > data.invalid_profile_dive_num) - sample_size = cochran_commander_profile_size(device, &data, i, PROFILE_READ_SIZE); + sample_size = cochran_commander_profile_size(device, &data, i, PROFILE_SIZE_READ); // Build dive blob unsigned int dive_size = device->layout->rb_logbook_entry_size + sample_size; @@ -887,7 +888,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call if (sample_size) { if (sample_end_address == 0xFFFFFFFF) // Corrupt dive, guess the end address - sample_end_address = cochran_commander_guess_sample_end_address(device, data, dive_num); + sample_end_address = cochran_commander_guess_sample_end_address(device, &data, i); if (sample_start_address <= sample_end_address) { do { @@ -895,7 +896,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call } while (rc != DC_STATUS_SUCCESS && tries++ < 3); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); - status = rc + status = rc; goto error; } } else { @@ -908,7 +909,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call } while (rc != DC_STATUS_SUCCESS && tries++ < 3); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); - status = rc + status = rc; goto error; } tries = 0; @@ -917,7 +918,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call } while (rc != DC_STATUS_SUCCESS && tries++ < 3); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); - status = rc + status = rc; goto error; } } -- 2.4.11

1 0

[PATCH] Cochran: Fixed code review issues
by John Van Ostrand 02 Jun '17

02 Jun '17

Fixed several memory leaks Removed unused variable Changed use of int to unsigned int where it made sense and fixed initializations Used ringbuffer functions Adjusted enum names to comply --- src/cochran_commander.c | 57 ++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index 4c15541..5ff46a5 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -42,8 +42,8 @@ typedef enum cochran_endian_t { } cochran_endian_t; typedef enum cochran_profile_size_t { - PROFILE_FULL_SIZE, - PROFILE_READ_SIZE, + PROFILE_SIZE_FULL, + PROFILE_SIZE_READ, } cochran_profile_size_t; typedef struct cochran_commander_model_t { @@ -54,7 +54,6 @@ typedef struct cochran_commander_model_t { typedef struct cochran_data_t { unsigned char config[1024]; unsigned char *logbook; - unsigned char *sample; unsigned short int dive_count; int fp_dive_num; @@ -455,18 +454,18 @@ cochran_commander_guess_sample_end_address(cochran_commander_device_t *device, c } -static int +static unsigned int cochran_commander_profile_size(cochran_commander_device_t *device, cochran_data_t *data, int dive_num, cochran_profile_size_t type) { const unsigned char *log_entry = data->logbook + dive_num * device->layout->rb_logbook_entry_size; - unsigned int sample_start_address = -1; + unsigned int sample_start_address = 0xFFFFFFFF; unsigned int sample_end_address = array_uint32_le (log_entry + device->layout->pt_profile_end); - if (type == PROFILE_FULL_SIZE) { + if (type == PROFILE_SIZE_FULL) { // actual size, includes pre-dive events sample_start_address = array_uint32_le (log_entry + device->layout->pt_profile_pre); - } else if (type == PROFILE_READ_SIZE) { + } else if (type == PROFILE_SIZE_READ) { // read size, only include dive profile sample_start_address = array_uint32_le (log_entry + device->layout->pt_profile_begin); } @@ -484,14 +483,7 @@ cochran_commander_profile_size(cochran_commander_device_t *device, cochran_data_ // Corrupt dive, guess the end address sample_end_address = cochran_commander_guess_sample_end_address(device, data, dive_num); - // Calculate the size of the profile only - int sample_size = sample_end_address - sample_start_address; - - if (sample_size < 0) - // Adjust for ring buffer wrap-around - sample_size += device->layout->rb_profile_end - device->layout->rb_profile_begin; - - return sample_size; + return ringbuffer_distance(sample_start_address, sample_end_address, 0, device->layout->rb_profile_end - device->layout->rb_profile_begin); } @@ -501,7 +493,7 @@ cochran_commander_profile_size(cochran_commander_device_t *device, cochran_data_ * Determine the most recent dive without profile data. */ -static int +static unsigned int cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_data_t *data) { // We track profile ringbuffer usage to determine which dives have profile data @@ -536,8 +528,8 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d break; } - int sample_size = cochran_commander_profile_size(device, data, i, PROFILE_FULL_SIZE); - int read_size = cochran_commander_profile_size(device, data, i, PROFILE_READ_SIZE); + unsigned int sample_size = cochran_commander_profile_size(device, data, i, PROFILE_FULL_SIZE); + unsigned int read_size = cochran_commander_profile_size(device, data, i, PROFILE_READ_SIZE); // Determine if sample exists if (profile_capacity_remaining > 0) { @@ -550,12 +542,6 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d // Accumulate read size for progress bar sample_read_size += read_size; } - - if (profile_capacity_remaining < 0) { - // There is no profile for this dive - sample_size = 0; - } - } return sample_read_size; @@ -790,7 +776,6 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call cochran_data_t data; data.logbook = NULL; - data.sample = NULL; // Calculate max data sizes unsigned int max_config = sizeof(data.config); @@ -839,11 +824,13 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call // Request log book rc = cochran_commander_read(device, &progress, 0, data.logbook, data.logbook_size); - if (rc != DC_STATUS_SUCCESS) - return rc; + if (rc != DC_STATUS_SUCCESS) { + status = rc; + goto error; + } // Locate fingerprint, recent dive with invalid profile and calc read size - int profile_read_size = cochran_commander_find_fingerprint(device, &data); + 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); @@ -898,13 +885,18 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call int tries = 0; // Read profile data if (sample_size) { + if (sample_end_address == 0xFFFFFFFF) + // Corrupt dive, guess the end address + sample_end_address = cochran_commander_guess_sample_end_address(device, data, dive_num); + if (sample_start_address <= sample_end_address) { do { rc = cochran_commander_read (device, &progress, sample_start_address, dive + device->layout->rb_logbook_entry_size, sample_size); } while (rc != DC_STATUS_SUCCESS && tries++ < 3); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); - return rc; + status = rc + goto error; } } else { // It wrapped the buffer, copy two sections @@ -916,7 +908,8 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call } while (rc != DC_STATUS_SUCCESS && tries++ < 3); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); - return rc; + status = rc + goto error; } tries = 0; do { @@ -924,7 +917,8 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call } while (rc != DC_STATUS_SUCCESS && tries++ < 3); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); - return rc; + status = rc + goto error; } } } @@ -939,6 +933,5 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call error: free(data.logbook); - free(data.sample); return status; } -- 2.4.11

1 0

Oceanic OCS dive mode
by Kristaps Dzonsons 02 Jun '17

02 Jun '17

Hello, After finding that our Oceanic OCS (model 0x4450 as in the source) produced garbage values when not in dive ("normal") mode, but was still producing a log of free dives, I found that the dive mode is indeed exported. With the enclosed patch, I'm able to properly process free dives, gauge dives, and normal dives with the proper sampling. Yay! I dove with another computer at the same time and compared the results, just to be sure. That being said, I've also enclosed the vendor data being exported with each sample. Does anybody have an idea what the latter two bytes might mean? The former is the depth in 1/16ths foot. I figured on it being temperature or maximum depth, but can't correlate. Best, Kristaps

2 1