diff --git a/radio/src/gui/colorlcd/menus.h b/radio/src/gui/colorlcd/menus.h index 650abec8e..e539f06e2 100644 --- a/radio/src/gui/colorlcd/menus.h +++ b/radio/src/gui/colorlcd/menus.h @@ -31,9 +31,6 @@ extern int menuVerticalOffset; extern uint8_t menuCalibrationState; // Temporary no highlight -extern uint8_t noHighlightCounter; -#define NO_HIGHLIGHT() (noHighlightCounter > 0) -#define START_NO_HIGHLIGHT() do { noHighlightCounter = 25; } while(0) typedef bool (*MenuHandlerFunc)(event_t event); diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp index 8422cafe7..208633f2c 100644 --- a/radio/src/gui/colorlcd/model_setup.cpp +++ b/radio/src/gui/colorlcd/model_setup.cpp @@ -1085,7 +1085,6 @@ void ModelSetupPage::build(FormWindow * window) new CheckBox(window, grid.getFieldSlot(2, 0), GET_SET_DEFAULT(g_model.extendedTrims)); new TextButton(window, grid.getFieldSlot(2, 1), STR_RESET_BTN, []() -> uint8_t { - START_NO_HIGHLIGHT(); for (auto &flightModeData : g_model.flightModeData) { memclear(&flightModeData, TRIMS_ARRAY_SIZE); } diff --git a/radio/src/gui/colorlcd/splash.cpp b/radio/src/gui/colorlcd/splash.cpp index 0118b1ae9..1ac28e8b9 100644 --- a/radio/src/gui/colorlcd/splash.cpp +++ b/radio/src/gui/colorlcd/splash.cpp @@ -33,13 +33,9 @@ void drawSplash() static BitmapBuffer * splashImg = nullptr; if (loadImgFromSD && splashImg == nullptr) { - bool sd_mounted = sdMounted(); - if (!sd_mounted) - sdInit(); + if (!sdMounted()) sdInit(); splashImg = BitmapBuffer::loadBitmap(BITMAPS_PATH "/" SPLASH_FILE); loadImgFromSD = false; - if (!sd_mounted) - sdDone(); } lcd->clear(); diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 6e66e889f..08ab1872c 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -126,9 +126,7 @@ void per10ms() #if defined(GUI) if (lightOffCounter) lightOffCounter--; if (flashCounter) flashCounter--; -#if defined(LIBOPENUI) - #warning "TODO remove noHighlightCounter on LIBOPENUI" -#else +#if !defined(LIBOPENUI) if (noHighlightCounter) noHighlightCounter--; #endif #endif @@ -1797,7 +1795,9 @@ void opentxInit() #if defined(SDCARD) // SDCARD related stuff, only done if not unexpectedShutdown if (!globalData.unexpectedShutdown) { - sdInit(); + + if (!sdMounted()) + sdInit(); #if defined(AUTOUPDATE) sportStopSendByteLoop(); diff --git a/radio/src/targets/horus/lcd_driver.cpp b/radio/src/targets/horus/lcd_driver.cpp index c20ae6b1d..6275ca903 100644 --- a/radio/src/targets/horus/lcd_driver.cpp +++ b/radio/src/targets/horus/lcd_driver.cpp @@ -366,13 +366,13 @@ void lcdInit() LTDC_Cmd(ENABLE); /* Set Background layer */ + memset(LCD_FIRST_FRAME_BUFFER, 0, sizeof(LCD_FIRST_FRAME_BUFFER)); LCD_SetLayer(LCD_FIRST_LAYER); - // lcdClear(); LCD_SetTransparency(0); /* Set Foreground layer */ + memset(LCD_SECOND_FRAME_BUFFER, 0, sizeof(LCD_SECOND_FRAME_BUFFER)); LCD_SetLayer(LCD_SECOND_LAYER); - lcd->clear(); LCD_SetTransparency(255); } diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui index a7c793cc7..1bc7de6c4 160000 --- a/radio/src/thirdparty/libopenui +++ b/radio/src/thirdparty/libopenui @@ -1 +1 @@ -Subproject commit a7c793cc726b6a64160286f953a96833ea3a5efd +Subproject commit 1bc7de6c42c0a9e2284b55ae551a4d1245241bdb