mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
CCR code: Change to sample structure
1) All the variables in the sample structures are strongly typed
2) Two additional types were declared in units.h:
o2pressure_t
bearing_t
3) The following variables were added:
diluentpressure
o2setpoint
o2sensor[3]
4) Changes to a number of files were made to chanf
sample->po2 to sample->po2.mbar
bearing to bearring.degrees
Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
1fec6453a2
commit
eaf6d56487
11 changed files with 64 additions and 51 deletions
2
dive.c
2
dive.c
|
|
@ -1105,7 +1105,7 @@ static void merge_samples(struct divecomputer *res, struct divecomputer *a, stru
|
|||
sample.sensor = as->sensor;
|
||||
if (as->cns)
|
||||
sample.cns = as->cns;
|
||||
if (as->po2)
|
||||
if (as->po2.mbar)
|
||||
sample.po2 = as->po2;
|
||||
if (as->ndl.seconds)
|
||||
sample.ndl = as->ndl;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue