diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-20 14:39:02 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-20 17:32:54 -0700 |
| commit | 11a0c0cc701806ccec975c67d27dec97fbb13b1f (patch) | |
| tree | 15a3ace16588b80a88fea76cec30386414bfc3f7 /core/libdivecomputer.c | |
| parent | 94d8abd1a292ac0b02064c906da3a66ccf9e6737 (diff) | |
| download | subsurface-11a0c0cc701806ccec975c67d27dec97fbb13b1f.tar.gz | |
Unify sample pressure and o2pressure as pressure[2] array
We currently carry two pressures around for all the samples and plot
info, but the second pressure is reserved for CCR dives as the O2
cylinder pressure.
That's kind of annoying when we *could* use it for regular sidemount
dives as the secondary pressure.
So start prepping for that instead: don't make it "pressure" and
"o2pressure", make it just be an array of two pressure values.
NOTE! This is purely mindless prepwork. It literally just does a
search-and-replace, keeping the exact same semantics, so "pressure[1]"
is still just O2 pressure.
But at some future date, we can now start using it for a second sensor
value for sidemount instead.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/libdivecomputer.c')
| -rw-r--r-- | core/libdivecomputer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/libdivecomputer.c b/core/libdivecomputer.c index 57264aa83..2d7778346 100644 --- a/core/libdivecomputer.c +++ b/core/libdivecomputer.c @@ -354,14 +354,14 @@ sample_cb(dc_sample_type_t type, dc_sample_value_t value, void *userdata) break; case DC_SAMPLE_PRESSURE: /* Do we already have a pressure reading? */ - if (sample->cylinderpressure.mbar) { + if (sample->pressure[0].mbar) { /* Do we prefer the one we already have? */ /* If so, just ignore the new one */ if (sample->sensor == current_gas_index) break; } sample->sensor = value.pressure.tank; - sample->cylinderpressure.mbar = lrint(value.pressure.value * 1000); + sample->pressure[0].mbar = lrint(value.pressure.value * 1000); break; case DC_SAMPLE_GASMIX: handle_gasmix(dc, sample, value.gasmix); |