mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Be a bit more careful when deleting pO2 values

Browse source 
This patch adds tests if the computer is actually a Predator and
if the value is close to what we would have computed anyway.

[Dirk Hohndel: minor change to use same_string() ]

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 2015-02-07 21:02:02 +01:00 committed by Dirk Hohndel
parent e40798770b
commit 73145325ed
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dive.c
View file

@ -883,12 +883,28 @@ void update_setpoint_events(struct divecomputer *dc)
if (dc->divemode == CCR) if (dc->divemode == CCR)
new_setpoint = prefs.defaultsetpoint; new_setpoint = prefs.defaultsetpoint;
if (dc->divemode == OC) if (dc->divemode == OC && same_string(dc->model, "Shearwater Predator")) {
// make sure there's no setpoint in the samples // make sure there's no setpoint in the samples
// this is an irreversible change - so switching a dive to OC // this is an irreversible change - so switching a dive to OC
// by mistake when it's actually CCR is _bad_ // by mistake when it's actually CCR is _bad_
for (int i = 0; i < dc->samples; i++) // So we make sure, this comes from a Predator and we only remove
// pO2 values we would have computed anyway.
struct event *ev = get_next_event(dc->events, "gaschange");
struct gasmix *gasmix = get_gasmix_from_event(ev);
struct event *next = get_next_event(ev, "gaschange");
for (int i = 0; i < dc->samples; i++) {
struct gas_pressures pressures;
if (next && dc->sample[i].time.seconds >= next->time.seconds) {
ev = next;
gasmix = get_gasmix_from_event(ev);
next = get_next_event(ev, "gaschange");
}
fill_pressures(&pressures, calculate_depth_to_mbar(dc->sample[i].depth.mm, dc->surface_pressure, 0), gasmix ,0, OC);
if (abs(dc->sample[i].setpoint.mbar - (int)(1000 * pressures.o2) <= 50))
dc->sample[i].setpoint.mbar = 0; dc->sample[i].setpoint.mbar = 0;
}
}
// an "SP change" event at t=0 is currently our marker for OC vs CCR // an "SP change" event at t=0 is currently our marker for OC vs CCR
// this will need to change to a saner setup, but for now we can just // this will need to change to a saner setup, but for now we can just