Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

[Companion] Latest release correctly stored

Browse source
This commit is contained in:
Bertrand Songis 2016-03-17 20:08:30 +01:00
parent 32a3d4588e
commit de08e50f15
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/appdata.cpp
View file

@ -740,7 +740,7 @@ void AppData::init()
// Load and store all variables. Use default values if setting values are missing // Load and store all variables. Use default values if setting values are missing
QString _tempString; // Do not touch. Do not change the settings version before a new verson update! QString _tempString; // Do not touch. Do not change the settings version before a new verson update!
getset( _tempString, "settings_version" ,"210" ); // This is a version marker. Will be used to upgrade the settings later on. getset( _tempString, "settings_version" ,"220" ); // This is a version marker. Will be used to upgrade the settings later on.
getset( _recentFiles, "recentFileList" ,"" ); getset( _recentFiles, "recentFileList" ,"" );
getset( _mainWinGeo, "mainWindowGeometry" ,"" ); getset( _mainWinGeo, "mainWindowGeometry" ,"" );

6
companion/src/burnconfigdialog.cpp
View file

@ -21,7 +21,7 @@ burnConfigDialog::burnConfigDialog(QWidget *parent) :
getSettings(); getSettings();
populateProgrammers(); populateProgrammers();
EEPROMInterface *eepromInterface = GetEepromInterface(); EEPROMInterface *eepromInterface = GetEepromInterface();
if (IS_TARANIS(eepromInterface->getBoard())) { if (IS_STM32(eepromInterface->getBoard())) {
setWindowTitle(tr("DFU-UTIL Configuration")); setWindowTitle(tr("DFU-UTIL Configuration"));
ui->avrArgs->hide(); ui->avrArgs->hide();
ui->avrdude_location->hide(); ui->avrdude_location->hide();
@ -310,7 +310,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
{ {
EEPROMInterface *eepromInterface = GetEepromInterface(); EEPROMInterface *eepromInterface = GetEepromInterface();
if (checked) { if (checked) {
if (IS_TARANIS(eepromInterface->getBoard())) { if (IS_STM32(eepromInterface->getBoard())) {
ui->label_dfu2->show(); ui->label_dfu2->show();
ui->dfuArgs->show(); ui->dfuArgs->show();
} }
@ -327,7 +327,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
} }
} }
else { else {
if (IS_TARANIS(eepromInterface->getBoard())) { if (IS_STM32(eepromInterface->getBoard())) {
ui->label_dfu2->hide(); ui->label_dfu2->hide();
ui->dfuArgs->hide(); ui->dfuArgs->hide();
} }

1
companion/src/flashfirmwaredialog.cpp
View file

@ -203,6 +203,7 @@ void FlashFirmwareDialog::on_useLibrarySplash_clicked()
void FlashFirmwareDialog::on_burnButton_clicked() void FlashFirmwareDialog::on_burnButton_clicked()
{ {
g.flashDir(QFileInfo(fwName).dir().absolutePath()); g.flashDir(QFileInfo(fwName).dir().absolutePath());
g.profile[g.id()].fwName(fwName);
g.checkHardwareCompatibility(ui->checkHardwareCompatibility->isChecked()); g.checkHardwareCompatibility(ui->checkHardwareCompatibility->isChecked());
g.backupOnFlash(ui->backupEEprom->isChecked()); g.backupOnFlash(ui->backupEEprom->isChecked());

1
companion/src/mainwindow.cpp
View file

@ -493,6 +493,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
} }
} }
else if (download == true) { else if (download == true) {
firmwareVersionString = versionString;
startFirmwareDownload(); startFirmwareDownload();
} }