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

Only setpoint changes with non-zero SP indicate a CCR dive

Browse Source 
There might be some spurious setpoint changes at t=0 without
an actual value (I have no idea where those come from). In
any case, those do not indicate that the dive is a CCR dive.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Robert C. Helling 2016-06-14 17:12:57 +02:00 committed by Dirk Hohndel
parent 0d986b9cfd
commit fc213066f8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/load-git.c
View File

@ -762,7 +762,7 @@ static void parse_dc_event(char *line, struct membuffer *str, void *_dc)
* Better to mark them being CCR on import so no need for special treatments elsewhere on
* the code.
*/
if (ev && event.time.seconds == 0 && event.type == SAMPLE_EVENT_PO2 && dc->divemode==OC) {
if (ev && event.time.seconds == 0 && event.type == SAMPLE_EVENT_PO2 && event.value && xdc->divemode==OC) {
dc->divemode = CCR;
}

2
core/parse-xml.c
View File

@ -1663,7 +1663,7 @@ static void event_end(void)
* Older logs might mark the dive to be CCR by having an "SP change" event at time 0:00. Better
* to mark them being CCR on import so no need for special treatments elsewhere on the code.
*/
if (ev && cur_event.time.seconds == 0 && cur_event.type == SAMPLE_EVENT_PO2 && dc->divemode==OC) {
if (ev && cur_event.time.seconds == 0 && cur_event.type == SAMPLE_EVENT_PO2 && cur_event.value && dc->divemode==OC) {
dc->divemode = CCR;
}