MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🩹 Fix Color UI touchscreen sleep (#24826)

Browse Source
This commit is contained in:
EvilGremlin 2022-10-01 23:04:50 +03:00 committed by Scott Lahteine
parent d6ff8f0062
commit b0f02b8f9e
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/src/lcd/marlinui.cpp
View File

@ -191,11 +191,12 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
uint8_t MarlinUI::sleep_timeout_minutes; // Initialized by settings.load() uint8_t MarlinUI::sleep_timeout_minutes; // Initialized by settings.load()
millis_t MarlinUI::screen_timeout_millis = 0; millis_t MarlinUI::screen_timeout_millis = 0;
void MarlinUI::refresh_screen_timeout() { #if DISABLED(TFT_COLOR_UI)
screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0; void MarlinUI::refresh_screen_timeout() {
sleep_display(false); screen_timeout_millis = sleep_timeout_minutes ? millis() + sleep_timeout_minutes * 60UL * 1000UL : 0;
} sleep_display(false);
}
#endif
#endif #endif
void MarlinUI::init() { void MarlinUI::init() {
@ -1065,7 +1066,7 @@ void MarlinUI::init() {
#if LCD_BACKLIGHT_TIMEOUT_MINS #if LCD_BACKLIGHT_TIMEOUT_MINS
refresh_backlight_timeout(); refresh_backlight_timeout();
#elif HAS_DISPLAY_SLEEP #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
refresh_screen_timeout(); refresh_screen_timeout();
#endif #endif
@ -1178,9 +1179,9 @@ void MarlinUI::init() {
WRITE(LCD_BACKLIGHT_PIN, LOW); // Backlight off WRITE(LCD_BACKLIGHT_PIN, LOW); // Backlight off
backlight_off_ms = 0; backlight_off_ms = 0;
} }
#elif HAS_DISPLAY_SLEEP #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
if (screen_timeout_millis && ELAPSED(ms, screen_timeout_millis)) if (screen_timeout_millis && ELAPSED(ms, screen_timeout_millis))
sleep_display(); sleep_display(true);
#endif #endif
// Change state of drawing flag between screen updates // Change state of drawing flag between screen updates

2
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@ -550,7 +550,7 @@ void menu_configuration() {
// //
#if LCD_BACKLIGHT_TIMEOUT_MINS #if LCD_BACKLIGHT_TIMEOUT_MINS
EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.backlight_timeout_minutes, ui.backlight_timeout_min, ui.backlight_timeout_max, ui.refresh_backlight_timeout); EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.backlight_timeout_minutes, ui.backlight_timeout_min, ui.backlight_timeout_max, ui.refresh_backlight_timeout);
#elif HAS_DISPLAY_SLEEP #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.sleep_timeout_minutes, ui.sleep_timeout_min, ui.sleep_timeout_max, ui.refresh_screen_timeout); EDIT_ITEM(uint8, MSG_SCREEN_TIMEOUT, &ui.sleep_timeout_minutes, ui.sleep_timeout_min, ui.sleep_timeout_max, ui.refresh_screen_timeout);
#endif #endif

4
Marlin/src/module/settings.cpp
View File

@ -642,7 +642,7 @@ void MarlinSettings::postprocess() {
#if LCD_BACKLIGHT_TIMEOUT_MINS #if LCD_BACKLIGHT_TIMEOUT_MINS
ui.refresh_backlight_timeout(); ui.refresh_backlight_timeout();
#elif HAS_DISPLAY_SLEEP #elif HAS_DISPLAY_SLEEP && DISABLED(TFT_COLOR_UI)
ui.refresh_screen_timeout(); ui.refresh_screen_timeout();
#endif #endif
} }
@ -3167,7 +3167,7 @@ void MarlinSettings::reset() {
#if LCD_BACKLIGHT_TIMEOUT_MINS #if LCD_BACKLIGHT_TIMEOUT_MINS
ui.backlight_timeout_minutes = LCD_BACKLIGHT_TIMEOUT_MINS; ui.backlight_timeout_minutes = LCD_BACKLIGHT_TIMEOUT_MINS;
#elif HAS_DISPLAY_SLEEP #elif HAS_DISPLAY_SLEEP
ui.sleep_timeout_minutes = DISPLAY_SLEEP_MINUTES; ui.sleep_timeout_minutes = TERN(TOUCH_SCREEN, TOUCH_IDLE_SLEEP_MINS, DISPLAY_SLEEP_MINUTES);
#endif #endif
// //