diff options
| author | HiFiPhile <[email protected]> | 2021-07-17 12:10:35 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-07-17 12:10:35 +0200 |
| commit | b194aa240bba9211e01dd9eaf4562e00a7215666 (patch) | |
| tree | b9ef8962f6fdac517e7fc8575526f6cdec8467c1 /examples/device/cdc_msc_freertos | |
| parent | 475742984f4d0f2b95c9c78dfff71814117feb90 (diff) | |
| parent | 21bfd11683c4bb6e0996130bd1061a97d3049121 (diff) | |
Merge branch 'master' into dcd_same70
Diffstat (limited to 'examples/device/cdc_msc_freertos')
| -rw-r--r-- | examples/device/cdc_msc_freertos/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | examples/device/cdc_msc_freertos/src/freertos_hook.c | 2 |
2 files changed, 12 insertions, 10 deletions
diff --git a/examples/device/cdc_msc_freertos/CMakeLists.txt b/examples/device/cdc_msc_freertos/CMakeLists.txt index 1d04a8518..639dde99a 100644 --- a/examples/device/cdc_msc_freertos/CMakeLists.txt +++ b/examples/device/cdc_msc_freertos/CMakeLists.txt @@ -1,20 +1,22 @@ cmake_minimum_required(VERSION 3.5) -# use BOARD-Directory name for project id -get_filename_component(PROJECT ${CMAKE_CURRENT_SOURCE_DIR} NAME) -set(PROJECT ${BOARD}-${PROJECT}) - # TOP is absolute path to root directory of TinyUSB git repo +# needed for esp32sx build. TOOD could be removed later on set(TOP "../../..") get_filename_component(TOP "${TOP}" REALPATH) -# Check for -DFAMILY= -if(FAMILY MATCHES "^esp32s[2-3]") - cmake_minimum_required(VERSION 3.5) +include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake) + +# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>) +family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR}) - include(${TOP}/hw/bsp/${FAMILY}/family.cmake) - project(${PROJECT}) +project(${PROJECT}) +# Checks this example is valid for the family and initializes the project +family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR}) + +# Check for -DFAMILY= +if(FAMILY MATCHES "^esp32s[2-3]") else() message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}") endif() diff --git a/examples/device/cdc_msc_freertos/src/freertos_hook.c b/examples/device/cdc_msc_freertos/src/freertos_hook.c index 273ad46e6..ab885947c 100644 --- a/examples/device/cdc_msc_freertos/src/freertos_hook.c +++ b/examples/device/cdc_msc_freertos/src/freertos_hook.c @@ -94,7 +94,7 @@ void vApplicationGetTimerTaskMemory( StaticTask_t **ppxTimerTaskTCBBuffer, Stack *pulTimerTaskStackSize = configTIMER_TASK_STACK_DEPTH; } -#if CFG_TUSB_MCU == OPT_MCU_RX63X +#if CFG_TUSB_MCU == OPT_MCU_RX63X | CFG_TUSB_MCU == OPT_MCU_RX65X #include "iodefine.h" void vApplicationSetupTimerInterrupt(void) { |