diff options
| author |  Jan Mulder <jlmulder@xs4all.nl> | 2018-08-27 21:09:40 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-27 17:41:09 -0700 |
| commit | cae30f450af10f919410cbfe45497404d065a722 (patch) | |
| tree | ed75bd6240602fa0a1d9b836ed4c1a5033a25fef | |
| parent | 0566f344a91531105630be45ca31c2e3128812c8 (diff) | |
| download | subsurface-cae30f450af10f919410cbfe45497404d065a722.tar.gz | |
Show new firmware notice for OSTC Plus
Also show a new firmware notice for a HW OSTC Plus. This appeared
to be broken (as can be verified on the current master from today,
as HW just released version 2.98 of the firmware).
Notice that there is some confusion in both Subsurface and
Libdivecomputer with respect to types of OSTCs. Physcically,
there exist 2 type of OSTC3's. The first edition with
only DC_TRANSPORT_SERIAL (and an USB connector), and a second
version that lacks the connector but supports both BT and BLE.
Confusingly, the second version is marked OSTC3 on the device,
but the user needs to select OSTC Plus (which is basically a 3rd
version of the OSTC3, combined with a successor of the OSTC Sport)
to download dives using BT/BLE.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
| -rw-r--r-- | desktop-widgets/configuredivecomputerdialog.cpp | 2 | ||||
| -rw-r--r-- | desktop-widgets/downloadfromdivecomputer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp index cb7ec8371..ed6c2d712 100644 --- a/desktop-widgets/configuredivecomputerdialog.cpp +++ b/desktop-widgets/configuredivecomputerdialog.cpp @@ -236,7 +236,7 @@ OstcFirmwareCheck::OstcFirmwareCheck(QString product) : parent(0) { QUrl url; memset(&devData, 1, sizeof(devData)); - if (product == "OSTC 3" || product == "OSTC 3+" || product == "OSTC cR") { + if (product == "OSTC 3" || product == "OSTC 3+" || product == "OSTC cR" || product == "OSTC Plus") { url = QUrl("http://www.heinrichsweikamp.net/autofirmware/ostc3_changelog.txt"); latestFirmwareHexFile = QString("http://www.heinrichsweikamp.net/autofirmware/ostc3_firmware.hex"); } else if (product == "OSTC Sport") { diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp index 4d86958af..b52efc636 100644 --- a/desktop-widgets/downloadfromdivecomputer.cpp +++ b/desktop-widgets/downloadfromdivecomputer.cpp @@ -331,7 +331,7 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked() // // We shouldn't do this for memory dumps. if ((product == "OSTC 3" || product == "OSTC 3+" || product == "OSTC cR" || - product == "OSTC Sport" || product == "OSTC 4") && + product == "OSTC Sport" || product == "OSTC 4" || product == "OSTC Plus") && !data->saveDump()) { ostcFirmwareCheck = new OstcFirmwareCheck(product); } |