diff --git a/radio/src/gui/common/stdlcd/popups.cpp b/radio/src/gui/common/stdlcd/popups.cpp index e4dfe0e5f..392df2330 100644 --- a/radio/src/gui/common/stdlcd/popups.cpp +++ b/radio/src/gui/common/stdlcd/popups.cpp @@ -183,7 +183,7 @@ void runPopupWarning(event_t event) lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, warningInfoText, warningInfoLength, WARNING_INFO_FLAGS); } - lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT)); + lcdDrawText(WARNING_LINE_X, WARNING_LINE_Y+2*FH+2, warningType == WARNING_TYPE_INFO ? STR_OK : (warningType == WARNING_TYPE_ASTERISK ? STR_EXIT : STR_POPUPS_ENTER_EXIT)); switch (event) { case EVT_KEY_BREAK(KEY_ENTER): diff --git a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp index 96463be1a..7d838d036 100644 --- a/radio/src/gui/common/stdlcd/radio_sdmanager.cpp +++ b/radio/src/gui/common/stdlcd/radio_sdmanager.cpp @@ -69,8 +69,6 @@ void getSelectionFullPath(char * lfn) strcat(lfn, reusableBuffer.sdManager.lines[menuVerticalPosition - HEADER_LINE - menuVerticalOffset]); } -const char * STR_FLASH_RECEIVER_OTA = "Flash receiver OTA"; - void onSdFormatConfirm(const char * result) { if (result == STR_OK) { @@ -101,7 +99,13 @@ void onBindStateChanged() { if (reusableBuffer.sdManager.otaInformation.step == BIND_INFO_REQUEST) { POPUP_CONFIRMATION(PXX2receiversModels[reusableBuffer.sdManager.otaInformation.receiverInformation.modelID], onUpdateConfirmation); - // SET_WARNING_INFO(STR_MODEL_STILL_POWERED, sizeof(TR_MODEL_STILL_POWERED), 0); + char * tmp = strAppend(reusableBuffer.sdManager.otaReceiverVersion, TR_CURRENT_VERSION); + tmp = strAppendUnsigned(tmp, 1 + reusableBuffer.sdManager.otaInformation.receiverInformation.swVersion.major); + *tmp++ = '.'; + tmp = strAppendUnsigned(tmp, reusableBuffer.sdManager.otaInformation.receiverInformation.swVersion.minor); + *tmp++ = '.'; + tmp = strAppendUnsigned(tmp, reusableBuffer.sdManager.otaInformation.receiverInformation.swVersion.revision); + SET_WARNING_INFO(reusableBuffer.sdManager.otaReceiverVersion, tmp - reusableBuffer.sdManager.otaReceiverVersion, 0); } } diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 2a07251fd..032a7134c 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -1179,6 +1179,7 @@ union ReusableBuffer uint16_t count; char originalName[SD_SCREEN_FILE_LENGTH+1]; BindInformation otaInformation; + char otaReceiverVersion[sizeof(TR_CURRENT_VERSION) + 12]; } sdManager; #endif diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 905615a9a..1eb99f6ac 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -575,6 +575,8 @@ const char STR_FIRMWARE_UPDATE_ERROR[] = TR_FIRMWARE_UPDATE_ERROR; const char STR_FIRMWARE_UPDATE_SUCCESS[] = TR_FIRMWARE_UPDATE_SUCCESS; const char STR_WRITING[] = TR_WRITING; const char STR_FLASH_EXTERNAL_DEVICE[] = TR_FLASH_EXTERNAL_DEVICE; +const char STR_FLASH_RECEIVER_OTA[] = TR_FLASH_RECEIVER_OTA; +const char STR_CURRENT_VERSION[] = TR_CURRENT_VERSION; const char STR_CONFIRM_FORMAT[] = TR_CONFIRM_FORMAT; const char STR_CONFIRMRESET[] = TR_CONFIRMRESET; const char STR_TOO_MANY_LUA_SCRIPTS[] = TR_TO_MANY_LUA_SCRIPTS; diff --git a/radio/src/translations.h b/radio/src/translations.h index df9487f3c..3d1d5473d 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -770,6 +770,8 @@ extern const char STR_PATH_TOO_LONG[]; extern const char STR_VIEW_TEXT[]; extern const char STR_FLASH_BOOTLOADER[]; extern const char STR_FLASH_EXTERNAL_DEVICE[]; +extern const char STR_FLASH_RECEIVER_OTA[]; +extern const char STR_CURRENT_VERSION[]; extern const char STR_FLASH_INTERNAL_MODULE[]; extern const char STR_FLASH_EXTERNAL_MODULE[]; extern const char STR_FIRMWARE_UPDATE_ERROR[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index f9fc08b2f..53eb2de85 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -932,6 +932,8 @@ #define TR_VIEW_TEXT "Zobrazit text" #define TR_FLASH_BOOTLOADER "Flash BootLoaderu" #define TR_FLASH_EXTERNAL_DEVICE TR("Flash ext. port", "Flash externího port") +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE TR("Flash vnitř. modulu", "Flash vnitřního modulu") #define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. modulu", "Flash externího zařízení") #define TR_FIRMWARE_UPDATE_ERROR TR("Chyba zápisu FW", "Chyba zápisu firmware") diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index c618aa33c..15444df31 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -937,6 +937,8 @@ #define TR_VIEW_TEXT "View Text" #define TR_FLASH_BOOTLOADER TR("Flash Bootloader","Flash BootLoader selbst") // #define TR_FLASH_EXTERNAL_DEVICE TR("Flash ext. Gerät","Flash externes Gerät") +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE TR("Flash int. XJT","Flash internes XJT-Modul") #define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. mod","Flash extern module") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 00aee231a..4dda51443 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -937,6 +937,8 @@ #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash bootLoader" #define TR_FLASH_EXTERNAL_DEVICE TR("Flash S.Port", "Flash S.Port device") +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE TR("Flash int. module", "Flash internal module") #define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. module", "Flash external module") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update error", "Firmware update error") diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 24156ca0d..5732fcd25 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -943,6 +943,8 @@ #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 748855e1b..60940cb36 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -935,6 +935,8 @@ #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 859ade415..73d0466b2 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -947,6 +947,8 @@ #define TR_VIEW_TEXT "Voir texte" #define TR_FLASH_BOOTLOADER "Flasher BootLoader" #define TR_FLASH_EXTERNAL_DEVICE TR("Flasher S.Port", "Flasher S.Port externe") +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION "Version courante :" #define TR_FLASH_INTERNAL_MODULE TR("Flasher module int.", "Flasher module interne") #define TR_FLASH_EXTERNAL_MODULE TR("Flasher module ext.", "Flasher module externe") #define TR_FIRMWARE_UPDATE_ERROR TR("Erreur màj FW","Erreur de mise à jour") diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index d2137a254..fb6b51f18 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -937,6 +937,8 @@ #define TR_VIEW_TEXT "Vedi testo" #define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_EXTERNAL_DEVICE "Progr. Dispositivo Esterno" +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Progr. Modulo Interno" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 2a03725d8..b93e8832e 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -938,6 +938,8 @@ TR_GYR_VSRCRAW #define TR_VIEW_TEXT "Lees Tekst" #define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_EXTERNAL_DEVICE "Flash extern Apparaat" +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Flash interne XJT-Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index d90a49424..abf573150 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -938,6 +938,8 @@ #define TR_VIEW_TEXT "Pokaż tekst" #define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_EXTERNAL_DEVICE "Sflashuj Moduł Zewnętrzny" +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Sflashuj Moduł Wewnętrzny" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 9584907ce..77fdaacd8 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -942,6 +942,8 @@ #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index c78c964b6..6754ca080 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -951,6 +951,8 @@ #define TR_VIEW_TEXT "Visa Text" #define TR_FLASH_BOOTLOADER "Skriv BootLoader" #define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" +#define TR_FLASH_RECEIVER_OTA "Flash receiver OTA" +#define TR_CURRENT_VERSION TR("Current vers. ", "Current version: ") #define TR_FLASH_INTERNAL_MODULE "Flash Internal Module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error")