mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

In planner prefer best_first_ascend_cylinder for gas breaks

Browse source 
Up to now the cylinder for gas breaks was hardcoded to first cylinder.
With this change the best_first_ascend_cylinder is used if its
O2 is <=32%.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
Stefan Fuchs 2017-10-10 09:46:34 +02:00 • committed by Robert C. Helling
parent 80a2cd7b1b
commit 3e67bfaea6
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
core/planner.c
View file

@ -675,7 +675,7 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
struct gasmix gas, bottom_gas; struct gasmix gas, bottom_gas;
int o2time = 0; int o2time = 0;
int breaktime = -1; int breaktime = -1;
int breakcylinder = 0; int break_cylinder = -1, breakfrom_cylinder = 0;
int error = 0; int error = 0;
bool decodive = false; bool decodive = false;
int first_stop_depth = 0; int first_stop_depth = 0;
@ -855,7 +855,6 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
first_stop_depth = 0; first_stop_depth = 0;
stopidx = bottom_stopidx; stopidx = bottom_stopidx;
breaktime = -1; breaktime = -1;
breakcylinder = 0;
o2time = 0; o2time = 0;
deco_state->first_ceiling_pressure.mbar = depth_to_mbar(deco_allowed_depth(tissue_tolerance_calc(dive, deco_state->first_ceiling_pressure.mbar = depth_to_mbar(deco_allowed_depth(tissue_tolerance_calc(dive,
depth_to_bar(depth, dive)), depth_to_bar(depth, dive)),
@ -1006,18 +1005,24 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
o2breaking = false; o2breaking = false;
if (prefs.doo2breaks) { if (prefs.doo2breaks) {
/* The backgas breaks option limits time on oxygen to 12 minutes, followed by 6 minutes on /* The backgas breaks option limits time on oxygen to 12 minutes, followed by 6 minutes on
* backgas (first defined gas). This could be customized if there were demand. * backgas. This could be customized if there were demand.
*/ */
if (break_cylinder == -1) {
if (get_o2(&dive->cylinder[best_first_ascend_cylinder].gasmix) <= 320)
break_cylinder = best_first_ascend_cylinder;
else
break_cylinder = 0;
}
if (get_o2(&dive->cylinder[current_cylinder].gasmix) == 1000) { if (get_o2(&dive->cylinder[current_cylinder].gasmix) == 1000) {
if (laststoptime >= 12 * 60) { if (laststoptime >= 12 * 60) {
laststoptime = 12 * 60; laststoptime = 12 * 60;
o2breaking = true; o2breaking = true;
breaktime = 0; breaktime = 0;
breakcylinder = current_cylinder; breakfrom_cylinder = current_cylinder;
if (is_final_plan) if (is_final_plan)
plan_add_segment(diveplan, clock + laststoptime - previous_point_time, depth, current_cylinder, po2, false); plan_add_segment(diveplan, clock + laststoptime - previous_point_time, depth, current_cylinder, po2, false);
previous_point_time = clock + laststoptime; previous_point_time = clock + laststoptime;
current_cylinder = 0; current_cylinder = break_cylinder;
gas = dive->cylinder[current_cylinder].gasmix; gas = dive->cylinder[current_cylinder].gasmix;
} }
} else { } else {
@ -1029,7 +1034,7 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
if (is_final_plan) if (is_final_plan)
plan_add_segment(diveplan, clock + laststoptime - previous_point_time, depth, current_cylinder, po2, false); plan_add_segment(diveplan, clock + laststoptime - previous_point_time, depth, current_cylinder, po2, false);
previous_point_time = clock + laststoptime; previous_point_time = clock + laststoptime;
current_cylinder = breakcylinder; current_cylinder = breakfrom_cylinder;
gas = dive->cylinder[current_cylinder].gasmix; gas = dive->cylinder[current_cylinder].gasmix;
breaktime = -1; breaktime = -1;
} }