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

Associate the pressure samples with the primary tank.

Browse Source 
The primary tank, which is the tank connected to the hose and thus the
tank pressure sensor, it not necessary the first tank. The correct tank
index can be found by searching the array for a gas mix with a sensor id
equal to one.
This commit is contained in:
Jef Driesen 2014-10-10 20:29:17 +02:00
parent 9db9e970cf
commit 8853a1ccd4
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/atomics_cobalt_parser.c
View File

@ -213,6 +213,19 @@ atomics_cobalt_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback
// Previous gas mix - initialize with impossible value
unsigned int gasmix_previous = 0xFFFFFFFF;
// Get the primary tank.
unsigned int tank = 0;
while (tank < ngasmixes) {
unsigned int sensor = array_uint16_le(data + SZ_HEADER + SZ_GASMIX * tank + 12);
if (sensor == 1)
break;
tank++;
}
if (tank >= ngasmixes) {
ERROR (abstract->context, "Invalid primary tank index.");
return DC_STATUS_DATAFORMAT;
}
unsigned int time = 0;
unsigned int in_deco = 0;
unsigned int offset = header;
@ -231,7 +244,7 @@ atomics_cobalt_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback
// Pressure (1 psi).
unsigned int pressure = array_uint16_le (data + offset + 2);
sample.pressure.tank = 0;
sample.pressure.tank = tank;
sample.pressure.value = pressure * PSI / BAR;
if (callback) callback (DC_SAMPLE_PRESSURE, sample, userdata);