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

Fix the parsing of freedives.

Browse Source 
In freedive mode the sample rate is only 1 second instead of 4 seconds.
The tank pressure fields appear to be re-used for some other (unknown)
purposes, and should be ignored.
This commit is contained in:
Jef Driesen 2016-07-25 10:26:26 +02:00
parent 8b0a048175
commit bfcd707889
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/uwatec_smart_parser.c
View File

@ -501,7 +501,8 @@ uwatec_smart_parser_cache (uwatec_smart_parser_t *parser)
unsigned int beginpressure = 0;
unsigned int endpressure = 0;
if (header->tankpressure != UNSUPPORTED) {
if (header->tankpressure != UNSUPPORTED &&
divemode != DC_DIVEMODE_FREEDIVE) {
if (parser->model == GALILEO || parser->model == GALILEOTRIMIX ||
parser->model == ALADIN2G || parser->model == MERIDIAN ||
parser->model == CHROMIS || parser->model == MANTIS2) {
@ -924,6 +925,11 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
double salinity = (parser->watertype == DC_WATER_SALT ? SALT : FRESH);
unsigned int interval = 4;
if (parser->divemode == DC_DIVEMODE_FREEDIVE) {
interval = 1;
}
int have_depth = 0, have_temperature = 0, have_pressure = 0, have_rbt = 0,
have_heartrate = 0, have_bearing = 0;
@ -1210,7 +1216,7 @@ uwatec_smart_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t
if (callback) callback (DC_SAMPLE_DEPTH, sample, userdata);
}
time += 4;
time += interval;
complete--;
}
}