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 <Jan.Schubert@GMX.li>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Jan Schubert 2013-01-14 23:53:38 +01:00 committed by Dirk Hohndel
parent 2e53a41525
commit 90d3c5614a
11 changed files with 51 additions and 48 deletions

4
dive.c
View file

@ -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;
}