diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 5a77c3d2..e510e598 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -49,7 +49,7 @@ jobs: - out: makerfabs env: "makerfabs-tft35-cap -e makerfabs-s3-tft35-spi" - out: sunton - env: "esp32-2432s028r_4MB -e esp32-3248s035c_4MB -e esp32-3248s035r_4MB -e esp32-s3-4827s043r_16MB -e esp32-s3-4827s043c_16MB -e esp32-s3-8048s043c_16MB" + env: "esp32-2432s028r_4MB -e esp32-3248s035c_4MB -e esp32-3248s035r_4MB -e sunton-4827s043r_16MB -e sunton-4827s043c_16MB -e sunton-8047s043c_16MB -e sunton-8047s050c_16MB -e sunton-8047s070c_16MB" - out: wireless-tag env: "wt32-sc01_4MB -e wt32-sc01_16MB -e wt-86-32-3zw1 -e wt32-sc01-plus_8MB" - out: yeacreate diff --git a/src/drv/tft/tft_driver_arduinogfx.cpp b/src/drv/tft/tft_driver_arduinogfx.cpp index 5ec1d717..a01a4f75 100644 --- a/src/drv/tft/tft_driver_arduinogfx.cpp +++ b/src/drv/tft/tft_driver_arduinogfx.cpp @@ -39,6 +39,7 @@ void ArduinoGfx::init(int w, int h) 6 /* G1 */, 7 /* G2 */, 15 /* G3 */, 16 /* G4 */, 4 /* G5 */, 8 /* B0 */, 3 /* B1 */, 46 /* B2 */, 9 /* B3 */, 1 /* B4 */ ); + #if(TFT_WIDTH == 480) && (TFT_HEIGHT == 272) // ILI6485 LCD 480x272 tft = new Arduino_RPi_DPI_RGBPanel(bus, 480 /* width */, 0 /* hsync_polarity */, 8 /* hsync_front_porch */, @@ -52,7 +53,7 @@ void ArduinoGfx::init(int w, int h) 4 /* hsync_pulse_width */, 8 /* hsync_back_porch */, 480 /* height */, 0 /* vsync_polarity */, 8 /* vsync_front_porch */, 4 /* vsync_pulse_width */, 8 /* vsync_back_porch */, 1 /* pclk_active_neg */, 14000000 /* prefer_speed */, - true /* auto_flush */); + true /* auto_flush */); #endif #endif diff --git a/user_setups/esp32/_esp32.ini b/user_setups/esp32/_esp32.ini index 26b99985..fa4b8d26 100644 --- a/user_setups/esp32/_esp32.ini +++ b/user_setups/esp32/_esp32.ini @@ -137,7 +137,7 @@ board_build.partitions = user_setups/esp32/partitions_16MB.csv ; -- The Arduino ESP32 v2.0.2 with 3 available flash sizes: [arduino_esp32_v2] framework = arduino -platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.1/platform-espressif32-2.0.5.1.zip +platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.5/platform-espressif32-v.2.0.5.zip board_build.filesystem = littlefs ; ----- crash reporter monitor_filters = esp32_exception_decoder diff --git a/user_setups/esp32s3/_esp32s3.ini b/user_setups/esp32s3/_esp32s3.ini index f5db7b14..05d3c024 100644 --- a/user_setups/esp32s3/_esp32s3.ini +++ b/user_setups/esp32s3/_esp32s3.ini @@ -107,7 +107,8 @@ hspi = ; -- The Arduino ESP32 v2.0.2 with 3 available flash sizes: [arduino_esp32s3_v2] framework = arduino -platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4.1/platform-espressif32-2.0.4.1.zip +;platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4.1/platform-espressif32-2.0.4.1.zip +platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.5/platform-espressif32-v.2.0.5.zip ;platform = espressif32 board_build.filesystem = littlefs ; ----- crash reporter diff --git a/user_setups/esp32s3/esp32-s3-4827s043.ini b/user_setups/esp32s3/sunton-esp32-s3-tft.ini similarity index 54% rename from user_setups/esp32s3/esp32-s3-4827s043.ini rename to user_setups/esp32s3/sunton-esp32-s3-tft.ini index 11c7cb8e..9bac67f1 100644 --- a/user_setups/esp32s3/esp32-s3-4827s043.ini +++ b/user_setups/esp32s3/sunton-esp32-s3-tft.ini @@ -1,11 +1,11 @@ ;***************************************************; -; Sunton ESP32-S3 TFT 4.3" ; -; - Custom esp32-s3 board ; -; - st7701s TFT ; -; - xpt2046 or gt911 touch controller ; +; Sunton ESP32-S3 TFT 4.3", 5.0", 7.0" ; +; - Custom esp32-s3 board ; +; - ili6485 480x272 or st7262 IPS 800x480 ; +; - xpt2046 or gt911 touch controller ; ;***************************************************; -[sunton-esp32-s3-s043] +[sunton-esp32-s3-tft] board = esp32s3_qio_opi build_flags = @@ -15,7 +15,6 @@ build_flags = ; -D HASP_MODEL="Sunton 4.3\"" ;-DARDUINO_USB_CDC_ON_BOOT ;-DUSE_USB_CDC_CONSOLE - -DSUNTON_43 ;region -- LovyanGFX build options ------------------------ -D HASP_USE_ARDUINOGFX=1 @@ -57,11 +56,11 @@ lib_ignore = ;endregion -[env:esp32-s3-4827s043r_16MB] -extends = sunton-esp32-s3-s043, esp32s3_16mb_v2 +[env:sunton-4827s043r_16MB] +extends = sunton-esp32-s3-tft, esp32s3_16mb_v2 build_flags = - ${sunton-esp32-s3-s043.build_flags} + ${sunton-esp32-s3-tft.build_flags} -D HASP_MODEL="Sunton ESP32-4827S043R" -D TFT_WIDTH=480 -D TFT_HEIGHT=272 @@ -73,11 +72,11 @@ build_flags = -D TOUCH_IRQ=18 -[env:esp32-s3-4827s043c_16MB] -extends = sunton-esp32-s3-s043, esp32s3_16mb_v2 +[env:sunton-4827s043c_16MB] +extends = sunton-esp32-s3-tft, esp32s3_16mb_v2 build_flags = - ${sunton-esp32-s3-s043.build_flags} + ${sunton-esp32-s3-tft.build_flags} -D HASP_MODEL="Sunton ESP32-4827S043C" -D TFT_WIDTH=480 -D TFT_HEIGHT=272 @@ -88,15 +87,15 @@ build_flags = -D TOUCH_RST=38 -D I2C_TOUCH_FREQUENCY=400000 lib_deps = - ${sunton-esp32-s3-s043.lib_deps} + ${sunton-esp32-s3-tft.lib_deps} ${goodix.lib_deps} -[env:esp32-s3-8048s043c_16MB] -extends = sunton-esp32-s3-s043, esp32s3_16mb_v2 +[env:sunton-8048s043c_16MB] +extends = sunton-esp32-s3-tft, esp32s3_16mb_v2 build_flags = - ${sunton-esp32-s3-s043.build_flags} + ${sunton-esp32-s3-tft.build_flags} -D HASP_MODEL="Sunton ESP32-8048S043C" -D TFT_WIDTH=800 -D TFT_HEIGHT=480 @@ -109,5 +108,47 @@ build_flags = -D TOUCH_RST=38 -D I2C_TOUCH_FREQUENCY=400000 lib_deps = - ${sunton-esp32-s3-s043.lib_deps} + ${sunton-esp32-s3-tft.lib_deps} + ${goodix.lib_deps} + + +[env:sunton-8048s050c_16MB] +extends = sunton-esp32-s3-tft, esp32s3_16mb_v2 + +build_flags = + ${sunton-esp32-s3-tft.build_flags} + -D HASP_MODEL="Sunton ESP32-8048S050C" + -D TFT_WIDTH=800 + -D TFT_HEIGHT=480 + -D TOUCH_WIDTH=800 + -D TOUCH_HEIGHT=480 + -D TOUCH_DRIVER=0x911 + -D TOUCH_SCL=20 + -D TOUCH_SDA=19 + -D TOUCH_IRQ=-1 + -D TOUCH_RST=38 + -D I2C_TOUCH_FREQUENCY=400000 +lib_deps = + ${sunton-esp32-s3-tft.lib_deps} + ${goodix.lib_deps} + + +[env:sunton-8048s070c_16MB] +extends = sunton-esp32-s3-tft, esp32s3_16mb_v2 + +build_flags = + ${sunton-esp32-s3-tft.build_flags} + -D HASP_MODEL="Sunton ESP32-8048S070C" + -D TFT_WIDTH=800 + -D TFT_HEIGHT=480 + -D TOUCH_WIDTH=800 + -D TOUCH_HEIGHT=480 + -D TOUCH_DRIVER=0x911 + -D TOUCH_SCL=20 + -D TOUCH_SDA=19 + -D TOUCH_IRQ=-1 + -D TOUCH_RST=38 + -D I2C_TOUCH_FREQUENCY=400000 +lib_deps = + ${sunton-esp32-s3-tft.lib_deps} ${goodix.lib_deps} \ No newline at end of file