Skip to content

Commit 3bed4fd

Browse files
Upgrade to ESP-IDF release/v6.0 and remove usb component dependency
ESP-IDF release/v6.0 removed the 'usb' component from core - USB PHY functionality is now handled internally by esp_hw_support. Changes: - Remove 'usb' from REQUIRES in main/CMakeLists.txt - Remove obsolete esp_tinyusb workaround code - Update GitHub Actions workflows to use release-v6.0 - Matches local development environment esp_tinyusb v2.0.0 works correctly with release/v6.0 without the workaround since the component's dependencies are resolved transitively.
1 parent 2de5b61 commit 3bed4fd

3 files changed

Lines changed: 3 additions & 10 deletions

File tree

.github/workflows/build-esp32.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Build ${{ matrix.board.display_name }}
3737
uses: espressif/esp-idf-ci-action@v1
3838
with:
39-
esp_idf_version: 1bbf04cb4c
39+
esp_idf_version: release-v6.0
4040
target: esp32s3
4141
path: esp
4242
command: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jobs:
174174
- name: Build ${{ matrix.board.display_name }}
175175
uses: espressif/esp-idf-ci-action@v1
176176
with:
177-
esp_idf_version: 1bbf04cb4c
177+
esp_idf_version: release-v6.0
178178
target: esp32s3
179179
path: esp
180180
command: |

esp/main/CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,4 @@ idf_component_register(SRCS "usb_dfu.c" "ble_hid.c" "transport_hid.c" "transport
88
INCLUDE_DIRS "."
99
"mouthpad-proto/nanopb"
1010
"mouthpad-proto/src/C"
11-
REQUIRES bt esp_hid nvs_flash esp_driver_uart usb)
12-
13-
# Workaround for esp_tinyusb v2.0.1 bug: CMakeLists.txt has backwards logic for IDF 6.0
14-
# It only adds "usb" component for IDF < 6, but IDF 6.0+ is what requires it
15-
# Force esp_tinyusb to link against usb component
16-
idf_component_get_property(esp_tinyusb_lib espressif__esp_tinyusb COMPONENT_LIB)
17-
idf_component_get_property(usb_lib usb COMPONENT_LIB)
18-
target_link_libraries(${esp_tinyusb_lib} PRIVATE ${usb_lib})
11+
REQUIRES bt esp_hid nvs_flash esp_driver_uart)

0 commit comments

Comments
 (0)