mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: simplify default initialization of struct sample

Browse source 
Since the units got default constructors, we don't have to
manually initialize them.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-25 08:28:13 +02:00 • committed by bstoeger
parent 27dbdd35c6
commit af6201f89c
2 changed files with 8 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/sample.cpp
View file

@ -2,27 +2,7 @@
#include "sample.h" #include "sample.h"
sample::sample() : sample::sample() = default;
time({ 0 }),
stoptime({ 0 }),
ndl({ -1 }),
tts({ 0 }),
rbt({ 0 }),
depth({ 0 }),
stopdepth({ 0 }),
temperature({ 0 }),
pressure { { 0 }, { 0 } },
setpoint({ 0 }),
o2sensor { { 0 }, { 0 }, { 0 }, { 0 }, { 0 }, { 0 } },
bearing({ -1 }),
sensor { 0, 0 },
cns(0),
heartbeat(0),
sac({ 0 }),
in_deco(false),
manually_entered(false)
{
}
/* /*
* Adding a cylinder pressure sample field is not quite as trivial as it * Adding a cylinder pressure sample field is not quite as trivial as it

14
core/sample.h
View file

@ -12,7 +12,7 @@ struct sample // BASE TYPE BYTES UNITS RANGE
{ // --------- ----- ----- ----- ----------- { // --------- ----- ----- ----- -----------
duration_t time; // int32_t 4 seconds (0-34 yrs) elapsed dive time up to this sample duration_t time; // int32_t 4 seconds (0-34 yrs) elapsed dive time up to this sample
duration_t stoptime; // int32_t 4 seconds (0-34 yrs) time duration of next deco stop duration_t stoptime; // int32_t 4 seconds (0-34 yrs) time duration of next deco stop
duration_t ndl; // int32_t 4 seconds (-1 no val, 0-34 yrs) time duration before no-deco limit duration_t ndl = { -1 }; // int32_t 4 seconds (-1 no val, 0-34 yrs) time duration before no-deco limit
duration_t tts; // int32_t 4 seconds (0-34 yrs) time duration to reach the surface duration_t tts; // int32_t 4 seconds (0-34 yrs) time duration to reach the surface
duration_t rbt; // int32_t 4 seconds (0-34 yrs) remaining bottom time duration_t rbt; // int32_t 4 seconds (0-34 yrs) remaining bottom time
depth_t depth; // int32_t 4 mm (0-2000 km) dive depth of this sample depth_t depth; // int32_t 4 mm (0-2000 km) dive depth of this sample
@ -21,13 +21,13 @@ struct sample // BASE TYPE BYTES UNITS RANGE
pressure_t pressure[MAX_SENSORS]; // int32_t 2x4 mbar (0-2 Mbar) cylinder pressures (main and CCR o2) pressure_t pressure[MAX_SENSORS]; // int32_t 2x4 mbar (0-2 Mbar) cylinder pressures (main and CCR o2)
o2pressure_t setpoint; // uint16_t 2 mbar (0-65 bar) O2 partial pressure (will be setpoint) o2pressure_t setpoint; // uint16_t 2 mbar (0-65 bar) O2 partial pressure (will be setpoint)
o2pressure_t o2sensor[MAX_O2_SENSORS];// uint16_t 6x2 mbar (0-65 bar) Up to 6 PO2 sensor values (rebreather) o2pressure_t o2sensor[MAX_O2_SENSORS];// uint16_t 6x2 mbar (0-65 bar) Up to 6 PO2 sensor values (rebreather)
bearing_t bearing; // int16_t 2 degrees (-1 no val, 0-360 deg) compass bearing bearing_t bearing = { -1 }; // int16_t 2 degrees (-1 no val, 0-360 deg) compass bearing
int16_t sensor[MAX_SENSORS]; // int16_t 2x2 sensorID (0-16k) ID of cylinder pressure sensor int16_t sensor[MAX_SENSORS] = {}; // int16_t 2x2 sensorID (0-16k) ID of cylinder pressure sensor
uint16_t cns; // uint16_t 2 % (0-64k %) cns% accumulated uint16_t cns = 0; // uint16_t 2 % (0-64k %) cns% accumulated
uint8_t heartbeat; // uint8_t 1 beats/m (0-255) heart rate measurement uint8_t heartbeat = 0; // uint8_t 1 beats/m (0-255) heart rate measurement
volume_t sac; // 4 ml/min predefined SAC volume_t sac; // 4 ml/min predefined SAC
bool in_deco; // bool 1 y/n y/n this sample is part of deco bool in_deco = false; // bool 1 y/n y/n this sample is part of deco
bool manually_entered; // bool 1 y/n y/n this sample was entered by the user, bool manually_entered = false; // bool 1 y/n y/n this sample was entered by the user,
// not calculated when planning a dive // not calculated when planning a dive
sample(); // Default constructor sample(); // Default constructor
}; // Total size of structure: 63 bytes, excluding padding at end }; // Total size of structure: 63 bytes, excluding padding at end