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

Add support for trimix gas mixes.

Browse Source
This commit is contained in:
Jef Driesen 2014-04-17 10:50:56 +02:00
parent c74118a922
commit 3c99f55b6f
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/oceanic_atom2_parser.c
View File

@ -305,7 +305,8 @@ oceanic_atom2_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, uns
dc_gasmix_t *gasmix = (dc_gasmix_t *) value; dc_gasmix_t *gasmix = (dc_gasmix_t *) value;
unsigned int nitrox = 0; unsigned int oxygen = 0;
unsigned int helium = 0;
if (value) { if (value) {
switch (type) { switch (type) {
@ -330,14 +331,15 @@ oceanic_atom2_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, uns
*((unsigned int *) value) = 3; *((unsigned int *) value) = 3;
break; break;
case DC_FIELD_GASMIX: case DC_FIELD_GASMIX:
if (parser->model == DATAMASK || parser->model == COMPUMASK) if (parser->model == DATAMASK || parser->model == COMPUMASK) {
nitrox = data[header + 3]; oxygen = data[header + 3];
else if (parser->model == OCI) } else if (parser->model == OCI) {
nitrox = data[0x28 + flags]; oxygen = data[0x28 + flags];
else } else {
nitrox = data[header + 4 + flags]; oxygen = data[header + 4 + flags];
gasmix->helium = 0.0; }
gasmix->oxygen = (nitrox ? nitrox / 100.0 : 0.21); gasmix->helium = helium / 100.0;
gasmix->oxygen = (oxygen ? oxygen / 100.0 : 0.21);
gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium; gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
break; break;
default: default: