diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2016-01-22 14:17:46 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-01-22 06:50:01 -0800 |
| commit | e59e06704238cf6f9d31dff5b8eef0c38265a565 (patch) | |
| tree | 34b0caea787285da48354de4b9b2059e5252a94b | |
| parent | 040ef3a8f25dc439ec1f63624bfe5ea5dd738f19 (diff) | |
| download | subsurface-e59e06704238cf6f9d31dff5b8eef0c38265a565.tar.gz | |
Remove workaround for OSTC Sport 10.22 and below
Now with firmware 10.23, the settings behave as they should, and won't
hang the communication.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | subsurface-core/configuredivecomputerthreads.cpp | 28 |
1 files changed, 6 insertions, 22 deletions
diff --git a/subsurface-core/configuredivecomputerthreads.cpp b/subsurface-core/configuredivecomputerthreads.cpp index 78edcb37c..59a14b834 100644 --- a/subsurface-core/configuredivecomputerthreads.cpp +++ b/subsurface-core/configuredivecomputerthreads.cpp @@ -648,17 +648,9 @@ 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); - - //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); - } + READ_SETTING(OSTC3_DYNAMIC_ASCEND_RATE, dynamicAscendRate); + READ_SETTING(OSTC3_GRAPHICAL_SPEED_INDICATOR, graphicalSpeedIndicator); + READ_SETTING(OSTC3_ALWAYS_SHOW_PPO2, alwaysShowppO2); #undef READ_SETTING @@ -912,17 +904,9 @@ 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); - - //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); - } + WRITE_SETTING(OSTC3_DYNAMIC_ASCEND_RATE, dynamicAscendRate); + WRITE_SETTING(OSTC3_GRAPHICAL_SPEED_INDICATOR, graphicalSpeedIndicator); + WRITE_SETTING(OSTC3_ALWAYS_SHOW_PPO2, alwaysShowppO2); #undef WRITE_SETTING |