diff --git a/examples/device_composite/ses/device_composite.emProject b/examples/device/cdc_msc_hid/ses/cdc_msc_hid.emProject similarity index 76% rename from examples/device_composite/ses/device_composite.emProject rename to examples/device/cdc_msc_hid/ses/cdc_msc_hid.emProject index d78430f58..ebf758cd3 100644 --- a/examples/device_composite/ses/device_composite.emProject +++ b/examples/device/cdc_msc_hid/ses/cdc_msc_hid.emProject @@ -1,5 +1,5 @@ - + diff --git a/examples/device_composite/ses/nrf5x/flash_placement.xml b/examples/device/cdc_msc_hid/ses/nrf5x/flash_placement.xml similarity index 100% rename from examples/device_composite/ses/nrf5x/flash_placement.xml rename to examples/device/cdc_msc_hid/ses/nrf5x/flash_placement.xml diff --git a/examples/device_composite/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml b/examples/device/cdc_msc_hid/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml similarity index 100% rename from examples/device_composite/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml rename to examples/device/cdc_msc_hid/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml diff --git a/examples/device_composite/ses/nrf5x/nRF_Target.js b/examples/device/cdc_msc_hid/ses/nrf5x/nRF_Target.js similarity index 100% rename from examples/device_composite/ses/nrf5x/nRF_Target.js rename to examples/device/cdc_msc_hid/ses/nrf5x/nRF_Target.js diff --git a/examples/device_composite/ses/nrf5x/nrf52840_Registers.xml b/examples/device/cdc_msc_hid/ses/nrf5x/nrf52840_Registers.xml similarity index 100% rename from examples/device_composite/ses/nrf5x/nrf52840_Registers.xml rename to examples/device/cdc_msc_hid/ses/nrf5x/nrf52840_Registers.xml diff --git a/examples/device_composite/ses/nrf5x/nrf5x.emProject b/examples/device/cdc_msc_hid/ses/nrf5x/nrf5x.emProject similarity index 57% rename from examples/device_composite/ses/nrf5x/nrf5x.emProject rename to examples/device/cdc_msc_hid/ses/nrf5x/nrf5x.emProject index c785e4287..b16c43efa 100644 --- a/examples/device_composite/ses/nrf5x/nrf5x.emProject +++ b/examples/device/cdc_msc_hid/ses/nrf5x/nrf5x.emProject @@ -27,7 +27,7 @@ link_use_linker_script_file="No" linker_memory_map_file="nRF52840_xxAA_MemoryMap.xml" linker_section_placement_file="flash_placement.xml" - macros="DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;rootDir=../../../..;nrfxDir=../../../../hw/mcu/nordic/nrfx" + macros="DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;rootDir=../../../../..;nrfxDir=../../../../../hw/mcu/nordic/nrfx" project_directory="" project_type="Executable" target_reset_script="Reset();" @@ -37,50 +37,50 @@ Name="tinyusb" exclude="" filter="*.c;*.h" - path="../../../../src" + path="../../../../../src" recurse="Yes" /> - - + + - - + + - - - + + + - - + + - - - + + + - - - - - - - - - + + + + + + + + + - - + + @@ -102,7 +102,7 @@ Name="segger_rtt" exclude="" filter="*.c;*.h" - path="../../../../lib/segger_rtt" + path="../../../../../lib/segger_rtt" recurse="No" /> diff --git a/examples/device_composite/ses/nrf5x/thumb_crt0.s b/examples/device/cdc_msc_hid/ses/nrf5x/thumb_crt0.s similarity index 100% rename from examples/device_composite/ses/nrf5x/thumb_crt0.s rename to examples/device/cdc_msc_hid/ses/nrf5x/thumb_crt0.s diff --git a/examples/device_composite/ses/samd21/ATSAMD21G18A_MemoryMap.xml b/examples/device/cdc_msc_hid/ses/samd21/ATSAMD21G18A_MemoryMap.xml similarity index 100% rename from examples/device_composite/ses/samd21/ATSAMD21G18A_MemoryMap.xml rename to examples/device/cdc_msc_hid/ses/samd21/ATSAMD21G18A_MemoryMap.xml diff --git a/examples/device_composite/ses/samd21/ATSAMD21G18A_Registers.xml b/examples/device/cdc_msc_hid/ses/samd21/ATSAMD21G18A_Registers.xml similarity index 100% rename from examples/device_composite/ses/samd21/ATSAMD21G18A_Registers.xml rename to examples/device/cdc_msc_hid/ses/samd21/ATSAMD21G18A_Registers.xml diff --git a/examples/device_composite/ses/samd21/ATSAMD21G18A_Vectors.s b/examples/device/cdc_msc_hid/ses/samd21/ATSAMD21G18A_Vectors.s similarity index 100% rename from examples/device_composite/ses/samd21/ATSAMD21G18A_Vectors.s rename to examples/device/cdc_msc_hid/ses/samd21/ATSAMD21G18A_Vectors.s diff --git a/examples/device_composite/ses/samd21/SAMD21_Startup.s b/examples/device/cdc_msc_hid/ses/samd21/SAMD21_Startup.s similarity index 100% rename from examples/device_composite/ses/samd21/SAMD21_Startup.s rename to examples/device/cdc_msc_hid/ses/samd21/SAMD21_Startup.s diff --git a/examples/device_composite/ses/samd21/SAMD21_Target.js b/examples/device/cdc_msc_hid/ses/samd21/SAMD21_Target.js similarity index 100% rename from examples/device_composite/ses/samd21/SAMD21_Target.js rename to examples/device/cdc_msc_hid/ses/samd21/SAMD21_Target.js diff --git a/examples/device_composite/ses/samd21/flash_placement.xml b/examples/device/cdc_msc_hid/ses/samd21/flash_placement.xml similarity index 100% rename from examples/device_composite/ses/samd21/flash_placement.xml rename to examples/device/cdc_msc_hid/ses/samd21/flash_placement.xml diff --git a/examples/device_composite/ses/samd21/samd21.emProject b/examples/device/cdc_msc_hid/ses/samd21/samd21.emProject similarity index 78% rename from examples/device_composite/ses/samd21/samd21.emProject rename to examples/device/cdc_msc_hid/ses/samd21/samd21.emProject index 54767199a..a6a439970 100644 --- a/examples/device_composite/ses/samd21/samd21.emProject +++ b/examples/device/cdc_msc_hid/ses/samd21/samd21.emProject @@ -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" + macros="DeviceFamily=SAMD21;Target=ATSAMD21G18A;Placement=Flash;rootDir=../../../../..;asf4Dir=../../../../../hw/mcu/microchip/samd/asf4/samd21" 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,7 +96,7 @@ Name="segger_rtt" exclude="" filter="*.c;*.h" - path="../../../../lib/segger_rtt" + path="../../../../../lib/segger_rtt" recurse="No" /> diff --git a/examples/device_composite/ses/samd21/thumb_crt0.s b/examples/device/cdc_msc_hid/ses/samd21/thumb_crt0.s similarity index 100% rename from examples/device_composite/ses/samd21/thumb_crt0.s rename to examples/device/cdc_msc_hid/ses/samd21/thumb_crt0.s diff --git a/examples/device_composite/ses/samd51/ATSAMD51J19A_MemoryMap.xml b/examples/device/cdc_msc_hid/ses/samd51/ATSAMD51J19A_MemoryMap.xml similarity index 100% rename from examples/device_composite/ses/samd51/ATSAMD51J19A_MemoryMap.xml rename to examples/device/cdc_msc_hid/ses/samd51/ATSAMD51J19A_MemoryMap.xml diff --git a/examples/device_composite/ses/samd51/ATSAMD51J19A_Registers.xml b/examples/device/cdc_msc_hid/ses/samd51/ATSAMD51J19A_Registers.xml similarity index 100% rename from examples/device_composite/ses/samd51/ATSAMD51J19A_Registers.xml rename to examples/device/cdc_msc_hid/ses/samd51/ATSAMD51J19A_Registers.xml diff --git a/examples/device_composite/ses/samd51/ATSAMD51J19A_Vectors.s b/examples/device/cdc_msc_hid/ses/samd51/ATSAMD51J19A_Vectors.s similarity index 100% rename from examples/device_composite/ses/samd51/ATSAMD51J19A_Vectors.s rename to examples/device/cdc_msc_hid/ses/samd51/ATSAMD51J19A_Vectors.s diff --git a/examples/device_composite/ses/samd51/SAMD51_Startup.s b/examples/device/cdc_msc_hid/ses/samd51/SAMD51_Startup.s similarity index 100% rename from examples/device_composite/ses/samd51/SAMD51_Startup.s rename to examples/device/cdc_msc_hid/ses/samd51/SAMD51_Startup.s diff --git a/examples/device_composite/ses/samd51/SAMD51_Target.js b/examples/device/cdc_msc_hid/ses/samd51/SAMD51_Target.js similarity index 100% rename from examples/device_composite/ses/samd51/SAMD51_Target.js rename to examples/device/cdc_msc_hid/ses/samd51/SAMD51_Target.js diff --git a/examples/device_composite/ses/samd51/flash_placement.xml b/examples/device/cdc_msc_hid/ses/samd51/flash_placement.xml similarity index 100% rename from examples/device_composite/ses/samd51/flash_placement.xml rename to examples/device/cdc_msc_hid/ses/samd51/flash_placement.xml diff --git a/examples/device_composite/ses/samd51/samd51.emProject b/examples/device/cdc_msc_hid/ses/samd51/samd51.emProject similarity index 75% rename from examples/device_composite/ses/samd51/samd51.emProject rename to examples/device/cdc_msc_hid/ses/samd51/samd51.emProject index 76be9cf5e..260d452f7 100644 --- a/examples/device_composite/ses/samd51/samd51.emProject +++ b/examples/device/cdc_msc_hid/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" + macros="DeviceFamily=SAMD51;Target=ATSAMD51J19A;Placement=Flash;rootDir=../../../../..;asf4Dir=../../../../../hw/mcu/microchip/samd/asf4/samd51" 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,7 +100,7 @@ Name="segger_rtt" exclude="" filter="*.c;*.h" - path="../../../../lib/segger_rtt" + path="../../../../../lib/segger_rtt" recurse="No" /> diff --git a/examples/device_composite/ses/samd51/thumb_crt0.s b/examples/device/cdc_msc_hid/ses/samd51/thumb_crt0.s similarity index 100% rename from examples/device_composite/ses/samd51/thumb_crt0.s rename to examples/device/cdc_msc_hid/ses/samd51/thumb_crt0.s diff --git a/examples/device_composite/src/main.c b/examples/device/cdc_msc_hid/src/main.c similarity index 100% rename from examples/device_composite/src/main.c rename to examples/device/cdc_msc_hid/src/main.c diff --git a/examples/device_composite/src/msc_app.c b/examples/device/cdc_msc_hid/src/msc_app.c similarity index 100% rename from examples/device_composite/src/msc_app.c rename to examples/device/cdc_msc_hid/src/msc_app.c diff --git a/examples/device_composite/src/msc_app.h b/examples/device/cdc_msc_hid/src/msc_app.h similarity index 100% rename from examples/device_composite/src/msc_app.h rename to examples/device/cdc_msc_hid/src/msc_app.h diff --git a/examples/device_composite/src/msc_flash_qspi.c b/examples/device/cdc_msc_hid/src/msc_flash_qspi.c similarity index 100% rename from examples/device_composite/src/msc_flash_qspi.c rename to examples/device/cdc_msc_hid/src/msc_flash_qspi.c diff --git a/examples/device_composite/src/msc_flash_ram.c b/examples/device/cdc_msc_hid/src/msc_flash_ram.c similarity index 100% rename from examples/device_composite/src/msc_flash_ram.c rename to examples/device/cdc_msc_hid/src/msc_flash_ram.c diff --git a/examples/device_composite/src/tusb_config.h b/examples/device/cdc_msc_hid/src/tusb_config.h similarity index 100% rename from examples/device_composite/src/tusb_config.h rename to examples/device/cdc_msc_hid/src/tusb_config.h diff --git a/examples/device_composite/src/tusb_descriptors.c b/examples/device/cdc_msc_hid/src/tusb_descriptors.c similarity index 100% rename from examples/device_composite/src/tusb_descriptors.c rename to examples/device/cdc_msc_hid/src/tusb_descriptors.c diff --git a/examples/device_composite/ses/device_composite.emSession b/examples/device_composite/ses/device_composite.emSession deleted file mode 100644 index 86dfea211..000000000 --- a/examples/device_composite/ses/device_composite.emSession +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -