aboutsummaryrefslogtreecommitdiffstats
path: root/subsurface-core/devicedetails.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'subsurface-core/devicedetails.cpp')
-rw-r--r--subsurface-core/devicedetails.cpp31
1 files changed, 9 insertions, 22 deletions
diff --git a/subsurface-core/devicedetails.cpp b/subsurface-core/devicedetails.cpp
index a2da0d5bc..a917a4d0e 100644
--- a/subsurface-core/devicedetails.cpp
+++ b/subsurface-core/devicedetails.cpp
@@ -1,32 +1,19 @@
#include "devicedetails.h"
-// This can probably be done better by someone with better c++-FU
-const struct gas zero_gas = {0};
-const struct setpoint zero_setpoint = {0};
+gas::gas(unsigned char oxygen, unsigned char helium, unsigned char type, unsigned char depth) :
+ oxygen(oxygen), helium(helium), type(type), depth(depth)
+{
+}
+
+setpoint::setpoint(unsigned char sp, unsigned char depth) :
+ sp(sp), depth(depth)
+{
+}
DeviceDetails::DeviceDetails(QObject *parent) :
QObject(parent),
data(0),
- serialNo(""),
- firmwareVersion(""),
- customText(""),
- model(""),
syncTime(false),
- gas1(zero_gas),
- gas2(zero_gas),
- gas3(zero_gas),
- gas4(zero_gas),
- gas5(zero_gas),
- dil1(zero_gas),
- dil2(zero_gas),
- dil3(zero_gas),
- dil4(zero_gas),
- dil5(zero_gas),
- sp1(zero_setpoint),
- sp2(zero_setpoint),
- sp3(zero_setpoint),
- sp4(zero_setpoint),
- sp5(zero_setpoint),
setPointFallback(0),
ccrMode(0),
calibrationGas(0),