diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp index 6a99ead4d..11a95c45a 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp @@ -123,6 +123,17 @@ class FlashDialog: public FullScreenDialog Progress progress; }; +template +class MultiFlashDialog: public FlashDialog +{ + public: + explicit MultiFlashDialog(ModuleIndex module, MultiModuleType type): + FlashDialog(module) + { + FlashDialog::device.setType(type); + } +}; + void RadioSdManagerPage::build(FormWindow * window) { FormGridLayout grid; @@ -187,17 +198,23 @@ void RadioSdManagerPage::build(FormWindow * window) if (information.readMultiFirmwareInformation(name.data()) == nullptr) { #if defined(INTERNAL_MODULE_MULTI) menu->addLine(STR_FLASH_INTERNAL_MULTI, [=]() { - auto dialog = new FlashDialog(INTERNAL_MODULE); + auto dialog = new MultiFlashDialog(INTERNAL_MODULE, MULTI_TYPE_MULTIMODULE); dialog->flash(getFullPath(name)); }); #endif menu->addLine(STR_FLASH_EXTERNAL_MULTI, [=]() { - auto dialog = new FlashDialog(EXTERNAL_MODULE); + auto dialog = new MultiFlashDialog(EXTERNAL_MODULE, MULTI_TYPE_MULTIMODULE); dialog->flash(getFullPath(name)); }); } } #endif + else if (!READ_ONLY() && !strcasecmp(ext, ELRS_FIRMWARE_EXT)) { + menu->addLine(STR_FLASH_EXTERNAL_ELRS, [=]() { + auto dialog = new MultiFlashDialog(EXTERNAL_MODULE, MULTI_TYPE_ELRS); + dialog->flash(getFullPath(name)); + }); + } else if (isExtensionMatching(ext, BITMAPS_EXT)) { // TODO } diff --git a/radio/src/io/multi_firmware_update.cpp b/radio/src/io/multi_firmware_update.cpp index 940b7dc74..1c0a526eb 100644 --- a/radio/src/io/multi_firmware_update.cpp +++ b/radio/src/io/multi_firmware_update.cpp @@ -546,7 +546,7 @@ const char * MultiFirmwareInformation::readMultiFirmwareInformation(FIL * file) return readV1Signature(buffer); } -bool MultiDeviceFirmwareUpdate::flashFirmware(const char * filename, MultiModuleType type, ProgressHandler progressHandler) +bool MultiDeviceFirmwareUpdate::flashFirmware(const char * filename, ProgressHandler progressHandler) { FIL file; diff --git a/radio/src/io/multi_firmware_update.h b/radio/src/io/multi_firmware_update.h index 837dcd7bf..4d73162e5 100644 --- a/radio/src/io/multi_firmware_update.h +++ b/radio/src/io/multi_firmware_update.h @@ -112,8 +112,14 @@ class MultiDeviceFirmwareUpdate { { } - bool flashFirmware(const char * filename, MultiModuleType type, ProgressHandler progressHandler); + void setType(MultiModuleType value) + { + type = value; + } + + bool flashFirmware(const char * filename, ProgressHandler progressHandler); protected: ModuleIndex module; + MultiModuleType type; }; diff --git a/radio/src/translations/tw.h.txt b/radio/src/translations/tw.h.txt index e40b5d5dc..ff7f1f3e7 100644 --- a/radio/src/translations/tw.h.txt +++ b/radio/src/translations/tw.h.txt @@ -1315,4 +1315,4 @@ #define ZSTR_SERVO_CURRENT "SrvA" #define ZSTR_SERVO_VOLTAGE "SrvV" #define ZSTR_SERVO_TEMPERATURE "SrvT" -#define ZSTR_SERVO_STATUS "SrvS" +#define ZSTR_SERVO_STATUS "SrvS" \ No newline at end of file