Define global defaults explicitly in header

4 files changed, 15 insertions, 6 deletions

diff --git a/src/deco.c b/src/deco.c
index 9719f06..a03ed34 100644
--- a/src/deco.c
+++ b/src/deco.c
@@ -8,12 +8,12 @@
 
 #define RND(x) (round((x) *10000) / 10000)
 
-enum ALGO ALGO_VER = ZHL_16C;
-double SURFACE_PRESSURE = 1.01325;
-double P_WV = P_WV_BUHL;
+enum ALGO ALGO_VER = ALGO_VER_DEFAULT;
+double SURFACE_PRESSURE = SURFACE_PRESSURE_DEFAULT;
+double P_WV = P_WV_DEFAULT;
 
-double PO2_MAX = 1.6;
-double END_MAX = 4.01325;
+double PO2_MAX = PO2_MAX_DEFAULT;
+double END_MAX = END_MAX_DEFAULT;
 
 typedef struct zhl_n2_t {
     double t;
diff --git a/src/deco.h b/src/deco.h
index 68c65ed..16072a1 100644
--- a/src/deco.h
+++ b/src/deco.h
@@ -13,6 +13,13 @@
 #define P_WV_NAVY 0.0567 /* US. Navy value, Rq = 0.9 */
 #define P_WV_SCHR 0.0493 /* Schreiner value, Rq = 0.8, most conservative */
 
+#define ALGO_VER_DEFAULT ZHL_16C
+#define SURFACE_PRESSURE_DEFAULT 1.01325
+#define P_WV_DEFAULT P_WV_BUHL
+
+#define PO2_MAX_DEFAULT 1.6
+#define END_MAX_DEFAULT 4.01325
+
 #define MOD_AUTO 0
 
 /* types */
diff --git a/src/schedule.c b/src/schedule.c
index d444d5e..4b540fd 100644
--- a/src/schedule.c
+++ b/src/schedule.c
@@ -8,7 +8,7 @@
 #define STOPLEN_ROUGH 10
 #define STOPLEN_FINE 1
 
-int SWITCH_INTERMEDIATE = 1;
+int SWITCH_INTERMEDIATE = SWITCH_INTERMEDIATE_DEFAULT;
 
 const gas_t *best_gas(const double depth, const gas_t *gasses, const int nof_gasses)
 {
diff --git a/src/schedule.h b/src/schedule.h
index 57f1e9d..2af6481 100644
--- a/src/schedule.h
+++ b/src/schedule.h
@@ -5,6 +5,8 @@
 
 #include "deco.h"
 
+#define SWITCH_INTERMEDIATE_DEFAULT 1
+
 /* types */
 typedef struct waypoint_t {
     double depth;