Skip to content

Commit 23bdc16

Browse files
committed
fix(usb_webcam): fix build error with latest component manager
1 parent a47fb40 commit 23bdc16

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

components/usb/esp_tinyuf2/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
### How to use
1313

14-
[esp_tinyuf2 user guide]()
14+
[esp_tinyuf2 user guide](https://docs.espressif.com/projects/esp-iot-solution/en/latest/usb/usb_device/esp_tinyuf2.html)
1515

examples/usb/device/usb_webcam/CMakeLists.txt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
66
if("$ENV{IDF_TARGET}" STREQUAL "esp32s3")
77
if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/sdkconfig)
88
file(READ ${CMAKE_CURRENT_LIST_DIR}/sdkconfig SDKCONFIG_RULE)
9-
string(REGEX MATCH "CONFIG_CAMERA_MODULE_ESP_S3_EYE=y" ENABLE_EYES_SHOW "${SDKCONFIG_RULE}")
9+
string(REGEX MATCH "CONFIG_CAMERA_MODULE_ESP_S3_EYE=y" ENABLE_ESP_S3_EYE "${SDKCONFIG_RULE}")
1010
else()
1111
message(STATUS "sdkconfig not exist")
1212
file(READ ${CMAKE_CURRENT_LIST_DIR}/main/Kconfig.projbuild SDKCONFIG_RULE)
13-
string(REGEX MATCH "default CAMERA_MODULE_ESP_S3_EYE" ENABLE_EYES_SHOW "${SDKCONFIG_RULE}")
13+
string(REGEX MATCH "default CAMERA_MODULE_ESP_S3_EYE" ENABLE_ESP_S3_EYE "${SDKCONFIG_RULE}")
1414
endif()
1515
endif()
1616

17-
if (ENABLE_EYES_SHOW)
18-
set(ENV{EYES_SHOW_TARGET} "esp32s3")
19-
message("EYES_SHOW_TARGET is set to esp32s3")
20-
else()
21-
set(ENV{EYES_SHOW_TARGET} "none")
22-
message("EYES_SHOW_TARGET is set to none")
17+
if (ENABLE_ESP_S3_EYE)
18+
set(ENV{USB_WEBCAM_BOARD} "esp32_s3_eye")
19+
else()
20+
set(ENV{USB_WEBCAM_BOARD} "general")
2321
endif()
2422

23+
message("USB_WEBCAM_BOARD is set to $ENV{USB_WEBCAM_BOARD}")
2524
project(usb_webcam)

examples/usb/device/usb_webcam/main/idf_component.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ dependencies:
66
idf:
77
version: ">=5.0"
88
esp32-camera:
9-
version: ">=2.0.5"
9+
version: "2.0.10"
1010
esp32_s3_eye:
1111
version: ^2.0.2
1212
rules:
13-
- if: "target == $EYES_SHOW_TARGET"
13+
- if: "${USB_WEBCAM_BOARD} in [esp32_s3_eye]"
1414
eyes_show:
1515
rules:
16-
- if: "target == $EYES_SHOW_TARGET"
16+
- if: "${USB_WEBCAM_BOARD} in [esp32_s3_eye]"
1717
override_path: "../eyes_show"
1818
cmake_utilities: "*"
1919
usb_device_uvc:

0 commit comments

Comments
 (0)