diff --git a/user_setups/esp32/esp32-ili9341-unoshield-analog.ini b/user_setups/esp32/esp32-ili9341-unoshield-analog.ini
index 66def78e..815bdf79 100644
--- a/user_setups/esp32/esp32-ili9341-unoshield-analog.ini
+++ b/user_setups/esp32/esp32-ili9341-unoshield-analog.ini
@@ -36,7 +36,7 @@ build_flags =
     -D TFT_D7=14
     -D SD_CS=5
     -D SPI_FREQUENCY=40000000
-    -D TOUCH_DRIVER=404 ; No touch driver found? No problem
+    -D TOUCH_DRIVER=0xADC ; 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
diff --git a/user_setups/esp32/ttgo-lilygo-pi_st7796.ini b/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
new file mode 100644
index 00000000..2a1df519
--- /dev/null
+++ b/user_setups/esp32/ttgo-lilygo-pi_st7796.ini
@@ -0,0 +1,60 @@
+;***************************************************;
+;          Lilygo®Ttgo Pi ESP32 with TFT 3.5"       ;
+;               - Custom PCB with ESP32-WROVER      ;
+;               - IPS ili9481 LCD                   ;
+;               - GT911 touch controller            ;
+;***************************************************;
+
+[env:ttgo-lilygo-pi_ili9481]
+extends = esp32
+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}
+    
+;region -- TFT_eSPI build options ------------------------
+    -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 USER_SETUP_LOADED=1
+    ;-D SUPPORT_TRANSACTIONS   ; Default on ESP32
+    -D TFT_MISO=23
+    -D TFT_MOSI=19
+    -D TFT_SCLK=18
+    -D TFT_DC=27
+    -D TFT_CS=5 
+    -D TFT_RST=-1  ; RST
+    -D TFT_BCKL=12 ; None, configurable via web UI (e.g. 21)
+    -D TOUCH_DRIVER=911 ; GT911 Capacitive I2C touch panel driver
+    -D TOUCH_IRQ=34
+    -D TOUCH_RST=-1
+    -D TOUCH_SDA=21
+    -D TOUCH_SCL=22
+    -D I2C_TOUCH_FREQUENCY=400000
+;endregion
+
+;region -- Hasp build options ----------------------------
+    -D HASP_USE_WIFI=1
+;endregion
+
+;region -- Library options -------------------------------
+lib_deps =
+    ${env.lib_deps}
+    ${esp32.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
+
+lib_ignore =
+    ${env.lib_ignore}
+    ${esp32.lib_ignore}
+;endregion
diff --git a/user_setups/stm32f7xx/nucleo_f767zi-ili9486.ini b/user_setups/stm32f7xx/nucleo_f767zi-ili9486.ini
new file mode 100644
index 00000000..358ba22c
--- /dev/null
+++ b/user_setups/stm32f7xx/nucleo_f767zi-ili9486.ini
@@ -0,0 +1,81 @@
+;***************************************************;
+;      Waveshare ESP32 One with TFT 3.5" or 4"      ;
+;               - Waveshare ESP32 One board         ;
+;               - IPS ST7796S Rpi LCD MHS4001 (B)   ;
+;               - XPT2046 touch controller          ;
+;***************************************************;
+
+[env:nucleo_f767zi-ili9486]
+extends = stm32f7
+board = nucleo_f767zi
+
+build_flags =
+    ${env.build_flags}
+    ${stm32f7.build_flags}
+    
+;region -- TFT_eSPI build options ------------------------
+    -D RPI_DISPLAY_TYPE=1
+    -D ILI9486_DRIVER=1
+    -D TFT_WIDTH=320
+    -D TFT_HEIGHT=480
+    -D TFT_ROTATION=0 ; Use default, see TFT_ROTATION values
+    -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 SUPPORT_TRANSACTIONS
+    -D USE_TFT_ESPI=1
+
+    -D TFT_SCLK=PA5
+    -D TFT_BMISO=PA6       ; Default, configurable via web UI
+    -D TFT_MOSI=PA7
+    -D TFT_CS=PD14
+    -D TFT_BCKL=PD15       ; Default, configurable via web UI
+    -D TFT_RST=PF12
+
+    -D TFT_DC=PF13
+    -D TOUCH_BUSY=PE9
+    -D SD_CS=PE11        ; Currently not supported
+    -D TOUCH_CS=PF14
+    -D TOUCH_IRQ=PE13
+    ;-D LED_BUILTIN=21   ; Onboard LED
+;endregion
+
+;region -- Hasp build options ----------------------------
+    -D HASP_USE_WIFI=0
+    -D HASP_USE_MQTT=1
+    -D HASP_USE_HTTP=1
+    -D HASP_USE_MDNS=0
+    -D HASP_USE_SYSLOG=0
+    -D HASP_USE_TELNET=0
+    -D HASP_USE_SPIFFS=0
+    -D HASP_USE_LITTLEFS=0
+    -D HASP_USE_EEPROM=1
+    -D HASP_USE_CONSOLE=1
+    -D HASP_USE_GPIO=0
+    -D HASP_USE_TASMOTA_CLIENT=0
+    -D HASP_USE_OTA=0
+    -D HASP_USE_ETHERNET=1
+    -D USE_BUILTIN_ETHERNET=1
+    -D HASP_ATTRIBUTE_FAST_MEM=
+;endregion
+
+;region -- Library options -------------------------------
+lib_deps =
+    ${env.lib_deps}
+    ${stm32f7.lib_deps}
+    ;arduino-libraries/Ethernet @ ^2.0.0
+    stm32duino/STM32Ethernet @ ^1.2.0
+    khoih-prog/EthernetWebServer_STM32 @ ^1.2.0
+
+lib_ignore =
+    GxTFT
+    XPT2046_Touchscreen
+    Adafruit TouchScreen
+    Adafruit BusIO
+    Adafruit GFX Library
+    sstaub/Ticker
+    lv_drv_fsmc_ili9341
+    lv_drivers
+    AXP192
+;endregion