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

Discard pressure samples from invalid tanks

Browse Source 
Keeping the one based tank number interally allows to easily discard the
pressure samples from invalid tanks. This avoid returning a huge tank
number (e.g. 0xFFFFFFFF) when the internal tank number happens to be
zero.
This commit is contained in:
Jef Driesen 2024-03-07 19:29:53 +01:00
parent 811ae7de82
commit f5f855d428
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/oceanic_atom2_parser.c
View File

@ -645,7 +645,7 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
} }
// Initial tank pressure. // Initial tank pressure.
unsigned int tank = 0; unsigned int tank = 1;
unsigned int pressure = 0; unsigned int pressure = 0;
if (have_pressure) { if (have_pressure) {
unsigned int idx = 2; unsigned int idx = 2;
@ -700,17 +700,17 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
if (sampletype == 0xAA) { if (sampletype == 0xAA) {
if (parser->model == DATAMASK || parser->model == COMPUMASK) { if (parser->model == DATAMASK || parser->model == COMPUMASK) {
// Tank pressure (1 psi) and number // Tank pressure (1 psi) and number
tank = 0; tank = 1;
pressure = (((data[offset + 7] << 8) + data[offset + 6]) & 0x0FFF); pressure = (((data[offset + 7] << 8) + data[offset + 6]) & 0x0FFF);
} else if (parser->model == A300CS || parser->model == VTX || } else if (parser->model == A300CS || parser->model == VTX ||
parser->model == I750TC || parser->model == SAGE || parser->model == I750TC || parser->model == SAGE ||
parser->model == BEACON) { parser->model == BEACON) {
// Tank pressure (1 psi) and number (one based index) // Tank pressure (1 psi) and number (one based index)
tank = (data[offset + 1] & 0x03) - 1; tank = data[offset + 1] & 0x03;
pressure = ((data[offset + 7] << 8) + data[offset + 6]) & 0x0FFF; pressure = ((data[offset + 7] << 8) + data[offset + 6]) & 0x0FFF;
} else { } else {
// Tank pressure (2 psi) and number (one based index) // Tank pressure (2 psi) and number (one based index)
tank = (data[offset + 1] & 0x03) - 1; tank = data[offset + 1] & 0x03;
if (parser->model == ATOM2 || parser->model == EPICA || parser->model == EPICB) if (parser->model == ATOM2 || parser->model == EPICA || parser->model == EPICB)
pressure = (((data[offset + 3] << 8) + data[offset + 4]) & 0x0FFF) * 2; pressure = (((data[offset + 3] << 8) + data[offset + 4]) & 0x0FFF) * 2;
else else
@ -852,10 +852,12 @@ oceanic_atom2_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_
pressure = array_uint16_le (data + offset + 4); pressure = array_uint16_le (data + offset + 4);
else else
pressure -= data[offset + 1]; pressure -= data[offset + 1];
sample.pressure.tank = tank; if (tank) {
sample.pressure.tank = tank - 1;
sample.pressure.value = pressure * PSI / BAR; sample.pressure.value = pressure * PSI / BAR;
if (callback) callback (DC_SAMPLE_PRESSURE, &sample, userdata); if (callback) callback (DC_SAMPLE_PRESSURE, &sample, userdata);
} }
}
// Depth (1/16 ft) // Depth (1/16 ft)
unsigned int depth; unsigned int depth;