diff options
| author | hathach <[email protected]> | 2025-07-08 10:09:24 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2025-07-08 10:09:24 +0700 |
| commit | a56f55c10bea2ce0d38de6a04edae41e6c814b9f (patch) | |
| tree | e9a1791ce6ba17a2ac9a411f5c897f0911d28ff1 /examples/device/video_capture_2ch | |
| parent | 545690c83435fc9e972a65a4e46539c88f2a2853 (diff) | |
| parent | ea64300a9ad57fbdcafbed189b3d358bf9b6912e (diff) | |
Merge remote-tracking branch 'origin/master' into xfer_isr
# Conflicts:
# examples/device/audio_4_channel_mic_freertos/src/main.c
# examples/device/audio_test_freertos/src/main.c
# src/class/audio/audio_device.c
Diffstat (limited to 'examples/device/video_capture_2ch')
| -rw-r--r-- | examples/device/video_capture_2ch/src/main.c | 6 | ||||
| -rw-r--r-- | examples/device/video_capture_2ch/src/tusb_config.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/device/video_capture_2ch/src/main.c b/examples/device/video_capture_2ch/src/main.c index 245e7abb8..dc616e3fa 100644 --- a/examples/device/video_capture_2ch/src/main.c +++ b/examples/device/video_capture_2ch/src/main.c @@ -300,7 +300,7 @@ void led_blinking_task(void* param) { #define BLINKY_STACK_SIZE configMINIMAL_STACK_SIZE #define VIDEO_STACK_SIZE (configMINIMAL_STACK_SIZE*4) -#if TUSB_MCU_VENDOR_ESPRESSIF +#ifdef ESP_PLATFORM #define USBD_STACK_SIZE 4096 int main(void); void app_main(void) { @@ -359,8 +359,8 @@ void freertos_init_task(void) { xTaskCreate(video_task, "video", VIDEO_STACK_SZIE, NULL, configMAX_PRIORITIES - 2, NULL); #endif - // skip starting scheduler (and return) for ESP32-S2 or ESP32-S3 - #if !TUSB_MCU_VENDOR_ESPRESSIF + // only start scheduler for non-espressif mcu + #ifndef ESP_PLATFORM vTaskStartScheduler(); #endif } diff --git a/examples/device/video_capture_2ch/src/tusb_config.h b/examples/device/video_capture_2ch/src/tusb_config.h index 91775a327..e84e49879 100644 --- a/examples/device/video_capture_2ch/src/tusb_config.h +++ b/examples/device/video_capture_2ch/src/tusb_config.h @@ -58,7 +58,7 @@ #endif // Espressif IDF requires "freertos/" prefix in include path -#if TUSB_MCU_VENDOR_ESPRESSIF +#ifdef ESP_PLATFORM #define CFG_TUSB_OS_INC_PATH freertos/ #endif |