COLOR_UI: Wake up on any feedback

rename TouchButtons object to avoid conflicts with tft/touch one
MarlinFirmware · Aug 26, 2021 · 6c719fd · 6c719fd
1 parent 0934241
commit 6c719fd
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 5 deletions.
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
@@ -1349,7 +1349,7 @@ void setup() {
   #endif
 
   #if HAS_TOUCH_BUTTONS
-    SETUP_RUN(touch.init());
+    SETUP_RUN(touchBt.init());
   #endif
 
   TERN_(HAS_M206_COMMAND, current_position += home_offset); // Init current position based on home_offset

diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp
@@ -664,7 +664,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
   }
 
   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();
+    #endif
     TERN_(HAS_LCD_MENU, refresh());
 
     #if HAS_ENCODER_ACTION
@@ -916,7 +919,7 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
 
         if (on_status_screen()) next_lcd_update_ms += (LCD_UPDATE_INTERVAL) * 2;
 
-        TERN_(HAS_ENCODER_ACTION, touch_buttons = touch.read_buttons());
+        TERN_(HAS_ENCODER_ACTION, touch_buttons = touchBt.read_buttons());
 
       #endif
 

diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h
@@ -39,6 +39,10 @@
   #include "tft_io/touch_calibration.h"
 #endif
 
+#if ENABLED(TOUCH_SCREEN) && defined(TOUCH_IDLE_SLEEP)
+  #include "tft/touch.h"
+#endif
+
 #if ANY(HAS_LCD_MENU, ULTIPANEL_FEEDMULTIPLY, SOFT_RESET_ON_KILL)
   #define HAS_ENCODER_ACTION 1
 #endif

diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
@@ -283,6 +283,12 @@ bool Touch::isSleeping() {
   #endif
 }
 
+void Touch::wakeUp() {
+  #if ENABLED(TFT_TOUCH_DEVICE_XPT2046)
+    if (io.isSleeping()) io.doWakeUp();
+  #endif
+}
+
 Touch touch;
 
 bool MarlinUI::touch_pressed() {

diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
@@ -123,6 +123,7 @@ class Touch {
     static void enable() { enabled = true; }
 
     static bool isSleeping();
+    static void wakeUp();
 
     static void add_control(TouchControlType type, uint16_t x, uint16_t y, uint16_t width, uint16_t height, intptr_t data = 0);
 };

diff --git a/Marlin/src/lcd/touch/touch_buttons.cpp b/Marlin/src/lcd/touch/touch_buttons.cpp
@@ -50,7 +50,7 @@
 #define BUTTON_AREA_TOP BUTTON_Y_LO
 #define BUTTON_AREA_BOT BUTTON_Y_HI
 
-TouchButtons touch;
+TouchButtons touchBt;
 
 void TouchButtons::init() { touchIO.Init(); }
 

diff --git a/Marlin/src/lcd/touch/touch_buttons.h b/Marlin/src/lcd/touch/touch_buttons.h
@@ -56,4 +56,4 @@ class TouchButtons {
   static uint8_t read_buttons();
 };
 
-extern TouchButtons touch;
+extern TouchButtons touchBt;