From 9e1742cb1aaa55375a1eddf5ea3d10f117eb98a6 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Sat, 12 Nov 2022 14:25:45 +0100
Subject: [PATCH] Add gs-t3e

---
 .github/workflows/build.yaml         | 34 +++++++++++++---------------
 src/drv/touch/touch_driver_ft6336u.h |  2 +-
 src/drv/touch/touch_driver_gt911.h   |  7 ++----
 user_setups/esp32s3/gs-t3e.ini       |  2 +-
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ba1beb79..1890fb2d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,6 +20,8 @@ jobs:
       fail-fast: false
       matrix:
         environment:
+          - out: adafruit
+            env: "huzzah32-featherwing-24 -e huzzah32-featherwing-35"
           - out: az-touch
             env: "az-touch-mod-esp32_ili9341_4MB -e az-touch-mod-esp32_ili9341_8MB"
           - env: d1-mini-esp32_ili9341
@@ -30,22 +32,18 @@ jobs:
             out: d1-r32-espduino32
           - env: d1-r32-unoshield_ili9486_adc
             out: d1-r32-espduino32
-          - env: esp32-one_st7796
-            out: waveshare
-          - env: esp32-one_ili9486
-            out: waveshare
-          - env: esp32-touchdown
-            out: esp32-touchdown
-          - out: freetouchdeck
-            env: "freetouchdeck_4MB -e freetouchdeck_8MB"
-          - out: featherwing
-            env: "huzzah32-featherwing-24 -e huzzah32-featherwing-35"
-          - env: lanbon_l8
-            out: lanbon_l8
-          - env: lolin-d32-pro_ili9341
-            out: lolin-d32-pro
-          - env: m5stack-core2
-            out: m5stack
+          - out: waveshare
+            env: "esp32-one_ili9486 -e esp32-one_st7796"
+          - out: dustinwatts
+            env: "freetouchdeck_4MB -e freetouchdeck_8MB -e esp32-touchdown"
+          - out: globalsecurity
+            env: gs-t3e_16MB
+          - out: lanbon
+            env: lanbon_l8
+          - out: lolin
+            env: lolin-d32-pro_ili9341
+          - out: m5stack
+            env: m5stack-core2
           - out: makerfabs
             env: "makerfabs-tft35-cap -e makerfabs-s3-tft35-spi"
           - out: sunton
@@ -54,8 +52,8 @@ jobs:
             env: "ttgo-t7-v1.5_ili9341_4MB -e ttgo-t7-v1.5_ili9341_16MB -e ttgo-lilygo-pi_ili9481 -e ttgo-lilygo-pi_st7796"
           - out: wireless-tag
             env: "wt32-sc01_4MB -e wt32-sc01_16MB -e wt-86-32-3zw1 -e wt32-sc01-plus_8MB"
-          - env: yeacreate-nscreen32
-            out: yeacreate
+          - out: yeacreate
+            env: yeacreate-nscreen32
 
     steps:
       - uses: actions/checkout@v3
diff --git a/src/drv/touch/touch_driver_ft6336u.h b/src/drv/touch/touch_driver_ft6336u.h
index 6a0c72a9..0935781b 100644
--- a/src/drv/touch/touch_driver_ft6336u.h
+++ b/src/drv/touch/touch_driver_ft6336u.h
@@ -18,7 +18,7 @@
 #include "../../hasp/hasp.h" // for hasp_sleep_state
 extern uint8_t hasp_sleep_state;
 
-#define RST_PIN (TOUCH_RST) // -1 if pin is connected to VCC else set pin number
+// #define RST_PIN (TOUCH_RST) // -1 if pin is connected to VCC else set pin number
 
 // Read touch points
 // HASP_ATTRIBUTE_FAST_MEM bool FT6336U_getXY(int16_t* touchX, int16_t* touchY)
diff --git a/src/drv/touch/touch_driver_gt911.h b/src/drv/touch/touch_driver_gt911.h
index be02a3cc..78f1b962 100644
--- a/src/drv/touch/touch_driver_gt911.h
+++ b/src/drv/touch/touch_driver_gt911.h
@@ -18,9 +18,6 @@
 #include "../../hasp/hasp.h" // for hasp_sleep_state
 extern uint8_t hasp_sleep_state;
 
-#define INT_PIN (TOUCH_IRQ)
-#define RST_PIN (TOUCH_RST) // -1 if pin is connected to VCC else set pin number
-
 static Goodix touch = Goodix();
 // static int8_t GT911_num_touches;
 // static GTPoint* GT911_points;
@@ -84,7 +81,7 @@ class TouchGt911 : public BaseTouch {
             data->state = LV_INDEV_STATE_REL;
         }
 
-        touch.loop(); // reset IRQ
+       // touch.loop(); // reset IRQ (now in readInput)
 
         /*Return `false` because we are not buffering and no more data to read*/
         return false;
@@ -98,7 +95,7 @@ class TouchGt911 : public BaseTouch {
 
         touch.setHandler(GT911_setXY);
 
-        if(touch.begin(INT_PIN, RST_PIN)) {
+        if(touch.begin(TOUCH_IRQ, TOUCH_RST)) {
             LOG_INFO(TAG_DRVR, F("GT911 " D_SERVICE_STARTED));
         } else {
             LOG_WARNING(TAG_DRVR, F("GT911 " D_SERVICE_START_FAILED));
diff --git a/user_setups/esp32s3/gs-t3e.ini b/user_setups/esp32s3/gs-t3e.ini
index da9976e3..5c498b34 100644
--- a/user_setups/esp32s3/gs-t3e.ini
+++ b/user_setups/esp32s3/gs-t3e.ini
@@ -20,7 +20,7 @@ build_flags =
 ;region -- LovyanGFX build options ------------------------
     -D HASP_USE_ARDUINOGFX=1
     -D ST7701_DRIVER=1
-    ;-D TOUCH_DRIVER=0x911
+    -D TOUCH_DRIVER=0x911
     -D TFT_WIDTH=480
     -D TFT_HEIGHT=480
     -D SPI_FREQUENCY=20000000