Skip to content

Commit fb45009

Browse files
authored
fix(color): restore prior startup and shutdown behaviour (#4865)
1 parent 24bae0d commit fb45009

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

Diff for: radio/src/gui/colorlcd/startup_shutdown.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ void drawSleepBitmap()
194194
} else {
195195
shutdownWindow = new Window(MainWindow::instance(), {0, 0, LCD_W, LCD_H});
196196
shutdownWindow->setWindowFlag(OPAQUE);
197-
etx_solid_bg(shutdownWindow->getLvObj(), COLOR_BLACK_INDEX);
197+
etx_solid_bg(shutdownWindow->getLvObj(), COLOR_THEME_PRIMARY1_INDEX);
198198
}
199199

200200
(new StaticIcon(shutdownWindow, 0, 0, ICON_SHUTDOWN, COLOR_THEME_PRIMARY2))
@@ -221,7 +221,7 @@ void drawShutdownAnimation(uint32_t duration, uint32_t totalDuration,
221221
if (shutdownWindow == nullptr) {
222222
shutdownWindow = new Window(MainWindow::instance(), {0, 0, LCD_W, LCD_H});
223223
shutdownWindow->setWindowFlag(OPAQUE);
224-
etx_solid_bg(shutdownWindow->getLvObj(), COLOR_BLACK_INDEX);
224+
etx_solid_bg(shutdownWindow->getLvObj(), COLOR_THEME_PRIMARY1_INDEX);
225225

226226
if (sdMounted() && !shutdownSplashImg)
227227
shutdownSplashImg = BitmapBuffer::loadBitmap(

Diff for: radio/src/opentx.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -1482,8 +1482,9 @@ void edgeTxInit()
14821482

14831483
#if defined(GUI)
14841484
if (!calibration_needed && !(startOptions & OPENTX_START_NO_SPLASH)) {
1485-
if (!g_eeGeneral.dontPlayHello)
1486-
AUDIO_HELLO();
1485+
if (!g_eeGeneral.dontPlayHello) AUDIO_HELLO();
1486+
1487+
waitSplash();
14871488
}
14881489
#endif // defined(GUI)
14891490

Diff for: radio/src/tasks.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ TASK_FUNCTION(menusTask)
5656

5757
mixerTaskInit();
5858

59-
waitSplash();
60-
6159
#if defined(PWR_BUTTON_PRESS)
6260
while (true) {
6361
uint32_t pwr_check = pwrCheck();

0 commit comments

Comments
 (0)