From 90d3c5614a9c952a50e582e2dff6e21419c64729 Mon Sep 17 00:00:00 2001 From: Jan Schubert Date: Mon, 14 Jan 2013 23:53:38 +0100 Subject: Centralising and redefining values as integers This patch centralizes the definition for surface pressure, oxygen in air, (re)defines all such values as plain integers and adapts calculations. It eliminates 11 (!) occurrences of definitions for surface pressure and also a few for oxygen in air. It also rewrites the calculation for EAD, END and EADD using the new definitons, harmonizing it for OC and CC and fixes a bug for EADD OC calculation. And finally it removes the unneeded variable entry_ead in gtk-gui.c. Jan Signed-off-by: Jan Schubert Signed-off-by: Dirk Hohndel --- dive.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dive.c') diff --git a/dive.c b/dive.c index 4fc6f7551..b61166569 100644 --- a/dive.c +++ b/dive.c @@ -269,8 +269,8 @@ static void sanitize_gasmix(struct gasmix *mix) if (!he) { if (!o2) return; - /* 20.9% or 21% O2 is just air */ - if (o2 >= 209 && o2 <= 210) { + /* 20.8% to 21% O2 is just air */ + if (o2 >= (O2_IN_AIR - 1) && o2 <= (O2_IN_AIR + 1)) { mix->o2.permille = 0; return; } -- cgit v1.2.3-70-g09d2