zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

♻️ No ui.reinit_lcd on any ExtUI (#23722)

Browse source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
InsanityAutomation 2022-02-13 14:44:24 -05:00 committed by Scott Lahteine
parent 172cd2eefb
commit 7da28768f7
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/inc/Conditionals_post.h
View file

@ -459,8 +459,8 @@
#endif
#if ANY(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI) || !PIN_EXISTS(SD_DETECT)
#define NO_LCD_REINIT 1 // Suppress LCD re-initialization
#if PIN_EXISTS(SD_DETECT) && NONE(HAS_GRAPHICAL_TFT, LCD_USE_DMA_FSMC, HAS_FSMC_GRAPHICAL_TFT, HAS_SPI_GRAPHICAL_TFT, IS_DWIN_MARLINUI, EXTENSIBLE_UI)
#define REINIT_NOISY_LCD 1 // Have the LCD re-init on SD insertion
#endif
/**

6
Marlin/src/lcd/marlinui.cpp
View file

@ -625,7 +625,7 @@ void MarlinUI::init() {
next_filament_display = millis() + 5000UL; // Show status message for 5s
#endif
goto_screen(menu_main);
IF_DISABLED(NO_LCD_REINIT, init_lcd()); // May revive the LCD if static electricity killed it
reinit_lcd(); // Revive a noisy shared SPI LCD
return;
}
@ -1697,9 +1697,7 @@ void MarlinUI::init() {
}
}
#if PIN_EXISTS(SD_DETECT) && DISABLED(NO_LCD_REINIT)
init_lcd(); // Revive a noisy shared SPI LCD
#endif
reinit_lcd(); // Revive a noisy shared SPI LCD
refresh();

2
Marlin/src/lcd/marlinui.h
View file

@ -209,6 +209,8 @@ public:
static void init_lcd() {}
#endif
static void reinit_lcd() { TERN_(REINIT_NOISY_LCD, init_lcd()); }
#if HAS_WIRED_LCD
static bool detected();
#else