mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show new firmware notice for OSTC Plus

Browse source 
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>
This commit is contained in:
Jan Mulder 2018-08-27 21:09:40 +02:00 committed by Dirk Hohndel
parent 0566f344a9
commit cae30f450a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
desktop-widgets/configuredivecomputerdialog.cpp
View file

@ -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") {

2
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -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);
}