diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index a2e057d15a5d2..57e47fe7b97c8 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -667,6 +667,8 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP; #if ENABLED(TOUCH_SCREEN) && defined(TOUCH_IDLE_SLEEP) // Wake up, if needed, the TFT from any button or encoder touch.wakeUp(); + #elif HAS_TOUCH_BUTTONS && defined(TOUCH_IDLE_SLEEP) + touchBt.wakeUp(); #endif TERN_(HAS_LCD_MENU, refresh()); diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h index a87adf67bb96a..974259b1de53c 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -41,7 +41,7 @@ #if ENABLED(TOUCH_SCREEN) && defined(TOUCH_IDLE_SLEEP) #include "tft/touch.h" -#elif ENABLED(TFT_TOUCH_DEVICE_XPT2046) && defined(TOUCH_IDLE_SLEEP) +#elif HAS_TOUCH_BUTTONS && defined(TOUCH_IDLE_SLEEP) #include "touch/touch_buttons.h" #endif @@ -430,7 +430,7 @@ class MarlinUI { static inline void completion_feedback(const bool=true) { #if ENABLED(TOUCH_SCREEN) && defined(TOUCH_IDLE_SLEEP) touch.wakeUp(); - #elif ENABLED(TFT_TOUCH_DEVICE_XPT2046) && defined(TOUCH_IDLE_SLEEP) + #elif HAS_TOUCH_BUTTONS && defined(TOUCH_IDLE_SLEEP) touchBt.wakeUp(); #endif } diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp index dd52eb2b5b533..d0f9469252528 100644 --- a/Marlin/src/lcd/menu/menu.cpp +++ b/Marlin/src/lcd/menu/menu.cpp @@ -285,6 +285,11 @@ void scroll_screen(const uint8_t limit, const bool is_menu) { #if HAS_BUZZER void MarlinUI::completion_feedback(const bool good/*=true*/) { + #if ENABLED(TOUCH_SCREEN) && defined(TOUCH_IDLE_SLEEP) + touch.wakeUp(); + #elif HAS_TOUCH_BUTTONS && defined(TOUCH_IDLE_SLEEP) + touchBt.wakeUp(); + #endif if (good) { BUZZ(100, 659); BUZZ(100, 698); diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp index 0bb6c8f0fa31e..c1243930fe660 100644 --- a/Marlin/src/lcd/touch/touch_buttons.cpp +++ b/Marlin/src/lcd/touch/touch_buttons.cpp @@ -97,9 +97,9 @@ uint8_t TouchButtons::read_buttons() { } void TouchButtons::wakeUp() { -#if ENABLED(TFT_TOUCH_DEVICE_XPT2046) - if (touchIO.isSleeping()) touchIO.doWakeUp(); -#endif + #if ENABLED(TFT_TOUCH_DEVICE_XPT2046) + if (touchIO.isSleeping()) touchIO.doWakeUp(); + #endif } #endif // HAS_TOUCH_BUTTONS