mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix MKVI erroneous sample time

Browse source 
There was a bug in MKVI download tool that resulted in erroneous sample
times. This fix takes care of that and should work similarly as the
vendor's own.

Fixes #916

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2015-08-18 07:35:23 +03:00 • committed by Dirk Hohndel
parent 56c90efba8
commit 2e8286623d
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
file.c
View file

@ -552,6 +552,7 @@ int parse_txt_file(const char *filename, const char *csv)
bool has_depth = false, has_setpoint = false, has_ndl = false; bool has_depth = false, has_setpoint = false, has_ndl = false;
char *lineptr, *key, *value; char *lineptr, *key, *value;
int o2cylinder_pressure = 0, cylinder_pressure = 0, cur_cylinder_index = 0; int o2cylinder_pressure = 0, cylinder_pressure = 0, cur_cylinder_index = 0;
unsigned int prev_time = 0;
struct dive *dive; struct dive *dive;
struct divecomputer *dc; struct divecomputer *dc;
@ -651,7 +652,14 @@ int parse_txt_file(const char *filename, const char *csv)
has_setpoint = false; has_setpoint = false;
has_ndl = false; has_ndl = false;
sample = prepare_sample(dc); sample = prepare_sample(dc);
sample->time.seconds = cur_sampletime;
/*
* There was a bug in MKVI download tool that resulted in erroneous sample
* times. This fix should work similarly as the vendor's own.
*/
sample->time.seconds = cur_sampletime < 0xFFFF * 3 / 4 ? cur_sampletime : prev_time;
prev_time = sample->time.seconds;
do { do {
int i = sscanf(lineptr, "%d,%d,%d", &sampletime, &type, &value); int i = sscanf(lineptr, "%d,%d,%d", &sampletime, &type, &value);