Skip to content

Commit

Permalink
Fix Conpilation failed if USB-SERIAL is disabled on S3
Browse files Browse the repository at this point in the history
  • Loading branch information
luc-github committed May 2, 2024
1 parent e5fdfb7 commit ea33417
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions cmake/targets/ESP32S3_BZM_TFT35_GT911.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ if(ESP32S3_BZM_TFT35_GT911)
set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_BZM_TFT35_GT911/sdkconfig)
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_BZM_TFT35_GT911/components)
add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_BZM_TFT35_GT911/components/bsp")
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
if (USB_SERIAL_SERVICE)
# Enable USB-OTG as serial alternative for communications
add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
endif()
endif()
6 changes: 3 additions & 3 deletions cmake/targets/ESP32S3_CUSTOM.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ if(ESP32S3_CUSTOM)
set(TFT_TARGET "ESP32S3_CUSTOM")
set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_CUSTOM/sdkconfig)
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_CUSTOM/components)
add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_CUSTOM/components/bsp")
add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_CUSTOM/components/bsp")
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
if (USB_SERIAL_SERVICE)
# Enable USB-OTG as serial alternative for communications
add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
endif()
endif()
6 changes: 3 additions & 3 deletions cmake/targets/ESP32S3_FREENOVE_1_1.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ if(ESP32S3_FREENOVE_1_1)
set(TFT_TARGET "ESP32S3_FREENOVE_1_1")
set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_FREENOVE_1_1/sdkconfig)
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_FREENOVE_1_1/components)
add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_FREENOVE_1_1/components/bsp")
add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_FREENOVE_1_1/components/bsp")
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
if (USB_SERIAL_SERVICE)
# Enable USB-OTG as serial alternative for communications
add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
endif()
unset(TFT_UI_SERVICE CACHE)
endif()
4 changes: 2 additions & 2 deletions cmake/targets/ESP32S3_HMI43V3.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ if(ESP32S3_HMI43V3)
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_video_i80)
# Add specific bsp path for board definition
add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_HMI43V3/components/bsp")
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
if (USB_SERIAL_SERVICE)
# Enable USB-OTG as serial alternative for communications
add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
endif()
endif()
4 changes: 2 additions & 2 deletions cmake/targets/ESP32S3_SEEED_STUDIO_XIAO.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ if(ESP32S3_SEEED_STUDIO_XIAO)
set(SDKCONFIG ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_SEEED_STUDIO_XIAO/sdkconfig)
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/ESP32S3_SEEED_STUDIO_XIAO/components)
add_compile_options("-I${CMAKE_SOURCE_DIR}/hardware/ESP32S3_SEEED_STUDIO_XIAO/components/bsp")
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
if (USB_SERIAL_SERVICE)
# Enable USB-OTG as serial alternative for communications
add_compile_options(-DESP3D_USB_SERIAL_FEATURE=1)
# Add specific usb driver for otg
list(APPEND EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/hardware/drivers_usb_otg)
endif()
unset(TFT_UI_SERVICE CACHE)
endif()

0 comments on commit ea33417

Please sign in to comment.