No more global warning displayed only on Main View. Global warning will

be displayed on all menus. Saves flash on stock 9x!

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;

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<BOOTLOADER_SIZE; i+=1024) {
+    watchdogSetTimeout(100/*1s*/);
     if (f_read(&file, buffer, 1024, &count) != FR_OK || count != 1024) {
-      // TODO popup error
+      POPUP_WARNING(STR_SDCARD_ERROR);
       break;
     }
     if (i==0 && !isBootloaderStart((uint32_t *)buffer)) {
-      // TODO popup error
+      POPUP_WARNING(STR_INCOMPATIBLE);
       break;
     }
     for (int j=0; j<1024; j+=FLASH_PAGESIZE) {
@@ -733,7 +734,7 @@ void onSdManagerMenu(const char *result)
     pushMenu(menuGeneralSdManagerInfo);
   }
   else if (result == STR_SD_FORMAT) {
-    POPUP_CONFIRMATION(PSTR("Confirm Format?"));
+    POPUP_CONFIRMATION(STR_CONFIRM_FORMAT);
   }
   else if (result == STR_DELETE_FILE) {
     f_getcwd(lfn, _MAX_LFN);

radio/src/gui/menus.cpp

@@ -1036,7 +1036,6 @@ uint8_t         s_warning_info_len;
 // uint8_t s_warning_info_att not needed now
 uint8_t         s_warning_type;
 uint8_t         s_warning_result = 0;
-const pm_char * s_global_warning = NULL;
 
 #if defined(CPUARM)
 int16_t s_warning_input_value;

radio/src/gui/menus.h

@@ -342,8 +342,6 @@ extern uint8_t         s_warning_info_len;
 extern uint8_t         s_warning_result;
 extern uint8_t         s_warning_type;
 
-extern const pm_char * s_global_warning;
-
 #define WARNING_LINE_X 16
 #define WARNING_LINE_Y 3*FH
 #if LCD_W >= 212

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;
+  switch(event) {
-  if (s_global_warning) {
-    event = 0;
-  }
 
-  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);

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);
       }
     }
   }

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 */
       }
     }

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;

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 {

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"

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"

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"

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."

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"

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"

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"

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"

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"

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"