From 2820f0da25399a869e16aba672233bf31bec39bf Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 13 Jan 2021 12:46:35 +0100 Subject: [PATCH 1/4] Some compile fixes --- radio/src/gui/colorlcd/radio_sdmanager.cpp | 48 +++++++++++++++++++++- radio/src/translations/cn.h.txt | 14 ++++--- radio/src/translations/tw.h.txt | 32 ++++++++++++--- 3 files changed, 81 insertions(+), 13 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp index 6a99ead4d..f30eaa553 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp @@ -123,6 +123,44 @@ class FlashDialog: public FullScreenDialog Progress progress; }; +template +class MultiFlashDialog: public FullScreenDialog +{ + public: + explicit MultiFlashDialog(ModuleIndex module, MultiModuleType type): + FullScreenDialog(WARNING_TYPE_INFO, "Flash device"), + device(module), + type(type), + progress(this, {LCD_W / 2 - 50, LCD_H / 2, 100, 15}) + { + } + + void deleteLater(bool detach = true, bool trash = true) override + { + if (_deleted) + return; + + progress.deleteLater(true, false); + + FullScreenDialog::deleteLater(detach, trash); + } + + void flash(const char * filename) + { + device.flashFirmware(filename, type, [=](const char * title, const char * message, int count, int total) -> void { + setMessage(message); + progress.setValue(total > 0 ? count * 100 / total : 0); + MainWindow::instance()->run(false); + }); + deleteLater(); + } + + protected: + T device; + MultiModuleType type; + Progress progress; +}; + void RadioSdManagerPage::build(FormWindow * window) { FormGridLayout grid; @@ -187,17 +225,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/translations/cn.h.txt b/radio/src/translations/cn.h.txt index 2d9ac47ef..999bc1805 100644 --- a/radio/src/translations/cn.h.txt +++ b/radio/src/translations/cn.h.txt @@ -456,6 +456,8 @@ #define TR_BEEPCOUNTDOWN INDENT "倒数" #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "关机保持") #define TR_BACKLIGHT_LABEL "背光" +#define TR_BLDELAY INDENT "Duration" +#define TR_GHOST_MENU_LABEL "GHOST MENU" #define TR_BLONBRIGHTNESS "背光开" #define TR_BLOFFBRIGHTNESS "背光关" #define TR_KEYS_BACKLIGHT "按键背光" @@ -643,6 +645,7 @@ #define TR_NO_SDCARD "存储卡未安装" #define TR_WAITING_FOR_RX "等待接收机响应..." #define TR_WAITING_FOR_TX "等待发射机响应..." +#define TR_WAITING_FOR_MODULE "Waiting for module..." #define TR_NO_TOOLS "无可用附加功能" #define TR_NORMAL "正常" #define TR_NOT_INVERTED "正向" @@ -779,11 +782,12 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "刷新蓝牙模块") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" -#define TR_CURRENT_VERSION "当前版本: " -#define TR_FLASH_INTERNAL_MODULE TR("Flash int. module", "更新内置模块固件") -#define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "更新内置多协议模块固件") -#define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. module", "更新外置模块固件") -#define TR_FLASH_EXTERNAL_MULTI TR("Flash Ext. Multi", "更新外置多协议模块固件") +#define TR_CURRENT_VERSION "当前版本: " +#define TR_FLASH_INTERNAL_MODULE "更新内置模块固件" +#define TR_FLASH_INTERNAL_MULTI "更新内置多协议模块固件" +#define TR_FLASH_EXTERNAL_MODULE "更新外置模块固件" +#define TR_FLASH_EXTERNAL_MULTI "更新外置多协议模块固件" +#define TR_FLASH_EXTERNAL_ELRS "Flash External ELRS" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update error", "固件更新失败") #define TR_FIRMWARE_UPDATE_SUCCESS "固件更新成功" #define TR_WRITING "正在写入..." diff --git a/radio/src/translations/tw.h.txt b/radio/src/translations/tw.h.txt index 46482f977..1c4bbdd72 100644 --- a/radio/src/translations/tw.h.txt +++ b/radio/src/translations/tw.h.txt @@ -456,6 +456,8 @@ #define TR_BEEPCOUNTDOWN INDENT "倒數" #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "關機保持") #define TR_BACKLIGHT_LABEL "背光" +#define TR_GHOST_MENU_LABEL "GHOST MENU" +#define TR_BLDELAY INDENT "Duration" #define TR_BLONBRIGHTNESS "背光開" #define TR_BLOFFBRIGHTNESS "背光關" #define TR_KEYS_BACKLIGHT "按鍵背光" @@ -643,6 +645,7 @@ #define TR_NO_SDCARD "存儲卡未安裝" #define TR_WAITING_FOR_RX "等待接收機響應..." #define TR_WAITING_FOR_TX "等待發射機響應..." +#define TR_WAITING_FOR_MODULE "Waiting for module..." #define TR_NO_TOOLS "無可用附加功能" #define TR_NORMAL "正常" #define TR_NOT_INVERTED "正向" @@ -780,11 +783,12 @@ #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "刷新藍牙模塊") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" #define TR_CURRENT_VERSION "當前版本: " -#define TR_FLASH_INTERNAL_MODULE TR("Flash int. module", "更新內置模塊韌體") -#define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "更新內置多協議模塊韌體") -#define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. module", "更新外置模塊韌體") -#define TR_FLASH_EXTERNAL_MULTI TR("Flash Ext. Multi", "更新外置多協議模塊韌體") -#define TR_FIRMWARE_UPDATE_ERROR TR("FW update error", "韌體更新失敗韌體") +#define TR_FLASH_INTERNAL_MODULE TR("Flash int. module", "更新內置模塊韌體") +#define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "更新內置多協議模塊韌體") +#define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. module", "更新外置模塊韌體") +#define TR_FLASH_EXTERNAL_MULTI TR("Flash Ext. Multi", "更新外置多協議模塊韌體") +#define TR_FIRMWARE_UPDATE_ERROR TR("FW update error", "韌體更新失敗韌體") +#define TR_FLASH_EXTERNAL_ELRS TR("Flash Ext. ELRS", "Flash External ELRS") #define TR_FIRMWARE_UPDATE_SUCCESS "韌體更新成功" #define TR_WRITING "正在寫入..." #define TR_CONFIRM_FORMAT "是否格式化?" @@ -1046,10 +1050,26 @@ #define TR_ABOUT_MARTIN_1 "Martin Hotar" #define TR_ABOUT_MARTIN_2 "Graphics designer" -#if defined(PCBFRSKY) +#if defined(MANUFACTURER_FRSKY) #define TR_ABOUT_HARDWARE_1 "FrSky" #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_RADIOMASTER) + #define TR_ABOUT_HARDWARE_1 "Radiomaster" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" +#elif defined(MANUFACTURER_JUMPER) + #define TR_ABOUT_HARDWARE_1 "JumperRC" + #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") + #define TR_ABOUT_HARDWARE_3 "Firmware contributor" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" From 289508e94914ac81f3411de2a0ae48c7e1c7c976 Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 21 Jan 2021 11:24:50 +0100 Subject: [PATCH 2/4] Chinese translation updates --- radio/src/translations/cn.h.txt | 6 +++--- radio/src/translations/tw.h.txt | 28 ++++++++++------------------ 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt index 999bc1805..e668f62fb 100644 --- a/radio/src/translations/cn.h.txt +++ b/radio/src/translations/cn.h.txt @@ -265,7 +265,7 @@ #endif #if defined(PCBHORUS) - #define TR_TRIMS_SWITCHES STR_CHAR_TRIM "Rl" STR_CHAR_TRIM "Rr" STR_CHAR_TRIM "Ed" STR_CHAR_TRIM "Eu" STR_CHAR_TRIM "Td" STR_CHAR_TRIM STR_CHAR_TRIM "Tu" STR_CHAR_TRIM "Al" STR_CHAR_TRIM "Ar" STR_CHAR_TRIM "5d" STR_CHAR_TRIM "5u" STR_CHAR_TRIM "6d" STR_CHAR_TRIM "6u" + #define TR_TRIMS_SWITCHES STR_CHAR_TRIM "Rl" STR_CHAR_TRIM "Rr" STR_CHAR_TRIM "Ed" STR_CHAR_TRIM "Eu" STR_CHAR_TRIM "Td" STR_CHAR_TRIM "Tu" STR_CHAR_TRIM "Al" STR_CHAR_TRIM "Ar" STR_CHAR_TRIM "5d" STR_CHAR_TRIM "5u" STR_CHAR_TRIM "6d" STR_CHAR_TRIM "6u" #else #define TR_TRIMS_SWITCHES TR("tRl" "tRr" "tEd" "tEu" "tTd" "tTu" "tAl" "tAr", STR_CHAR_TRIM "Rl" STR_CHAR_TRIM "Rr" STR_CHAR_TRIM "Ed" STR_CHAR_TRIM "Eu" STR_CHAR_TRIM "Td" STR_CHAR_TRIM "Tu" STR_CHAR_TRIM "Al" STR_CHAR_TRIM "Ar") #endif @@ -325,7 +325,7 @@ #define TR_TEXT_SIZE "标准" "小\0 " "较小" "中等" "双倍" #define LEN_SUBTRIMMODES "\010" -#define TR_SUBTRIMMODES STR_CHAR_DELTA "(中点)\0 " "= (整体)" +#define TR_SUBTRIMMODES STR_CHAR_DELTA "(中点)\0 " "=(整体)\0" // ZERO TERMINATED STRINGS @@ -782,7 +782,7 @@ #define TR_FLASH_FLIGHT_CONTROLLER_BY_INTERNAL_MODULE_OTA "Flash FC by int. OTA" #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "刷新蓝牙模块") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" -#define TR_CURRENT_VERSION "当前版本: " +#define TR_CURRENT_VERSION "当前版本: " #define TR_FLASH_INTERNAL_MODULE "更新内置模块固件" #define TR_FLASH_INTERNAL_MULTI "更新内置多协议模块固件" #define TR_FLASH_EXTERNAL_MODULE "更新外置模块固件" diff --git a/radio/src/translations/tw.h.txt b/radio/src/translations/tw.h.txt index 1c4bbdd72..ff7f1f3e7 100644 --- a/radio/src/translations/tw.h.txt +++ b/radio/src/translations/tw.h.txt @@ -325,7 +325,7 @@ #define TR_TEXT_SIZE "標準" "小\0 " "較小" "中等" "雙倍" #define LEN_SUBTRIMMODES "\010" -#define TR_SUBTRIMMODES STR_CHAR_DELTA "(中点)\0 " "= (整體)" +#define TR_SUBTRIMMODES STR_CHAR_DELTA "(中点)\0 " "=(整體)\0" // ZERO TERMINATED STRINGS @@ -456,8 +456,8 @@ #define TR_BEEPCOUNTDOWN INDENT "倒數" #define TR_PERSISTENT TR(INDENT "Persist.", INDENT "關機保持") #define TR_BACKLIGHT_LABEL "背光" -#define TR_GHOST_MENU_LABEL "GHOST MENU" -#define TR_BLDELAY INDENT "Duration" +#define TR_GHOST_MENU_LABEL "GHOST MENU" +#define TR_BLDELAY INDENT "Duration" #define TR_BLONBRIGHTNESS "背光開" #define TR_BLOFFBRIGHTNESS "背光關" #define TR_KEYS_BACKLIGHT "按鍵背光" @@ -783,12 +783,12 @@ #define TR_FLASH_BLUETOOTH_MODULE TR("Flash BT module", "刷新藍牙模塊") #define TR_FLASH_POWER_MANAGEMENT_UNIT "Flash pwr mngt unit" #define TR_CURRENT_VERSION "當前版本: " -#define TR_FLASH_INTERNAL_MODULE TR("Flash int. module", "更新內置模塊韌體") -#define TR_FLASH_INTERNAL_MULTI TR("Flash Int. Multi", "更新內置多協議模塊韌體") -#define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. module", "更新外置模塊韌體") -#define TR_FLASH_EXTERNAL_MULTI TR("Flash Ext. Multi", "更新外置多協議模塊韌體") -#define TR_FIRMWARE_UPDATE_ERROR TR("FW update error", "韌體更新失敗韌體") -#define TR_FLASH_EXTERNAL_ELRS TR("Flash Ext. ELRS", "Flash External ELRS") +#define TR_FLASH_INTERNAL_MODULE "更新內置模塊韌體" +#define TR_FLASH_INTERNAL_MULTI "更新內置多協議模塊韌體" +#define TR_FLASH_EXTERNAL_MODULE "更新外置模塊韌體" +#define TR_FLASH_EXTERNAL_MULTI "更新外置多協議模塊韌體" +#define TR_FIRMWARE_UPDATE_ERROR "韌體更新失敗韌體" +#define TR_FLASH_EXTERNAL_ELRS "Flash External ELRS" #define TR_FIRMWARE_UPDATE_SUCCESS "韌體更新成功" #define TR_WRITING "正在寫入..." #define TR_CONFIRM_FORMAT "是否格式化?" @@ -1062,14 +1062,6 @@ #define TR_ABOUT_HARDWARE_1 "JumperRC" #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_RADIOMASTER) - #define TR_ABOUT_HARDWARE_1 "Radiomaster" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" -#elif defined(MANUFACTURER_JUMPER) - #define TR_ABOUT_HARDWARE_1 "JumperRC" - #define TR_ABOUT_HARDWARE_2 TR("Hardware design/producer", "Hardware designer/producer") - #define TR_ABOUT_HARDWARE_3 "Firmware contributor" #else #define TR_ABOUT_HARDWARE_1 "Brent Nelson" #define TR_ABOUT_HARDWARE_2 "Sky9x designer/producer" @@ -1323,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 From 0cf87da4026ed08763a9eba1ce8e0565d9a0fe55 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 25 Jan 2021 16:05:04 +0100 Subject: [PATCH 3/4] Better fix --- radio/src/gui/colorlcd/radio_sdmanager.cpp | 33 ++-------------------- radio/src/io/multi_firmware_update.cpp | 2 +- radio/src/io/multi_firmware_update.h | 8 +++++- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp index f30eaa553..8d9a0f99e 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp @@ -124,41 +124,14 @@ class FlashDialog: public FullScreenDialog }; template -class MultiFlashDialog: public FullScreenDialog +class MultiFlashDialog: public FlashDialog { public: explicit MultiFlashDialog(ModuleIndex module, MultiModuleType type): - FullScreenDialog(WARNING_TYPE_INFO, "Flash device"), - device(module), - type(type), - progress(this, {LCD_W / 2 - 50, LCD_H / 2, 100, 15}) + FlashDialog(module) { + device.setType(type); } - - void deleteLater(bool detach = true, bool trash = true) override - { - if (_deleted) - return; - - progress.deleteLater(true, false); - - FullScreenDialog::deleteLater(detach, trash); - } - - void flash(const char * filename) - { - device.flashFirmware(filename, type, [=](const char * title, const char * message, int count, int total) -> void { - setMessage(message); - progress.setValue(total > 0 ? count * 100 / total : 0); - MainWindow::instance()->run(false); - }); - deleteLater(); - } - - protected: - T device; - MultiModuleType type; - Progress progress; }; void RadioSdManagerPage::build(FormWindow * window) 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; }; From 89b1952c9679af45264850c5a8863924288af5a8 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 25 Jan 2021 16:11:45 +0100 Subject: [PATCH 4/4] Fix for some compiler --- radio/src/gui/colorlcd/radio_sdmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/radio_sdmanager.cpp b/radio/src/gui/colorlcd/radio_sdmanager.cpp index 8d9a0f99e..11a95c45a 100644 --- a/radio/src/gui/colorlcd/radio_sdmanager.cpp +++ b/radio/src/gui/colorlcd/radio_sdmanager.cpp @@ -130,7 +130,7 @@ class MultiFlashDialog: public FlashDialog explicit MultiFlashDialog(ModuleIndex module, MultiModuleType type): FlashDialog(module) { - device.setType(type); + FlashDialog::device.setType(type); } };