[PATCH 3/5] Skip OSTC3 configs which the sport doesn't handle
Anton Lundin
glance at acc.umu.se
Thu Sep 24 15:59:04 PDT 2015
Use model name to skip some configs which the Sport doesn't handle and
starts misbehaving on.
Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
configuredivecomputerthreads.cpp | 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/configuredivecomputerthreads.cpp b/configuredivecomputerthreads.cpp
index 00ab07f..ae83055 100644
--- a/configuredivecomputerthreads.cpp
+++ b/configuredivecomputerthreads.cpp
@@ -648,9 +648,17 @@ static dc_status_t read_ostc3_settings(dc_device_t *device, DeviceDetails *m_dev
READ_SETTING(OSTC3_BOTTOM_GAS_CONSUMPTION, bottomGasConsumption);
READ_SETTING(OSTC3_DECO_GAS_CONSUMPTION, decoGasConsumption);
READ_SETTING(OSTC3_MOD_WARNING, modWarning);
- READ_SETTING(OSTC3_DYNAMIC_ASCEND_RATE, dynamicAscendRate);
- READ_SETTING(OSTC3_GRAPHICAL_SPEED_INDICATOR, graphicalSpeedIndicator);
- READ_SETTING(OSTC3_ALWAYS_SHOW_PPO2, alwaysShowppO2);
+
+ //Skip things not supported on the sport, if its a sport.
+ if (m_deviceDetails->model == "Sport") {
+ EMIT_PROGRESS();
+ EMIT_PROGRESS();
+ EMIT_PROGRESS();
+ } else {
+ READ_SETTING(OSTC3_DYNAMIC_ASCEND_RATE, dynamicAscendRate);
+ READ_SETTING(OSTC3_GRAPHICAL_SPEED_INDICATOR, graphicalSpeedIndicator);
+ READ_SETTING(OSTC3_ALWAYS_SHOW_PPO2, alwaysShowppO2);
+ }
#undef READ_SETTING
@@ -904,9 +912,17 @@ static dc_status_t write_ostc3_settings(dc_device_t *device, DeviceDetails *m_de
WRITE_SETTING(OSTC3_BOTTOM_GAS_CONSUMPTION, bottomGasConsumption);
WRITE_SETTING(OSTC3_DECO_GAS_CONSUMPTION, decoGasConsumption);
WRITE_SETTING(OSTC3_MOD_WARNING, modWarning);
- WRITE_SETTING(OSTC3_DYNAMIC_ASCEND_RATE, dynamicAscendRate);
- WRITE_SETTING(OSTC3_GRAPHICAL_SPEED_INDICATOR, graphicalSpeedIndicator);
- WRITE_SETTING(OSTC3_ALWAYS_SHOW_PPO2, alwaysShowppO2);
+
+ //Skip things not supported on the sport, if its a sport.
+ if (m_deviceDetails->model == "Sport") {
+ EMIT_PROGRESS();
+ EMIT_PROGRESS();
+ EMIT_PROGRESS();
+ } else {
+ WRITE_SETTING(OSTC3_DYNAMIC_ASCEND_RATE, dynamicAscendRate);
+ WRITE_SETTING(OSTC3_GRAPHICAL_SPEED_INDICATOR, graphicalSpeedIndicator);
+ WRITE_SETTING(OSTC3_ALWAYS_SHOW_PPO2, alwaysShowppO2);
+ }
#undef WRITE_SETTING
--
2.1.4
More information about the subsurface
mailing list