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

Fixed duplicate gasmix event reports

Browse Source 
Newer cochran DCs record a gas change event at the begining of a
dive. The code creates a gas change before processing samples so
with newer DCs this resulted in duplicate events.
This commit is contained in:
John Van Ostrand 2017-07-02 10:07:45 -04:00 committed by Jef Driesen
parent 094b635f87
commit 2c5e787b77
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cochran_commander_parser.c
View File

@ -567,6 +567,7 @@ cochran_commander_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callb
sample.gasmix = 0; sample.gasmix = 0;
if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata); if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata);
unsigned int last_gasmix = sample.gasmix;
while (offset < size) { while (offset < size) {
const unsigned char *s = samples + offset; const unsigned char *s = samples + offset;
@ -630,12 +631,18 @@ cochran_commander_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callb
break; break;
case 0xCD: // Switched to deco blend case 0xCD: // Switched to deco blend
case 0xEF: // Switched to gas blend 2 case 0xEF: // Switched to gas blend 2
sample.gasmix = 1; if (last_gasmix != 1) {
if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata); sample.gasmix = 1;
if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata);
last_gasmix = sample.gasmix;
}
break; break;
case 0xF3: // Switched to gas blend 1 case 0xF3: // Switched to gas blend 1
sample.gasmix = 0; if (last_gasmix != 0) {
if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata); sample.gasmix = 0;
if (callback) callback(DC_SAMPLE_GASMIX, sample, userdata);
last_gasmix = sample.gasmix;
}
break; break;
} }