From 9ec69f8501fa2b2be2d6bfb39300e841b96908c9 Mon Sep 17 00:00:00 2001 From: Tim Segers Date: Mon, 10 Jul 2023 14:50:28 +0200 Subject: Move LAST_STOP_AT_SIX variable from deco.c to schedule.c --- src/deco.c | 2 -- src/deco.h | 4 ---- src/schedule.c | 1 + src/schedule.h | 2 ++ 4 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/deco.c b/src/deco.c index bd6ed1e..dca164f 100644 --- a/src/deco.c +++ b/src/deco.c @@ -16,8 +16,6 @@ double P_WV = P_WV_DEFAULT; double PO2_MAX = PO2_MAX_DEFAULT; double END_MAX = END_MAX_DEFAULT; -int LAST_STOP_AT_SIX = LAST_STOP_AT_SIX_DEFAULT; - typedef struct zhl_n2_t { double t; double a[3]; diff --git a/src/deco.h b/src/deco.h index 0630fec..074316e 100644 --- a/src/deco.h +++ b/src/deco.h @@ -21,8 +21,6 @@ #define PO2_MAX_DEFAULT 1.6 #define END_MAX_DEFAULT 4.01325 -#define LAST_STOP_AT_SIX_DEFAULT 0 - #define MOD_AUTO 0 /* types */ @@ -66,8 +64,6 @@ extern double P_WV; extern double PO2_MAX; extern double END_MAX; -extern int LAST_STOP_AT_SIX; - /* functions */ double bar_to_msw(double bar); double msw_to_bar(double msw); diff --git a/src/schedule.c b/src/schedule.c index 7fbfaf5..5786159 100644 --- a/src/schedule.c +++ b/src/schedule.c @@ -10,6 +10,7 @@ #define STOPLEN_FINE 1 int SWITCH_INTERMEDIATE = SWITCH_INTERMEDIATE_DEFAULT; +int LAST_STOP_AT_SIX = LAST_STOP_AT_SIX_DEFAULT; static void emit_waypoint(const decostate_t *ds, segtype_t type, const waypoint_callback_t *wp_cb) { diff --git a/src/schedule.h b/src/schedule.h index 7d7ac0f..3f9f78f 100644 --- a/src/schedule.h +++ b/src/schedule.h @@ -6,6 +6,7 @@ #include "deco.h" #define SWITCH_INTERMEDIATE_DEFAULT 1 +#define LAST_STOP_AT_SIX_DEFAULT 0 /* types */ typedef struct waypoint_t { @@ -37,6 +38,7 @@ typedef struct waypoint_callback_t { /* global variables */ extern int SWITCH_INTERMEDIATE; +extern int LAST_STOP_AT_SIX; /* functions */ const gas_t *best_gas(double depth, const gas_t *gasses, int nof_gasses); -- cgit v1.2.3-70-g09d2