From 0883b969086f74d8e6bf0e62b62c04d72a6869ec Mon Sep 17 00:00:00 2001
From: fvanroie <cpt_jack@msn.com>
Date: Fri, 6 May 2022 21:39:52 +0200
Subject: [PATCH] Tidy up ini files

---
 user_setups/esp32/esp32-dev_ili9488.ini | 4 +---
 user_setups/esp32/esp32-touchdown.ini   | 2 +-
 user_setups/esp32/freetouchdeck.ini     | 4 +---
 user_setups/esp32/wt32-sc01.ini         | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/user_setups/esp32/esp32-dev_ili9488.ini b/user_setups/esp32/esp32-dev_ili9488.ini
index 341689ba..18d28c52 100644
--- a/user_setups/esp32/esp32-dev_ili9488.ini
+++ b/user_setups/esp32/esp32-dev_ili9488.ini
@@ -14,14 +14,12 @@ build_flags =
     ${esp32.no_ps_ram}
 
 ;region -- TFT_eSPI build options ------------------------
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D USER_SETUP_LOADED=1
     -D ILI9488_DRIVER=1
     -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
     -D TFT_WIDTH=320
     -D TFT_HEIGHT=480
-    -D TFT_MISO=19 ;// (leave TFT SDO disconnected if other SPI devices share MISO)
-    -D TFT_MOSI=23
-    -D TFT_SCLK=18
     -D TFT_CS=15  ;// Chip select control pin
     -D TFT_DC=2  ;// Data Command control pin
     -D TFT_RST=4 ;// Reset pin (could connect to RST pin)
diff --git a/user_setups/esp32/esp32-touchdown.ini b/user_setups/esp32/esp32-touchdown.ini
index 8d83c533..3b3652d6 100644
--- a/user_setups/esp32/esp32-touchdown.ini
+++ b/user_setups/esp32/esp32-touchdown.ini
@@ -12,10 +12,10 @@ build_flags =
     ${env.build_flags}
     ${esp32.build_flags}
     ${esp32.no_ps_ram}
-    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D HASP_MODEL="ESP32 Touchdown"
 
 ;region -- TFT_eSPI build options ------------------------
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D USER_SETUP_LOADED=1
     -D ILI9488_DRIVER=1
     -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
diff --git a/user_setups/esp32/freetouchdeck.ini b/user_setups/esp32/freetouchdeck.ini
index 09f7d60b..3edb1305 100644
--- a/user_setups/esp32/freetouchdeck.ini
+++ b/user_setups/esp32/freetouchdeck.ini
@@ -15,15 +15,13 @@ build_flags =
     ;-mfix-esp32-psram-cache-issue  ; uses 24kB
 
 ;region -- TFT_eSPI build options ------------------------
+    ${esp32.vspi}        ; Use VSPI hardware SPI bus
     -D USER_SETUP_LOADED=1
     ;-D LGFX_USE_V1=1
     -D ILI9488_DRIVER=1
     -D TFT_ROTATION=0 ; 0=0, 1=90, 2=180 or 3=270 degree
     -D TFT_WIDTH=320
     -D TFT_HEIGHT=480
-    -D TFT_MISO=19    ;// (leave TFT SDO disconnected if other SPI devices share MISO)
-    -D TFT_MOSI=23
-    -D TFT_SCLK=18
     -D TFT_CS=15      ;// Chip select control pin
     -D TFT_DC=2       ;// Data Command control pin
     -D TFT_RST=4      ;// Reset pin (could connect to RST pin)
diff --git a/user_setups/esp32/wt32-sc01.ini b/user_setups/esp32/wt32-sc01.ini
index 88b42357..16ef9294 100644
--- a/user_setups/esp32/wt32-sc01.ini
+++ b/user_setups/esp32/wt32-sc01.ini
@@ -38,7 +38,6 @@ build_flags =
     -D TOUCH_RST=-1   ; not used, connected to 3.3V
     -D I2C_TOUCH_FREQUENCY=400000
     -D I2C_TOUCH_ADDRESS=0x38
-    -D LV_MEM_SIZE=60416U
 ;endregion
 
 ;region -- Library options -------------------------------