From 414fba167d123ec830783b5fdef3a03eeb180eed Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 28 Aug 2020 15:58:18 +0200 Subject: [PATCH] Do not try to flash frsky updates on non frsky internal modules (#7890) --- radio/src/gui/480x272/radio_sdmanager.cpp | 4 ++++ radio/src/gui/common/stdlcd/radio_sdmanager.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/radio/src/gui/480x272/radio_sdmanager.cpp b/radio/src/gui/480x272/radio_sdmanager.cpp index d1bb86ce8..71691c85f 100644 --- a/radio/src/gui/480x272/radio_sdmanager.cpp +++ b/radio/src/gui/480x272/radio_sdmanager.cpp @@ -365,14 +365,18 @@ bool menuRadioSdManager(event_t _event) else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) { if (HAS_SPORT_UPDATE_CONNECTOR()) POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_DEVICE); +#if defined(INTERNAL_MODULE_PXX1) || defined(INTERNAL_MODULE_PXX2) POPUP_MENU_ADD_ITEM(STR_FLASH_INTERNAL_MODULE); +#endif POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_MODULE); } else if (!READ_ONLY() && !strcasecmp(ext, FRSKY_FIRMWARE_EXT)) { FrSkyFirmwareInformation information; if (readFrSkyFirmwareInformation(line, information) == nullptr) { +#if defined(INTERNAL_MODULE_PXX1) || defined(INTERNAL_MODULE_PXX2) if (information.productFamily == FIRMWARE_FAMILY_INTERNAL_MODULE) POPUP_MENU_ADD_ITEM(STR_FLASH_INTERNAL_MODULE); +#endif if (information.productFamily == FIRMWARE_FAMILY_EXTERNAL_MODULE) POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_MODULE); if (information.productFamily == FIRMWARE_FAMILY_RECEIVER || information.productFamily == FIRMWARE_FAMILY_SENSOR) { diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index ffb4ff0bd..eb20bb283 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -403,14 +403,18 @@ void menuRadioSdManager(event_t _event) else if (!READ_ONLY() && !strcasecmp(ext, SPORT_FIRMWARE_EXT)) { if (HAS_SPORT_UPDATE_CONNECTOR()) POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_DEVICE); +#if defined(INTERNAL_MODULE_PXX1) || defined(INTERNAL_MODULE_PXX2) POPUP_MENU_ADD_ITEM(STR_FLASH_INTERNAL_MODULE); +#endif POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_MODULE); } else if (!READ_ONLY() && !strcasecmp(ext, FRSKY_FIRMWARE_EXT)) { FrSkyFirmwareInformation information; if (readFrSkyFirmwareInformation(line, information) == nullptr) { +#if defined(INTERNAL_MODULE_PXX1) || defined(INTERNAL_MODULE_PXX2) if (information.productFamily == FIRMWARE_FAMILY_INTERNAL_MODULE) POPUP_MENU_ADD_ITEM(STR_FLASH_INTERNAL_MODULE); +#endif if (information.productFamily == FIRMWARE_FAMILY_EXTERNAL_MODULE) POPUP_MENU_ADD_ITEM(STR_FLASH_EXTERNAL_MODULE); if (information.productFamily == FIRMWARE_FAMILY_RECEIVER || information.productFamily == FIRMWARE_FAMILY_SENSOR) {