diff options
| author |  Anton Lundin <glance@acc.umu.se> | 2018-04-25 19:46:43 +0200 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-04-27 21:33:47 +0300 |
| commit | fd359f5a88c9cab94713908cc0b79780f22729c3 (patch) | |
| tree | b43f50a076fb5cf9ebc3aa1c0a9aa4e4c5b23f6d | |
| parent | 6582896e7f7868170d6418e66e1021d54f2d1710 (diff) | |
| download | subsurface-fd359f5a88c9cab94713908cc0b79780f22729c3.tar.gz | |
Configure ostc3: Remove obsoleted setting
In firmware version 2.97 the setting 0x38, SETPOINT FALLBACK, has bin
obsoleted and we get a error when trying to write to it.
This removes this setting.
Signed-off-by: Anton Lundin <glance@acc.umu.se>
| -rw-r--r-- | core/configuredivecomputerthreads.cpp | 6 | ||||
| -rw-r--r-- | desktop-widgets/configuredivecomputerdialog.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/configuredivecomputerdialog.ui | 10 |
3 files changed, 2 insertions, 16 deletions
diff --git a/core/configuredivecomputerthreads.cpp b/core/configuredivecomputerthreads.cpp index 885cd0226..51a61048e 100644 --- a/core/configuredivecomputerthreads.cpp +++ b/core/configuredivecomputerthreads.cpp @@ -902,7 +902,7 @@ static dc_status_t read_ostc3_settings(dc_device_t *device, DeviceDetails *m_dev dc_status_t rc; dc_event_progress_t progress; progress.current = 0; - progress.maximum = 57; + progress.maximum = 56; unsigned char hardware[1]; //Read hardware type @@ -1128,7 +1128,6 @@ static dc_status_t read_ostc3_settings(dc_device_t *device, DeviceDetails *m_dev READ_SETTING(OSTC3_AGF_LOW, aGFLow); READ_SETTING(OSTC3_CALIBRATION_GAS_O2, calibrationGas); READ_SETTING(OSTC3_FLIP_SCREEN, flipScreen); - READ_SETTING(OSTC3_SETPOINT_FALLBACK, setPointFallback); READ_SETTING(OSTC3_LEFT_BUTTON_SENSIVITY, leftButtonSensitivity); READ_SETTING(OSTC3_RIGHT_BUTTON_SENSIVITY, rightButtonSensitivity); READ_SETTING(OSTC3_BOTTOM_GAS_CONSUMPTION, bottomGasConsumption); @@ -1178,7 +1177,7 @@ static dc_status_t write_ostc3_settings(dc_device_t *device, DeviceDetails *m_de dc_status_t rc; dc_event_progress_t progress; progress.current = 0; - progress.maximum = 56; + progress.maximum = 55; //write gas values unsigned char gas1Data[4] = { @@ -1395,7 +1394,6 @@ static dc_status_t write_ostc3_settings(dc_device_t *device, DeviceDetails *m_de WRITE_SETTING(OSTC3_AGF_LOW, aGFLow); WRITE_SETTING(OSTC3_CALIBRATION_GAS_O2, calibrationGas); WRITE_SETTING(OSTC3_FLIP_SCREEN, flipScreen); - WRITE_SETTING(OSTC3_SETPOINT_FALLBACK, setPointFallback); WRITE_SETTING(OSTC3_LEFT_BUTTON_SENSIVITY, leftButtonSensitivity); WRITE_SETTING(OSTC3_RIGHT_BUTTON_SENSIVITY, rightButtonSensitivity); WRITE_SETTING(OSTC3_BOTTOM_GAS_CONSUMPTION, bottomGasConsumption); diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index bf6b9cc34..b0925ddb0 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -463,7 +463,6 @@ void ConfigureDiveComputerDialog::populateDeviceDetailsOSTC3() deviceDetails->aGFLow = ui.aGFLowSpinBox->value(); deviceDetails->calibrationGas = ui.calibrationGasSpinBox->value(); deviceDetails->flipScreen = ui.flipScreenCheckBox->isChecked(); - deviceDetails->setPointFallback = ui.setPointFallbackCheckBox->isChecked(); deviceDetails->leftButtonSensitivity = ui.leftButtonSensitivity->value(); deviceDetails->rightButtonSensitivity = ui.rightButtonSensitivity->value(); deviceDetails->bottomGasConsumption = ui.bottomGasConsumption->value(); @@ -1000,7 +999,6 @@ void ConfigureDiveComputerDialog::reloadValuesOSTC3() ui.aGFLowSpinBox->setValue(deviceDetails->aGFLow); ui.calibrationGasSpinBox->setValue(deviceDetails->calibrationGas); ui.flipScreenCheckBox->setChecked(deviceDetails->flipScreen); - ui.setPointFallbackCheckBox->setChecked(deviceDetails->setPointFallback); ui.leftButtonSensitivity->setValue(deviceDetails->leftButtonSensitivity); ui.rightButtonSensitivity->setValue(deviceDetails->rightButtonSensitivity); ui.bottomGasConsumption->setValue(deviceDetails->bottomGasConsumption); diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui index e8cc84efd..51e429908 100644 --- a/desktop-widgets/configuredivecomputerdialog.ui +++ b/desktop-widgets/configuredivecomputerdialog.ui @@ -2415,16 +2415,6 @@ </item> </widget> </item> - <item row="3" column="3"> - <widget class="QCheckBox" name="setPointFallbackCheckBox"> - <property name="text"> - <string>Setpoint fallback</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> <item row="6" column="2"> <spacer> <property name="orientation"> |