From 0350f86c3553b5dd213be37b571b972347e7404b Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Sat, 29 May 2021 15:15:10 +0200 Subject: [PATCH] Rename STMPE_CS to TOUCH_CS --- src/drv/old/hasp_drv_stmpe610.cpp | 2 +- user_setups/esp32/huzzah32-featherwing-24.ini | 2 +- user_setups/esp32/huzzah32-featherwing-35.ini | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/drv/old/hasp_drv_stmpe610.cpp b/src/drv/old/hasp_drv_stmpe610.cpp index 3815135b..0c0d4216 100644 --- a/src/drv/old/hasp_drv_stmpe610.cpp +++ b/src/drv/old/hasp_drv_stmpe610.cpp @@ -14,7 +14,7 @@ #define TS_MINY 100 #define TS_MAXY 3750 -static Adafruit_STMPE610 touch = Adafruit_STMPE610(STMPE_CS); +static Adafruit_STMPE610 touch = Adafruit_STMPE610(TOUCH_CS); // Read touch points from global variable HASP_ATTRIBUTE_FAST_MEM bool STMPE610_getXY(int16_t* touchX, int16_t* touchY, uint8_t touchRotation, bool debug) diff --git a/user_setups/esp32/huzzah32-featherwing-24.ini b/user_setups/esp32/huzzah32-featherwing-24.ini index ecbb68e0..6e658929 100644 --- a/user_setups/esp32/huzzah32-featherwing-24.ini +++ b/user_setups/esp32/huzzah32-featherwing-24.ini @@ -23,7 +23,7 @@ build_flags = -D TFT_CS=15 -D TFT_RST=-1 ; RST -D TFT_BCKL=-1 ; Solder the LITE pad to a PWM enabled pin of the ESP. - -D STMPE_CS=32 + -D TOUCH_CS=32 ;endregion lib_deps = diff --git a/user_setups/esp32/huzzah32-featherwing-35.ini b/user_setups/esp32/huzzah32-featherwing-35.ini index 27775bf6..3543ac71 100644 --- a/user_setups/esp32/huzzah32-featherwing-35.ini +++ b/user_setups/esp32/huzzah32-featherwing-35.ini @@ -12,8 +12,9 @@ board = featheresp32 build_flags = ${env.build_flags} ${esp32.build_flags} - -D HASP_MODEL="Adafruit Featherwing 3.2" + -D HASP_MODEL="Adafruit Featherwing 3.5" + -D LV_INDEV_DEF_READ_PERIOD=30 ;region -- TFT_eSPI build options ------------------------ ${lcd.featherwing-35} -D TFT_MISO=19 @@ -23,7 +24,7 @@ build_flags = -D TFT_CS=15 -D TFT_RST=-1 ; RST -D TFT_BCKL=21 ; Solder the LITE pad to a PWM enabled pin of the ESP, like GPIO 21 - -D STMPE_CS=32 + -D TOUCH_CS=32 ;endregion lib_deps =