Skip to content

Commit 7ccc509

Browse files
luc-githubluc-github
authored
Add Waveshare 7 TFT Support
* Extract hardware target from common make to define resolution * Fix compilation failed if disable Time * Fix compilation issue if nothing is enabled but SD and WiFi * Fix warning if nothing is enabled but SD and WiFi * Update esp3d_version.h
1 parent 74df62e commit 7ccc509

38 files changed

+3667
-83
lines changed

‎.github/ci/ESP32S3_8048S070C.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf
55
source ./export.sh
66
cd $GITHUB_WORKSPACE
77
idf.py fullclean
8-
sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt
9-
sed -i '1,32s/ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" OFF/ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" ON/g' ./CMakeLists.txt
8+
sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt
9+
sed -i '1,36s/ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" OFF/ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" ON/g' ./CMakeLists.txt
1010
idf.py fullclean
1111
head ./CMakeLists.txt -n 9
1212
idf.py -DIDF_TARGET=esp32s3 reconfigure

‎.github/ci/ESP32S3_FREENOVE.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf
55
source ./export.sh
66
cd $GITHUB_WORKSPACE
77
idf.py fullclean
8-
sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt
9-
sed -i '1,32s/OPTION(ESP32S3_FREENOVE_1_1 "HARDWARE TARGET is ESP32S3 Freenove v1.1" OFF/OPTION(ESP32S3_FREENOVE_1_1 "HARDWARE TARGET is ESP32S3 Freenove v1.1" ON/g' ./CMakeLists.txt
8+
sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt
9+
sed -i '1,36s/OPTION(ESP32S3_FREENOVE_1_1 "HARDWARE TARGET is ESP32S3 Freenove v1.1" OFF/OPTION(ESP32S3_FREENOVE_1_1 "HARDWARE TARGET is ESP32S3 Freenove v1.1" ON/g' ./CMakeLists.txt
1010
sed -i 's/OPTION(CAMERA_SERVICE "Camera service" OFF/OPTION(CAMERA_SERVICE "Camera service" ON/g' ./CMakeLists.txt
1111
sed -i 's/OPTION(TFT_UI_SERVICE "TFT UI service" ON/OPTION(TFT_UI_SERVICE "TFT UI service" OFF/g' ./CMakeLists.txt
1212
idf.py fullclean

‎.github/ci/ESP32S3_HMI43V3.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf
55
source ./export.sh
66
cd $GITHUB_WORKSPACE
77
idf.py fullclean
8-
sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt
9-
sed -i '1,32s/OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" OFF/OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" ON/g' ./CMakeLists.txt
8+
sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt
9+
sed -i '1,36s/OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" OFF/OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" ON/g' ./CMakeLists.txt
1010
idf.py fullclean
1111
head ./CMakeLists.txt -n 9
1212
idf.py -DIDF_TARGET=esp32s3 reconfigure

‎.github/ci/ESP32_2432S028R.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf
55
source ./export.sh
66
cd $GITHUB_WORKSPACE
77
idf.py fullclean
8-
sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt
9-
sed -i '1,32s/OPTION(ESP32_2432S028R "TFT TARGET is ESP32_2432S028R - 2.8in. 320x240 (Resistive)" OFF/OPTION(ESP32_2432S028R "TFT TARGET is ESP32_2432S028R - 2.8in. 320x240 (Resistive)" ON/g' ./CMakeLists.txt
8+
sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt
9+
sed -i '1,36s/OPTION(ESP32_2432S028R "TFT TARGET is ESP32_2432S028R - 2.8in. 320x240 (Resistive)" OFF/OPTION(ESP32_2432S028R "TFT TARGET is ESP32_2432S028R - 2.8in. 320x240 (Resistive)" ON/g' ./CMakeLists.txt
1010
idf.py fullclean
1111
head ./CMakeLists.txt -n 9
1212
idf.py -DIDF_TARGET=esp32 reconfigure

‎.github/ci/ESP32_ROTRICS_DEXARM35.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf
55
source ./export.sh
66
cd $GITHUB_WORKSPACE
77
idf.py fullclean
8-
sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt
9-
sed -i '1,32s/OPTION(ESP32_ROTRICS_DEXARM35 "TFT TARGET is ESP32 Rotrics DexArm 3.5inches" OFF/OPTION(ESP32_ROTRICS_DEXARM35 "TFT TARGET is ESP32 Rotrics DexArm 3.5inches" ON/g' ./CMakeLists.txt
8+
sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt
9+
sed -i '1,36s/OPTION(ESP32_ROTRICS_DEXARM35 "TFT TARGET is ESP32 Rotrics DexArm 3.5inches" OFF/OPTION(ESP32_ROTRICS_DEXARM35 "TFT TARGET is ESP32 Rotrics DexArm 3.5inches" ON/g' ./CMakeLists.txt
1010
idf.py fullclean
1111
head ./CMakeLists.txt -n 9
1212
idf.py -DIDF_TARGET=esp32 reconfigure

‎.github/ci/ZX3D50CE02S-SRC-4832.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ cd $GITHUB_WORKSPACE/esp-idf
55
source ./export.sh
66
cd $GITHUB_WORKSPACE
77
idf.py fullclean
8-
sed -i '1,32s/ ON/ OFF/g' ./CMakeLists.txt
9-
sed -i '1,32s/ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" OFF/ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" ON/g' ./CMakeLists.txt
8+
sed -i '1,36s/ ON/ OFF/g' ./CMakeLists.txt
9+
sed -i '1,36s/ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" OFF/ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" ON/g' ./CMakeLists.txt
1010
idf.py fullclean
1111
head ./CMakeLists.txt -n 9
1212
idf.py -DIDF_TARGET=esp32s3 reconfigure

‎CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" ON)
77
OPTION(ESP32S3_ZX3D50CE02S_USRC_4832 "TFT TARGET is ESP32S3 Panlee ZX3D50CE02S-SRC-4832 3.5inches" OFF)
88
OPTION(ESP32S3_BZM_TFT35_GT911 "TFT TARGET is ESP32S3 Panlee BZM 3.5inches" OFF)
9+
OPTION (ESP32S3_8048_TOUCH_LCD_7 "TFT TARGET is ESP32S3 - 7.0in. 800x480 (Capacitive)" OFF)
910
OPTION(ESP32S3_8048S070C "TFT TARGET is ESP32S3_8048S070C - 7.0in. 800x480 (Capacitive)" OFF)
1011
OPTION(ESP32S3_8048S050C "TFT TARGET is ESP32S3_8048S050C - 5.0in. 800x480 (Capacitive)" OFF)
1112
OPTION(ESP32S3_8048S043C "TFT TARGET is ESP32S3_8048S043C - 4.3in. 800x480 (Capacitive)" OFF)
@@ -64,7 +65,7 @@ OPTION(TFT_UI_SERVICE "TFT UI service" ON)
6465
OPTION(SD_CARD_SERVICE "SD card service" ON)
6566
OPTION(NOTIFICATIONS_SERVICE "Notifications service" ON)
6667
OPTION(UPDATE_SERVICE "Update service" ON)
67-
OPTION(USB_SERIAL_SERVICE "Use USB Serial if Available" ON)
68+
OPTION(USB_SERIAL_SERVICE "Use USB Serial if Available" OFF)
6869
OPTION(USE_FAT_INSTEAD_OF_LITTLEFS "Use FAT instead of LittleFS" OFF)
6970

7071
# ===========================================
@@ -87,6 +88,7 @@ set(PLATFORMS_LIST
8788
ESP32S3_SEEED_STUDIO_XIAO
8889
ESP32S3_CUSTOM
8990
ESP32_CUSTOM
91+
ESP32S3_8048_TOUCH_LCD_7
9092
)
9193

9294
set(FIRMWARES_LIST

‎cmake/features.cmake

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,18 @@ message(STATUS "${Cyan}Update Service: ${White}${UPDATE_SERVICE} ${ColourReset}
157157
message(STATUS "${Cyan}Use FAT instead of LittleFS: ${White}${USE_FAT_INSTEAD_OF_LITTLEFS} ${ColourReset}")
158158
message(STATUS "${Cyan}Authentication: ${White}${ESP3D_AUTHENTICATION} ${ColourReset}")
159159
message(STATUS "${Cyan}Time Service: ${White}${TIME_SERVICE} ${ColourReset}")
160+
message(STATUS "${Cyan}SSDP Service: ${White}${SSDP_SERVICE} ${ColourReset}")
161+
message(STATUS "${Cyan}MDNS Service: ${White}${MDNS_SERVICE} ${ColourReset}")
162+
message(STATUS "${Cyan}Web Services: ${White}${WEB_SERVICES} ${ColourReset}")
163+
message(STATUS "${Cyan}Camera Service: ${White}${CAMERA_SERVICE} ${ColourReset}")
164+
message(STATUS "${Cyan}WebDav Services: ${White}${WEBDAV_SERVICES} ${ColourReset}")
165+
message(STATUS "${Cyan}Telnet Service: ${White}${TELNET_SERVICE} ${ColourReset}")
166+
message(STATUS "${Cyan}WebSocket Service: ${White}${WS_SERVICE} ${ColourReset}")
167+
message(STATUS "${Cyan}Notifications Service: ${White}${NOTIFICATIONS_SERVICE} ${ColourReset}")
168+
message(STATUS "${Cyan}USB Serial Service: ${White}${USB_SERIAL_SERVICE} ${ColourReset}")
160169
message(STATUS "${Cyan}------------------------${ColourReset}")
161170
message(STATUS "")
162171

163-
164172
# ===========================================
165173
# Development Configuration Summary
166174
# ===========================================

‎cmake/targets/ESP32S3_4827S043C.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ if (ESP32S3_4827S043C)
77
if(HARDWARE_MOD_GT911_INT)
88
add_compile_options(-DWITH_GT911_INT=1)
99
endif()
10+
set (RESOLUTION_SCREEN "res_480_272")
1011
endif()

‎cmake/targets/ESP32S3_8048S043C.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ if(ESP32S3_8048S043C)
77
if(HARDWARE_MOD_GT911_INT)
88
add_compile_options(-DWITH_GT911_INT=1)
99
endif()
10+
set (RESOLUTION_SCREEN "res_800_480")
1011
endif()

0 commit comments

Comments
 (0)