mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Desktop: Add option to force overwrite firmware for OSTC4.

Browse source 
In order to support development of the open source firmware of the
OSTC4.
Requires changes in libdivecomputer.

Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2023-03-03 01:01:46 +13:00
parent 5b263a8f4e
commit 324fbfa685
7 changed files with 47 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
desktop-widgets/configuredivecomputerdialog.cpp
View file

@ -346,7 +346,7 @@ void OstcFirmwareCheck::saveOstcFirmware(QNetworkReply *reply)
connect(config, &ConfigureDiveComputer::error, dialog, &QProgressDialog::setLabelText);
connect(config, &ConfigureDiveComputer::progress, dialog, &QProgressDialog::setValue);
config->dc_open(&devData);
config->startFirmwareUpdate(storeFirmware, &devData);
config->startFirmwareUpdate(storeFirmware, &devData, false);
}
ConfigureDiveComputerDialog::~ConfigureDiveComputerDialog()
@ -869,6 +869,7 @@ void ConfigureDiveComputerDialog::readSettings()
ui.progressBar->setTextVisible(true);
// Fw update is no longer a option, needs to be done on a untouched device
ui.updateFirmwareButton->setEnabled(false);
ui.forceUpdateFirmware->setEnabled(false);
config->readSettings(&device_data);
}
@ -1387,6 +1388,7 @@ void ConfigureDiveComputerDialog::on_restoreBackupButton_clicked()
if (!restorePath.isEmpty()) {
// Fw update is no longer a option, needs to be done on a untouched device
ui.updateFirmwareButton->setEnabled(false);
ui.forceUpdateFirmware->setEnabled(false);
if (!config->restoreXMLBackup(restorePath, deviceDetails)) {
QMessageBox::critical(this, tr("XML restore error"),
tr("An error occurred while restoring the backup file.\n%1")
@ -1411,7 +1413,7 @@ void ConfigureDiveComputerDialog::on_updateFirmwareButton_clicked()
ui.progressBar->setFormat("%p%");
ui.progressBar->setTextVisible(true);
config->startFirmwareUpdate(firmwarePath, &device_data);
config->startFirmwareUpdate(firmwarePath, &device_data, ui.forceUpdateFirmware->isChecked());
}
}
@ -1503,7 +1505,6 @@ void ConfigureDiveComputerDialog::dc_open()
ui.retrieveDetails->setEnabled(true);
ui.resetButton->setEnabled(true);
ui.resetButton_4->setEnabled(true);
ui.updateFirmwareButton->setEnabled(true);
ui.disconnectButton->setEnabled(true);
ui.restoreBackupButton->setEnabled(true);
ui.connectButton->setEnabled(false);
@ -1511,6 +1512,7 @@ void ConfigureDiveComputerDialog::dc_open()
ui.DiveComputerList->setEnabled(false);
ui.logToFile->setEnabled(false);
ui.updateFirmwareButton->setEnabled(fw_upgrade_possible);
ui.forceUpdateFirmware->setEnabled(selected_product == "OSTC 4");
ui.progressBar->setFormat(tr("Connected to device"));
}
@ -1521,7 +1523,6 @@ void ConfigureDiveComputerDialog::dc_close()
ui.retrieveDetails->setEnabled(false);
ui.resetButton->setEnabled(false);
ui.resetButton_4->setEnabled(false);
ui.updateFirmwareButton->setEnabled(false);
ui.disconnectButton->setEnabled(false);
ui.connectButton->setEnabled(true);
ui.bluetoothMode->setEnabled(true);
@ -1531,6 +1532,7 @@ void ConfigureDiveComputerDialog::dc_close()
ui.DiveComputerList->setEnabled(true);
ui.logToFile->setEnabled(true);
ui.updateFirmwareButton->setEnabled(false);
ui.forceUpdateFirmware->setEnabled(false);
ui.progressBar->setFormat(tr("Disconnected from device"));
ui.progressBar->setValue(0);
}