TFT: Wake up with Rotary encoder wheel too

MarlinFirmware · Sep 7, 2021 · 729e7ce · 729e7ce
1 parent c83cb49
commit 729e7ce
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 13 deletions.
diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
@@ -673,12 +673,21 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
  draw_kill_screen();
  }
 
+ #ifdef TOUCH_IDLE_SLEEP
+ // Handle events which should wake up a sleeping TFT
+ void MarlinUI::wakeup_screen() {
+ #if ENABLED(TOUCH_SCREEN)
+ touch.wakeUp();
+ #elif HAS_TOUCH_BUTTONS
+ touchBt.wakeUp();
+ #endif
+ }
+ #endif
+
  void MarlinUI::quick_feedback(const bool clear_buttons/*=true*/) {
- #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();
+ #ifdef TOUCH_IDLE_SLEEP
+ // Wake up the TFT with most buttons
+ ui.wakeup_screen();
  #endif
  TERN_(HAS_LCD_MENU, refresh());
 
@@ -960,6 +969,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
  abs_diff = epps; // Treat as a full step size
  encoderDiff = (encoderDiff < 0 ? -1 : 1) * abs_diff; // ...in the spin direction.
  }
+ #ifdef TOUCH_IDLE_SLEEP
+ if (lastEncoderDiff != encoderDiff) ui.wakeup_screen();
+ #endif
  lastEncoderDiff = encoderDiff;
  #endif
 

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
@@ -441,15 +441,17 @@ class MarlinUI {
  static millis_t next_filament_display;
  #endif
 
+ #ifdef TOUCH_IDLE_SLEEP
+ static void wakeup_screen();
+ #endif
+
  static void quick_feedback(const bool clear_buttons=true);
  #if HAS_BUZZER
  static void completion_feedback(const bool good=true);
  #else
  static inline void completion_feedback(const bool=true) {
- #if ENABLED(TOUCH_SCREEN) && defined(TOUCH_IDLE_SLEEP)
- touch.wakeUp();
- #elif HAS_TOUCH_BUTTONS && defined(TOUCH_IDLE_SLEEP)
- touchBt.wakeUp();
+ #ifdef TOUCH_IDLE_SLEEP
+ wakeup_screen();
  #endif
  }
  #endif

diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
@@ -285,10 +285,9 @@ 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();
+ #ifdef TOUCH_IDLE_SLEEP
+ // Wake up on rotary encoder click...
+ ui.wakeup_screen();
  #endif
  if (good) {
  BUZZ(100, 659);