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

Planner: clean up the function that tracks our gases

Browse source 
This doesn't add gases. It just makes sure they are there.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-05-29 17:36:39 -07:00
parent 7d42b53bba
commit 63c21d55de
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
planner.c
View file

@ -180,7 +180,9 @@ void fill_default_cylinder(cylinder_t *cyl)
cyl->depth.mm = 1600 * 1000 / O2_IN_AIR * 10 - 10000; // MOD of air cyl->depth.mm = 1600 * 1000 / O2_IN_AIR * 10 - 10000; // MOD of air
} }
static int add_gas(struct dive *dive, int o2, int he) /* make sure that the gas we are switching to is represented in our
* list of cylinders */
static int verify_gas_exists(struct dive *dive, int o2, int he)
{ {
int i; int i;
struct gasmix *mix; struct gasmix *mix;
@ -224,7 +226,7 @@ static struct dive *create_dive_from_plan(struct diveplan *diveplan, struct dive
struct divecomputer *dc; struct divecomputer *dc;
struct sample *sample; struct sample *sample;
cylinder_t *cyl; cylinder_t *cyl;
int oldo2 = O2_IN_AIR, oldhe = 0; int oldo2, oldhe;
int oldpo2 = 0; int oldpo2 = 0;
int lasttime = 0; int lasttime = 0;
@ -242,21 +244,14 @@ static struct dive *create_dive_from_plan(struct diveplan *diveplan, struct dive
dp = diveplan->dp; dp = diveplan->dp;
copy_cylinders(master_dive, dive); copy_cylinders(master_dive, dive);
/* reset the end pressure values and start with the first cylinder */ /* reset the end pressure values and start with the gas on the first cylinder */
reset_cylinders(master_dive); reset_cylinders(master_dive);
cyl = &master_dive->cylinder[0]; cyl = &master_dive->cylinder[0];
oldhe = cyl->gasmix.he.permille;
/* let's start with the gas given on the first segment */ oldo2 = cyl->gasmix.o2.permille;
if (dp->o2 || dp->he) {
oldo2 = dp->o2;
oldhe = dp->he;
}
sample = prepare_sample(dc); sample = prepare_sample(dc);
sample->po2 = dp->po2; sample->po2 = dp->po2;
finish_sample(dc); finish_sample(dc);
if (add_gas(dive, oldo2, oldhe) < 0)
goto gas_error_exit;
while (dp) { while (dp) {
int o2 = dp->o2, he = dp->he; int o2 = dp->o2, he = dp->he;
int po2 = dp->po2; int po2 = dp->po2;
@ -266,7 +261,7 @@ static struct dive *create_dive_from_plan(struct diveplan *diveplan, struct dive
if (time == 0) { if (time == 0) {
/* special entries that just inform the algorithm about /* special entries that just inform the algorithm about
* additional gases that are available */ * additional gases that are available */
if (add_gas(dive, o2, he) < 0) if (verify_gas_exists(dive, o2, he) < 0)
goto gas_error_exit; goto gas_error_exit;
dp = dp->next; dp = dp->next;
continue; continue;
@ -293,7 +288,7 @@ static struct dive *create_dive_from_plan(struct diveplan *diveplan, struct dive
int plano2 = (o2 + 5) / 10 * 10; int plano2 = (o2 + 5) / 10 * 10;
int planhe = (he + 5) / 10 * 10; int planhe = (he + 5) / 10 * 10;
int idx; int idx;
if ((idx = add_gas(dive, plano2, planhe)) < 0) if ((idx = verify_gas_exists(dive, plano2, planhe)) < 0)
goto gas_error_exit; goto gas_error_exit;
add_gas_switch_event(dive, dc, lasttime, idx); add_gas_switch_event(dive, dc, lasttime, idx);
/* need to insert a last sample for the old gas */ /* need to insert a last sample for the old gas */