fix(color): unable to turn off radio if powered on with no SD card (#…

…5893)
EdgeTX · Feb 12, 2025 · 34847c7 · 34847c7
1 parent bdea8e0
commit 34847c7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/radio/src/edgetx.cpp b/radio/src/edgetx.cpp
@@ -1370,6 +1370,15 @@ void edgeTxInit()
 {
   TRACE("edgeTxInit");
 
+  #if defined(COLORLCD)
+  // SD_CARD_PRESENT() does not work properly on most
+  // B&W targets, so that we need to delay the detection
+  // until the SD card is mounted (requires RTOS scheduler running)
+  if (!SD_CARD_PRESENT() && !UNEXPECTED_SHUTDOWN()) {
+    runFatalErrorScreen(STR_NO_SDCARD);
+  }
+#endif
+
   // Show splash screen (color LCD)
   if (!(startOptions & OPENTX_START_NO_SPLASH))
     startSplash();
@@ -1623,15 +1632,6 @@ int main()
   }
 #endif
 
-#if defined(COLORLCD)
-  // SD_CARD_PRESENT() does not work properly on most
-  // B&W targets, so that we need to delay the detection
-  // until the SD card is mounted (requires RTOS scheduler running)
-  if (!SD_CARD_PRESENT() && !UNEXPECTED_SHUTDOWN()) {
-    runFatalErrorScreen(STR_NO_SDCARD);
-  }
-#endif
-
   tasksStart();
 }
 

diff --git a/radio/src/gui/colorlcd/startup_shutdown.cpp b/radio/src/gui/colorlcd/startup_shutdown.cpp
@@ -275,6 +275,13 @@ void runFatalErrorScreen(const char* message)
 {
   lcdInitDisplayDriver();
 
+  drawFatalErrorScreen(message);
+
+  // On startup wait for power button to be released
+  while (pwrPressed()) {
+    WDG_RESET();
+  }
+
   while (true) {
     drawFatalErrorScreen(message);
     WDG_RESET();