From 662137aa6daa7eeb6ea5231392acf30e76293e2f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 17 Mar 2016 21:04:09 +0100 Subject: [PATCH] [Companion] dfu-util launched with right args for Horus --- companion/src/flashfirmwaredialog.cpp | 2 +- companion/src/radiointerface.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/companion/src/flashfirmwaredialog.cpp b/companion/src/flashfirmwaredialog.cpp index c8460180e..a6ee513ca 100644 --- a/companion/src/flashfirmwaredialog.cpp +++ b/companion/src/flashfirmwaredialog.cpp @@ -37,7 +37,7 @@ fwName(g.profile[g.id()].fwName()) ui->useProfileSplash->setDisabled(true); } - if (IS_TARANIS(GetEepromInterface()->getBoard())) { + if (IS_STM32(GetEepromInterface()->getBoard())) { // No backup on Taranis ... could be done if in massstorage ui->backupEEprom->hide(); ui->backupEEprom->setCheckState(Qt::Unchecked); diff --git a/companion/src/radiointerface.cpp b/companion/src/radiointerface.cpp index 843357806..c609444d2 100644 --- a/companion/src/radiointerface.cpp +++ b/companion/src/radiointerface.cpp @@ -102,7 +102,7 @@ QStringList getReadEEpromCmd(const QString &filename) { QStringList result; EEPROMInterface *eepromInterface = GetEepromInterface(); - if (IS_TARANIS(eepromInterface->getBoard())) { + if (IS_STM32(eepromInterface->getBoard())) { // impossible } else if (IS_SKY9X(eepromInterface->getBoard())) { @@ -117,7 +117,7 @@ QStringList getReadEEpromCmd(const QString &filename) QStringList getWriteEEpromCmd(const QString &filename) { EEPROMInterface *eepromInterface = GetEepromInterface(); - if (IS_TARANIS(eepromInterface->getBoard())) { + if (IS_STM32(eepromInterface->getBoard())) { // impossible return QStringList(); } @@ -132,7 +132,7 @@ QStringList getWriteEEpromCmd(const QString &filename) QStringList getWriteFirmwareArgs(const QString &filename) { EEPROMInterface *eepromInterface = GetEepromInterface(); - if (IS_TARANIS(eepromInterface->getBoard())) { + if (IS_STM32(eepromInterface->getBoard())) { return getDfuArgs("-D", filename); } else if (eepromInterface->getBoard() == BOARD_SKY9X) { @@ -313,7 +313,7 @@ bool readEeprom(const QString &filename, ProgressWidget *progress) } } - if (result == false && !IS_TARANIS(GetCurrentFirmware()->getBoard())) { + if (result == false && !IS_STM32(GetCurrentFirmware()->getBoard())) { FlashProcess flashProcess(getRadioInterfaceCmd(), getReadEEpromCmd(filename), progress); result = flashProcess.run(); }