jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix FTDUI Status Screen Timeout

Browse Source
This commit is contained in:
InsanityAutomation
2022-10-18 17:52:20 -04:00
parent 9ff3500dda
commit d2a5d2d220
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.cpp
+10 -4
View File
@@ -45,8 +45,9 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
return false;
}
#if SCREENS_CAN_TIME_OUT
#if LCD_TIMEOUT_TO_STATUS > 0
if (EventLoop::get_pressed_tag() != 0) {
SERIAL_ECHO_MSG("buttonStyleCallback, resetting timeout");
reset_menu_timeout();
}
#endif
@@ -65,7 +66,10 @@ bool BaseScreen::buttonStyleCallback(CommandProcessor &cmd, uint8_t tag, uint8_t
}
void BaseScreen::onIdle() {
#if SCREENS_CAN_TIME_OUT
#if LCD_TIMEOUT_TO_STATUS > 0
if (EventLoop::get_pressed_tag() != 0) {
reset_menu_timeout();
}
if ((millis() - last_interaction) > LCD_TIMEOUT_TO_STATUS) {
reset_menu_timeout();
#if ENABLED(TOUCH_UI_DEBUG)
@@ -77,10 +81,12 @@ void BaseScreen::onIdle() {
}
void BaseScreen::reset_menu_timeout() {
TERN_(SCREENS_CAN_TIME_OUT, last_interaction = millis());
#if LCD_TIMEOUT_TO_STATUS > 0
last_interaction = millis();
#endif
}
#if SCREENS_CAN_TIME_OUT
#if LCD_TIMEOUT_TO_STATUS > 0
uint32_t BaseScreen::last_interaction;
#endif
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/base_screen.h
+1 -1
View File
@@ -27,7 +27,7 @@
class BaseScreen : public UIScreen {
protected:
#if SCREENS_CAN_TIME_OUT
#if LCD_TIMEOUT_TO_STATUS > 0
static uint32_t last_interaction;
#endif