From 61c3d122c9ffbb6d482d805fd9827ceebe8b38d4 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Fri, 25 Mar 2022 16:39:46 -0400 Subject: [PATCH] Fix marlinUI V2 display bootscreen reloading cached BG --- Marlin/Configuration_adv.h | 2 +- Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp | 2 +- Marlin/src/lcd/e3v2/marlinui/ui_common.cpp | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 209b4a4e14..b2317b0d7c 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1398,7 +1398,7 @@ #endif #endif - #if NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2) + #if NONE(MachineCR10Orig, LowMemoryBoard, SKRMiniE3V2, MachineEnder3V2) // Scroll a longer status message into view #define STATUS_MESSAGE_SCROLLING #endif diff --git a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp index a4cefe4ab9..b439999592 100644 --- a/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp +++ b/Marlin/src/lcd/e3v2/marlinui/dwin_lcd.cpp @@ -45,9 +45,9 @@ void DWIN_Startup() { const bool success = DWIN_Handshake(); if (success) DEBUG_ECHOLNPGM("ok."); else DEBUG_ECHOLNPGM("error."); DWIN_Frame_SetDir(TERN(DWIN_MARLINUI_LANDSCAPE, 0, 1)); - DWIN_JPG_ShowAndCache(3); DWIN_Frame_Clear(Color_Bg_Black); // MarlinUI handles the bootscreen so just clear here DWIN_UpdateLCD(); + DWIN_JPG_ShowAndCache(3); } /*---------------------------------------- Picture related functions ----------------------------------------*/ diff --git a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp index f49d06d396..0c4ad5ef2b 100644 --- a/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp +++ b/Marlin/src/lcd/e3v2/marlinui/ui_common.cpp @@ -122,6 +122,7 @@ void MarlinUI::clear_lcd() { void MarlinUI::bootscreen_completion(const millis_t sofar) { if ((BOOTSCREEN_TIMEOUT) > sofar) safe_delay((BOOTSCREEN_TIMEOUT) - sofar); + DWIN_JPG_ShowAndCache(3); clear_lcd(); }