COLOR_UI: Use common touch class

MarlinFirmware · Aug 26, 2021 · 0934241 · 0934241
1 parent d7b9756
commit 0934241
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/Marlin/src/lcd/tft/touch.cpp b/Marlin/src/lcd/tft/touch.cpp
@@ -274,6 +274,15 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
 
   return is_touched;
 }
+
+bool Touch::isSleeping() {
+  #if ENABLED(TFT_TOUCH_DEVICE_XPT2046)
+    return io.isSleeping();
+  #else
+    return false;
+  #endif
+}
+
 Touch touch;
 
 bool MarlinUI::touch_pressed() {

diff --git a/Marlin/src/lcd/tft/touch.h b/Marlin/src/lcd/tft/touch.h
@@ -122,6 +122,8 @@ class Touch {
     static void disable() { enabled = false; }
     static void enable() { enabled = true; }
 
+    static bool isSleeping();
+
     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/tft/ui_1024x600.cpp b/Marlin/src/lcd/tft/ui_1024x600.cpp
@@ -49,7 +49,7 @@ void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
     #if HAS_TOUCH_SLEEP
       static bool sleepCleared;
-      if (touchIO.isSleeping()) {
+      if (touch.isSleeping()) {
         tft.queue.reset();
         if (!sleepCleared) {
           sleepCleared = true;

diff --git a/Marlin/src/lcd/tft/ui_320x240.cpp b/Marlin/src/lcd/tft/ui_320x240.cpp
@@ -49,7 +49,7 @@ void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
     #if HAS_TOUCH_SLEEP
       static bool sleepCleared;
-      if (touchIO.isSleeping()) {
+      if (touch.isSleeping()) {
         tft.queue.reset();
         if (!sleepCleared) {
           sleepCleared = true;

diff --git a/Marlin/src/lcd/tft/ui_480x320.cpp b/Marlin/src/lcd/tft/ui_480x320.cpp
@@ -49,7 +49,7 @@ void MarlinUI::tft_idle() {
   #if ENABLED(TOUCH_SCREEN)
     #if HAS_TOUCH_SLEEP
       static bool sleepCleared;
-      if (touchIO.isSleeping()) {
+      if (touch.isSleeping()) {
         tft.queue.reset();
         if (!sleepCleared) {
           sleepCleared = true;

diff --git a/Marlin/src/lcd/tft/ui_common.h b/Marlin/src/lcd/tft/ui_common.h
@@ -35,9 +35,6 @@
 #if ENABLED(TOUCH_SCREEN)
   #include "touch.h"
   extern bool draw_menu_navigation;
-  #if HAS_TOUCH_SLEEP
-    extern XPT2046 touchIO;
-  #endif
 #endif
 
 #if HAS_UI_320x240