Update PSram, Touch driver and Flash size configs

2025-07-28 05:36:37 +00:00 · 2021-11-08 17:24:20 +01:00 · 2021-11-08 17:24:20 +01:00 · a874639b7c
commit a874639b7c
parent af336e4ec1
28 changed files with 95 additions and 84 deletions
--- a/platformio.ini
+++ b/platformio.ini
@ -95,9 +95,6 @@ src_filter = +<*> -<.git/> -<examples/> -<test/> -<tests/> -<stm32f4/> -<lv_font
 framework = arduino
 platform = espressif32@^3.3.2

-board_upload.flash_size=4MB
-board_upload.maximum_size = 4194304
-board_build.partitions = user_setups/esp32/partitions_4MB.csv
 board_build.filesystem = littlefs
 board_build.embed_files =
    data/edit.htm.gz
@ -162,10 +159,6 @@ lib_deps =
    ;git+https://github.com/lvgl/lv_lib_gif.git#release/v7
    ;git+https://github.com/lvgl/lv_lib_split_jpg.git

-ps_ram =
-    -DBOARD_HAS_PSRAM
-    -mfix-esp32-psram-cache-issue  ; uses 24kB
-
 extra_scripts =
    tools/littlefsbuilder.py
    tools/esp_merge_bin.py
@ -173,6 +166,11 @@ extra_scripts =
 ;    ${env.extra_scripts}
 ;    tools/copy_partitions.py

+ps_ram =
+    -DBOARD_HAS_PSRAM
+    -mfix-esp32-psram-cache-issue  ; uses 24kB
+no_ps_ram =
+
 ; -- The ESP32 has 2 SPI Hardware Busses available to use:
 vspi =
    -D TFT_MISO=19
@ -183,6 +181,26 @@ hspi =
    -D TFT_MOSI=13
    -D TFT_SCLK=14

+; -- The ESP32 has 3 available flash sizes:
+[esp32_4mb]
+extends = esp32
+board_upload.flash_size=4MB
+board_upload.maximum_size = 4194304
+board_build.partitions = user_setups/esp32/partitions_4MB.csv
+
+[esp32_8mb]
+extends = esp32
+board_upload.flash_size=8MB
+board_upload.maximum_size = 8388608
+board_build.partitions = user_setups/esp32/partitions_8MB.csv
+
+[esp32_16mb]
+extends = esp32
+board_upload.flash_size = 16MB
+board_upload.maximum_size = 16777216
+board_build.partitions = user_setups/esp32/partitions_16MB.csv
+
+
 ; -- Platform specific build flags
 [esp32s2]
 framework = arduino
--- a/user_setups/esp32/arduitouch-esp32_ili9341.ini
+++ b/user_setups/esp32/arduitouch-esp32_ili9341.ini
@ -6,7 +6,7 @@
 ;***************************************************;

 [env:arduitouch-esp32_ili9341]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
--- a/user_setups/esp32/d1-mini-esp32_ili9341.ini
+++ b/user_setups/esp32/d1-mini-esp32_ili9341.ini
@ -6,12 +6,13 @@
 ;***************************************************;

 [env:d1-mini-esp32_ili9341]
-extends = esp32
+extends = esp32_4mb
 board = wemos_d1_mini32

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}
    -D HASP_MODEL="ESP32 D1 Mini"

 ;region -- TFT_eSPI build options ------------------------
--- a/user_setups/esp32/d1-r32-esp32_ili9486.ini
+++ b/user_setups/esp32/d1-r32-esp32_ili9486.ini
@ -6,12 +6,13 @@
 ;***************************************************;

 [env:d1-r32-esp32_ili9486]
-extends = esp32
+extends = esp32_4mb
 board = wemos_d1_mini32

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}
    -D HASP_MODEL="ESP32 D1 R32 ILI9486"

 ;region -- TFT_eSPI build options ------------------------
@ -25,7 +26,7 @@ build_flags =
    -D SPI_FREQUENCY=20000000 ; Some displays will operate at higher frequencies
    -D SPI_TOUCH_FREQUENCY=2500000
    -D USER_SETUP_LOADED=1
-    -D TOUCH_DRIVER=2046 ; XPT2046
+    -D TOUCH_DRIVER=0x2046 ; XPT2046
    ;-D SUPPORT_TRANSACTIONS   ; Default on ESP32

    -D TFT_DC=14
--- a/user_setups/esp32/d1-r32-unoshield_ili9341-adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9341-adc.ini
@ -5,12 +5,13 @@
 ;***************************************************;

 [env:esp32-9341-unoshield-analog]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}

 ;region -- TFT_eSPI build options ------------------------
    ${esp32.vspi}        ; Use VSPI hardware SPI bus
@ -38,7 +39,7 @@ build_flags =
    -D SD_CS=5
    -D SPI_FREQUENCY=40000000
    -D SPI_READ_FREQUENCY=20000000
-    -D TOUCH_DRIVER=0xADC ; No touch driver found? No problem
+    -D TOUCH_DRIVER=0x0ADC ; No touch driver found? No problem
    -D TOUCH_anDC=35 ; Analog pin to be connected to TFT_DC
    -D TOUCH_anWR=34 ; Analog pin to be connected to TFT_WR
 ;endregion
--- a/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
+++ b/user_setups/esp32/d1-r32-unoshield_ili9486_adc.ini
@ -5,12 +5,13 @@
 ;***************************************************;

 [env:d1-r32-unoshield]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}

 ;region -- TFT_eSPI build options ------------------------
    ${esp32.vspi}        ; Use VSPI hardware SPI bus
@ -37,7 +38,7 @@ build_flags =
    -D SD_CS=5
    -D SPI_FREQUENCY=40000000
    -D SPI_READ_FREQUENCY=20000000
-    -D TOUCH_DRIVER=0xADC ; No touch driver found? No problem
+    -D TOUCH_DRIVER=0x0ADC ; No touch driver found? No problem
    -D TOUCH_anDC=35 ; Analog pin to be connected to TFT_DC
    -D TOUCH_anWR=34 ; Analog pin to be connected to TFT_WR
 ;endregion
--- a/user_setups/esp32/esp32-dev_ili9488.ini
+++ b/user_setups/esp32/esp32-dev_ili9488.ini
@ -5,12 +5,13 @@
 ;***************************************************;

 [env:esp32dev-ili9488]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}

 ;region -- TFT_eSPI build options ------------------------
    -D USER_SETUP_LOADED=1
@ -27,7 +28,7 @@ build_flags =
    -D TFT_BCKL=5  ;None, configurable via web UI (e.g. 2 for D4)
    -D SUPPORT_TRANSACTIONS
    -D TOUCH_CS=22
-    -D TOUCH_DRIVER=2046 ; XPT2606 Resistive touch panel driver
+    -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
    -D SPI_FREQUENCY=27000000
    -D SPI_TOUCH_FREQUENCY=2500000
    -D SPI_READ_FREQUENCY=20000000
--- a/user_setups/esp32/esp32-dev_ili9488_parallel.ini
+++ b/user_setups/esp32/esp32-dev_ili9488_parallel.ini
@ -6,12 +6,13 @@
 ;***************************************************;

 [env:esp32dev-mrb3511]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}

 ;region -- TFT_eSPI build options ------------------------
    ${lcd.mrb3511}
--- a/user_setups/esp32/esp32-one_st7796.ini
+++ b/user_setups/esp32/esp32-one_st7796.ini
@ -6,7 +6,7 @@
 ;***************************************************;

 [env:esp32-one_st7796]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
--- a/user_setups/esp32/esp32-touchdown.ini
+++ b/user_setups/esp32/esp32-touchdown.ini
@ -5,12 +5,13 @@
 ;***************************************************;

 [env:esp32-touchdown]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}
    ${esp32.vspi}        ; Use VSPI hardware SPI bus
    -D HASP_MODEL="ESP32 Touchdown"

@ -25,7 +26,7 @@ build_flags =
    -D TFT_RST=4 ;// Reset pin (could connect to RST pin)
    -D TFT_BCKL=32  ;None, configurable via web UI (e.g. 2 for D4)
    -D SUPPORT_TRANSACTIONS
-    -D TOUCH_DRIVER=6336 ; FT6336 Capacitive touch panel driver 
+    -D TOUCH_DRIVER=0x6336 ; FT6336 Capacitive touch panel driver 
    -D TOUCH_SDA=21
    -D TOUCH_SCL=22
    -D TOUCH_IRQ=27
--- a/user_setups/esp32/esp32cam_st7796.ini
+++ b/user_setups/esp32/esp32cam_st7796.ini
@ -6,7 +6,7 @@
 ;***************************************************;

 [env:esp32cam-st7796]
-extends = esp32
+extends = esp32_4mb
 board = esp32cam

 ;ESP32 CAM PINS
--- a/user_setups/esp32/freetouchdeck.ini
+++ b/user_setups/esp32/freetouchdeck.ini
@ -5,7 +5,7 @@
 ;***************************************************;

 [env:freetouchdeck]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
@ -31,7 +31,7 @@ build_flags =
    -D TFT_BCKL=32    ;None, configurable via web UI (e.g. 2 for D4)
    -D SUPPORT_TRANSACTIONS
    -D TOUCH_CS=21
-    -D TOUCH_DRIVER=2046 ; XPT2606 Resistive touch panel driver
+    -D TOUCH_DRIVER=0x2046 ; XPT2606 Resistive touch panel driver
    -D SPI_FREQUENCY=27000000
    -D SPI_TOUCH_FREQUENCY=2500000
    -D SPI_READ_FREQUENCY=20000000
--- a/user_setups/esp32/huzzah32-featherwing-24.ini
+++ b/user_setups/esp32/huzzah32-featherwing-24.ini
@ -6,12 +6,13 @@
 ;***************************************************;

 [env:huzzah32-featherwing-24]
-extends = esp32
+extends = esp32_4mb
 board = featheresp32

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}
    -D HASP_MODEL="Adafruit Featherwing 2.4"

 ;region -- TFT_eSPI build options ------------------------
--- a/user_setups/esp32/huzzah32-featherwing-35.ini
+++ b/user_setups/esp32/huzzah32-featherwing-35.ini
@ -6,12 +6,13 @@
 ;***************************************************;

 [env:huzzah32-featherwing-35]
-extends = esp32
+extends = esp32_4mb
 board = featheresp32

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}
    -D HASP_MODEL="Adafruit Featherwing 3.5"

    -D LV_INDEV_DEF_READ_PERIOD=30
--- a/user_setups/esp32/lanbon_l8.ini
+++ b/user_setups/esp32/lanbon_l8.ini
@ -6,11 +6,8 @@
 ;***************************************************;

 [env:lanbon_l8]
-extends = esp32
+extends = esp32_8mb
 board = esp32dev
-board_upload.flash_size=8MB
-board_upload.maximum_size = 8388608
-board_build.partitions = user_setups/esp32/partitions_8MB.csv

 build_flags =
    ${env.build_flags}
@ -28,7 +25,7 @@ build_flags =
    -D TFT_MOSI=23       ; FCP pin6 SDA
    -D TFT_MISO=25       ; FCP pin7 SDO
    -D TFT_BCKL=5
-    -D TOUCH_DRIVER=6336 ; FT5206 is too slow, 6336U works 6x faster
+    -D TOUCH_DRIVER=0x6336 ; FT5206 is too slow, 6336U works 6x faster
    -D TOUCH_SDA=4
    -D TOUCH_SCL=0
    -D TOUCH_IRQ=-1   ; not connected
--- a/user_setups/esp32/lolin-d32-pro_ili9341.ini
+++ b/user_setups/esp32/lolin-d32-pro_ili9341.ini
@ -8,11 +8,8 @@
 ; !! This board already defines TFT_CS, TFT_DC and TFT_RST !!

 [env:lolin-d32-pro_ili9341]
-extends = esp32
+extends = esp32_16mb
 board = lolin_d32_pro
-board_upload.flash_size=16MB
-board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32/partitions_16MB.csv

 build_flags =
    ${env.build_flags}
--- a/user_setups/esp32/m5stack_core2.ini
+++ b/user_setups/esp32/m5stack_core2.ini
@ -6,11 +6,8 @@
 ;***************************************************;

 [env:m5stack-core2]
-extends = esp32
+extends = esp32_16mb
 board = esp32dev
-board_upload.flash_size=16MB
-board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32/partitions_16MB.csv

 build_flags =
    ${env.build_flags}
@ -26,7 +23,7 @@ build_flags =
    -D TFT_MOSI=23
    -D TFT_MISO=38
    -D TFT_BCKL=-1    ; Managed by AXP_DC3 & AXP_LDO2
-    -D TOUCH_DRIVER=6336
+    -D TOUCH_DRIVER=0x6336
    -D TOUCH_SDA=21
    -D TOUCH_SCL=22
    -D TOUCH_IRQ=39
--- a/user_setups/esp32/makerfabs-tft35-cap.ini
+++ b/user_setups/esp32/makerfabs-tft35-cap.ini
@ -5,11 +5,8 @@
 ;***************************************************;

 [env:makerfabs-tft35-cap]
-extends = esp32
+extends = esp32_16mb
 board = esp32dev
-board_upload.flash_size=16MB
-board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32/partitions_16MB.csv

 build_flags =
    ${env.build_flags}
@ -30,7 +27,7 @@ build_flags =
    -D TFT_CS=15
    -D TFT_BCKL=-1    ; Needs soldering R31
    -D SPI_FREQUENCY=60000000
-    -D TOUCH_DRIVER=6336
+    -D TOUCH_DRIVER=0x6336
    -D TOUCH_SDA=26
    -D TOUCH_SCL=27
    -D TOUCH_IRQ=0
--- a/user_setups/esp32/nodemcu-32s_st7796.ini
+++ b/user_setups/esp32/nodemcu-32s_st7796.ini
@ -6,12 +6,13 @@
 ;***************************************************;

 [env:nodemcu32s-raspi]
-extends = esp32
+extends = esp32_4mb
 board = nodemcu-32s

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}

 ;region -- TFT_eSPI build options ------------------------
    ${lcd.raspberrypi}
--- a/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
+++ b/user_setups/esp32/ttgo-esp32-poe_ili9341.ini
@ -7,12 +7,13 @@
 ;***************************************************;

 [env:ttgo_esp32_poe-ili9341]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.no_ps_ram}

 ;region -- TFT_eSPI build options ------------------------
    ${lcd.lolin24}
--- a/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
+++ b/user_setups/esp32/ttgo-lilygo-pi_ili9481.ini
@ -6,11 +6,8 @@
 ;***************************************************;

 [env:ttgo-lilygo-pi_ili9481]
-extends = esp32
+extends = esp32_16mb
 board = esp32dev
-board_upload.flash_size=16MB
-board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32/partitions_16MB.csv

 #platform  = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
 #platform_packages =
@ -22,6 +19,8 @@ build_flags =
    ${esp32.ps_ram}
    
 ;region -- TFT_eSPI build options ------------------------
+    -D LGFX_USE_V1=1
+    ;-D USER_SETUP_LOADED=1
    -D ILI9481_DRIVER=1
    -D INVERT_COLORS=1
    -D TFT_INVERSION_ON   ; for inverted colors
@ -30,7 +29,6 @@ build_flags =
    -D TFT_WIDTH=320
    -D TFT_HEIGHT=480
    ;-D TFT_ROTATION=0 ; Use default, see TFT_ROTATION values
-    -D LGFX_USE_V1=1
    ;-D SUPPORT_TRANSACTIONS   ; Default on ESP32
    -D TFT_MISO=23
    -D TFT_MOSI=19
@ -41,8 +39,8 @@ build_flags =
    -D TFT_BCKL=12 ; None, configurable via web UI (e.g. 21)
    -D I2C_TOUCH_FREQUENCY=400000
    -D I2C_TOUCH_PORT=1
-    -D I2C_TOUCH_ADDRESS=0x38
-    -D TOUCH_DRIVER=911 ; GT911 Capacitive I2C touch panel driver
+    -D I2C_TOUCH_ADDRESS=0x5D ; or 0x14
+    -D TOUCH_DRIVER=0x0911 ; GT911 Capacitive I2C touch panel driver
    -D TOUCH_IRQ=34
    -D TOUCH_RST=-1
    -D TOUCH_SDA=21
@ -60,8 +58,8 @@ lib_deps =
    adafruit/Adafruit GFX Library @ ^1.10.3
    adafruit/Adafruit BusIO @ ^1.6.0
    ; GT911 touch screen driver
-    git+https://github.com/netwizeBE/arduino-goodix.git
-    lovyan03/LovyanGFX @ ^0.4.4
+    ; git+https://github.com/netwizeBE/arduino-goodix.git
+    lovyan03/LovyanGFX @ ^0.4.5

 lib_ignore =
    ${env.lib_ignore}
--- a/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
+++ b/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
@ -6,11 +6,8 @@
 ;***************************************************;

 [env:ttgo-lilygo-pi_st7796]
-extends = esp32
+extends = esp32_16mb
 board = esp32dev
-board_upload.flash_size=16MB
-board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32/partitions_16MB.csv

 build_flags =
    ${env.build_flags}
@ -18,13 +15,14 @@ build_flags =
    ${esp32.ps_ram}
    
 ;region -- TFT_eSPI build options ------------------------
+    -D LGFX_USE_V1=1
+    ;-D USER_SETUP_LOADED=1
    -D ST7796_DRIVER=1
    -D SPI_FREQUENCY=40000000
    -D SPI_READ_FREQUENCY=20000000
    -D TFT_WIDTH=320
    -D TFT_HEIGHT=480
    ;-D TFT_ROTATION=0 ; Use default, see TFT_ROTATION values
-    -D LGFX_USE_V1=1
    ;-D SUPPORT_TRANSACTIONS   ; Default on ESP32
    -D TFT_MISO=23
    -D TFT_MOSI=19
@ -36,7 +34,7 @@ build_flags =
    -D I2C_TOUCH_FREQUENCY=400000
    -D I2C_TOUCH_PORT=1
    -D I2C_TOUCH_ADDRESS=0x38
-    -D TOUCH_DRIVER=6336
+    -D TOUCH_DRIVER=0x6336
    -D TOUCH_IRQ=34
    -D TOUCH_RST=-1
    -D TOUCH_SDA=21
@ -54,9 +52,9 @@ lib_deps =
    adafruit/Adafruit GFX Library @ ^1.10.3
    adafruit/Adafruit BusIO @ ^1.6.0
    ; GT911 touch screen driver
-    git+https://github.com/netwizeBE/arduino-goodix.git
-    lovyan03/LovyanGFX @ ^0.4.4
-    git+https://github.com/aselectroworks/Arduino-FT6336U.git
+    ; git+https://github.com/netwizeBE/arduino-goodix.git
+    ; git+https://github.com/aselectroworks/Arduino-FT6336U.git
+    lovyan03/LovyanGFX @ ^0.4.5

 lib_ignore =
    ${env.lib_ignore}
--- a/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
+++ b/user_setups/esp32/ttgo-t7-v1.5_ili9341.ini
@ -6,7 +6,7 @@
 ;***************************************************;

 [env:ttgo-t7-v1.5_ili9341]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
--- a/user_setups/esp32/wt32-sc01.ini
+++ b/user_setups/esp32/wt32-sc01.ini
@ -6,7 +6,7 @@
 ;***************************************************;

 [env:wt32-sc01]
-extends = esp32
+extends = esp32_4mb
 board = esp32dev

 build_flags =
@ -27,7 +27,7 @@ build_flags =
    -D TFT_MOSI=13
    -D TFT_MISO=-1
    -D TFT_BCKL=23
-    -D TOUCH_DRIVER=6336
+    -D TOUCH_DRIVER=0x6336
    -D TOUCH_SDA=18
    -D TOUCH_SCL=19
    -D TOUCH_IRQ=-1   ; not connected
--- a/user_setups/esp32/yeacreate-nscreen32.ini
+++ b/user_setups/esp32/yeacreate-nscreen32.ini
@ -6,15 +6,13 @@
 ; untested config

 [env:yeacreate-nscreen32]
-extends = esp32
+extends = esp32_16mb
 board = esp32dev
-board_upload.flash_size=16MB
-board_upload.maximum_size = 16777216
-board_build.partitions = user_setups/esp32/partitions_16MB.csv

 build_flags =
    ${env.build_flags}
    ${esp32.build_flags}
+    ${esp32.ps_ram}
    ${esp32.hspi}        ; Use HSPI hardware SPI bus
    -D HASP_MODEL="YeaCreate Nscreen32"

@ -41,7 +39,7 @@ build_flags =
    -D TFT_RST=32   ; Reset pin
    ;-D TFT_BCKL=32  ;None, configurable via web UI (e.g. 2 for D4)
    -D SUPPORT_TRANSACTIONS
-    -D TOUCH_DRIVER=911  ; GT911 Capacitive touch panel driver 
+    -D TOUCH_DRIVER=0x0911  ; GT911 Capacitive touch panel driver 
    -D TOUCH_SDA=21
    -D TOUCH_SCL=22
    -D TOUCH_IRQ=5
--- a/user_setups/esp32s2/esp32s2-featherwing-24.ini
+++ b/user_setups/esp32s2/esp32s2-featherwing-24.ini
@ -27,7 +27,7 @@ build_flags =
    -D SPI_TOUCH_FREQUENCY=2500000
    -D SPI_READ_FREQUENCY=20000000
    ; -D USER_SETUP_LOADED=1
-    -D TOUCH_DRIVER=610 ;STMPE610
+    -D TOUCH_DRIVER=0x0610 ;STMPE610
    -D LGFX_USE_V1=1
    -D TFT_MISO=19
    -D TFT_MOSI=18
@ -43,7 +43,7 @@ lib_deps =
    ${env.lib_deps}
    ${esp32s2.lib_deps}
    adafruit/Adafruit STMPE610@^1.1.3 ;STMPE610 touch controller
-    lovyan03/LovyanGFX @ ^0.4.4
+    lovyan03/LovyanGFX @ ^0.4.5

 lib_ignore =
    ${env.lib_ignore}
--- a/user_setups/lcd_config.ini
+++ b/user_setups/lcd_config.ini
@ -2,14 +2,14 @@
 [touch]
 xpt2046 =
    -D SPI_TOUCH_FREQUENCY=2500000
-    -D TOUCH_DRIVER=2046     ; XPT2046 Resistive SPI touch panel driver
+    -D TOUCH_DRIVER=0x2046     ; XPT2046 Resistive SPI touch panel driver

 gt911 =
-    -D TOUCH_DRIVER=911      ; GT911 Capacitive I2C touch panel driver
+    -D TOUCH_DRIVER=0x0911      ; GT911 Capacitive I2C touch panel driver
    -D I2C_TOUCH_FREQUENCY=400000

 stmpe610 =
-    -D TOUCH_DRIVER=610      ;STMPE610 Capacitive SPI touch panel driver
+    -D TOUCH_DRIVER=0x0610      ;STMPE610 Capacitive SPI touch panel driver
    -D SPI_TOUCH_FREQUENCY=2500000

 ; -- Standard configuration parameters for supported displays
@ -48,7 +48,7 @@ lolin24 =
    -D SPI_READ_FREQUENCY=20000000
    -D USER_SETUP_LOADED=1
    ;-D TOUCH_DRIVER=0x2046B ; Alternate
-    -D TOUCH_DRIVER=2046     ; XPT2046 Resistive SPI touch panel driver
+    -D TOUCH_DRIVER=0x2046     ; XPT2046 Resistive SPI touch panel driver
    -D SUPPORT_TRANSACTIONS

 m5stack =
@ -72,7 +72,7 @@ raspberrypi =
    -D SPI_FREQUENCY=80000000
    -D SPI_TOUCH_FREQUENCY=2500000
    -D USER_SETUP_LOADED=1
-    -D TOUCH_DRIVER=2046 ; XPT2046 Resistive SPI touch panel driver
+    -D TOUCH_DRIVER=0x2046 ; XPT2046 Resistive SPI touch panel driver
    -D SUPPORT_TRANSACTIONS

 mrb3511 =
@ -82,7 +82,7 @@ mrb3511 =
    -D TFT_HEIGHT=480
    ;-D TFT_ROTATION=0 ; Use default, see TFT_ROTATION values
    -D USER_SETUP_LOADED=1
-    -D TOUCH_DRIVER=911 ; GT911 Capacitive I2C touch panel driver
+    -D TOUCH_DRIVER=0x0911 ; GT911 Capacitive I2C touch panel driver
    ;-D SUPPORT_TRANSACTIONS   ; Default on ESP32
    -D I2C_TOUCH_FREQUENCY=400000

@ -119,7 +119,7 @@ featherwing-35 =
    -D SPI_TOUCH_FREQUENCY=2500000
    -D SPI_READ_FREQUENCY=20000000
    -D USER_SETUP_LOADED=1
-    -D TOUCH_DRIVER=610 ;STMPE610
+    -D TOUCH_DRIVER=0x0610 ;STMPE610
    ;-D SUPPORT_TRANSACTIONS   ; Default on ESP32

 featherwing-24 =
@ -131,5 +131,5 @@ featherwing-24 =
    -D SPI_TOUCH_FREQUENCY=2500000
    -D SPI_READ_FREQUENCY=20000000
    -D USER_SETUP_LOADED=1
-    -D TOUCH_DRIVER=610 ;STMPE610
+    -D TOUCH_DRIVER=0x0610 ;STMPE610
    ;-D SUPPORT_TRANSACTIONS   ; Default on ESP32
--- a/user_setups/stm32f7xx/nucleo_f767zi-ili9486.ini
+++ b/user_setups/stm32f7xx/nucleo_f767zi-ili9486.ini
@ -22,7 +22,7 @@ build_flags =
    -D SPI_FREQUENCY=20000000 ; Some displays will operate at higher frequencies
    -D SPI_TOUCH_FREQUENCY=2500000
    -D USER_SETUP_LOADED=1
-    -D TOUCH_DRIVER=2046 ; XPT2046
+    -D TOUCH_DRIVER=0x2046 ; XPT2046
    -D SUPPORT_TRANSACTIONS
    -D USE_TFT_ESPI=1