devel

devel@libdivecomputer.org

3 participants
290 discussions

[PATCH] Add average depth from OSTC/OSTC3 logbook
by Anton Lundin 21 Jan '15

21 Jan '15

Signed-off-by: Anton Lundin <glance(a)acc.umu.se> --- src/hw_ostc_parser.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/hw_ostc_parser.c b/src/hw_ostc_parser.c index a3ee279..800dac4 100644 --- a/src/hw_ostc_parser.c +++ b/src/hw_ostc_parser.c @@ -75,6 +75,7 @@ typedef struct hw_ostc_sample_info_t { typedef struct hw_ostc_layout_t { unsigned int datetime; unsigned int maxdepth; + unsigned int avgdepth; unsigned int divetime; unsigned int atmospheric; unsigned int salinity; @@ -108,6 +109,7 @@ static const dc_parser_vtable_t hw_ostc_parser_vtable = { static const hw_ostc_layout_t hw_ostc_layout_ostc = { 3, /* datetime */ 8, /* maxdepth */ + 45, /* avgdepth */ 10, /* divetime */ 15, /* atmospheric */ 43, /* salinity */ @@ -121,6 +123,7 @@ static const hw_ostc_layout_t hw_ostc_layout_ostc = { static const hw_ostc_layout_t hw_ostc_layout_frog = { 9, /* datetime */ 14, /* maxdepth */ + UNSUPPORTED, /* avgdepth */ 16, /* divetime */ 21, /* atmospheric */ 43, /* salinity */ @@ -134,6 +137,7 @@ static const hw_ostc_layout_t hw_ostc_layout_frog = { static const hw_ostc_layout_t hw_ostc_layout_ostc3 = { 12, /* datetime */ 17, /* maxdepth */ + 73, /* avgdepth */ 19, /* divetime */ 24, /* atmospheric */ 70, /* salinity */ @@ -329,6 +333,11 @@ hw_ostc_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsigned case DC_FIELD_MAXDEPTH: *((double *) value) = array_uint16_le (data + layout->maxdepth) / 100.0; break; + case DC_FIELD_AVGDEPTH: + if (version == 0x22) + return DC_STATUS_UNSUPPORTED; + *((double *) value) = array_uint16_le (data + layout->avgdepth) / 100.0; + break; case DC_FIELD_GASMIX_COUNT: if (version == 0x22) { *((unsigned int *) value) = 3; -- 2.1.0

2 3

[PATCH] Have make be more silent by default
by Anton Lundin 21 Jan '15

21 Jan '15

Signed-off-by: Anton Lundin <glance(a)acc.umu.se> --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index fb99319..370fda4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,7 @@ if ENABLE_EXAMPLES SUBDIRS += examples endif +AM_MAKEFLAGS = -s ACLOCAL_AMFLAGS = -I m4 pkgconfigdir = $(libdir)/pkgconfig -- 2.1.0

2 4

[PATCH] Add option to control compiler warnings for gcc
by Anton Lundin 21 Jan '15

21 Jan '15

This adds a configure option, --enable-gcc-compile-warnings which controls which CFLAGS to pass to gcc. It defaults to -Wall but can with the configure argument be turned to different levels. Signed-off-by: Anton Lundin <glance(a)acc.umu.se> --- I think i kinda over-did-it, but hey. I had something quite close laying around from another project so i picked the whole thingie. configure.ac | 26 ++++++++++++++++++++++++++ examples/Makefile.am | 2 +- src/Makefile.am | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 047b3f0..78de1df 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,32 @@ LT_PREREQ([2.2.0]) LT_INIT([win32-dll]) LT_PROG_RC +# If were running gcc, give the option for some warnings, and enable -Wall by default +WARNING_CFLAGS="" +AC_ARG_ENABLE([gcc-compile-warnings], + [AS_HELP_STRING([--enable-gcc-compile-warnings=@<:@no/yes/maximum/error@:>@], + [Turn on compiler warnings @<:@default=yes@:>@])], + [case "$enableval" in + no) + ;; + '' | yes) + WARNING_CFLAGS="-Wall" + ;; + maximum) + WARNING_CFLAGS="-Wall -Wextra -pedantic" + ;; + error) + WARNING_CFLAGS="-Wall -Werror -Wextra -pedantic" + ;; + *) + AC_MSG_ERROR([Unknown argument '$enableval' to --enable-gcc-compile-warnings]) + ;; + esac], + [WARNING_CFLAGS="-Wall"]) +AS_IF([test "x$GCC" = "xyes"], [ + AC_SUBST([WARNING_CFLAGS]) +]) + # Logging support. AC_ARG_ENABLE([logging], [AS_HELP_STRING([--enable-logging=@<:@yes/no@:>@], diff --git a/examples/Makefile.am b/examples/Makefile.am index d77db45..32a5e72 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include +AM_CPPFLAGS = $(WARNING_CFLAGS) -I$(top_builddir)/include -I$(top_srcdir)/include LDADD = $(top_builddir)/src/libdivecomputer.la bin_PROGRAMS = \ diff --git a/src/Makefile.am b/src/Makefile.am index 821bc1b..1c110b8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -AM_CFLAGS = $(LIBUSB_CFLAGS) +AM_CFLAGS = $(WARNING_CFLAGS) $(LIBUSB_CFLAGS) lib_LTLIBRARIES = libdivecomputer.la -- 2.1.0

2 3

Cochran changes
by John Van Ostrand 20 Jan '15

20 Jan '15

Jef, I'm working though some of the changes you recommended and I'm looking for advice. 1. Fingerprint optimized download. The current logic only works when the DC's logbook buffer hasn't wrapped and will likely fail with a segfault when not the case. I have to treat the logbook like a ring buffer buffer and maybe I have to treat the profile data like ring buffer too. The logbook is small enough that optimizing its download makes less sense but optimizing the profile data would. It would mean more complicated logic and potentially downloading two segments if the profile data has wrapped. I'd create a buffer the size of DC memory and write the profile data in the proper areas to make the logic easier. 2. Foreach function size. You seem to want the read logic in the foreach function. If I put it all in-line, including the progress updates, logic to locate the fingerprint, the logic to determine which profile data to read it's going to be a very large function. It seems that keeping it seperate would make it much more readable. With those functions outside foreach() is 70 lines. You proposed version which is lacking many lines of code is 140 lines and 3. I'm concerned about the performance cost of using ring-buffer logic for profile data, although it solves existing bugs. The Cochran's profile data is not stored in blocks, it's a byte stream in which two or three bytes describes a second's worth of most data. Some data, like NDL, deco stop time and dive events are spread across many bytes and require reading ahead. As a result the code would be calling ring buffer_increment a lot, samples are every second, so a 1 hour dive would require over 11,000 calls to ring buffer_increment. I could add some logic to workaround that, it might not be too bad. -- John Van Ostrand At large on sabbatical

2 1

[PATCH] Cochran: Dump changes; reads fewer config blocks
by John Van Ostrand 17 Jan '15

17 Jan '15

It's no longer reading the two extra config blocks for Commanders. These only ever seem to hold FFs. It cleans up some other logic. ID, config and misc blocks are now sent to the user via vendor events. The dump file now contains only logbook and sample memory. --- src/cochran_commander.c | 72 ++++++++++++++++++++++++++----------------------- src/cochran_commander.h | 2 +- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/src/cochran_commander.c b/src/cochran_commander.c index c9d7386..2287541 100644 --- a/src/cochran_commander.c +++ b/src/cochran_commander.c @@ -461,21 +461,21 @@ cochran_read_config (dc_device_t *abstract, dc_event_progress_t *progress) { cochran_device_t *device = (cochran_device_t *) abstract; cochran_data_t *data = &device->data; + dc_event_vendor_t vendor; dc_status_t rc; unsigned char command[2] = { 0x96, 0x00 }; - if ((data->conf.model & 0xFF0000) == COCHRAN_MODEL_EMC_FAMILY) - data->config_count = 2; - else - data->config_count = 4; - int n; - for (n = 0; n < data->config_count; n++) { + for (n = 0; n < 2; n++) { command[1] = n; rc = cochran_packet(device, progress, command, 2, data->config[n], 512, 0); if (rc != DC_STATUS_SUCCESS) return rc; + + vendor.data = data->config[n]; + vendor.size = 512; + device_event_emit (abstract, DC_EVENT_VENDOR, &vendor); } return DC_STATUS_SUCCESS; @@ -486,6 +486,8 @@ static dc_status_t cochran_read_misc (dc_device_t *abstract, dc_event_progress_t *progress) { cochran_device_t *device = (cochran_device_t *) abstract; + dc_status_t rc; + dc_event_vendor_t vendor; unsigned char command[7] = { 0x89, 0x05, 0x00, 0x00, 0x00, 0xDC, 0x05 }; @@ -513,7 +515,16 @@ cochran_read_misc (dc_device_t *abstract, dc_event_progress_t *progress) return EXITCODE (n); } - return cochran_packet(device, progress, command + 1, 6, device->data.misc, 1500, 0); + rc = cochran_packet(device, progress, command + 1, 6, device->data.misc, 1500, 0); + + if (rc != DC_STATUS_SUCCESS) + return rc; + + vendor.data = device->data.misc; + vendor.size = 1500; + device_event_emit (abstract, DC_EVENT_VENDOR, &vendor); + + return DC_STATUS_SUCCESS; } @@ -733,57 +744,50 @@ cochran_commander_device_dump (dc_device_t *abstract, dc_buffer_t *data) cochran_device_t *device = (cochran_device_t *) abstract; cochran_data_t *d = (cochran_data_t *) &device->data; dc_event_progress_t progress = {0}; + dc_event_vendor_t vendor; dc_status_t rc; - int size, offset; + int size; - // Determine size for progress - if (d->extra_id_flag) { - // two ID blocks, 4 config block, misc block - size = 67 + 67 + 512 + 512 + 512 + 512 + 1500 + d->conf.sample_memory_end_address; - } else { - // one ID blocks, 2 config block, misc block - size = 67 + 512 + 512 + 1500 + d->conf.sample_memory_end_address; + // Make sure buffer is good. + if (!dc_buffer_clear(data)) { + ERROR (abstract->context, "Uninitialized buffer."); + return DC_STATUS_INVALIDARGS; } + // Determine size for progress + size = 512 + 512 + 1500 + d->conf.sample_memory_end_address; + progress.current = 0; progress.maximum = size; device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); - // Append id blocks + // Emit ID blocks as vendor data if (d->extra_id_flag) { - dc_buffer_append (data, d->id0, 67); - dc_buffer_append (data, d->id, 67); - progress.current += 134; - } else { - dc_buffer_append (data, d->id, 67); - progress.current += 67; + vendor.data = d->id0; + vendor.size = 67; + device_event_emit (abstract, DC_EVENT_VENDOR, &vendor); } - device_event_emit (abstract, DC_EVENT_PROGRESS, &progress); + vendor.data = d->id; + vendor.size = 67; + device_event_emit (abstract, DC_EVENT_VENDOR, &vendor); rc = cochran_read_config (abstract, &progress); if (rc != DC_STATUS_SUCCESS) return rc; - for (int n = 0; n < d->config_count; n++) { - dc_buffer_append (data, d->config[n], 512); - } - rc = cochran_read_misc (abstract, &progress); if (rc != DC_STATUS_SUCCESS) return rc; - dc_buffer_append(data, d->misc, 1500); - // Read logbook and sample memory // Reserve space - offset = dc_buffer_get_size(data); - int rcm; - rcm = dc_buffer_resize(data, offset + d->conf.sample_memory_end_address); - if (!rcm) + if (!dc_buffer_resize(data, d->conf.sample_memory_end_address)) { + ERROR(abstract->context, "Insufficient buffer space available."); return DC_STATUS_NOMEMORY; + } serial_sleep(device->port, 800); @@ -792,7 +796,7 @@ cochran_commander_device_dump (dc_device_t *abstract, dc_buffer_t *data) // Read the sample data, from 0 to sample end will include logbook rc = cochran_commander_read (abstract, &progress, 0, - dc_buffer_get_data(data) + offset, d->conf.sample_memory_end_address); + dc_buffer_get_data(data), d->conf.sample_memory_end_address); if (rc != DC_STATUS_SUCCESS) { ERROR (abstract->context, "Failed to read the sample data."); return rc; diff --git a/src/cochran_commander.h b/src/cochran_commander.h index 05b49ed..57962d8 100644 --- a/src/cochran_commander.h +++ b/src/cochran_commander.h @@ -73,7 +73,7 @@ typedef struct cochran_config_t { typedef struct cochran_data_t { unsigned char id0[67]; unsigned char id[67]; - unsigned char config[4][512]; + unsigned char config[2][512]; unsigned char misc[1500]; unsigned char *logbook; unsigned char *sample; -- 1.9.3

1 0

Trade show Boot Düsseldorf
by Jef Driesen 13 Jan '15

13 Jan '15

Hi, Anyone visiting the trade show Boot in Düsseldorf (Germany)? That may be an opportunity to meet people in person. I'll be there on Sunday 25th January. Jef

1 0

[PATCH 4/4] Add EON Steel bookmarks, warnings and alarm events
by Linus Torvalds 08 Jan '15

08 Jan '15

From: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Sat, 3 Jan 2015 16:25:19 -0800 Subject: [PATCH 4/4] Add EON Steel bookmarks, warnings and alarm events I'd missed these because I'm blind. But mostly because they aren't as common. Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> --- There is no really good way to distinguish between "notification", "warning" and "alarm" in libdivecomputer. Sometimes there are sane middle grounds (ie a "notification" of a safety stop is would be the "voluntary" version, while a warning would be a "mandatory" one). But how to distinguish between a deep stop ceiling violation notification vs warning vs alarm? Anyway, these translations really aren't wonderful, and some things aren'ty translated at all (ie they translate to SAMPLE_EVENT_NONE). But they make *some* amount of sense. As usual, I'd be happier with a string-based model, rather than the crazy enumeration constants that don't make any sense and are too limited anyway. But now I think I *really* have all the core EON Steel data translated. src/suunto_eonsteel_parser.c | 101 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 3 deletions(-) diff --git a/src/suunto_eonsteel_parser.c b/src/suunto_eonsteel_parser.c index a31c1a7e9b68..d5fe9f8ca7f2 100644 --- a/src/suunto_eonsteel_parser.c +++ b/src/suunto_eonsteel_parser.c @@ -229,6 +229,7 @@ struct sample_data { void *userdata; unsigned int time; unsigned char state_type, notify_type; + unsigned char warning_type, alarm_type; }; static void sample_time(struct sample_data *info, unsigned short time_delta) @@ -292,6 +293,17 @@ static void sample_cylinder_pressure(struct sample_data *info, unsigned char idx if (info->callback) info->callback(DC_SAMPLE_PRESSURE, sample, info->userdata); } +static void sample_bookmark_event(struct sample_data *info, unsigned short idx) +{ + suunto_eonsteel_parser_t *eon = info->eon; + dc_sample_value_t sample = {0}; + + sample.event.type = SAMPLE_EVENT_BOOKMARK; + sample.event.value = idx; + + if (info->callback) info->callback(DC_SAMPLE_EVENT, sample, info->userdata); +} + static void sample_gas_switch_event(struct sample_data *info, unsigned short idx) { suunto_eonsteel_parser_t *eon = info->eon; @@ -312,8 +324,8 @@ static void sample_gas_switch_event(struct sample_data *info, unsigned short idx } /* - * The EON Steel has two different sample events: "state" and "notification". - * Both end up having two fields: type and a boolean value. + * The EON Steel has four different sample events: "state", "notification", + * "warning" and "alarm". All end up having two fields: type and a boolean value. * * The type enumerations are available as part of the type descriptor, and we * *should* probably parse them dynamically, but this hardcodes the different @@ -363,7 +375,7 @@ static void sample_event_notify_value(struct sample_data *info, unsigned char va SAMPLE_EVENT_TISSUELEVEL, // 3=Tissue Level SAMPLE_EVENT_NONE, // 4=Deco SAMPLE_EVENT_NONE, // 5=Deco Window - SAMPLE_EVENT_SAFETYSTOP_MANDATORY, // 6=Safety Stop Ahead + SAMPLE_EVENT_SAFETYSTOP_VOLUNTARY, // 6=Safety Stop Ahead SAMPLE_EVENT_SAFETYSTOP, // 7=Safety Stop SAMPLE_EVENT_CEILING_SAFETYSTOP, // 8=Safety Stop Broken SAMPLE_EVENT_NONE, // 9=Deep Stop Ahead @@ -387,6 +399,74 @@ static void sample_event_notify_value(struct sample_data *info, unsigned char va } +static void sample_event_warning_type(struct sample_data *info, unsigned char type) +{ + info->warning_type = type; +} + + +static void sample_event_warning_value(struct sample_data *info, unsigned char value) +{ + dc_sample_value_t sample = {0}; + static const enum parser_sample_event_t translate_warning[] = { + SAMPLE_EVENT_NONE, // 0=ICD Penalty ("Isobaric counterdiffusion") + SAMPLE_EVENT_VIOLATION, // 1=Deep Stop Penalty + SAMPLE_EVENT_SAFETYSTOP_MANDATORY, // 2=Mandatory Safety Stop + SAMPLE_EVENT_NONE, // 3=OTU250 + SAMPLE_EVENT_NONE, // 4=OTU300 + SAMPLE_EVENT_NONE, // 5=CNS80% + SAMPLE_EVENT_NONE, // 6=CNS100% + SAMPLE_EVENT_AIRTIME, // 7=Air Time + SAMPLE_EVENT_MAXDEPTH, // 8=Max.Depth + SAMPLE_EVENT_AIRTIME, // 9=Tank Pressure + SAMPLE_EVENT_CEILING_SAFETYSTOP, // 10=Safety Stop Broken + SAMPLE_EVENT_CEILING_SAFETYSTOP, // 11=Deep Stop Broken + SAMPLE_EVENT_CEILING, // 12=Ceiling Broken + SAMPLE_EVENT_PO2, // 13=PO2 High + }; + + if (info->warning_type > 13) + return; + + sample.event.type = translate_warning[info->warning_type]; + if (sample.event.type == SAMPLE_EVENT_NONE) + return; + + sample.event.value = value ? SAMPLE_FLAGS_BEGIN : SAMPLE_FLAGS_END; + if (info->callback) info->callback(DC_SAMPLE_EVENT, sample, info->userdata); +} + +static void sample_event_alarm_type(struct sample_data *info, unsigned char type) +{ + info->alarm_type = type; +} + + +static void sample_event_alarm_value(struct sample_data *info, unsigned char value) +{ + dc_sample_value_t sample = {0}; + static const enum parser_sample_event_t translate_alarm[] = { + SAMPLE_EVENT_CEILING_SAFETYSTOP, // 0=Mandatory Safety Stop Broken + SAMPLE_EVENT_ASCENT, // 1=Ascent Speed + SAMPLE_EVENT_NONE, // 2=Diluent Hyperoxia + SAMPLE_EVENT_VIOLATION, // 3=Violated Deep Stop + SAMPLE_EVENT_CEILING, // 4=Ceiling Broken + SAMPLE_EVENT_PO2, // 5=PO2 High + SAMPLE_EVENT_PO2, // 6=PO2 Low + }; + + if (info->alarm_type > 6) + return; + + sample.event.type = translate_alarm[info->alarm_type]; + if (sample.event.type == SAMPLE_EVENT_NONE) + return; + + sample.event.value = value ? SAMPLE_FLAGS_BEGIN : SAMPLE_FLAGS_END; + if (info->callback) info->callback(DC_SAMPLE_EVENT, sample, info->userdata); +} + + static int traverse_samples(unsigned short type, const struct type_desc *desc, const unsigned char *data, int len, void *user) { struct sample_data *info = (struct sample_data *) user; @@ -419,6 +499,21 @@ static int traverse_samples(unsigned short type, const struct type_desc *desc, c case 0x0016: sample_event_notify_value(info, data[0]); break; + case 0x0017: + sample_event_warning_type(info, data[0]); + break; + case 0x0018: + sample_event_warning_value(info, data[0]); + break; + case 0x0019: + sample_event_warning_type(info, data[0]); + break; + case 0x001a: + sample_event_warning_value(info, data[0]); + break; + case 0x001c: + sample_bookmark_event(info, array_uint16_le(data)); + break; case 0x001d: sample_gas_switch_event(info, array_uint16_le(data)); break; -- 2.2.1.212.gc5b9256

3 7

Mares Nemo via IRIS (RS232)
by Stefano Mersi 06 Jan '15

06 Jan '15

Hello, I have a Mares Nemo and an IRIS RS232 interface. If anyone is interested in helping the debug here, I thank them in advance. More detailed info follow. I have tried to download all the dives from my Mares Nemo via the IRIS interface (the old one, which connects through RS232). It apparently did not work using subsurface, so I rolled back to the debug tools in libdivecomputer, following the instructions to obtain all the needed info. The download with the 'universal' test went smoothly from 0% to 100%, but I get periodic warnings: "[6.324485] WARNING: Only the first packet has a correct checksum. [in mares_nemo.c:257 (mares_nemo_device_dump)]" every ~ 100 packets). If anyone is interested in looking into this, I attach all the debug info. Thanks in advance Stefano

2 1

Re: Switch to msvc 12 (VS 2013) and stop jumping hoops?
by Jef Driesen 06 Jan '15

06 Jan '15

On 30-12-14 18:56, Anton Lundin wrote: > I know that Jef cares about msvc compatibility, and thus we are jumping > hoops to try to keep libdivecomputer building with old msvc versions. > > As far as i read from the project file, its targeting msvc 9.0 aka > VS 2008 which is quite old. I just had a chat with some friends of mine > who works (fights) with VS on a daily basis, and according to them VS > 2013 works quite fine, and is a pretty standard compliant c99 compiler. > > > Is it intentionally libdivecomputer is targeting msvc 9.0 or can we > bump > that version to msvc 12.0 and stop (at least to lesser degree) jumping > hoops for msvc support? The reason why I'm using msvc 9 is because that was the current version back than and freely available (express edition). I certainly don't mind switching to a newer version if they have better C99 support. The only requirement on my side is that it needs to run on Windows XP, and that might be a problem. I'm well aware that Windows XP is discontinued, but that's what I'm currently running in my Windows VM's. Portmon and some (older) manufacturer applications work fine there. I'm not sure whether that's still true for more recent windows version. So I'm a bit stuck with Windows XP for that reason. Jef

1 0

[PATCH] Add EON Steel gas change event parsing
by Linus Torvalds 04 Jan '15

04 Jan '15

From: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Fri, 2 Jan 2015 22:23:40 -0800 Subject: [PATCH] Add EON Steel gas change event parsing The really sad part is that the EON Steel handles gas change events correctly, by actually saying which cylinder it switches to. But the libdivecomputer interfaces are broken, and only contain the gas *mix* you switch to, which is ambiguous since you could have the same mix in multiple cylinders. Maybe we could put the one-based cylinder index into the "flags" field? With zero meaning "unknown". That would be a straightforward extension. Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> --- It's really sad how this loses the cylinder number information, but other than that it seems to work for me. There's a lot of other events that I don't parse, and that I now have that Don took the EON Steel down to 200 ft with trimix and sharks, but this is the primary missing one. src/suunto_eonsteel_parser.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/suunto_eonsteel_parser.c b/src/suunto_eonsteel_parser.c index 6c4f4aba3d39..d5bfb0e74942 100644 --- a/src/suunto_eonsteel_parser.c +++ b/src/suunto_eonsteel_parser.c @@ -291,6 +291,25 @@ static void sample_cylinder_pressure(struct sample_data *info, unsigned char idx if (info->callback) info->callback(DC_SAMPLE_PRESSURE, sample, info->userdata); } +static void sample_gas_switch_event(struct sample_data *info, unsigned short idx) +{ + suunto_eonsteel_parser_t *eon = info->eon; + dc_sample_value_t sample = {0}; + int o2, he; + + if (idx < 1 || idx > eon->cache.ngases) + return; + + // Horrible, broken, gas change events + o2 = 100 * eon->cache.gasmix[idx-1].oxygen; + he = 100 * eon->cache.gasmix[idx-1].helium; + + sample.event.type = SAMPLE_EVENT_GASCHANGE2; + sample.event.value = o2 | (he << 16); + + if (info->callback) info->callback(DC_SAMPLE_EVENT, sample, info->userdata); +} + static int traverse_samples(unsigned short type, const struct type_desc *desc, const unsigned char *data, int len, void *user) { struct sample_data *info = (struct sample_data *) user; @@ -311,6 +330,9 @@ static int traverse_samples(unsigned short type, const struct type_desc *desc, c case 0x000a: // cylinder idx in first byte, pressure in next word sample_cylinder_pressure(info, data[0], array_uint16_le(data+1)); break; + case 0x001d: + sample_gas_switch_event(info, array_uint16_le(data)); + break; } return 0; } -- 2.2.1.212.gc5b9256

3 3

← Newer
1
...
13
14
15
16
17
18
19
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

devel