fix(color): restore prior startup and shutdown behaviour (#4865)

EdgeTX · Apr 9, 2024 · fb45009 · fb45009
1 parent 24bae0d
commit fb45009
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/radio/src/gui/colorlcd/startup_shutdown.cpp b/radio/src/gui/colorlcd/startup_shutdown.cpp
@@ -194,7 +194,7 @@ void drawSleepBitmap()
   } else {
     shutdownWindow = new Window(MainWindow::instance(), {0, 0, LCD_W, LCD_H});
     shutdownWindow->setWindowFlag(OPAQUE);
-    etx_solid_bg(shutdownWindow->getLvObj(), COLOR_BLACK_INDEX);
+    etx_solid_bg(shutdownWindow->getLvObj(), COLOR_THEME_PRIMARY1_INDEX);
   }
 
   (new StaticIcon(shutdownWindow, 0, 0, ICON_SHUTDOWN, COLOR_THEME_PRIMARY2))
@@ -221,7 +221,7 @@ void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration,
   if (shutdownWindow == nullptr) {
     shutdownWindow = new Window(MainWindow::instance(), {0, 0, LCD_W, LCD_H});
     shutdownWindow->setWindowFlag(OPAQUE);
-    etx_solid_bg(shutdownWindow->getLvObj(), COLOR_BLACK_INDEX);
+    etx_solid_bg(shutdownWindow->getLvObj(), COLOR_THEME_PRIMARY1_INDEX);
 
     if (sdMounted() && !shutdownSplashImg)
       shutdownSplashImg = BitmapBuffer::loadBitmap(

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
@@ -1482,8 +1482,9 @@ void edgeTxInit()
 
 #if defined(GUI)
     if (!calibration_needed && !(startOptions & OPENTX_START_NO_SPLASH)) {
-      if (!g_eeGeneral.dontPlayHello)
-        AUDIO_HELLO();
+      if (!g_eeGeneral.dontPlayHello) AUDIO_HELLO();
+
+      waitSplash();
     }
 #endif // defined(GUI)
 

diff --git a/radio/src/tasks.cpp b/radio/src/tasks.cpp
@@ -56,8 +56,6 @@ TASK_FUNCTION(menusTask)
 
   mixerTaskInit();
 
-  waitSplash();
-
 #if defined(PWR_BUTTON_PRESS)
   while (true) {
     uint32_t pwr_check = pwrCheck();