Clean up the handling of surface pressure

There are two ways to look at surface pressure. One is to say "what was
the surface pressure during that dive?" - in that case we now return an
average over the pressure reported by the different divecomputers (or the
standard 1013mbar if none reported any).

Or you want to do specific calculations for a specific divecomputer - in
which case we access only the pressure reported by THAT divecomputer, if
present (and fall back to the previous case, otherwise).

We still have lots of places in Subsurface that only act on the first
divecomputer. As a side effect of this change we now make this more
obvious as we in those cases pass a pointer to the first divecomputer
explicitly to the calculations.

Either way, this commit should prevent us from ever mistakenly basing our
calculations on a surface pressure of 0 (which is the initial bug in
deco.c that triggered all this).

Similar changes need to be made for other elements that we currently only
use from the first divecomputer, i.e., salinity.

Reported-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 10 insertions, 6 deletions

diff --git a/dive.h b/dive.h
index fcbaca713..ddb9327c6 100644
--- a/dive.h
+++ b/dive.h
@@ -333,17 +333,21 @@ static inline void copy_gps_location(struct dive *from, struct dive *to)
 	}
 }
 
+extern int get_surface_pressure_in_mbar(const struct dive *dive, gboolean non_null);
+
 /* Pa = N/m^2 - so we determine the weight (in N) of the mass of 10m
  * of water (and use standard salt water at 1.03kg per liter if we don't know salinity)
  * and add that to the surface pressure (or to 1013 if that's unknown) */
-static inline int depth_to_mbar(int depth, struct dive *dive)
+static inline int depth_to_mbar(int depth, struct dive *dive, struct divecomputer *dc)
 {
 	double specific_weight = 1.03 * 0.981;
-	int surface_pressure = SURFACE_PRESSURE;
-	if (dive->dc.salinity)
-		specific_weight = dive->dc.salinity / 10000.0 * 0.981;
-	if (dive->dc.surface_pressure.mbar)
-		surface_pressure = dive->dc.surface_pressure.mbar;
+	int surface_pressure;
+	if (dc->salinity)
+		specific_weight = dc->salinity / 10000.0 * 0.981;
+	if (dc->surface_pressure.mbar)
+		surface_pressure = dc->surface_pressure.mbar;
+	else
+		surface_pressure = get_surface_pressure_in_mbar(dive, TRUE);
 	return depth / 10.0 * specific_weight + surface_pressure + 0.5;
 }