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

Ignore disabled gas mixes.

Browse Source 
Gas mixes that have been disabled are stored as a mix with 0% oxygen and
0% helium. This is clearly an invalid gas mix, and it makes no sense to
return it back to the application.
This commit is contained in:
Jef Driesen 2014-08-09 17:12:23 +02:00
parent ed2b9d34d5
commit c2f86a7806
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/shearwater_predator_parser.c
View File

@ -40,6 +40,8 @@
#define METRIC 0
#define IMPERIAL 1
#define NGASMIXES 10
typedef struct shearwater_predator_parser_t shearwater_predator_parser_t;
struct shearwater_predator_parser_t {
@ -171,6 +173,20 @@ shearwater_predator_parser_get_field (dc_parser_t *abstract, dc_field_type_t typ
// Get the unit system.
unsigned int units = data[8];
// Get the gas mixes.
unsigned int ngasmixes = 0;
unsigned int oxygen[NGASMIXES] = {0};
unsigned int helium[NGASMIXES] = {0};
for (unsigned int i = 0; i < NGASMIXES; ++i) {
unsigned int o2 = data[20 + i];
unsigned int he = data[30 + i];
if (o2 == 0 && he == 0)
continue; // Skip disabled gas mixes.
oxygen[ngasmixes] = o2;
helium[ngasmixes] = he;
ngasmixes++;
}
dc_gasmix_t *gasmix = (dc_gasmix_t *) value;
dc_salinity_t *water = (dc_salinity_t *) value;
unsigned int density = 0;
@ -187,11 +203,11 @@ shearwater_predator_parser_get_field (dc_parser_t *abstract, dc_field_type_t typ
*((double *) value) = array_uint16_be (data + footer + 4);
break;
case DC_FIELD_GASMIX_COUNT:
*((unsigned int *) value) = 10;
*((unsigned int *) value) = ngasmixes;
break;
case DC_FIELD_GASMIX:
gasmix->oxygen = data[20 + flags] / 100.0;
gasmix->helium = data[30 + flags] / 100.0;
gasmix->oxygen = oxygen[flags] / 100.0;
gasmix->helium = helium[flags] / 100.0;
gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
break;
case DC_FIELD_SALINITY: