mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Do not zero setpoint value when duplicate

Browse source 
We cannot zero setpoint value upon import if the current and previous
values are zero. This is because on setpoint context a value of 0 means
open circuit.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2014-10-27 18:19:53 +02:00 committed by Dirk Hohndel
parent 1f1bb71d78
commit 8b6d49092b
1 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dive.c
View file

@ -1092,7 +1092,7 @@ static void fixup_dive_dc(struct dive *dive, struct divecomputer *dc)
int maxdepth = dc->maxdepth.mm;
int mintemp = 0;
int lastdepth = 0;
int lasto2val[3] = { 0, 0, 0 }, lasto2setpoint = 0;
int lasto2val[3] = { 0, 0, 0 };
int lasttemp = 0, lastpressure = 0, lastdiluentpressure = 0;
int pressure_delta[MAX_CYLINDERS] = { INT_MAX, };
@ -1166,15 +1166,6 @@ static void fixup_dive_dc(struct dive *dive, struct divecomputer *dc)
}
}
// If there are consecutive identical CCR O2 setpoint readings, throw away the redundant ones.
o2val = sample->setpoint.mbar;
if (o2val) {
if (lasto2setpoint == o2val)
sample->setpoint.mbar = 0;
else
lasto2setpoint = o2val;
}
update_min_max_temperatures(dive, sample->temperature);
depthtime += (time - lasttime) * (lastdepth + depth) / 2;