diff options
| -rw-r--r-- | equipment.c | 2 | ||||
| -rw-r--r-- | planner.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/equipment.c b/equipment.c index 66427324e..14d02df77 100644 --- a/equipment.c +++ b/equipment.c @@ -243,7 +243,7 @@ void reset_cylinders(struct dive *dive, bool track_gas) continue; if (cyl->depth.mm == 0) /* if the gas doesn't give a mod, assume conservative pO2 */ cyl->depth = gas_mod(&cyl->gasmix, pO2, M_OR_FT(3,10)); - if (track_gas && cyl->type.workingpressure.mbar) + if (track_gas) cyl->start.mbar = cyl->end.mbar = cyl->type.workingpressure.mbar; cyl->gas_used.mliter = 0; cyl->deco_gas_used.mliter = 0; @@ -275,7 +275,7 @@ static void create_dive_from_plan(struct diveplan *diveplan, bool track_gas) oldgasmix = cyl->gasmix; sample = prepare_sample(dc); sample->po2.mbar = dp->po2; - if (track_gas) + if (track_gas && cyl->type.workingpressure.mbar) sample->cylinderpressure.mbar = cyl->end.mbar; finish_sample(dc); while (dp) { @@ -315,7 +315,7 @@ static void create_dive_from_plan(struct diveplan *diveplan, bool track_gas) sample[-1].po2.mbar = po2; sample->time.seconds = lasttime + 1; sample->depth.mm = lastdepth; - if (track_gas) + if (track_gas && cyl->type.workingpressure.mbar) sample->cylinderpressure.mbar = cyl->sample_end.mbar; finish_sample(dc); oldgasmix = gasmix; @@ -331,7 +331,8 @@ static void create_dive_from_plan(struct diveplan *diveplan, bool track_gas) if (track_gas) { update_cylinder_pressure(&displayed_dive, sample[-1].depth.mm, depth, time - sample[-1].time.seconds, dp->entered ? diveplan->bottomsac : diveplan->decosac, cyl, !dp->entered); - sample->cylinderpressure.mbar = cyl->end.mbar; + if (cyl->type.workingpressure.mbar) + sample->cylinderpressure.mbar = cyl->end.mbar; } finish_sample(dc); dp = dp->next; |