devel January 2015

devel@libdivecomputer.org

7 participants
16 discussions

[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

[PATCH] Extend SAMPLE_EVENT_GASCHANGE2 to have cylinder index in 'flags' field
by Linus Torvalds 04 Jan '15

04 Jan '15

From: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Sat, 3 Jan 2015 17:21:05 -0800 Subject: [PATCH] Extend SAMPLE_EVENT_GASCHANGE2 to have cylinder index in 'flags' field A value of zero (which is the normal legacy one) remains "unknown", but the divecomputer backend can now give both gasmix and cylinder number this way. Currently only the EON Steel backend does that, but it should be easy enough to extend others too. Also, fix the user-visible cylinder numbering in the cylinder change tooltip to use a human-friendlier one-based numbering (ie first cylinder is "cyl 1", not "cyl 0") Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> --- This is the subsurface side to take advantage of the gas index in the "flags" field of SAMPLE_EVENT_GASCHANGE2. The main downside is that nobody historically looked at the "flag" field before, it is possible that some libdivecomputer backend doesn't fill it with zero. But a quick check seems to imply that all backends properly clear it (most with an explicit "flag = 0" right around that SAMPLE_EVENT_GASCHANGE2, and the Suunto D9 parser that doesn't do that has a dc_sample_value_t sample = {0}; to initialize the whole sample with zero, so it all looks fine. NOTE! In subsurface itself, when we then *save* the data, it looks like we don't save a cylinder index of 0 in the git save state. So we lose the explicit cylinder value for the first cylinder. I'll take a look at that later, but it's independent of this particular patch. It's also not clear that subsurface should necessarily bother to save the cylinder index at all if it's unambiguous and can be calculated from the gas mix. None of this code has really gotten much testing, since the whole "explicit cylinder index" is all new, and basically nobody has data with it (since libdivecomputer imports haven't had the data). The fact that we showed the cylinder index zero-based in the newly added tooltip text is very much an example of that kind of lack of data leading to lack of test coverage. This fixes that too (we internally number our gas indexes from 0..7 because they are C array indexes, and "unknown" is thus -1. But obviously from a human readability we should call the first cylinder "cyl 1" rather than "cyl 0". Ho humm. We probably have tons of small issues like this in this area. dive.c | 7 ++++++- qt-ui/profile/diveeventitem.cpp | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dive.c b/dive.c index 32ac25e2ae83..711392c5adc1 100644 --- a/dive.c +++ b/dive.c @@ -57,6 +57,7 @@ int event_gasmix_redundant(struct event *ev) struct event *add_event(struct divecomputer *dc, int time, int type, int flags, int value, const char *name) { + int gas_index = -1; struct event *ev, **p; unsigned int size, len = strlen(name); @@ -79,11 +80,15 @@ struct event *add_event(struct divecomputer *dc, int time, int type, int flags, case SAMPLE_EVENT_GASCHANGE2: /* High 16 bits are He percentage */ ev->gas.mix.he.permille = (value >> 16) * 10; + + /* Extension to the GASCHANGE2 format: cylinder index in 'flags' */ + if (flags > 0 && flags <= MAX_CYLINDERS) + gas_index = flags-1; /* Fallthrough */ case SAMPLE_EVENT_GASCHANGE: /* Low 16 bits are O2 percentage */ ev->gas.mix.o2.permille = (value & 0xffff) * 10; - ev->gas.index = -1; + ev->gas.index = gas_index; break; } diff --git a/qt-ui/profile/diveeventitem.cpp b/qt-ui/profile/diveeventitem.cpp index 4294dfb29589..1a5e29dda1ee 100644 --- a/qt-ui/profile/diveeventitem.cpp +++ b/qt-ui/profile/diveeventitem.cpp @@ -106,7 +106,7 @@ void DiveEventItem::setupToolTipString() /* Do we have an explicit cylinder index? Show it. */ if (internalEvent->gas.index >= 0) - name += QString(" (cyl %1)").arg(internalEvent->gas.index); + name += QString(" (cyl %1)").arg(internalEvent->gas.index+1); } else if (type == SAMPLE_EVENT_PO2 && name == "SP change") { name += QString(":%1").arg((double)value / 1000); } else { -- 2.2.1.212.gc5b9256

1 0

[PATCH 2/2] EON Steel: expose the gas switch cylinder in the "flags" field
by Linus Torvalds 04 Jan '15

04 Jan '15

From: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Sat, 3 Jan 2015 17:09:45 -0800 Subject: [PATCH 2/2] EON Steel: expose the gas switch cylinder in the "flags" field This seems to be the simplest extension to the SAMPLE_EVENT_GASCHANGE2 format: the "value" remains the oddly encoded gas mix, but the "flags" value (if non-zero) now contains the actual cylinder number we switch to. This will need a trivial patch to subsurface to take advantage of the new data too. But then we can actually distinguish between cylinders that have the same gas mix. Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> --- Hey, it sure is simple. src/suunto_eonsteel_parser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/suunto_eonsteel_parser.c b/src/suunto_eonsteel_parser.c index 6296b2642ba0..40e3feb02a35 100644 --- a/src/suunto_eonsteel_parser.c +++ b/src/suunto_eonsteel_parser.c @@ -325,6 +325,7 @@ static void sample_gas_switch_event(struct sample_data *info, unsigned short idx sample.event.type = SAMPLE_EVENT_GASCHANGE2; sample.event.value = o2 | (he << 16); + sample.event.flags = idx; if (info->callback) info->callback(DC_SAMPLE_EVENT, sample, info->userdata); } -- 2.2.1.212.gc5b9256

1 0

[PATCH 1/2] Add EON Steel personal adjustment parsing
by Linus Torvalds 04 Jan '15

04 Jan '15

From: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Sat, 3 Jan 2015 17:07:38 -0800 Subject: [PATCH 1/2] Add EON Steel personal adjustment parsing Suunto calls it "Conservatism" in the dump, but "Personal adjustment" in at least some of the documentation. That's what we expose it as. Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> --- So a "Personal adjustment" of "P-2" looks a bit odd, but that's how Suunto shows it on the dive computer (with the explanation "More aggressive"), and it matches older Suunto computers that called their personal adjustments P0 .. P2. src/suunto_eonsteel_parser.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/suunto_eonsteel_parser.c b/src/suunto_eonsteel_parser.c index d5fe9f8ca7f2..6296b2642ba0 100644 --- a/src/suunto_eonsteel_parser.c +++ b/src/suunto_eonsteel_parser.c @@ -21,6 +21,12 @@ #include <stdlib.h> #include <string.h> +#include <stdio.h> + +/* Wow. MSC is truly crap */ +#ifdef _MSC_VER +#define snprintf _snprintf +#endif #include <libdivecomputer/suunto_eonsteel.h> @@ -756,6 +762,15 @@ static int traverse_header_fields(suunto_eonsteel_parser_t *eon, const char *nam if (!strcmp(name, "Diving.DiveMode")) return add_string(eon, "Dive Mode", data); + /* Signed byte of conservatism (-2 .. +2) */ + if (!strcmp(name, "Diving.Conservatism")) { + char buffer[10]; + int val = *(signed char *)data; + + snprintf(buffer, sizeof(buffer), "P%d", val); + return add_string(eon, "Personal Adjustment", buffer); + } + return 0; } -- 2.2.1.212.gc5b9256

1 0

[PATCH 3/3] Parse EON Steel notification and state changes
by Linus Torvalds 03 Jan '15

03 Jan '15

From: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Sat, 3 Jan 2015 15:23:35 -0800 Subject: [PATCH 3/3] Parse EON Steel notification and state changes The EON Steel notifications and states match the libdivecomputer ones very badly, but this tries to make sense of the ones that match. And puts the infrastructure in to do others in the future. Signed-off-by: Linus Torvalds <torvalds(a)linux-fouindation.org> --- I'll double-check, but I think this ends up finishiong off the obviously useful parts of the EON Steel information. There are more things that the EON Steel reports, but they tend to be pretty esoteric. src/suunto_eonsteel_parser.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/src/suunto_eonsteel_parser.c b/src/suunto_eonsteel_parser.c index 368769675e0f..a31c1a7e9b68 100644 --- a/src/suunto_eonsteel_parser.c +++ b/src/suunto_eonsteel_parser.c @@ -228,6 +228,7 @@ struct sample_data { dc_sample_callback_t callback; void *userdata; unsigned int time; + unsigned char state_type, notify_type; }; static void sample_time(struct sample_data *info, unsigned short time_delta) @@ -310,6 +311,82 @@ static void sample_gas_switch_event(struct sample_data *info, unsigned short idx if (info->callback) info->callback(DC_SAMPLE_EVENT, sample, info->userdata); } +/* + * The EON Steel has two different sample events: "state" and "notification". + * Both 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 + * type values. + * + * For event states, the types are: + * + * 0=Wet Outside + * 1=Below Wet Activation Depth + * 2=Below Surface + * 3=Dive Active + * 4=Surface Calculation + * 5=Tank pressure available + */ +static void sample_event_state_type(struct sample_data *info, unsigned char type) +{ + info->state_type = type; +} + +static void sample_event_state_value(struct sample_data *info, unsigned char value) +{ + /* + * We could turn these into sample events, but they don't actually + * match any libdivecomputer events. + * + * unsigned int state = info->state_type; + * dc_sample_value_t sample = {0}; + * sample.event.type = ... + * sample.event.value = value; + * if (info->callback) info->callback(DC_SAMPLE_EVENT, sample, info->userdata); + */ +} + +static void sample_event_notify_type(struct sample_data *info, unsigned char type) +{ + info->notify_type = type; +} + + +static void sample_event_notify_value(struct sample_data *info, unsigned char value) +{ + dc_sample_value_t sample = {0}; + static const enum parser_sample_event_t translate_notification[] = { + SAMPLE_EVENT_NONE, // 0=NoFly Time + SAMPLE_EVENT_NONE, // 1=Depth + SAMPLE_EVENT_NONE, // 2=Surface Time + 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, // 7=Safety Stop + SAMPLE_EVENT_CEILING_SAFETYSTOP, // 8=Safety Stop Broken + SAMPLE_EVENT_NONE, // 9=Deep Stop Ahead + SAMPLE_EVENT_DEEPSTOP, // 10=Deep Stop + SAMPLE_EVENT_DIVETIME, // 11=Dive Time + SAMPLE_EVENT_NONE, // 12=Gas Available + SAMPLE_EVENT_NONE, // 13=SetPoint Switch + SAMPLE_EVENT_NONE, // 14=Diluent Hypoxia + SAMPLE_EVENT_NONE, // 15=Tank Pressure + }; + + if (info->notify_type > 15) + return; + + sample.event.type = translate_notification[info->notify_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; @@ -330,6 +407,18 @@ 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 0x0013: + sample_event_state_type(info, data[0]); + break; + case 0x0014: + sample_event_state_value(info, data[0]); + break; + case 0x0015: + sample_event_notify_type(info, data[0]); + break; + case 0x0016: + sample_event_notify_value(info, data[0]); + break; case 0x001d: sample_gas_switch_event(info, array_uint16_le(data)); break; -- 2.2.1.212.gc5b9256

1 0

[PATCH 2/3] Add EON Steel dive mode and transmitter ID information
by Linus Torvalds 03 Jan '15

03 Jan '15

From: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Sat, 3 Jan 2015 14:43:46 -0800 Subject: [PATCH 2/3] Add EON Steel dive mode and transmitter ID information This adds the divemode name (Nitrox, Trimix, Gauge, or whatever custon name) and the transmitter ID as extra string information when downloading from the EON Steel. Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> --- Patch 1/3 was the "Add EON Steel gas change event parsing" patch I sent yesterday, but it hasn't changed and I'm not resending it here, so if you wonder why you only get 2/3 and 3/3, that's why. Holler if you don't see yesterday's patch, and I'll send that one too. src/suunto_eonsteel_parser.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/suunto_eonsteel_parser.c b/src/suunto_eonsteel_parser.c index d5bfb0e74942..368769675e0f 100644 --- a/src/suunto_eonsteel_parser.c +++ b/src/suunto_eonsteel_parser.c @@ -569,6 +569,9 @@ static int traverse_header_fields(suunto_eonsteel_parser_t *eon, const char *nam if (!strcmp(name, "Diving.Algorithm")) return add_string(eon, "Deco algorithm", data); + if (!strcmp(name, "Diving.DiveMode")) + return add_string(eon, "Dive Mode", data); + return 0; } @@ -614,6 +617,9 @@ static int traverse_fields(unsigned short type, const struct type_desc *desc, co case 0x000f: // Helium percentage in first byte add_gas_he(eon, data[0]); break; + case 0x0011: // Transmitter ID + add_string(eon, "Transmitter ID", data); + break; default: // The types with the high byte set seem to be dynamic // although not all of them seem to change. But let's -- 2.2.1.212.gc5b9256

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

devel January 2015