Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-16 21:05:26 +03:00
Code Issues Wiki Activity

OTA update continued

Browse source
This commit is contained in:
Bertrand Songis 2019-04-24 17:39:59 +02:00
parent bae1131a1b
commit ae0781f6d7
16 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/gui/common/stdlcd/popups.cpp
View file

@ -183,7 +183,7 @@ void runPopupWarning(event_t event)
lcdDrawSizedText(WARNING_LINE_X, WARNING_LINE_Y+FH, warningInfoText, warningInfoLength, WARNING_INFO_FLAGS); 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) { switch (event) {
case EVT_KEY_BREAK(KEY_ENTER): case EVT_KEY_BREAK(KEY_ENTER):

10
radio/src/gui/common/stdlcd/radio_sdmanager.cpp
View file

@ -69,8 +69,6 @@ void getSelectionFullPath(char * lfn)
strcat(lfn, reusableBuffer.sdManager.lines[menuVerticalPosition - HEADER_LINE - menuVerticalOffset]); strcat(lfn, reusableBuffer.sdManager.lines[menuVerticalPosition - HEADER_LINE - menuVerticalOffset]);
} }
const char * STR_FLASH_RECEIVER_OTA = "Flash receiver OTA";
void onSdFormatConfirm(const char * result) void onSdFormatConfirm(const char * result)
{ {
if (result == STR_OK) { if (result == STR_OK) {
@ -101,7 +99,13 @@ void onBindStateChanged()
{ {
if (reusableBuffer.sdManager.otaInformation.step == BIND_INFO_REQUEST) { if (reusableBuffer.sdManager.otaInformation.step == BIND_INFO_REQUEST) {
POPUP_CONFIRMATION(PXX2receiversModels[reusableBuffer.sdManager.otaInformation.receiverInformation.modelID], onUpdateConfirmation); 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);
} }
} }

1
radio/src/opentx.h
View file

@ -1179,6 +1179,7 @@ union ReusableBuffer
uint16_t count; uint16_t count;
char originalName[SD_SCREEN_FILE_LENGTH+1]; char originalName[SD_SCREEN_FILE_LENGTH+1];
BindInformation otaInformation; BindInformation otaInformation;
char otaReceiverVersion[sizeof(TR_CURRENT_VERSION) + 12];
} sdManager; } sdManager;
#endif #endif

2
radio/src/translations.cpp
View file

@ -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_FIRMWARE_UPDATE_SUCCESS[] = TR_FIRMWARE_UPDATE_SUCCESS;
const char STR_WRITING[] = TR_WRITING; const char STR_WRITING[] = TR_WRITING;
const char STR_FLASH_EXTERNAL_DEVICE[] = TR_FLASH_EXTERNAL_DEVICE; 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_CONFIRM_FORMAT[] = TR_CONFIRM_FORMAT;
const char STR_CONFIRMRESET[] = TR_CONFIRMRESET; const char STR_CONFIRMRESET[] = TR_CONFIRMRESET;
const char STR_TOO_MANY_LUA_SCRIPTS[] = TR_TO_MANY_LUA_SCRIPTS; const char STR_TOO_MANY_LUA_SCRIPTS[] = TR_TO_MANY_LUA_SCRIPTS;

2
radio/src/translations.h
View file

@ -770,6 +770,8 @@ extern const char STR_PATH_TOO_LONG[];
extern const char STR_VIEW_TEXT[]; extern const char STR_VIEW_TEXT[];
extern const char STR_FLASH_BOOTLOADER[]; extern const char STR_FLASH_BOOTLOADER[];
extern const char STR_FLASH_EXTERNAL_DEVICE[]; 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_INTERNAL_MODULE[];
extern const char STR_FLASH_EXTERNAL_MODULE[]; extern const char STR_FLASH_EXTERNAL_MODULE[];
extern const char STR_FIRMWARE_UPDATE_ERROR[]; extern const char STR_FIRMWARE_UPDATE_ERROR[];

2
radio/src/translations/cz.h.txt
View file

@ -932,6 +932,8 @@
#define TR_VIEW_TEXT "Zobrazit text" #define TR_VIEW_TEXT "Zobrazit text"
#define TR_FLASH_BOOTLOADER "Flash BootLoaderu" #define TR_FLASH_BOOTLOADER "Flash BootLoaderu"
#define TR_FLASH_EXTERNAL_DEVICE TR("Flash ext. port", "Flash externího port") #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_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_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") #define TR_FIRMWARE_UPDATE_ERROR TR("Chyba zápisu FW", "Chyba zápisu firmware")

2
radio/src/translations/de.h.txt
View file

@ -937,6 +937,8 @@
#define TR_VIEW_TEXT "View Text" #define TR_VIEW_TEXT "View Text"
#define TR_FLASH_BOOTLOADER TR("Flash Bootloader","Flash BootLoader selbst") // #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_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_INTERNAL_MODULE TR("Flash int. XJT","Flash internes XJT-Modul")
#define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. mod","Flash extern module") #define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. mod","Flash extern module")
#define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error")

2
radio/src/translations/en.h.txt
View file

@ -937,6 +937,8 @@
#define TR_VIEW_TEXT "View text" #define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash bootLoader" #define TR_FLASH_BOOTLOADER "Flash bootLoader"
#define TR_FLASH_EXTERNAL_DEVICE TR("Flash S.Port", "Flash S.Port device") #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_INTERNAL_MODULE TR("Flash int. module", "Flash internal module")
#define TR_FLASH_EXTERNAL_MODULE TR("Flash ext. module", "Flash external 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") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update error", "Firmware update error")

2
radio/src/translations/es.h.txt
View file

@ -943,6 +943,8 @@
#define TR_VIEW_TEXT "View text" #define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
#define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" #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_INTERNAL_MODULE "Flash Internal Module"
#define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module"
#define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error")

2
radio/src/translations/fi.h.txt
View file

@ -935,6 +935,8 @@
#define TR_VIEW_TEXT "View text" #define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
#define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" #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_INTERNAL_MODULE "Flash Internal Module"
#define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module"
#define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error")

2
radio/src/translations/fr.h.txt
View file

@ -947,6 +947,8 @@
#define TR_VIEW_TEXT "Voir texte" #define TR_VIEW_TEXT "Voir texte"
#define TR_FLASH_BOOTLOADER "Flasher BootLoader" #define TR_FLASH_BOOTLOADER "Flasher BootLoader"
#define TR_FLASH_EXTERNAL_DEVICE TR("Flasher S.Port", "Flasher S.Port externe") #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_INTERNAL_MODULE TR("Flasher module int.", "Flasher module interne")
#define TR_FLASH_EXTERNAL_MODULE TR("Flasher module ext.", "Flasher module externe") #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") #define TR_FIRMWARE_UPDATE_ERROR TR("Erreur màj FW","Erreur de mise à jour")

2
radio/src/translations/it.h.txt
View file

@ -937,6 +937,8 @@
#define TR_VIEW_TEXT "Vedi testo" #define TR_VIEW_TEXT "Vedi testo"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
#define TR_FLASH_EXTERNAL_DEVICE "Progr. Dispositivo Esterno" #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_INTERNAL_MODULE "Progr. Modulo Interno"
#define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module"
#define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error")

2
radio/src/translations/nl.h.txt
View file

@ -938,6 +938,8 @@ TR_GYR_VSRCRAW
#define TR_VIEW_TEXT "Lees Tekst" #define TR_VIEW_TEXT "Lees Tekst"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
#define TR_FLASH_EXTERNAL_DEVICE "Flash extern Apparaat" #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_INTERNAL_MODULE "Flash interne XJT-Module"
#define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module"
#define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error")

2
radio/src/translations/pl.h.txt
View file

@ -938,6 +938,8 @@
#define TR_VIEW_TEXT "Pokaż tekst" #define TR_VIEW_TEXT "Pokaż tekst"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
#define TR_FLASH_EXTERNAL_DEVICE "Sflashuj Moduł Zewnętrzny" #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_INTERNAL_MODULE "Sflashuj Moduł Wewnętrzny"
#define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module"
#define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error")

2
radio/src/translations/pt.h.txt
View file

@ -942,6 +942,8 @@
#define TR_VIEW_TEXT "View text" #define TR_VIEW_TEXT "View text"
#define TR_FLASH_BOOTLOADER "Flash BootLoader" #define TR_FLASH_BOOTLOADER "Flash BootLoader"
#define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" #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_INTERNAL_MODULE "Flash Internal Module"
#define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module"
#define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error")

2
radio/src/translations/se.h.txt
View file

@ -951,6 +951,8 @@
#define TR_VIEW_TEXT "Visa Text" #define TR_VIEW_TEXT "Visa Text"
#define TR_FLASH_BOOTLOADER "Skriv BootLoader" #define TR_FLASH_BOOTLOADER "Skriv BootLoader"
#define TR_FLASH_EXTERNAL_DEVICE "Flash External Device" #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_INTERNAL_MODULE "Flash Internal Module"
#define TR_FLASH_EXTERNAL_MODULE "Flash external module" #define TR_FLASH_EXTERNAL_MODULE "Flash external module"
#define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error") #define TR_FIRMWARE_UPDATE_ERROR TR("FW update Error","Firmware update error")