Define O2 permille for air in one spot

Having the O2 permille defined once is more readable.

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>

diff --git a/dive.h b/dive.h
index 0549843ab5374cdca86d5be614c40a9017d0a6d8..bdf3aa6e1f52fc8c553377592537741dc95381e9 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -326,4 +326,6 @@ const char *monthname(int mon);
 #define FIVE_STARS     UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR
 extern const char *star_strings[];
 
+#define AIR_PERMILLE 209
+
 #endif /* DIVE_H */

diff --git a/divelist.c b/divelist.c
index 32dc92b9980dc7bf75573c0880a84e069927b871..4ab61997cfc4e71c374b0f6606708e760377e14d 100644 (file)
--- a/divelist.c
+++ b/divelist.c
@@ -244,7 +244,7 @@ static void get_dive_gas(struct dive *dive, int *o2, int *he, int *o2low)
                if (cylinder_none(cyl))
                        continue;
                if (!o2)
-                       o2 = 209;
+                       o2 = AIR_PERMILLE;
                if (o2 < mino2)
                        mino2 = o2;
                if (he > maxhe)
@@ -258,7 +258,7 @@ newmax:
                maxo2 = o2;
        }
        /* All air? Show/sort as "air"/zero */
-       if (!maxhe && maxo2 == 209 && mino2 == maxo2)
+       if (!maxhe && maxo2 == AIR_PERMILLE && mino2 == maxo2)
                maxo2 = mino2 = 0;
        *o2 = maxo2;
        *he = maxhe;
@@ -394,7 +394,7 @@ static int calculate_otu(struct dive *dive)
                t = sample->time.seconds - psample->time.seconds;
                int o2 = dive->cylinder[sample->cylinderindex].gasmix.o2.permille;
                if (!o2)
-                       o2 = 209;
+                       o2 = AIR_PERMILLE;
                po2 = o2 / 1000.0 * (sample->depth.mm + 10000) / 10000.0;
                if (po2 >= 0.5)
                        otu += pow(po2 - 0.5, 0.83) * t / 30.0;

diff --git a/equipment.c b/equipment.c
index 482fb4e1c3ee7595e1824d1e1ee595d0743fd21a..d2c7891aef4569c334d2a3c210be73aaf51d25cc 100644 (file)
--- a/equipment.c
+++ b/equipment.c
@@ -285,7 +285,7 @@ static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder)
        o2 = cyl->gasmix.o2.permille / 10.0;
        he = cyl->gasmix.he.permille / 10.0;
        if (!o2)
-               o2 = 21.0;
+               o2 = AIR_PERMILLE / 10.0;
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2);
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->he), he);
 }

diff --git a/libdivecomputer.c b/libdivecomputer.c
index 9d4c1065a3817ce046798448b7c7a39a2a10be2a..daf724190d44d7868ff1a753c29a6a9954c06e09 100644 (file)
--- a/libdivecomputer.c
+++ b/libdivecomputer.c
@@ -109,7 +109,7 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases)
                he = gasmix.helium * 1000 + 0.5;
 
                /* Ignore bogus data - libdivecomputer does some crazy stuff */
-               if (o2 < 210 || o2 >= 1000)
+               if (o2 <= AIR_PERMILLE || o2 >= 1000)
                        o2 = 0;
                if (he < 0 || he >= 800 || o2+he >= 1000)
                        he = 0;

diff --git a/statistics.c b/statistics.c
index f8f9d0e24549ca10c568eb85fcc2b957ea14a814..9510030d717655e06b1104474814429e2af3ef07 100644 (file)
--- a/statistics.c
+++ b/statistics.c
@@ -171,7 +171,7 @@ void show_dive_stats(struct dive *dive)
                end = cyl->end.mbar ? : cyl->sample_end.mbar;
                if (!cylinder_none(cyl)) {
                        /* 0% O2 strangely means air, so 21% - I don't like that at all */
-                       int o2 = cyl->gasmix.o2.permille ? : 209;
+                       int o2 = cyl->gasmix.o2.permille ? : AIR_PERMILLE;
                        if (offset > 0) {
                                snprintf(buf+offset, 80-offset, ", ");
                                offset += 2;