From e1e2ff3833f86dd0df2535661d73d53656dcf7e0 Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Tue, 27 Feb 2024 00:06:46 +0100
Subject: [PATCH] Add esp32-2432s028r-st7789_4MB

---
 .github/workflows/build.yaml         |  2 +-
 user_setups/esp32/esp32-2832s028.ini | 30 ++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 4e250b1b..80d8c4ab 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -51,7 +51,7 @@ jobs:
           - out: seeed-studios
             env: "sensecap-indicator-d1_8MB"
           - out: sunton
-            env: "esp32-2432s028r_4MB -e esp32-3248s035c_4MB -e esp32-3248s035r_4MB -e sunton-4827s043c_16MB -e sunton-8048s043c_16MB -e sunton-8048s050c_16MB -e sunton-8048s070c_16MB"
+            env: "esp32-2432s028r_4MB -e esp32-2432s028r-st7789_4MB -e esp32-3248s035c_4MB -e esp32-3248s035r_4MB -e sunton-4827s043c_16MB -e sunton-8048s043c_16MB -e sunton-8048s050c_16MB -e sunton-8048s070c_16MB"
           - out: waveshare
             env: "esp32-one_ili9486 -e esp32-one_st7796"
           - out: wireless-tag
diff --git a/user_setups/esp32/esp32-2832s028.ini b/user_setups/esp32/esp32-2832s028.ini
index c9a96cc8..5cc2802a 100644
--- a/user_setups/esp32/esp32-2832s028.ini
+++ b/user_setups/esp32/esp32-2832s028.ini
@@ -16,7 +16,6 @@ build_flags =
 ;region -- TFT_eSPI build options ------------------------
     ; -D USER_SETUP_LOADED=1
     -D LGFX_USE_V1=1
-    -D ILI9341_DRIVER=1
     -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
     -D TFT_WIDTH=240
     -D TFT_HEIGHT=320
@@ -28,7 +27,6 @@ build_flags =
     -D TFT_MISO=12
     -D TFT_BCKL=21
     -D SUPPORT_TRANSACTIONS
-    -D SPI_FREQUENCY=55000000
     -D SPI_READ_FREQUENCY=20000000
     -D TOUCH_OFFSET_ROTATION=0  ; 1=swap xy, 2=invert x, 4=inverty
 
@@ -47,6 +45,7 @@ lib_deps =
 extends = esp32-2432s028r, flash_4mb
 build_flags =
     ${esp32-2432s028r.build_flags}
+    -D ILI9341_DRIVER=1
     -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
     -D HASP_USE_LGFX_TOUCH=1
     -D TOUCH_CS=33
@@ -56,6 +55,33 @@ build_flags =
     -D TOUCH_SDA=-1
     -D TOUCH_SCL=-1
     -D TOUCH_IRQ=36
+    -D SPI_FREQUENCY=55000000
+    -D SPI_TOUCH_FREQUENCY=2500000
+
+; -- Debugging options -----------------------------
+;   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
+
+lib_deps =
+    ${esp32-2432s028r.lib_deps}
+    ;${tft_espi.lib_deps}
+    ${lovyangfx.lib_deps}
+    ;${goodix.lib_deps}
+
+[env:esp32-2432s028r-st7789_4MB]
+extends = esp32-2432s028r, flash_4mb
+build_flags =
+    ${esp32-2432s028r.build_flags}
+    -D ST7789_DRIVER=1
+    -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
+    -D HASP_USE_LGFX_TOUCH=1
+    -D TOUCH_CS=33
+    -D TOUCH_SCLK=25
+    -D TOUCH_MOSI=32
+    -D TOUCH_MISO=39
+    -D TOUCH_SDA=-1
+    -D TOUCH_SCL=-1
+    -D TOUCH_IRQ=36
+    -D SPI_FREQUENCY=24000000
     -D SPI_TOUCH_FREQUENCY=2500000
 
 ; -- Debugging options -----------------------------