From 4173bebdab1971b62e63ef6c3326e5152d4d37e3 Mon Sep 17 00:00:00 2001 From: Joakim Bygdell Date: Wed, 8 Apr 2015 19:18:54 +0200 Subject: [PATCH 1/3] Recmode: Take safety stop into account when calculating ascent gas consumption. Signed-off-by: Joakim Bygdell --- planner.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/planner.c b/planner.c index e80375c..bd34f17 100644 --- a/planner.c +++ b/planner.c @@ -802,13 +802,17 @@ int ascent_velocity(int depth, int avg_depth, int bottom_time) } } -void track_ascent_gas(int depth, cylinder_t *cylinder, int avg_depth, int bottom_time) +void track_ascent_gas(int depth, cylinder_t *cylinder, int avg_depth, int bottom_time, bool safety_stop) { while (depth > 0) { int deltad = ascent_velocity(depth, avg_depth, bottom_time) * TIMESTEP; if (deltad > depth) deltad = depth; update_cylinder_pressure(&displayed_dive, depth, depth - deltad, TIMESTEP, prefs.bottomsac, cylinder, true); + if (depth <= 5000 && safety_stop){ + update_cylinder_pressure(&displayed_dive, 5000, 5000, 180, prefs.bottomsac, cylinder, true); + safety_stop = false; + } depth -= deltad; } } @@ -944,7 +948,7 @@ int plan(struct diveplan *diveplan, char **cached_datap, bool is_planner, bool s gi = gaschangenr - 1; if(prefs.recreational_mode) { bool safety_stop = prefs.safetystop && max_depth >= 10000; - track_ascent_gas(depth, &displayed_dive.cylinder[current_cylinder], avg_depth, bottom_time); + track_ascent_gas(depth, &displayed_dive.cylinder[current_cylinder], avg_depth, bottom_time, safety_stop); // How long can we stay at the current depth and still directly ascent to the surface? while (trial_ascent(depth, 0, avg_depth, bottom_time, tissue_tolerance, &displayed_dive.cylinder[current_cylinder].gasmix, po2, diveplan->surface_pressure / 1000.0) && -- 1.9.5 (Apple Git-50.3)