diff --git a/radio/src/eeprom_rlc.cpp b/radio/src/eeprom_rlc.cpp index df445dcac..09b8be5fd 100644 --- a/radio/src/eeprom_rlc.cpp +++ b/radio/src/eeprom_rlc.cpp @@ -494,7 +494,7 @@ void RlcFile::nextWriteStep() } if (s_write_err == ERR_FULL) { - s_global_warning = STR_EEPROMOVERFLOW; + POPUP_WARNING(STR_EEPROMOVERFLOW); m_write_step = 0; m_write_len = 0; m_cur_rlc_len = 0; diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp index 55054a262..329e59870 100644 --- a/radio/src/gui/menu_general.cpp +++ b/radio/src/gui/menu_general.cpp @@ -692,10 +692,10 @@ void flashBootloader(const char * filename) f_open(&file, filename, FA_READ); uint8_t buffer[1024]; UINT count; + lcd_clear(); - lcd_putsLeft(4*FH, "\032Writing..."); + lcd_putsLeft(4*FH, STR_WRITING); lcd_rect(3, 6*FH+4, 204, 7); - watchdogSetTimeout(1000/*10s*/); static uint8_t unlocked = 0; if (!unlocked) { @@ -704,12 +704,13 @@ void flashBootloader(const char * filename) } for (int i=0; i= 212 diff --git a/radio/src/gui/view_main.cpp b/radio/src/gui/view_main.cpp index 4c2f8d323..721925c1c 100644 --- a/radio/src/gui/view_main.cpp +++ b/radio/src/gui/view_main.cpp @@ -499,13 +499,8 @@ void menuMainView(uint8_t event) uint8_t view_base = view & 0x0f; #endif - uint8_t _event = event; - if (s_global_warning) { - event = 0; - } + switch(event) { - switch(event) - { case EVT_ENTRY: killEvents(KEY_EXIT); killEvents(KEY_UP); @@ -637,16 +632,13 @@ void menuMainView(uint8_t event) return; case EVT_KEY_FIRST(KEY_EXIT): - if (s_global_warning) { - s_global_warning = NULL; - } #if defined(GVARS) && !defined(PCBSTD) - else if (s_gvar_timer > 0) { + if (s_gvar_timer > 0) { s_gvar_timer = 0; } #endif #if !defined(PCBTARANIS) - else if (view == VIEW_TIMER2) { + if (view == VIEW_TIMER2) { resetTimer(1); } #endif @@ -871,15 +863,8 @@ void menuMainView(uint8_t event) } #endif - if (s_global_warning) { - s_warning = s_global_warning; - displayWarning(_event); - if (!s_warning) s_global_warning = NULL; - s_warning = NULL; - } - #if defined(GVARS) && !defined(PCBSTD) - else if (s_gvar_timer > 0) { + if (s_gvar_timer > 0) { s_gvar_timer--; #if LCD_W >= 212 lcd_filled_rect(BITMAP_X, BITMAP_Y, 64, 32, SOLID, ERASE); diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp index 389b419be..6bbfdcb20 100644 --- a/radio/src/logs.cpp +++ b/radio/src/logs.cpp @@ -197,7 +197,7 @@ void writeLogs() if (result != NULL) { if (result != error_displayed) { error_displayed = result; - s_global_warning = result; + POPUP_WARNING(result); } return; } @@ -294,7 +294,7 @@ void writeLogs() if (result<0 && !error_displayed) { error_displayed = STR_SDCARD_ERROR; - s_global_warning = STR_SDCARD_ERROR; + POPUP_WARNING(STR_SDCARD_ERROR); } } } diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index 55750d713..dac35c2f5 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -677,7 +677,7 @@ void telemetryWakeup() if (alarmsCheckStep == 0) { if ((IS_MODULE_XJT(0) || IS_MODULE_XJT(1)) && frskyData.swr.value > 0x33) { AUDIO_SWR_RED(); - s_global_warning = STR_ANTENNAPROBLEM; + POPUP_WARNING(STR_ANTENNAPROBLEM); alarmsCheckTime = get_tmr10ms() + 300; /* next check in 3seconds */ } } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index cea0fbcf7..fc2e4bd25 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -466,6 +466,8 @@ const pm_char STR_CHANNELS_MONITOR[] PROGMEM = TR_CHANNELS_MONITOR; const pm_char STR_PATH_TOO_LONG[] PROGMEM = TR_PATH_TOO_LONG; const pm_char STR_VIEW_TEXT[] PROGMEM = TR_VIEW_TEXT; const pm_char STR_FLASH_BOOTLOADER[] PROGMEM = TR_FLASH_BOOTLOADER; +const pm_char STR_WRITING[] PROGMEM = TR_WRITING; +const pm_char STR_CONFIRM_FORMAT[] PROGMEM = TR_CONFIRM_FORMAT; #if LCD_W >= 212 const pm_char STR_MODELNAME[] PROGMEM = TR_MODELNAME; diff --git a/radio/src/translations.h b/radio/src/translations.h index e473dca7b..a786eefd5 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -617,6 +617,8 @@ extern const pm_char STR_CHANNELS_MONITOR[]; extern const pm_char STR_PATH_TOO_LONG[]; extern const pm_char STR_VIEW_TEXT[]; extern const pm_char STR_FLASH_BOOTLOADER[]; +extern const pm_char STR_WRITING[]; +extern const pm_char STR_CONFIRM_FORMAT[]; #if defined(VOICE) && defined(CPUARM) struct LanguagePack { diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index b2e7cf761..6563d4aea 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -713,6 +713,8 @@ #define TR_PATH_TOO_LONG "Cesta je moc dlouhá" #define TR_VIEW_TEXT "Zobrazit text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Vnitřní RF modul" #define TR_EXTERNALRF "Externí RF modul" #define TR_FAILSAFE "Mód Failsafe" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 6ab13c68d..a1cb9cd6b 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -713,6 +713,8 @@ #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "----Internes HF Modul----------" #define TR_EXTERNALRF "----Externes HF Modul----------" #define TR_FAILSAFE "Failsafe Mode" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 67458bbc0..9e87008d7 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -717,6 +717,8 @@ #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE INDENT "Failsafe mode" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 2de385b59..f4ee1194b 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -713,6 +713,8 @@ #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Interna RF" #define TR_EXTERNALRF "Externa RF" #define TR_FAILSAFE INDENT"Modo sgdad." diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 40d2a09e0..0b7540155 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -713,6 +713,8 @@ #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE INDENT "Failsafe mode" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 553396fe9..cd25b391b 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -713,6 +713,8 @@ #define TR_PATH_TOO_LONG "Chemin trop long" #define TR_VIEW_TEXT "Voir texte" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "HF interne" #define TR_EXTERNALRF "HF externe" #define TR_FAILSAFE INDENT "Type failsafe" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 210d4e6f0..333606b37 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -713,6 +713,8 @@ #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Modulo Interno" #define TR_EXTERNALRF "Modulo esterno" #define TR_FAILSAFE "Modo failsafe" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index f23abb0d6..fe5b93973 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -713,6 +713,8 @@ #define TR_PATH_TOO_LONG "Ścieżka za długa" #define TR_VIEW_TEXT "Pokaż tekst" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Wewnętrzny moduł RF" #define TR_EXTERNALRF "Zewnętrzny moduł RF" #define TR_FAILSAFE "Tryb Failsafe" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 463de312e..41d249528 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -713,6 +713,8 @@ #define TR_PATH_TOO_LONG "Path too long" #define TR_VIEW_TEXT "View text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Internal RF" #define TR_EXTERNALRF "External RF" #define TR_FAILSAFE "Failsafe mode" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index c80153e12..5e66482c4 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -713,6 +713,8 @@ #define TR_PATH_TOO_LONG "För lång sökväg" #define TR_VIEW_TEXT "Visa Text" #define TR_FLASH_BOOTLOADER "Flash BootLoader" +#define TR_WRITING "\032Writing..." +#define TR_CONFIRM_FORMAT "Confirm Format?" #define TR_INTERNALRF "Intern Radio" #define TR_EXTERNALRF "Extern Radiomodul" #define TR_FAILSAFE "Failsafeläge"