mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct time bookkeeping when doing O2 breaks

Browse source 
These got mangled with previous changes to stop length determination.

Fixes #662

Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2017-10-18 23:51:14 +02:00 committed by Dirk Hohndel
parent 3acc28cebf
commit 0f458023d9
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/planner.c
View file

@ -994,9 +994,6 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
int new_clock = wait_until(dive, clock, clock, laststoptime * 2, timestep, depth, stoplevels[stopidx], avg_depth, bottom_time, &dive->cylinder[current_cylinder].gasmix, po2, diveplan->surface_pressure / 1000.0); int new_clock = wait_until(dive, clock, clock, laststoptime * 2, timestep, depth, stoplevels[stopidx], avg_depth, bottom_time, &dive->cylinder[current_cylinder].gasmix, po2, diveplan->surface_pressure / 1000.0);
laststoptime = new_clock - clock; laststoptime = new_clock - clock;
decostoptable[decostopcounter].depth = depth;
decostoptable[decostopcounter].time = laststoptime;
++decostopcounter;
/* Finish infinite deco */ /* Finish infinite deco */
if (clock >= 48 * 3600 && depth >= 6000) { if (clock >= 48 * 3600 && depth >= 6000) {
error = LONGDECO; error = LONGDECO;
@ -1017,11 +1014,12 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
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;
new_clock = clock + laststoptime;
o2breaking = true; o2breaking = true;
breaktime = 0; breaktime = 0;
breakfrom_cylinder = 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, laststoptime, depth, current_cylinder, po2, false);
previous_point_time = clock + laststoptime; previous_point_time = clock + laststoptime;
current_cylinder = break_cylinder; current_cylinder = break_cylinder;
gas = dive->cylinder[current_cylinder].gasmix; gas = dive->cylinder[current_cylinder].gasmix;
@ -1030,10 +1028,11 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
if (breaktime >= 0) { if (breaktime >= 0) {
if (laststoptime >= 6 * 60) { if (laststoptime >= 6 * 60) {
laststoptime = 6 * 60; laststoptime = 6 * 60;
new_clock = clock + laststoptime;
o2breaking = true; o2breaking = true;
o2time = 0; o2time = 0;
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, laststoptime, depth, current_cylinder, po2, false);
previous_point_time = clock + laststoptime; previous_point_time = clock + laststoptime;
current_cylinder = breakfrom_cylinder; current_cylinder = breakfrom_cylinder;
gas = dive->cylinder[current_cylinder].gasmix; gas = dive->cylinder[current_cylinder].gasmix;
@ -1044,6 +1043,10 @@ bool plan(struct diveplan *diveplan, struct dive *dive, int timestep, struct dec
} }
add_segment(depth_to_bar(depth, dive), &dive->cylinder[current_cylinder].gasmix, add_segment(depth_to_bar(depth, dive), &dive->cylinder[current_cylinder].gasmix,
laststoptime, po2, dive, prefs.decosac); laststoptime, po2, dive, prefs.decosac);
decostoptable[decostopcounter].depth = depth;
decostoptable[decostopcounter].time = laststoptime;
++decostopcounter;
clock = new_clock; clock = new_clock;
if (!o2breaking) if (!o2breaking)
break; break;