Merge branch 'master' of https://github.com/Bodmer/TFT_eSPI

TFT_eSPI.h

@@ -27,10 +27,6 @@
 ***************************************************************************************/
 
 //Standard support
-#ifdef TFT_eSPI_COMPONENT
-  #include "TFT_config.h"
-#endif
-
 #include <Arduino.h>
 #include <Print.h>
 #include <SPI.h>
@@ -40,6 +36,9 @@
 ***************************************************************************************/
 // Include header file that defines the fonts loaded, the TFT drivers
 // available and the pins to be used, etc, etc
+#ifdef CONFIG_TFT_eSPI_ESPIDF
+  #include "TFT_config.h"
+#endif
 #include <User_Setup_Select.h>
 
 // Handle FLASH based storage e.g. PROGMEM

User_Setup_Select.h

@@ -115,6 +115,10 @@
 
 //#include <User_Setups/Setup203_ST7789.h>     // Setup file for ESP32/ESP8266 based ST7789 240X280 1.69inch TFT 
 
+//#include <User_Setups/Setup204_ESP32_TouchDown.h>     // Setup file for the ESP32 TouchDown based on ILI9488 480 x 320 TFT 
+
+//#include <User_Setups/Setup205_ESP32_TouchDown_S3.h>     // Setup file for the ESP32 TouchDown S3 based on ILI9488 480 x 320 TFT 
+
 //#include <User_Setups/SetupX_Template.h>     // Template file for a setup
 
 

User_Setups/Setup204_ESP32_TouchDown.h

+// User Setup for the ESP32 TouchDown V1.0 and V1.1
+// ILI9488 using 4-wire SPI and using an FT6206 touch controller
+
+#define USER_SETUP_ID 204
+
+#define ILI9488_DRIVER
+
+#define TFT_BL   32
+#define TFT_BACKLIGHT_ON HIGH
+
+#define TFT_MISO 19
+#define TFT_MOSI 23
+#define TFT_SCLK 18
+#define TFT_CS   15
+#define TFT_DC    2
+#define TFT_RST   4
+
+#define TOUCH_CS 21
+
+#define LOAD_GLCD
+#define LOAD_FONT2
+#define LOAD_FONT4
+#define LOAD_FONT6
+#define LOAD_FONT7
+#define LOAD_FONT8
+#define LOAD_GFXFF
+
+#define SMOOTH_FONT
+
+#define SPI_FREQUENCY  27000000
+#define SPI_READ_FREQUENCY  20000000
+#define SPI_TOUCH_FREQUENCY  2500000
\ No newline at end of file

User_Setups/Setup205_ESP32_TouchDown_S3.h

+// User Setup for the ESP32 TouchDown S3 V1.1
+// ILI9488 using 8-bit Parallel and using an FT6206 touch controller
+
+#define USER_SETUP_ID 205
+
+#define ESP32_PARALLEL
+
+#define ILI9488_DRIVER    
+
+#define TFT_DC   5
+#define TFT_RST  46
+
+#define TFT_WR   7
+#define TFT_RD   6
+
+#define TFT_D0   21
+#define TFT_D1   14
+#define TFT_D2   13
+#define TFT_D3   12
+#define TFT_D4   11
+#define TFT_D5   10
+#define TFT_D6   9
+#define TFT_D7   8
+
+#define TFT_BL	 48
+#define TFT_BACKLIGHT_ON HIGH
+
+#define LOAD_GLCD
+#define LOAD_FONT2
+#define LOAD_FONT4
+#define LOAD_FONT6
+#define LOAD_FONT7
+#define LOAD_FONT8
+#define LOAD_GFXFF
+
+#define SMOOTH_FONT
\ No newline at end of file