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

Merge branch 'gasmix'

Browse Source
This commit is contained in:
Jef Driesen 2014-06-19 09:01:14 +02:00
commit f8081f1e1f
1 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/suunto_d9_parser.c
View File

@ -67,6 +67,7 @@ struct suunto_d9_parser_t {
unsigned int ngasmixes; unsigned int ngasmixes;
unsigned int oxygen[NGASMIXES]; unsigned int oxygen[NGASMIXES];
unsigned int helium[NGASMIXES]; unsigned int helium[NGASMIXES];
unsigned int gasmix;
unsigned int config; unsigned int config;
}; };
@ -146,16 +147,35 @@ suunto_d9_parser_cache (suunto_d9_parser_t *parser)
// Cache the data for later use. // Cache the data for later use.
parser->mode = data[gasmode_offset]; parser->mode = data[gasmode_offset];
parser->ngasmixes = gasmix_count; parser->gasmix = 0;
for (unsigned int i = 0; i < gasmix_count; ++i) { if (parser->mode == AIR) {
if (parser->model == HELO2 || parser->model == D4i || parser->oxygen[0] = 21;
parser->model == D6i || parser->model == D9tx || parser->helium[0] = 0;
parser->model == DX) { parser->ngasmixes = 1;
parser->oxygen[i] = data[gasmix_offset + 6 * i + 1]; } else {
parser->helium[i] = data[gasmix_offset + 6 * i + 2]; parser->ngasmixes = 0;
} else { for (unsigned int i = 0; i < gasmix_count; ++i) {
parser->oxygen[i] = data[gasmix_offset + i]; if (parser->model == HELO2 || parser->model == D4i ||
parser->helium[i] = 0.0; parser->model == D6i || parser->model == D9tx ||
parser->model == DX) {
parser->oxygen[i] = data[gasmix_offset + 6 * i + 1];
parser->helium[i] = data[gasmix_offset + 6 * i + 2];
} else {
unsigned int oxygen = data[gasmix_offset + i];
if (oxygen == 0x00 || oxygen == 0xFF)
break;
parser->oxygen[i] = oxygen;
parser->helium[i] = 0;
}
parser->ngasmixes++;
}
// Initial gasmix.
if (parser->model == HELO2) {
parser->gasmix = data[0x26];
} else if (parser->model == D4i || parser->model == D6i ||
parser->model == D9tx) {
parser->gasmix = data[0x28];
} }
} }
parser->config = config; parser->config = config;
@ -189,6 +209,7 @@ suunto_d9_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int
parser->oxygen[i] = 0; parser->oxygen[i] = 0;
parser->helium[i] = 0; parser->helium[i] = 0;
} }
parser->gasmix = 0;
parser->config = 0; parser->config = 0;
*out = (dc_parser_t*) parser; *out = (dc_parser_t*) parser;
@ -220,6 +241,7 @@ suunto_d9_parser_set_data (dc_parser_t *abstract, const unsigned char *data, uns
parser->oxygen[i] = 0; parser->oxygen[i] = 0;
parser->helium[i] = 0; parser->helium[i] = 0;
} }
parser->gasmix = 0;
parser->config = 0; parser->config = 0;
return DC_STATUS_SUCCESS; return DC_STATUS_SUCCESS;
@ -297,20 +319,11 @@ suunto_d9_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsigne
*((double *) value) = array_uint16_le (data + 0x09) / 100.0; *((double *) value) = array_uint16_le (data + 0x09) / 100.0;
break; break;
case DC_FIELD_GASMIX_COUNT: case DC_FIELD_GASMIX_COUNT:
if (parser->mode == AIR) { *((unsigned int *) value) = parser->ngasmixes;
*((unsigned int *) value) = 1;
} else {
*((unsigned int *) value) = parser->ngasmixes;
}
break; break;
case DC_FIELD_GASMIX: case DC_FIELD_GASMIX:
if (parser->mode == AIR) { gasmix->helium = parser->helium[flags] / 100.0;
gasmix->helium = 0.0; gasmix->oxygen = parser->oxygen[flags] / 100.0;
gasmix->oxygen = 0.21;
} else {
gasmix->helium = parser->helium[flags] / 100.0;
gasmix->oxygen = parser->oxygen[flags] / 100.0;
}
gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium; gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
break; break;
default: default:
@ -335,19 +348,6 @@ suunto_d9_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t ca
if (rc != DC_STATUS_SUCCESS) if (rc != DC_STATUS_SUCCESS)
return rc; return rc;
// Initial gasmix.
unsigned int gasmix = 0;
if (parser->model == HELO2) {
gasmix = data[0x26];
} else if (parser->model == D4i || parser->model == D6i ||
parser->model == D9tx) {
gasmix = data[0x28];
}
if (gasmix >= parser->ngasmixes) {
ERROR (abstract->context, "Invalid initial gas mix.");
return DC_STATUS_DATAFORMAT;
}
// Number of parameters in the configuration data. // Number of parameters in the configuration data.
unsigned int nparams = data[parser->config]; unsigned int nparams = data[parser->config];
if (nparams == 0 || nparams > MAXPARAMS) { if (nparams == 0 || nparams > MAXPARAMS) {
@ -459,16 +459,13 @@ suunto_d9_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t ca
} }
// Initial gasmix. // Initial gasmix.
if (time == 0) { if (time == 0 && parser->ngasmixes > 0) {
unsigned int he = 0; if (parser->gasmix >= parser->ngasmixes) {
unsigned int o2 = 0; ERROR (abstract->context, "Invalid initial gas mix.");
if (parser->mode == AIR) { return DC_STATUS_DATAFORMAT;
he = 0;
o2 = 21;
} else {
he = parser->helium[gasmix];
o2 = parser->oxygen[gasmix];
} }
unsigned int he = parser->helium[parser->gasmix];
unsigned int o2 = parser->oxygen[parser->gasmix];
sample.event.type = SAMPLE_EVENT_GASCHANGE2; sample.event.type = SAMPLE_EVENT_GASCHANGE2;
sample.event.time = 0; sample.event.time = 0;
sample.event.value = o2 | (he << 16); sample.event.value = o2 | (he << 16);