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
22
units.h
22
units.h
|
|
@ -59,22 +59,32 @@ typedef int64_t timestamp_t;
|
|||
|
||||
typedef struct
|
||||
{
|
||||
int seconds;
|
||||
uint32_t seconds; // durations up to 68 yrs
|
||||
} duration_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int mm;
|
||||
} depth_t;
|
||||
int32_t mm;
|
||||
} depth_t; // depth to 2000 km
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int mbar;
|
||||
int32_t mbar; // pressure up to 2000 bar
|
||||
} pressure_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int mkelvin;
|
||||
uint16_t mbar;
|
||||
} o2pressure_t; // pressure up to 65 bar
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int16_t degrees;
|
||||
} bearing_t; // compass bearing
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int32_t mkelvin; // up to 1750 degrees K
|
||||
} temperature_t;
|
||||
|
||||
typedef struct
|
||||
|
|
@ -242,4 +252,4 @@ struct units {
|
|||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue