diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp
index 970ffb96e..138f9763a 100644
--- a/desktop-widgets/configuredivecomputerdialog.cpp
+++ b/desktop-widgets/configuredivecomputerdialog.cpp
@@ -417,17 +417,17 @@ void ConfigureDiveComputerDialog::populateDeviceDetails()
{
switch (ui.dcStackedWidget->currentIndex()) {
case 0:
- populateDeviceDetailsOSTC3();
- break;
- case 1:
- populateDeviceDetailsSuuntoVyper();
- break;
- case 2:
populateDeviceDetailsOSTC();
break;
- case 3:
+ case 1:
+ populateDeviceDetailsOSTC3();
+ break;
+ case 2:
populateDeviceDetailsOSTC4();
break;
+ case 3:
+ populateDeviceDetailsSuuntoVyper();
+ break;
}
}
@@ -954,17 +954,17 @@ void ConfigureDiveComputerDialog::reloadValues()
switch (ui.dcStackedWidget->currentIndex()) {
case 0:
- reloadValuesOSTC3();
- break;
- case 1:
- reloadValuesSuuntoVyper();
- break;
- case 2:
reloadValuesOSTC();
break;
- case 3:
+ case 1:
+ reloadValuesOSTC3();
+ break;
+ case 2:
reloadValuesOSTC4();
break;
+ case 3:
+ reloadValuesSuuntoVyper();
+ break;
}
}
@@ -1430,24 +1430,24 @@ void ConfigureDiveComputerDialog::on_DiveComputerList_currentRowChanged(int curr
{
switch (currentRow) {
case 0:
- selected_vendor = "Heinrichs Weikamp";
- selected_product = "OSTC 3";
- fw_upgrade_possible = true;
- break;
- case 1:
- selected_vendor = "Suunto";
- selected_product = "Vyper";
- fw_upgrade_possible = false;
- break;
- case 2:
selected_vendor = "Heinrichs Weikamp";
selected_product = "OSTC 2N";
fw_upgrade_possible = true;
break;
- case 3:
+ case 1:
+ selected_vendor = "Heinrichs Weikamp";
+ selected_product = "OSTC 3";
+ fw_upgrade_possible = true;
+ break;
+ case 2:
selected_vendor = "Heinrichs Weikamp";
selected_product = "OSTC 4";
fw_upgrade_possible = true;
+ break;
+ case 3:
+ selected_vendor = "Suunto";
+ selected_product = "Vyper";
+ fw_upgrade_possible = false;
default:
/* Not Supported */
return;
diff --git a/desktop-widgets/configuredivecomputerdialog.ui b/desktop-widgets/configuredivecomputerdialog.ui
index e765c2e5c..e8cc84efd 100644
--- a/desktop-widgets/configuredivecomputerdialog.ui
+++ b/desktop-widgets/configuredivecomputerdialog.ui
@@ -211,31 +211,22 @@
-
- OSTC 3,Sport,Cr,2
-
-
-
- :dc-ostc-3-icon:dc-ostc-3-icon
-
-
- -
-
- Suunto Vyper family
-
-
-
- :dc-suunto-vyper-icon:dc-suunto-vyper-icon
-
-
- -
-
- OSTC, Mk.2/2N/2C
+ OSTC Mk2/2N/2C
:dc-ostc-2n-icon:dc-ostc-2n-icon
+ -
+
+ OSTC 2/3/Sport/Plus/cR
+
+
+
+ :dc-ostc-3-icon:dc-ostc-3-icon
+
+
-
OSTC 4
@@ -245,11 +236,952 @@
:dc-ostc-4-icon:dc-ostc-4-icon
+ -
+
+ Suunto Vyper family
+
+
+
+ :dc-suunto-vyper-icon:dc-suunto-vyper-icon
+
+
0
+
+
+ -
+
+
+ 0
+
+
+
+ Basic settings
+
+
+
-
+
+
+ Serial No.
+
+
+ serialNoLineEdit
+
+
+
+ -
+
+
+ Length
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+ true
+
+
+
+ -
+
+
+ Firmware version
+
+
+ firmwareVersionLineEdit_3
+
+
+
+ -
+
+
+ Custom text
+
+
+ customTextLlineEdit_3
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+ 23
+
+
+
+ -
+
+
+ Number of dives
+
+
+
+ -
+
+
+ Show safety stop
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ Sampling rate
+
+
+ samplingRateComboBox
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 1
+
+
+ 120
+
+
+ 10
+
+
+
+ -
+
+
+ Date format
+
+
+ dateFormatComboBox
+
+
+
+ -
+
+
-
+
+ MM/DD/YY
+
+
+ -
+
+ DD/MM/YY
+
+
+ -
+
+ YY/MM/DD
+
+
+
+
+ -
+
+
+ Sync dive computer time with PC
+
+
+
+ -
+
+
+ Salinity
+
+
+ salinitySpinBox
+
+
+
+ -
+
+
+ kg/ℓ
+
+
+ 1.000000000000000
+
+
+ 1.040000000000000
+
+
+ 0.010000000000000
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 177
+
+
+
+
+ -
+
+
+ Start Depth
+
+
+
+ -
+
+
+ End Depth
+
+
+
+ -
+
+
+ Reset Depth
+
+
+
+ -
+
+
+ false
+
+
+ s
+
+
+ 10
+
+
+ 250
+
+
+ 180
+
+
+
+ -
+
+
+ false
+
+
+ m
+
+
+ 1
+
+
+ 3.000000000000000
+
+
+ 6.500000000000000
+
+
+ 0.100000000000000
+
+
+ 5.100000000000000
+
+
+
+ -
+
+
+ false
+
+
+ m
+
+
+ 1
+
+
+ 2.500000000000000
+
+
+ 5.000000000000000
+
+
+ 2.900000000000000
+
+
+
+ -
+
+
+ false
+
+
+ m
+
+
+ 1
+
+
+ 7.500000000000000
+
+
+ 20.100000000000001
+
+
+ 10.100000000000000
+
+
+
+
+
+
+
+ Advanced settings
+
+
+ -
+
+
+ Alt GF can be selected underwater
+
+
+
+ -
+
+
+ Desaturation
+
+
+ desaturationSpinBox
+
+
+
+ -
+
+
+ Future TTS
+
+
+
+ -
+
+
+ %
+
+
+ 60
+
+
+ 100
+
+
+ 90
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ m
+
+
+ 3
+
+
+ 6
+
+
+
+ -
+
+
+ Decotype
+
+
+
+ -
+
+
+ 4
+
+
-
+
+ ZH-L16
+
+
+ -
+
+ Gauge
+
+
+ -
+
+ ZH-L16 CC
+
+
+ -
+
+ Apnea
+
+
+ -
+
+ L16-GF OC
+
+
+ -
+
+ L16-GF CC
+
+
+ -
+
+ PSCR-GF
+
+
+
+
+ -
+
+
+ min
+
+
+ 9
+
+
+
+ -
+
+
+ false
+
+
+ %
+
+
+ 5
+
+
+ 255
+
+
+ 30
+
+
+
+ -
+
+
+ Last deco
+
+
+ lastDecoSpinBox
+
+
+
+ -
+
+
+ %
+
+
+ 100
+
+
+ 140
+
+
+ 110
+
+
+
+ -
+
+
+ Alt GFLow
+
+
+
+ -
+
+
+ false
+
+
+ %
+
+
+ 5
+
+
+ 255
+
+
+ 90
+
+
+
+ -
+
+
+ Alt GFHigh
+
+
+
+ -
+
+
+ Saturation
+
+
+ saturationSpinBox
+
+
+
+ -
+
+
+ GFHigh
+
+
+
+ -
+
+
+ %
+
+
+ 10
+
+
+ 100
+
+
+ 30
+
+
+
+ -
+
+
+ GFLow
+
+
+
+ -
+
+
+ %
+
+
+ 60
+
+
+ 110
+
+
+ 85
+
+
+
+ -
+
+
+ Graphical speed indicator
+
+
+
+ -
+
+
+ ℓ/min
+
+
+ 5
+
+
+ 50
+
+
+ 20
+
+
+
+ -
+
+
+ ℓ/min
+
+
+ 5
+
+
+ 50
+
+
+ 20
+
+
+
+ -
+
+
+ Bottom gas consumption
+
+
+
+ -
+
+
+ Deco gas consumption
+
+
+
+
+
+
+
+ Gas settings
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %O₂
+
+
+
+
+ %He
+
+
+
+
+ Type
+
+
+
+
+ Change depth
+
+
+ -
+
+ Gas 1
+
+
+ -
+
+ Gas 2
+
+
+ -
+
+ Gas 3
+
+
+ -
+
+ Gas 4
+
+
+ -
+
+ Gas 5
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ %O₂
+
+
+
+
+ %He
+
+
+
+
+ Type
+
+
+
+
+ Change depth
+
+
+ -
+
+ Dil 1
+
+
+ -
+
+ Dil 2
+
+
+ -
+
+ Dil 3
+
+
+ -
+
+ Dil 4
+
+
+ -
+
+ Dil 5
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Setpoint
+
+
+
+
+ Change depth
+
+
+ -
+
+ SP 1
+
+
+ -
+
+ SP 2
+
+
+ -
+
+ SP 3
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ cbar
+
+
+ 120
+
+
+ 180
+
+
+ 160
+
+
+
+ -
+
+
+ cbar
+
+
+ 16
+
+
+ 21
+
+
+ 19
+
+
+
+ -
+
+
+ pO₂ max
+
+
+
+ -
+
+
+ pO₂ min
+
+
+
+
+
+
+
+
+
-
@@ -1558,1314 +2490,6 @@
-
-
- -
-
-
- 0
-
-
-
- Basic settings
-
-
-
-
-
-
-
- 1
- 0
-
-
-
- true
-
-
- 200.000000000000000
-
-
-
- -
-
-
- Safety level
-
-
-
- -
-
-
-
-
- A0 (0m - 300m)
-
-
- -
-
- A1 (300m - 1500m)
-
-
- -
-
- A2 (1500m - 3000m)
-
-
-
-
- -
-
-
- Altitude range
-
-
-
- -
-
-
- Model
-
-
-
- -
-
-
-
- 1
- 0
-
-
-
- 30
-
-
-
- -
-
-
- Number of dives
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- Serial No.
-
-
- serialNoLineEdit_1
-
-
-
- -
-
-
-
- 1
- 0
-
-
-
- true
-
-
-
- -
-
-
- Firmware version
-
-
- firmwareVersionLineEdit_1
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Max. depth
-
-
-
- -
-
-
- true
-
-
- 5000
-
-
-
- -
-
-
- Custom text
-
-
- customTextLlineEdit_1
-
-
-
- -
-
-
-
-
- Air
-
-
- -
-
- Nitrox
-
-
- -
-
- Gauge
-
-
-
-
- -
-
-
-
-
- P0 (none)
-
-
- -
-
- P1 (medium)
-
-
- -
-
- P2 (high)
-
-
-
-
- -
-
-
- Sample rate
-
-
-
- -
-
-
-
-
- 10s
-
-
- -
-
- 20s
-
-
- -
-
- 30s
-
-
- -
-
- 60s
-
-
-
-
- -
-
-
- Total dive time
-
-
-
- -
-
-
- Computer model
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- true
-
-
- min
-
-
- 0
-
-
- 5000000
-
-
-
- -
-
-
-
-
- 24h
-
-
- -
-
- 12h
-
-
-
-
- -
-
-
- Time format
-
-
-
- -
-
-
- Units
-
-
-
- -
-
-
-
-
- Imperial
-
-
- -
-
- Metric
-
-
-
-
- -
-
-
- false
-
-
- s
-
-
-
- -
-
-
- Light
-
-
-
- -
-
-
- false
-
-
- 200.000000000000000
-
-
-
- -
-
-
- Depth alarm
-
-
-
- -
-
-
- false
-
-
- min
-
-
- 999
-
-
-
- -
-
-
- Time alarm
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
- 0
-
-
-
- Basic settings
-
-
-
-
-
-
- Serial No.
-
-
- serialNoLineEdit
-
-
-
- -
-
-
- Length
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
-
- 1
- 0
-
-
-
- true
-
-
-
- -
-
-
- Firmware version
-
-
- firmwareVersionLineEdit_3
-
-
-
- -
-
-
- Custom text
-
-
- customTextLlineEdit_3
-
-
-
- -
-
-
-
- 1
- 0
-
-
-
- 23
-
-
-
- -
-
-
- Number of dives
-
-
-
- -
-
-
- Show safety stop
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Sampling rate
-
-
- samplingRateComboBox
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- 1
-
-
- 120
-
-
- 10
-
-
-
- -
-
-
- Date format
-
-
- dateFormatComboBox
-
-
-
- -
-
-
-
-
- MM/DD/YY
-
-
- -
-
- DD/MM/YY
-
-
- -
-
- YY/MM/DD
-
-
-
-
- -
-
-
- Sync dive computer time with PC
-
-
-
- -
-
-
- Salinity
-
-
- salinitySpinBox
-
-
-
- -
-
-
- kg/ℓ
-
-
- 1.000000000000000
-
-
- 1.040000000000000
-
-
- 0.010000000000000
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 177
-
-
-
-
- -
-
-
- Start Depth
-
-
-
- -
-
-
- End Depth
-
-
-
- -
-
-
- Reset Depth
-
-
-
- -
-
-
- false
-
-
- s
-
-
- 10
-
-
- 250
-
-
- 180
-
-
-
- -
-
-
- false
-
-
- m
-
-
- 1
-
-
- 3.000000000000000
-
-
- 6.500000000000000
-
-
- 0.100000000000000
-
-
- 5.100000000000000
-
-
-
- -
-
-
- false
-
-
- m
-
-
- 1
-
-
- 2.500000000000000
-
-
- 5.000000000000000
-
-
- 2.900000000000000
-
-
-
- -
-
-
- false
-
-
- m
-
-
- 1
-
-
- 7.500000000000000
-
-
- 20.100000000000001
-
-
- 10.100000000000000
-
-
-
-
-
-
-
- Advanced settings
-
-
- -
-
-
- Alt GF can be selected underwater
-
-
-
- -
-
-
- Desaturation
-
-
- desaturationSpinBox
-
-
-
- -
-
-
- Future TTS
-
-
-
- -
-
-
- %
-
-
- 60
-
-
- 100
-
-
- 90
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- m
-
-
- 3
-
-
- 6
-
-
-
- -
-
-
- Decotype
-
-
-
- -
-
-
- 4
-
-
-
-
- ZH-L16
-
-
- -
-
- Gauge
-
-
- -
-
- ZH-L16 CC
-
-
- -
-
- Apnea
-
-
- -
-
- L16-GF OC
-
-
- -
-
- L16-GF CC
-
-
- -
-
- PSCR-GF
-
-
-
-
- -
-
-
- min
-
-
- 9
-
-
-
- -
-
-
- false
-
-
- %
-
-
- 5
-
-
- 255
-
-
- 30
-
-
-
- -
-
-
- Last deco
-
-
- lastDecoSpinBox
-
-
-
- -
-
-
- %
-
-
- 100
-
-
- 140
-
-
- 110
-
-
-
- -
-
-
- Alt GFLow
-
-
-
- -
-
-
- false
-
-
- %
-
-
- 5
-
-
- 255
-
-
- 90
-
-
-
- -
-
-
- Alt GFHigh
-
-
-
- -
-
-
- Saturation
-
-
- saturationSpinBox
-
-
-
- -
-
-
- GFHigh
-
-
-
- -
-
-
- %
-
-
- 10
-
-
- 100
-
-
- 30
-
-
-
- -
-
-
- GFLow
-
-
-
- -
-
-
- %
-
-
- 60
-
-
- 110
-
-
- 85
-
-
-
- -
-
-
- Graphical speed indicator
-
-
-
- -
-
-
- ℓ/min
-
-
- 5
-
-
- 50
-
-
- 20
-
-
-
- -
-
-
- ℓ/min
-
-
- 5
-
-
- 50
-
-
- 20
-
-
-
- -
-
-
- Bottom gas consumption
-
-
-
- -
-
-
- Deco gas consumption
-
-
-
-
-
-
-
- Gas settings
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- %O₂
-
-
-
-
- %He
-
-
-
-
- Type
-
-
-
-
- Change depth
-
-
- -
-
- Gas 1
-
-
- -
-
- Gas 2
-
-
- -
-
- Gas 3
-
-
- -
-
- Gas 4
-
-
- -
-
- Gas 5
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- %O₂
-
-
-
-
- %He
-
-
-
-
- Type
-
-
-
-
- Change depth
-
-
- -
-
- Dil 1
-
-
- -
-
- Dil 2
-
-
- -
-
- Dil 3
-
-
- -
-
- Dil 4
-
-
- -
-
- Dil 5
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Setpoint
-
-
-
-
- Change depth
-
-
- -
-
- SP 1
-
-
- -
-
- SP 2
-
-
- -
-
- SP 3
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- cbar
-
-
- 120
-
-
- 180
-
-
- 160
-
-
-
- -
-
-
- cbar
-
-
- 16
-
-
- 21
-
-
- 19
-
-
-
- -
-
-
- pO₂ max
-
-
-
- -
-
-
- pO₂ min
-
-
-
-
-
-
-
-
-
-
@@ -3941,6 +3565,382 @@
+
+
+ -
+
+
+ 0
+
+
+
+ Basic settings
+
+
+
-
+
+
+
+ 1
+ 0
+
+
+
+ true
+
+
+ 200.000000000000000
+
+
+
+ -
+
+
+ Safety level
+
+
+
+ -
+
+
-
+
+ A0 (0m - 300m)
+
+
+ -
+
+ A1 (300m - 1500m)
+
+
+ -
+
+ A2 (1500m - 3000m)
+
+
+
+
+ -
+
+
+ Altitude range
+
+
+
+ -
+
+
+ Model
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+ 30
+
+
+
+ -
+
+
+ Number of dives
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Serial No.
+
+
+ serialNoLineEdit_1
+
+
+
+ -
+
+
+
+ 1
+ 0
+
+
+
+ true
+
+
+
+ -
+
+
+ Firmware version
+
+
+ firmwareVersionLineEdit_1
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ Max. depth
+
+
+
+ -
+
+
+ true
+
+
+ 5000
+
+
+
+ -
+
+
+ Custom text
+
+
+ customTextLlineEdit_1
+
+
+
+ -
+
+
-
+
+ Air
+
+
+ -
+
+ Nitrox
+
+
+ -
+
+ Gauge
+
+
+
+
+ -
+
+
-
+
+ P0 (none)
+
+
+ -
+
+ P1 (medium)
+
+
+ -
+
+ P2 (high)
+
+
+
+
+ -
+
+
+ Sample rate
+
+
+
+ -
+
+
-
+
+ 10s
+
+
+ -
+
+ 20s
+
+
+ -
+
+ 30s
+
+
+ -
+
+ 60s
+
+
+
+
+ -
+
+
+ Total dive time
+
+
+
+ -
+
+
+ Computer model
+
+
+
+ -
+
+
+ true
+
+
+
+ -
+
+
+ true
+
+
+ min
+
+
+ 0
+
+
+ 5000000
+
+
+
+ -
+
+
-
+
+ 24h
+
+
+ -
+
+ 12h
+
+
+
+
+ -
+
+
+ Time format
+
+
+
+ -
+
+
+ Units
+
+
+
+ -
+
+
-
+
+ Imperial
+
+
+ -
+
+ Metric
+
+
+
+
+ -
+
+
+ false
+
+
+ s
+
+
+
+ -
+
+
+ Light
+
+
+
+ -
+
+
+ false
+
+
+ 200.000000000000000
+
+
+
+ -
+
+
+ Depth alarm
+
+
+
+ -
+
+
+ false
+
+
+ min
+
+
+ 999
+
+
+
+ -
+
+
+ Time alarm
+
+
+
+
+
+
+
+
+