diff options
| author | hathach <[email protected]> | 2026-06-11 20:14:31 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2026-06-11 20:14:31 +0700 |
| commit | 4f5be18911c4d5dd4c3b097cb4ff18e2b7bf2543 (patch) | |
| tree | 7215ed281d513583e23d3056231cc689dacd8eb0 /examples/device/cdc_msc_freertos | |
| parent | 264472e380bbca90aebabc6457fc53d372fcb66e (diff) | |
| parent | 629e805e08575398070d0a9ac2087a853c93d290 (diff) | |
Merge remote-tracking branch 'origin/master' into musb_ep0_race
# Conflicts:
# test/hil/hil_test.py
Diffstat (limited to 'examples/device/cdc_msc_freertos')
| -rw-r--r-- | examples/device/cdc_msc_freertos/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | examples/device/cdc_msc_freertos/src/main.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/examples/device/cdc_msc_freertos/CMakeLists.txt b/examples/device/cdc_msc_freertos/CMakeLists.txt index 429000427..1eafd529a 100644 --- a/examples/device/cdc_msc_freertos/CMakeLists.txt +++ b/examples/device/cdc_msc_freertos/CMakeLists.txt @@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 3.20) include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake) +# Need to set Espressif defaults before project() is called +if(FAMILY STREQUAL "espressif") + list(APPEND SDKCONFIG_DEFAULTS "${CMAKE_CURRENT_LIST_DIR}/sdkconfig.defaults") +endif() + project(cdc_msc_freertos C CXX ASM) # Checks this example is valid for the family and initializes the project diff --git a/examples/device/cdc_msc_freertos/src/main.c b/examples/device/cdc_msc_freertos/src/main.c index f2f71d089..4a920c90b 100644 --- a/examples/device/cdc_msc_freertos/src/main.c +++ b/examples/device/cdc_msc_freertos/src/main.c @@ -88,7 +88,7 @@ int main(void) { #else xTaskCreate(led_blinking_task, "blinky", BLINKY_STACK_SIZE, NULL, 1, NULL); xTaskCreate(usb_device_task, "usbd", USBD_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL); - xTaskCreate(cdc_task, "cdc", CDC_STACK_SZIE, NULL, configMAX_PRIORITIES - 2, NULL); + xTaskCreate(cdc_task, "cdc", CDC_STACK_SIZE, NULL, configMAX_PRIORITIES - 2, NULL); #endif #ifndef ESP_PLATFORM |