diff options
| author |  Robert C. Helling <helling@atdotde.de> | 2014-10-19 07:07:07 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2014-10-19 07:07:07 -0700 |
| commit | 5f44fdd9cf6fba073837cbc1d89c6ed3ea28dd76 (patch) | |
| tree | ccf7ecf769b5b3240fa313233eff78c0f52c7881 /libdivecomputer.c | |
| parent | 839bcaaf70b763590509031208b6786288910bc3 (diff) | |
| download | subsurface-5f44fdd9cf6fba073837cbc1d89c6ed3ea28dd76.tar.gz | |
Make planner work again for CCR dives
The latest CCR patches had rendered the planner not usable for CCR dives.
This patch corrects this (and reenables the CCR set point column for
segments). The problem was that a new member setpoint of struct divepoint
had been introduced, but there was already po2 which had the same meaning.
This patch merges the two and renames them setpoint to prevent future
confusion.
Signed-off-by: Robert C. Helling <helling@atdotde.de>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'libdivecomputer.c')
| -rw-r--r-- | libdivecomputer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libdivecomputer.c b/libdivecomputer.c index 401fd8a6f..22c758ffb 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -208,7 +208,7 @@ sample_cb(dc_sample_type_t type, dc_sample_value_t value, void *userdata) sample->ndl.seconds = ndl; sample->stoptime.seconds = stoptime; sample->stopdepth.mm = stopdepth; - sample->po2.mbar = po2; + sample->setpoint.mbar = po2; sample->cns = cns; } sample = prepare_sample(dc); @@ -247,10 +247,10 @@ sample_cb(dc_sample_type_t type, dc_sample_value_t value, void *userdata) #if DC_VERSION_CHECK(0, 3, 0) case DC_SAMPLE_SETPOINT: /* for us a setpoint means constant pO2 from here */ - sample->po2.mbar = po2 = rint(value.setpoint * 1000); + sample->setpoint.mbar = po2 = rint(value.setpoint * 1000); break; case DC_SAMPLE_PPO2: - sample->po2.mbar = po2 = rint(value.ppo2 * 1000); + sample->setpoint.mbar = po2 = rint(value.ppo2 * 1000); break; case DC_SAMPLE_CNS: sample->cns = cns = rint(value.cns * 100); |