FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix gas handling for OSTC

Browse Source 
Two issues:
- the OSTC counts its gases 1-based, not 0-based
- dives don't always start with the first gas. Simply create a gas change
event right after the first time sample that informs the application what
the first gas mix is

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-12-28 21:44:29 -08:00 committed by Jef Driesen
parent 0e0168f4d4
commit 1079bdc0b0
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hw_ostc_parser.c
View File

@ -334,6 +334,19 @@ hw_ostc_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t call
sample.time = time;
if (callback) callback (DC_SAMPLE_TIME, sample, userdata);
// Initial gas mix.
if (time == samplerate) {
unsigned int idx = data[31];
if (idx < 1 || idx > 5)
return DC_STATUS_DATAFORMAT;
idx--; /* Convert to a zero based index. */
sample.event.type = SAMPLE_EVENT_GASCHANGE2;
sample.event.time = 0;
sample.event.flags = 0;
sample.event.value = data[19 + 2 * idx] | (data[20 + 2 * idx] << 16);
if (callback) callback (DC_SAMPLE_EVENT, sample, userdata);
}
// Depth (mbar).
unsigned int depth = array_uint16_le (data + offset);
sample.depth = (depth * BAR / 1000.0) / hydrostatic;
@ -400,9 +413,12 @@ hw_ostc_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t call
// Gas Change
if (events & 0x20) {
if (offset + 1 > size || data[offset] >= 5)
if (offset + 1 > size)
return DC_STATUS_DATAFORMAT;
unsigned int idx = data[offset];
if (idx < 1 || idx > 5)
return DC_STATUS_DATAFORMAT;
idx--; /* Convert to a zero based index. */
sample.event.type = SAMPLE_EVENT_GASCHANGE2;
sample.event.time = 0;
sample.event.flags = 0;