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

Fix the gas mix parsing for the Aeris CompuMask.

Browse Source
This commit is contained in:
Jef Driesen 2012-04-22 22:30:50 +02:00
parent 5126ef389a
commit 6c2014732a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/oceanic_atom2_parser.c
View File

@ -248,10 +248,9 @@ oceanic_atom2_parser_get_field (parser_t *abstract, parser_field_type_t type, un
unsigned int length = 11 * PAGESIZE / 2; unsigned int length = 11 * PAGESIZE / 2;
unsigned int header = 4 * PAGESIZE; unsigned int header = 4 * PAGESIZE;
unsigned int footer = size - PAGESIZE; unsigned int footer = size - PAGESIZE;
if (parser->model == GEO || parser->model == DATAMASK || if (parser->model == DATAMASK || parser->model == COMPUMASK ||
parser->model == GEO20 || parser->model == VEO20 || parser->model == GEO || parser->model == GEO20 ||
parser->model == VEO30) parser->model == VEO20 || parser->model == VEO30) {
{
length -= PAGESIZE; length -= PAGESIZE;
header -= PAGESIZE; header -= PAGESIZE;
} }
@ -284,13 +283,13 @@ oceanic_atom2_parser_get_field (parser_t *abstract, parser_field_type_t type, un
*((double *) value) = array_uint16_le (data + footer + 4) / 16.0 * FEET; *((double *) value) = array_uint16_le (data + footer + 4) / 16.0 * FEET;
break; break;
case FIELD_TYPE_GASMIX_COUNT: case FIELD_TYPE_GASMIX_COUNT:
if (parser->model == DATAMASK) if (parser->model == DATAMASK || parser->model == COMPUMASK)
*((unsigned int *) value) = 1; *((unsigned int *) value) = 1;
else else
*((unsigned int *) value) = 3; *((unsigned int *) value) = 3;
break; break;
case FIELD_TYPE_GASMIX: case FIELD_TYPE_GASMIX:
if (parser->model == DATAMASK) if (parser->model == DATAMASK || parser->model == COMPUMASK)
nitrox = data[header + 3]; nitrox = data[header + 3];
else else
nitrox = data[header + 4 + flags]; nitrox = data[header + 4 + flags];