devel

devel@libdivecomputer.org

3 participants
290 discussions

[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

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

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

devel