Skip to content

Commit 15b56e8

Browse files
luc-githubluc-github
committed
Extract hardware target from common make to define resolution
Add Codebase for waveshare 7 - io expander not yet implemented Add all flags in configuration summary
1 parent 74df62e commit 15b56e8

28 files changed

+3626
-61
lines changed

‎CMakeLists.txt

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
# #######################################
44

55
# With TFT:
6-
OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" ON)
6+
OPTION(ESP32S3_HMI43V3 "TFT TARGET is ESP32S3 HMI 4.3inches" OFF)
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)" ON)
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)
@@ -61,10 +62,10 @@ OPTION(WEBDAV_SERVICES "WebDav Services" ON)
6162
OPTION(TELNET_SERVICE "Telnet service" ON)
6263
OPTION(WS_SERVICE "WebSocket data service" ON)
6364
OPTION(TFT_UI_SERVICE "TFT UI service" ON)
64-
OPTION(SD_CARD_SERVICE "SD card service" ON)
65+
OPTION(SD_CARD_SERVICE "SD card service" OFF)
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/dev_tools.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# 2 = Debug
1010
# 1 = Error only
1111
# 0 = Disabled
12-
set(ESP3D_TFT_LOG_LEVEL 0)
12+
set(ESP3D_TFT_LOG_LEVEL 3)
1313
add_compile_options(-DESP3D_TFT_LOG=${ESP3D_TFT_LOG_LEVEL})
1414

1515
# ANSI Color in Logs

‎cmake/features.cmake

+9-1
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

+1
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

+1
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()

‎cmake/targets/ESP32S3_8048S050C.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ if(ESP32S3_8048S050C)
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()

‎cmake/targets/ESP32S3_8048S070C.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ if(ESP32S3_8048S070C)
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()

‎cmake/targets/ESP32S3_8048_TOUCH_LCD_7.cmake

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
if(ESP32S3_8048_TOUCH_LCD_7)
2+
set(TFT_TARGET "ESP32S3_8048_TOUCH_LCD_7")
3+
set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/common/sdkconfig/ESP32-S3/with_PSRAM/8MB_Flash)
4+
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_8048_TOUCH_LCD_7/components)
5+
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_video_rgb)
6+
add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_8048_TOUCH_LCD_7/components/bsp")
7+
add_compile_options(-DWITH_GT911_INT=1)
8+
# Add specific usb driver for otg
9+
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
10+
if (USB_SERIAL_SERVICE)
11+
# Enable USB-OTG as serial alternative for communications
12+
add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
13+
endif()
14+
set (RESOLUTION_SCREEN "res_800_480")
15+
endif()

‎cmake/targets/ESP32S3_BZM_TFT35_GT911.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ if(ESP32S3_BZM_TFT35_GT911)
1111
# Enable USB-OTG as serial alternative for communications
1212
add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
1313
endif()
14+
set (RESOLUTION_SCREEN "res_480_320")
1415
endif()

‎cmake/targets/ESP32S3_HMI43V3.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ if(ESP32S3_HMI43V3)
1616
# Enable USB-OTG as serial alternative for communications
1717
add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
1818
endif()
19+
set (RESOLUTION_SCREEN "res_800_480")
1920
endif()

‎cmake/targets/ESP32S3_ZX3D50CE02S_USRC_4832.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ if(ESP32S3_ZX3D50CE02S_USRC_4832)
1010
# Enable USB-OTG as serial alternative for communications
1111
add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
1212
endif()
13+
set (RESOLUTION_SCREEN "res_480_320")
1314
endif()

‎cmake/targets/ESP32_2432S028R.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ if (ESP32_2432S028R)
1313
set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/common/sdkconfig/ESP32/with_PSRAM/4MB_Flash)
1414
endif()
1515
endif()
16+
set (RESOLUTION_SCREEN "res_320_240")
1617
endif()

‎cmake/targets/ESP32_3248S035C.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,5 @@ if(ESP32_3248S035C)
1616
set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/common/sdkconfig/ESP32/with_PSRAM/4MB_Flash)
1717
endif()
1818
endif()
19+
set (RESOLUTION_SCREEN "res_480_320")
1920
endif()

‎cmake/targets/ESP32_3248S035R.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ if(ESP32_3248S035R)
1313
set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/common/sdkconfig/ESP32/with_PSRAM/4MB_Flash)
1414
endif()
1515
endif()
16+
set (RESOLUTION_SCREEN "res_480_320")
1617
endif()

‎cmake/targets/ESP32_ROTRICS_DEXARM35.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ if(ESP32_ROTRICS_DEXARM35)
33
set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/ESP32_ROTRICS_DEXARM35/sdkconfig)
44
set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32_ROTRICS_DEXARM35/components)
55
add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32_ROTRICS_DEXARM35/components/bsp")
6+
set (RESOLUTION_SCREEN "res_480_320")
67
endif()

‎hardware/ESP32S3_8048_TOUCH_LCD_7/components/bsp/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Component directive
2+
idf_component_register(
3+
SRCS "bsp.c"
4+
INCLUDE_DIRS .
5+
REQUIRES esp3d_log lvgl esp_lcd i2c_bus st7262 gt911 usb_serial
6+
)

0 commit comments

Comments
 (0)