From c93765c3bc7c492e1ad3c9c2bf7e469b535ec257 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 22 Nov 2018 11:23:36 +0700 Subject: [PATCH] rename freertos example --- .../ses/cdc_msc_hid_freertos.emProject} | 2 +- .../ses/nrf5x/FreeRTOSConfig.h | 0 .../ses/nrf5x/flash_placement.xml | 0 .../ses/nrf5x/nRF52840_xxAA_MemoryMap.xml | 0 .../ses/nrf5x/nRF_Target.js | 0 .../ses/nrf5x/nrf52840_Registers.xml | 0 .../ses/nrf5x/nrf5x.emProject | 152 ++++++++++++++++++ .../ses/nrf5x/thumb_crt0.s | 0 .../ses/samd21/ATSAMD21G18A_MemoryMap.xml | 0 .../ses/samd21/ATSAMD21G18A_Registers.xml | 0 .../ses/samd21/ATSAMD21G18A_Vectors.s | 0 .../ses/samd21/SAMD21_Startup.s | 0 .../ses/samd21/SAMD21_Target.js | 0 .../ses/samd21/flash_placement.xml | 0 .../ses/samd21/samd21.emProject | 78 ++++----- .../ses/samd21/thumb_crt0.s | 0 .../ses/samd51/ATSAMD51J19A_MemoryMap.xml | 0 .../ses/samd51/ATSAMD51J19A_Registers.xml | 0 .../ses/samd51/ATSAMD51J19A_Vectors.s | 0 .../ses/samd51/SAMD51_Startup.s | 0 .../ses/samd51/SAMD51_Target.js | 0 .../ses/samd51/flash_placement.xml | 0 .../ses/samd51/samd51.emProject | 78 ++++----- .../ses/samd51/thumb_crt0.s | 0 .../cdc_msc_hid_freertos}/src/main.c | 0 .../cdc_msc_hid_freertos}/src/msc_app.c | 0 .../cdc_msc_hid_freertos}/src/msc_app.h | 0 .../src/msc_device_ramdisk.c | 0 .../src/msc_flash_qspi.c | 0 .../cdc_msc_hid_freertos}/src/tusb_config.h | 0 .../src/tusb_descriptors.c | 0 .../ses/nrf5x/nrf5x.emProject | 152 ------------------ 32 files changed, 231 insertions(+), 231 deletions(-) rename examples/{device_composite_freertos/ses/device_composite_freertos.emProject => device/cdc_msc_hid_freertos/ses/cdc_msc_hid_freertos.emProject} (74%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/nrf5x/FreeRTOSConfig.h (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/nrf5x/flash_placement.xml (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/nrf5x/nRF_Target.js (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/nrf5x/nrf52840_Registers.xml (100%) create mode 100644 examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf5x.emProject rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/nrf5x/thumb_crt0.s (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd21/ATSAMD21G18A_MemoryMap.xml (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd21/ATSAMD21G18A_Registers.xml (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd21/ATSAMD21G18A_Vectors.s (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd21/SAMD21_Startup.s (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd21/SAMD21_Target.js (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd21/flash_placement.xml (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd21/samd21.emProject (54%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd21/thumb_crt0.s (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd51/ATSAMD51J19A_MemoryMap.xml (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd51/ATSAMD51J19A_Registers.xml (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd51/ATSAMD51J19A_Vectors.s (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd51/SAMD51_Startup.s (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd51/SAMD51_Target.js (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd51/flash_placement.xml (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd51/samd51.emProject (54%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/ses/samd51/thumb_crt0.s (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/src/main.c (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/src/msc_app.c (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/src/msc_app.h (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/src/msc_device_ramdisk.c (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/src/msc_flash_qspi.c (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/src/tusb_config.h (100%) rename examples/{device_composite_freertos => device/cdc_msc_hid_freertos}/src/tusb_descriptors.c (100%) delete mode 100644 examples/device_composite_freertos/ses/nrf5x/nrf5x.emProject diff --git a/examples/device_composite_freertos/ses/device_composite_freertos.emProject b/examples/device/cdc_msc_hid_freertos/ses/cdc_msc_hid_freertos.emProject similarity index 74% rename from examples/device_composite_freertos/ses/device_composite_freertos.emProject rename to examples/device/cdc_msc_hid_freertos/ses/cdc_msc_hid_freertos.emProject index 115fb4e99..d666ec949 100644 --- a/examples/device_composite_freertos/ses/device_composite_freertos.emProject +++ b/examples/device/cdc_msc_hid_freertos/ses/cdc_msc_hid_freertos.emProject @@ -1,5 +1,5 @@ - + diff --git a/examples/device_composite_freertos/ses/nrf5x/FreeRTOSConfig.h b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/FreeRTOSConfig.h similarity index 100% rename from examples/device_composite_freertos/ses/nrf5x/FreeRTOSConfig.h rename to examples/device/cdc_msc_hid_freertos/ses/nrf5x/FreeRTOSConfig.h diff --git a/examples/device_composite_freertos/ses/nrf5x/flash_placement.xml b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/flash_placement.xml similarity index 100% rename from examples/device_composite_freertos/ses/nrf5x/flash_placement.xml rename to examples/device/cdc_msc_hid_freertos/ses/nrf5x/flash_placement.xml diff --git a/examples/device_composite_freertos/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml similarity index 100% rename from examples/device_composite_freertos/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml rename to examples/device/cdc_msc_hid_freertos/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml diff --git a/examples/device_composite_freertos/ses/nrf5x/nRF_Target.js b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nRF_Target.js similarity index 100% rename from examples/device_composite_freertos/ses/nrf5x/nRF_Target.js rename to examples/device/cdc_msc_hid_freertos/ses/nrf5x/nRF_Target.js diff --git a/examples/device_composite_freertos/ses/nrf5x/nrf52840_Registers.xml b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf52840_Registers.xml similarity index 100% rename from examples/device_composite_freertos/ses/nrf5x/nrf52840_Registers.xml rename to examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf52840_Registers.xml diff --git a/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf5x.emProject new file mode 100644 index 000000000..4bfbe6467 --- /dev/null +++ b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/nrf5x.emProject @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/device_composite_freertos/ses/nrf5x/thumb_crt0.s b/examples/device/cdc_msc_hid_freertos/ses/nrf5x/thumb_crt0.s similarity index 100% rename from examples/device_composite_freertos/ses/nrf5x/thumb_crt0.s rename to examples/device/cdc_msc_hid_freertos/ses/nrf5x/thumb_crt0.s diff --git a/examples/device_composite_freertos/ses/samd21/ATSAMD21G18A_MemoryMap.xml b/examples/device/cdc_msc_hid_freertos/ses/samd21/ATSAMD21G18A_MemoryMap.xml similarity index 100% rename from examples/device_composite_freertos/ses/samd21/ATSAMD21G18A_MemoryMap.xml rename to examples/device/cdc_msc_hid_freertos/ses/samd21/ATSAMD21G18A_MemoryMap.xml diff --git a/examples/device_composite_freertos/ses/samd21/ATSAMD21G18A_Registers.xml b/examples/device/cdc_msc_hid_freertos/ses/samd21/ATSAMD21G18A_Registers.xml similarity index 100% rename from examples/device_composite_freertos/ses/samd21/ATSAMD21G18A_Registers.xml rename to examples/device/cdc_msc_hid_freertos/ses/samd21/ATSAMD21G18A_Registers.xml diff --git a/examples/device_composite_freertos/ses/samd21/ATSAMD21G18A_Vectors.s b/examples/device/cdc_msc_hid_freertos/ses/samd21/ATSAMD21G18A_Vectors.s similarity index 100% rename from examples/device_composite_freertos/ses/samd21/ATSAMD21G18A_Vectors.s rename to examples/device/cdc_msc_hid_freertos/ses/samd21/ATSAMD21G18A_Vectors.s diff --git a/examples/device_composite_freertos/ses/samd21/SAMD21_Startup.s b/examples/device/cdc_msc_hid_freertos/ses/samd21/SAMD21_Startup.s similarity index 100% rename from examples/device_composite_freertos/ses/samd21/SAMD21_Startup.s rename to examples/device/cdc_msc_hid_freertos/ses/samd21/SAMD21_Startup.s diff --git a/examples/device_composite_freertos/ses/samd21/SAMD21_Target.js b/examples/device/cdc_msc_hid_freertos/ses/samd21/SAMD21_Target.js similarity index 100% rename from examples/device_composite_freertos/ses/samd21/SAMD21_Target.js rename to examples/device/cdc_msc_hid_freertos/ses/samd21/SAMD21_Target.js diff --git a/examples/device_composite_freertos/ses/samd21/flash_placement.xml b/examples/device/cdc_msc_hid_freertos/ses/samd21/flash_placement.xml similarity index 100% rename from examples/device_composite_freertos/ses/samd21/flash_placement.xml rename to examples/device/cdc_msc_hid_freertos/ses/samd21/flash_placement.xml diff --git a/examples/device_composite_freertos/ses/samd21/samd21.emProject b/examples/device/cdc_msc_hid_freertos/ses/samd21/samd21.emProject similarity index 54% rename from examples/device_composite_freertos/ses/samd21/samd21.emProject rename to examples/device/cdc_msc_hid_freertos/ses/samd21/samd21.emProject index cb9cee4f5..2ae0d66a1 100644 --- a/examples/device_composite_freertos/ses/samd21/samd21.emProject +++ b/examples/device/cdc_msc_hid_freertos/ses/samd21/samd21.emProject @@ -19,7 +19,7 @@ arm_target_interface_type="SWD" build_treat_warnings_as_errors="Yes" c_preprocessor_definitions="__SAMD21G18A__;__SAMD21_FAMILY;__SAM_D21_SUBFAMILY;ARM_MATH_CM0PLUS;FLASH_PLACEMENT=1;USE_SIMPLE_ASSERT;CONF_XOSC32K_CONFIG=1;CONF_OSC32K_ENABLE=1;CONF_OSC32K_EN32K=1;CONF_XOSC32K_STARTUP=CONF_XOSC32K_STARTUP_TIME_2000092MCS;CONF_DFLL_ONDEMAND=0;CONF_DFLL_OVERWRITE_CALIBRATION=0;BOARD_METRO_M0_EXPRESS;CFG_TUSB_MCU=OPT_MCU_SAMD21" - c_user_include_directories="./;../../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(asf4Dir);$(asf4Dir)/include;$(asf4Dir)/config;$(asf4Dir)/hri;$(asf4Dir)/hal/include;$(asf4Dir)/hal/utils/include;$(asf4Dir)/hpl/port;$(asf4Dir)/hpl/gclk;$(asf4Dir)/hpl/pm" + c_user_include_directories="./;../../src;$(rootDir)/hw/cmsis/Include;$(rootDir)/hw;$(rootDir)/src;$(asf4Dir);$(asf4Dir)/include;$(asf4Dir)/config;$(asf4Dir)/hri;$(asf4Dir)/hal/include;$(asf4Dir)/hal/utils/include;$(asf4Dir)/hpl/port;$(asf4Dir)/hpl/gclk;$(asf4Dir)/hpl/pm;$(freertosDir)/Source/include;$(freertosDir)/Source/portable/GCC/ARM_CM0" debug_register_definition_file="ATSAMD21G18A_Registers.xml" debug_target_connection="J-Link" gcc_entry_point="Reset_Handler" @@ -27,7 +27,7 @@ linker_memory_map_file="$(ProjectDir)/ATSAMD21G18A_MemoryMap.xml" linker_section_placement_file="flash_placement.xml" linker_section_placements_segments="FLASH RX 0x00000000 0x00080000;RAM RWX 0x20000000 0x00030000" - macros="DeviceFamily=SAMD21;Target=ATSAMD21G18A;Placement=Flash;rootDir=../../../..;asf4Dir=../../../../hw/mcu/microchip/samd/asf4/samd21;freertosDir=../../../../lib/FreeRTOS" + macros="DeviceFamily=SAMD21;Target=ATSAMD21G18A;Placement=Flash;rootDir=../../../../..;asf4Dir=../../../../../hw/mcu/microchip/samd/asf4/samd21;freertosDir=../../../../../lib/FreeRTOS" project_directory="" project_type="Executable" target_reset_script="Reset();" @@ -37,15 +37,15 @@ Name="tinyusb" exclude="" filter="*.c;*.h" - path="../../../../src" + path="../../../../../src" recurse="Yes" /> - - + + - - + + @@ -54,20 +54,20 @@ - + - + - + - + - + @@ -96,49 +96,49 @@ Name="segger_rtt" exclude="" filter="*.c;*.h" - path="../../../../lib/segger_rtt" + path="../../../../../lib/segger_rtt" recurse="No" /> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - + - - - - + + + + - - + + diff --git a/examples/device_composite_freertos/ses/samd21/thumb_crt0.s b/examples/device/cdc_msc_hid_freertos/ses/samd21/thumb_crt0.s similarity index 100% rename from examples/device_composite_freertos/ses/samd21/thumb_crt0.s rename to examples/device/cdc_msc_hid_freertos/ses/samd21/thumb_crt0.s diff --git a/examples/device_composite_freertos/ses/samd51/ATSAMD51J19A_MemoryMap.xml b/examples/device/cdc_msc_hid_freertos/ses/samd51/ATSAMD51J19A_MemoryMap.xml similarity index 100% rename from examples/device_composite_freertos/ses/samd51/ATSAMD51J19A_MemoryMap.xml rename to examples/device/cdc_msc_hid_freertos/ses/samd51/ATSAMD51J19A_MemoryMap.xml diff --git a/examples/device_composite_freertos/ses/samd51/ATSAMD51J19A_Registers.xml b/examples/device/cdc_msc_hid_freertos/ses/samd51/ATSAMD51J19A_Registers.xml similarity index 100% rename from examples/device_composite_freertos/ses/samd51/ATSAMD51J19A_Registers.xml rename to examples/device/cdc_msc_hid_freertos/ses/samd51/ATSAMD51J19A_Registers.xml diff --git a/examples/device_composite_freertos/ses/samd51/ATSAMD51J19A_Vectors.s b/examples/device/cdc_msc_hid_freertos/ses/samd51/ATSAMD51J19A_Vectors.s similarity index 100% rename from examples/device_composite_freertos/ses/samd51/ATSAMD51J19A_Vectors.s rename to examples/device/cdc_msc_hid_freertos/ses/samd51/ATSAMD51J19A_Vectors.s diff --git a/examples/device_composite_freertos/ses/samd51/SAMD51_Startup.s b/examples/device/cdc_msc_hid_freertos/ses/samd51/SAMD51_Startup.s similarity index 100% rename from examples/device_composite_freertos/ses/samd51/SAMD51_Startup.s rename to examples/device/cdc_msc_hid_freertos/ses/samd51/SAMD51_Startup.s diff --git a/examples/device_composite_freertos/ses/samd51/SAMD51_Target.js b/examples/device/cdc_msc_hid_freertos/ses/samd51/SAMD51_Target.js similarity index 100% rename from examples/device_composite_freertos/ses/samd51/SAMD51_Target.js rename to examples/device/cdc_msc_hid_freertos/ses/samd51/SAMD51_Target.js diff --git a/examples/device_composite_freertos/ses/samd51/flash_placement.xml b/examples/device/cdc_msc_hid_freertos/ses/samd51/flash_placement.xml similarity index 100% rename from examples/device_composite_freertos/ses/samd51/flash_placement.xml rename to examples/device/cdc_msc_hid_freertos/ses/samd51/flash_placement.xml diff --git a/examples/device_composite_freertos/ses/samd51/samd51.emProject b/examples/device/cdc_msc_hid_freertos/ses/samd51/samd51.emProject similarity index 54% rename from examples/device_composite_freertos/ses/samd51/samd51.emProject rename to examples/device/cdc_msc_hid_freertos/ses/samd51/samd51.emProject index 222190a90..b08ad276d 100644 --- a/examples/device_composite_freertos/ses/samd51/samd51.emProject +++ b/examples/device/cdc_msc_hid_freertos/ses/samd51/samd51.emProject @@ -28,7 +28,7 @@ linker_memory_map_file="ATSAMD51J19A_MemoryMap.xml" linker_section_placement_file="flash_placement.xml" linker_section_placements_segments="FLASH RX 0x00000000 0x00080000;RAM RWX 0x20000000 0x00030000" - macros="DeviceFamily=SAMD51;Target=ATSAMD51J19A;Placement=Flash;rootDir=../../../..;asf4Dir=../../../../hw/mcu/microchip/samd/asf4/samd51;freertosDir=../../../../lib/FreeRTOS" + macros="DeviceFamily=SAMD51;Target=ATSAMD51J19A;Placement=Flash;rootDir=../../../../..;asf4Dir=../../../../../hw/mcu/microchip/samd/asf4/samd51;freertosDir=../../../../../lib/FreeRTOS" project_directory="" project_type="Executable" target_reset_script="Reset();" @@ -38,15 +38,15 @@ Name="tinyusb" exclude="" filter="*.c;*.h" - path="../../../../src" + path="../../../../../src" recurse="Yes" /> - - + + - - + + @@ -55,23 +55,23 @@ - + - + - + - + - + - + @@ -100,49 +100,49 @@ Name="segger_rtt" exclude="" filter="*.c;*.h" - path="../../../../lib/segger_rtt" + path="../../../../../lib/segger_rtt" recurse="No" /> - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - + - - - - + + + + - - + + diff --git a/examples/device_composite_freertos/ses/samd51/thumb_crt0.s b/examples/device/cdc_msc_hid_freertos/ses/samd51/thumb_crt0.s similarity index 100% rename from examples/device_composite_freertos/ses/samd51/thumb_crt0.s rename to examples/device/cdc_msc_hid_freertos/ses/samd51/thumb_crt0.s diff --git a/examples/device_composite_freertos/src/main.c b/examples/device/cdc_msc_hid_freertos/src/main.c similarity index 100% rename from examples/device_composite_freertos/src/main.c rename to examples/device/cdc_msc_hid_freertos/src/main.c diff --git a/examples/device_composite_freertos/src/msc_app.c b/examples/device/cdc_msc_hid_freertos/src/msc_app.c similarity index 100% rename from examples/device_composite_freertos/src/msc_app.c rename to examples/device/cdc_msc_hid_freertos/src/msc_app.c diff --git a/examples/device_composite_freertos/src/msc_app.h b/examples/device/cdc_msc_hid_freertos/src/msc_app.h similarity index 100% rename from examples/device_composite_freertos/src/msc_app.h rename to examples/device/cdc_msc_hid_freertos/src/msc_app.h diff --git a/examples/device_composite_freertos/src/msc_device_ramdisk.c b/examples/device/cdc_msc_hid_freertos/src/msc_device_ramdisk.c similarity index 100% rename from examples/device_composite_freertos/src/msc_device_ramdisk.c rename to examples/device/cdc_msc_hid_freertos/src/msc_device_ramdisk.c diff --git a/examples/device_composite_freertos/src/msc_flash_qspi.c b/examples/device/cdc_msc_hid_freertos/src/msc_flash_qspi.c similarity index 100% rename from examples/device_composite_freertos/src/msc_flash_qspi.c rename to examples/device/cdc_msc_hid_freertos/src/msc_flash_qspi.c diff --git a/examples/device_composite_freertos/src/tusb_config.h b/examples/device/cdc_msc_hid_freertos/src/tusb_config.h similarity index 100% rename from examples/device_composite_freertos/src/tusb_config.h rename to examples/device/cdc_msc_hid_freertos/src/tusb_config.h diff --git a/examples/device_composite_freertos/src/tusb_descriptors.c b/examples/device/cdc_msc_hid_freertos/src/tusb_descriptors.c similarity index 100% rename from examples/device_composite_freertos/src/tusb_descriptors.c rename to examples/device/cdc_msc_hid_freertos/src/tusb_descriptors.c diff --git a/examples/device_composite_freertos/ses/nrf5x/nrf5x.emProject b/examples/device_composite_freertos/ses/nrf5x/nrf5x.emProject deleted file mode 100644 index 978116988..000000000 --- a/examples/device_composite_freertos/ses/nrf5x/nrf5x.emProject +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -