From c3ffe9cc5e43c4d635c5be30c280dc15c0843a74 Mon Sep 17 00:00:00 2001
From: fvanroie <15969459+fvanroie@users.noreply.github.com>
Date: Fri, 28 May 2021 04:03:19 +0200
Subject: [PATCH] Move old touch driver into subfolder

---
 src/drv/hasp_drv_touch.cpp                   | 55 +++++++++++---------
 src/drv/{touch => old}/hasp_drv_ft5206.cpp   |  0
 src/drv/{touch => old}/hasp_drv_ft5206.h     |  0
 src/drv/{touch => old}/hasp_drv_ft6336u.cpp  | 16 +++---
 src/drv/{touch => old}/hasp_drv_ft6336u.h    |  0
 src/drv/{touch => old}/hasp_drv_gt911.cpp    |  0
 src/drv/{touch => old}/hasp_drv_gt911.h      |  0
 src/drv/{touch => old}/hasp_drv_stmpe610.cpp |  0
 src/drv/{touch => old}/hasp_drv_stmpe610.h   |  0
 src/drv/{touch => old}/hasp_drv_tft_espi.cpp |  0
 src/drv/{touch => old}/hasp_drv_tft_espi.h   |  0
 src/drv/{touch => old}/hasp_drv_xpt2046.cpp  |  0
 src/drv/{touch => old}/hasp_drv_xpt2046.h    |  0
 src/hasp_gui.cpp                             |  2 +-
 14 files changed, 39 insertions(+), 34 deletions(-)
 rename src/drv/{touch => old}/hasp_drv_ft5206.cpp (100%)
 rename src/drv/{touch => old}/hasp_drv_ft5206.h (100%)
 rename src/drv/{touch => old}/hasp_drv_ft6336u.cpp (90%)
 rename src/drv/{touch => old}/hasp_drv_ft6336u.h (100%)
 rename src/drv/{touch => old}/hasp_drv_gt911.cpp (100%)
 rename src/drv/{touch => old}/hasp_drv_gt911.h (100%)
 rename src/drv/{touch => old}/hasp_drv_stmpe610.cpp (100%)
 rename src/drv/{touch => old}/hasp_drv_stmpe610.h (100%)
 rename src/drv/{touch => old}/hasp_drv_tft_espi.cpp (100%)
 rename src/drv/{touch => old}/hasp_drv_tft_espi.h (100%)
 rename src/drv/{touch => old}/hasp_drv_xpt2046.cpp (100%)
 rename src/drv/{touch => old}/hasp_drv_xpt2046.h (100%)

diff --git a/src/drv/hasp_drv_touch.cpp b/src/drv/hasp_drv_touch.cpp
index 22d39b86..c3283ba1 100644
--- a/src/drv/hasp_drv_touch.cpp
+++ b/src/drv/hasp_drv_touch.cpp
@@ -9,23 +9,23 @@
 #if TOUCH_DRIVER == 2046
 #if defined(USE_FSMC)
 #else
-#include "drv/touch/hasp_drv_tft_espi.h"
+#include "drv/old/hasp_drv_tft_espi.h"
 #endif
 
 #elif TOUCH_DRIVER == 2046
 #include "indev/XPT2046.h"
 #elif TOUCH_DRIVER == 0x2046B
-#include "drv/touch/hasp_drv_xpt2046.h"
+#include "drv/old/hasp_drv_xpt2046.h"
 #elif TOUCH_DRIVER == 911
-#include "drv/touch/hasp_drv_gt911.h"
+#include "drv/old/hasp_drv_gt911.h"
 #elif TOUCH_DRIVER == 0xADC
-#include "drv/touch/hasp_drv_ft6336u.h"
+#include "drv/old/hasp_drv_ft6336u.h"
 #elif TOUCH_DRIVER == 5206
-#include "drv/touch/hasp_drv_ft5206.h"
+#include "drv/old/hasp_drv_ft5206.h"
 #elif TOUCH_DRIVER == 6336
-#include "drv/touch/hasp_drv_ft6336u.h"
+#include "drv/old/hasp_drv_ft6336u.h"
 #elif TOUCH_DRIVER == 610
-#include "drv/touch/hasp_drv_stmpe610.h"
+#include "drv/old/hasp_drv_stmpe610.h"
 #else
 //#include "tp_i2c.h"
 //#include "ft6x36.h"
@@ -93,7 +93,7 @@ static inline bool drv_touchpad_getXY(int16_t* touchX, int16_t* touchY)
     touched = haspTft.tft.getTouch((uint16_t*)&normal_x, (uint16_t*)&normal_y, 300);
 
 #elif TOUCH_DRIVER == 0x2046B
-    touched = XPT2046_getXY(&normal_x, &normal_y, true);
+    touched     = XPT2046_getXY(&normal_x, &normal_y, true);
 
 #elif TOUCH_DRIVER == 911
     touched = GT911_getXY(&normal_x, &normal_y, true);
@@ -188,29 +188,32 @@ IRAM_ATTR bool drv_touch_read(lv_indev_drv_t* indev_driver, lv_indev_data_t* dat
         touched = drv_touchpad_getXY(&touchX, &touchY);
     }
 
-    if(!touched) {
+    if(touched) {
+        if(hasp_sleep_state /* != HASP_SLEEP_OFF */) hasp_update_sleep_state(); // update Idle
+
+        if(touch_invert_x) {
+            data->point.x = indev_driver->disp->driver.hor_res - touchX;
+        } else {
+            data->point.x = touchX;
+        }
+
+        if(touch_invert_y) {
+            data->point.y = indev_driver->disp->driver.ver_res - touchY;
+        } else {
+            data->point.y = touchY;
+        }
+
+        /*Save the state and save the pressed coordinate for cursor position */
+        data->state = LV_INDEV_STATE_PR;
+    } else {
         data->state = LV_INDEV_STATE_REL;
-        return false;
-    }
 
-    if(hasp_sleep_state /* != HASP_SLEEP_OFF */ ) hasp_update_sleep_state(); // update Idle
+    } // touched
 
-    if(touch_invert_x) {
-        data->point.x = indev_driver->disp->driver.hor_res - touchX;
-    } else {
-        data->point.x = touchX;
-    }
-
-    if(touch_invert_y) {
-        data->point.y = indev_driver->disp->driver.ver_res - touchY;
-    } else {
-        data->point.y = touchY;
-    }
+#else
+    data->state = LV_INDEV_STATE_REL;
 #endif
 
-    /*Save the state and save the pressed coordinate for cursor position */
-    data->state = LV_INDEV_STATE_PR;
-
     /*Return `false` because we are not buffering and no more data to read*/
     return false;
 }
diff --git a/src/drv/touch/hasp_drv_ft5206.cpp b/src/drv/old/hasp_drv_ft5206.cpp
similarity index 100%
rename from src/drv/touch/hasp_drv_ft5206.cpp
rename to src/drv/old/hasp_drv_ft5206.cpp
diff --git a/src/drv/touch/hasp_drv_ft5206.h b/src/drv/old/hasp_drv_ft5206.h
similarity index 100%
rename from src/drv/touch/hasp_drv_ft5206.h
rename to src/drv/old/hasp_drv_ft5206.h
diff --git a/src/drv/touch/hasp_drv_ft6336u.cpp b/src/drv/old/hasp_drv_ft6336u.cpp
similarity index 90%
rename from src/drv/touch/hasp_drv_ft6336u.cpp
rename to src/drv/old/hasp_drv_ft6336u.cpp
index 07bcd14a..621f6297 100644
--- a/src/drv/touch/hasp_drv_ft6336u.cpp
+++ b/src/drv/old/hasp_drv_ft6336u.cpp
@@ -1,4 +1,4 @@
-#if TOUCH_DRIVER == 6336
+#if 0 // TOUCH_DRIVER == 6336
 
 #include <Wire.h>
 #include "FT6336U.h"
@@ -13,14 +13,16 @@ FT6336U* touchpanel;
 // Read touch points
 HASP_ATTRIBUTE_FAST_MEM bool FT6336U_getXY(int16_t* touchX, int16_t* touchY, bool debug)
 {
-    if(touchpanel->read_touch_number() != 1) return false;
-
-    *touchX = touchpanel->read_touch1_x();
-    *touchY = touchpanel->read_touch1_y();
-    return true;
+    if(touchpanel->read_touch_number() == 1) {
+        *touchX = touchpanel->read_touch1_x();
+        *touchY = touchpanel->read_touch1_y();
+        return true;
+    } else {
+        return false;
+    }
 }
 
-void scan(TwoWire& i2c)
+static void scan(TwoWire& i2c)
 {
     byte error, address;
     int nDevices;
diff --git a/src/drv/touch/hasp_drv_ft6336u.h b/src/drv/old/hasp_drv_ft6336u.h
similarity index 100%
rename from src/drv/touch/hasp_drv_ft6336u.h
rename to src/drv/old/hasp_drv_ft6336u.h
diff --git a/src/drv/touch/hasp_drv_gt911.cpp b/src/drv/old/hasp_drv_gt911.cpp
similarity index 100%
rename from src/drv/touch/hasp_drv_gt911.cpp
rename to src/drv/old/hasp_drv_gt911.cpp
diff --git a/src/drv/touch/hasp_drv_gt911.h b/src/drv/old/hasp_drv_gt911.h
similarity index 100%
rename from src/drv/touch/hasp_drv_gt911.h
rename to src/drv/old/hasp_drv_gt911.h
diff --git a/src/drv/touch/hasp_drv_stmpe610.cpp b/src/drv/old/hasp_drv_stmpe610.cpp
similarity index 100%
rename from src/drv/touch/hasp_drv_stmpe610.cpp
rename to src/drv/old/hasp_drv_stmpe610.cpp
diff --git a/src/drv/touch/hasp_drv_stmpe610.h b/src/drv/old/hasp_drv_stmpe610.h
similarity index 100%
rename from src/drv/touch/hasp_drv_stmpe610.h
rename to src/drv/old/hasp_drv_stmpe610.h
diff --git a/src/drv/touch/hasp_drv_tft_espi.cpp b/src/drv/old/hasp_drv_tft_espi.cpp
similarity index 100%
rename from src/drv/touch/hasp_drv_tft_espi.cpp
rename to src/drv/old/hasp_drv_tft_espi.cpp
diff --git a/src/drv/touch/hasp_drv_tft_espi.h b/src/drv/old/hasp_drv_tft_espi.h
similarity index 100%
rename from src/drv/touch/hasp_drv_tft_espi.h
rename to src/drv/old/hasp_drv_tft_espi.h
diff --git a/src/drv/touch/hasp_drv_xpt2046.cpp b/src/drv/old/hasp_drv_xpt2046.cpp
similarity index 100%
rename from src/drv/touch/hasp_drv_xpt2046.cpp
rename to src/drv/old/hasp_drv_xpt2046.cpp
diff --git a/src/drv/touch/hasp_drv_xpt2046.h b/src/drv/old/hasp_drv_xpt2046.h
similarity index 100%
rename from src/drv/touch/hasp_drv_xpt2046.h
rename to src/drv/old/hasp_drv_xpt2046.h
diff --git a/src/hasp_gui.cpp b/src/hasp_gui.cpp
index cf4e7dbc..09a19d4a 100644
--- a/src/hasp_gui.cpp
+++ b/src/hasp_gui.cpp
@@ -15,7 +15,7 @@
 
 //#include "drv/hasp_drv_display.h"
 #include "drv/hasp_drv_touch.h"
-#include "drv/touch/hasp_drv_tft_espi.h"
+#include "drv/old/hasp_drv_tft_espi.h"
 
 #include "hasp_debug.h"
 #include "hasp_config.h"