# HG changeset patch
# User Jan Mulder <jlmulder@xs4all.nl>
# Date 1558528744 -7200
# Node ID 2f43419102c8e43a64d21dcc9b2d3a6ff5db7a1b
# Parent 305f251cc9818a0ad03a7bdbb79302854a4ab71a
bugfix, cleanup: do not clip depth to 0
A real dive with the previous commits shows that testing from the simulator
cannot be fully trusted in relation to logic that is close to the depth
sensor (that is obviously bypassed using the simulator). So 1) there is
3 second interval between the stopwatch and the divetime, and 2) the depth
flips from 1m depth to surface 0m depth, and that is visible in the
profile data.
Point 2) is definitely caused by the removed code in this commit. It likely
is not right to clip the depth value at all. It is fine to base decisions like is
done in is_ambient_pressure_close_to_surface on it, but clipping the depth value
itself is seems wrong. This has become more prominent with commit eba8d1eb5bef
where the clipping depth changed from 40cm of depth to 1m of depth. When
comparing profiles from an OSTC Plus, it shows that no depth clipping is
present there, so that is one more argument to remove it here.
Point 1) The 3 sec interval is likely not a coincidence. It is the time
to travel for 1m depth with a default descend speed of 20m/min.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
diff -r 305f251cc981 -r 2f43419102c8 Discovery/Src/data_exchange_main.c
--- a/Discovery/Src/data_exchange_main.c Tue May 21 11:11:05 2019 +0200
+++ b/Discovery/Src/data_exchange_main.c Wed May 22 14:39:04 2019 +0200
@@ -890,14 +890,7 @@
pStateReal->mode = dataIn.mode;
pStateReal->chargeStatus = dataIn.chargeStatus;
- if(is_ambient_pressure_close_to_surface(&pStateReal->lifeData))
- {
- pStateReal->lifeData.depth_meter = 0;
- }
- else
- {
- pStateReal->lifeData.depth_meter = meter;
- }
+ pStateReal->lifeData.depth_meter = meter;
pStateReal->lifeData.temperature_celsius = getTemperature(&dataIn);
pStateReal->lifeData.ascent_rate_meter_per_min = dataIn.data[dataIn.boolPressureData].ascent_rate_meter_per_min;