From 1a91b5a62e514908d32d983431b0e2f2df9d12d3 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 22 Nov 2018 00:25:03 +0700 Subject: [PATCH] refractor device composite example --- .../ses/device_composite.emProject | 292 ------------------ .../ses/ses_nrf5x/nrf5x.emProject | 123 -------- .../ses/device_composite.emSession | 95 ++++++ .../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 | 109 +++++++ .../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 | 103 ++++++ .../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 | 107 +++++++ .../ses/samd51}/thumb_crt0.s | 0 .../{device => }/device_composite/src/main.c | 0 .../device_composite/src/msc_app.c | 0 .../device_composite/src/msc_app.h | 0 .../device_composite/src/msc_flash_qspi.c | 0 .../device_composite/src/msc_flash_ram.c | 0 .../device_composite/src/tusb_config.h | 0 .../device_composite/src/tusb_descriptors.c | 0 .../src => lib}/segger_rtt/SEGGER_RTT.c | 0 .../src => lib}/segger_rtt/SEGGER_RTT.h | 0 .../src => lib}/segger_rtt/SEGGER_RTT_Conf.h | 0 .../src => lib}/segger_rtt/SEGGER_RTT_SES.c | 0 36 files changed, 414 insertions(+), 415 deletions(-) delete mode 100644 examples/device/device_composite/ses/device_composite.emProject delete mode 100644 examples/device/device_composite/ses/ses_nrf5x/nrf5x.emProject create mode 100644 examples/device_composite/ses/device_composite.emSession rename examples/{device/device_composite/ses/ses_nrf5x => device_composite/ses/nrf5x}/flash_placement.xml (100%) rename examples/{device/device_composite/ses/ses_nrf5x => device_composite/ses/nrf5x}/nRF52840_xxAA_MemoryMap.xml (100%) rename examples/{device/device_composite/ses/ses_nrf5x => device_composite/ses/nrf5x}/nRF_Target.js (100%) rename examples/{device/device_composite/ses/ses_nrf5x => device_composite/ses/nrf5x}/nrf52840_Registers.xml (100%) create mode 100644 examples/device_composite/ses/nrf5x/nrf5x.emProject rename examples/{device/device_composite/ses/ses_nrf5x => device_composite/ses/nrf5x}/thumb_crt0.s (100%) rename examples/{device/device_composite/ses/ses_samd21 => device_composite/ses/samd21}/ATSAMD21G18A_MemoryMap.xml (100%) rename examples/{device/device_composite/ses/ses_samd21 => device_composite/ses/samd21}/ATSAMD21G18A_Registers.xml (100%) rename examples/{device/device_composite/ses/ses_samd21 => device_composite/ses/samd21}/ATSAMD21G18A_Vectors.s (100%) rename examples/{device/device_composite/ses/ses_samd21 => device_composite/ses/samd21}/SAMD21_Startup.s (100%) rename examples/{device/device_composite/ses/ses_samd21 => device_composite/ses/samd21}/SAMD21_Target.js (100%) rename examples/{device/device_composite/ses/ses_samd21 => device_composite/ses/samd21}/flash_placement.xml (100%) create mode 100644 examples/device_composite/ses/samd21/samd21.emProject rename examples/{device/device_composite/ses/ses_samd21 => device_composite/ses/samd21}/thumb_crt0.s (100%) rename examples/{device/device_composite/ses/ses_samd51 => device_composite/ses/samd51}/ATSAMD51J19A_MemoryMap.xml (100%) rename examples/{device/device_composite/ses/ses_samd51 => device_composite/ses/samd51}/ATSAMD51J19A_Registers.xml (100%) rename examples/{device/device_composite/ses/ses_samd51 => device_composite/ses/samd51}/ATSAMD51J19A_Vectors.s (100%) rename examples/{device/device_composite/ses/ses_samd51 => device_composite/ses/samd51}/SAMD51_Startup.s (100%) rename examples/{device/device_composite/ses/ses_samd51 => device_composite/ses/samd51}/SAMD51_Target.js (100%) rename examples/{device/device_composite/ses/ses_samd51 => device_composite/ses/samd51}/flash_placement.xml (100%) create mode 100644 examples/device_composite/ses/samd51/samd51.emProject rename examples/{device/device_composite/ses/ses_samd51 => device_composite/ses/samd51}/thumb_crt0.s (100%) rename examples/{device => }/device_composite/src/main.c (100%) rename examples/{device => }/device_composite/src/msc_app.c (100%) rename examples/{device => }/device_composite/src/msc_app.h (100%) rename examples/{device => }/device_composite/src/msc_flash_qspi.c (100%) rename examples/{device => }/device_composite/src/msc_flash_ram.c (100%) rename examples/{device => }/device_composite/src/tusb_config.h (100%) rename examples/{device => }/device_composite/src/tusb_descriptors.c (100%) rename {examples/device/device_composite/src => lib}/segger_rtt/SEGGER_RTT.c (100%) rename {examples/device/device_composite/src => lib}/segger_rtt/SEGGER_RTT.h (100%) rename {examples/device/device_composite/src => lib}/segger_rtt/SEGGER_RTT_Conf.h (100%) rename {examples/device/device_composite/src => lib}/segger_rtt/SEGGER_RTT_SES.c (100%) diff --git a/examples/device/device_composite/ses/device_composite.emProject b/examples/device/device_composite/ses/device_composite.emProject deleted file mode 100644 index f8168b7d3..000000000 --- a/examples/device/device_composite/ses/device_composite.emProject +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/device/device_composite/ses/ses_nrf5x/nrf5x.emProject b/examples/device/device_composite/ses/ses_nrf5x/nrf5x.emProject deleted file mode 100644 index 377ae4347..000000000 --- a/examples/device/device_composite/ses/ses_nrf5x/nrf5x.emProject +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/device_composite/ses/device_composite.emSession b/examples/device_composite/ses/device_composite.emSession new file mode 100644 index 000000000..86dfea211 --- /dev/null +++ b/examples/device_composite/ses/device_composite.emSession @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/device/device_composite/ses/ses_nrf5x/flash_placement.xml b/examples/device_composite/ses/nrf5x/flash_placement.xml similarity index 100% rename from examples/device/device_composite/ses/ses_nrf5x/flash_placement.xml rename to examples/device_composite/ses/nrf5x/flash_placement.xml diff --git a/examples/device/device_composite/ses/ses_nrf5x/nRF52840_xxAA_MemoryMap.xml b/examples/device_composite/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml similarity index 100% rename from examples/device/device_composite/ses/ses_nrf5x/nRF52840_xxAA_MemoryMap.xml rename to examples/device_composite/ses/nrf5x/nRF52840_xxAA_MemoryMap.xml diff --git a/examples/device/device_composite/ses/ses_nrf5x/nRF_Target.js b/examples/device_composite/ses/nrf5x/nRF_Target.js similarity index 100% rename from examples/device/device_composite/ses/ses_nrf5x/nRF_Target.js rename to examples/device_composite/ses/nrf5x/nRF_Target.js diff --git a/examples/device/device_composite/ses/ses_nrf5x/nrf52840_Registers.xml b/examples/device_composite/ses/nrf5x/nrf52840_Registers.xml similarity index 100% rename from examples/device/device_composite/ses/ses_nrf5x/nrf52840_Registers.xml rename to examples/device_composite/ses/nrf5x/nrf52840_Registers.xml diff --git a/examples/device_composite/ses/nrf5x/nrf5x.emProject b/examples/device_composite/ses/nrf5x/nrf5x.emProject new file mode 100644 index 000000000..c785e4287 --- /dev/null +++ b/examples/device_composite/ses/nrf5x/nrf5x.emProject @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/device/device_composite/ses/ses_nrf5x/thumb_crt0.s b/examples/device_composite/ses/nrf5x/thumb_crt0.s similarity index 100% rename from examples/device/device_composite/ses/ses_nrf5x/thumb_crt0.s rename to examples/device_composite/ses/nrf5x/thumb_crt0.s diff --git a/examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_MemoryMap.xml b/examples/device_composite/ses/samd21/ATSAMD21G18A_MemoryMap.xml similarity index 100% rename from examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_MemoryMap.xml rename to examples/device_composite/ses/samd21/ATSAMD21G18A_MemoryMap.xml diff --git a/examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_Registers.xml b/examples/device_composite/ses/samd21/ATSAMD21G18A_Registers.xml similarity index 100% rename from examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_Registers.xml rename to examples/device_composite/ses/samd21/ATSAMD21G18A_Registers.xml diff --git a/examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_Vectors.s b/examples/device_composite/ses/samd21/ATSAMD21G18A_Vectors.s similarity index 100% rename from examples/device/device_composite/ses/ses_samd21/ATSAMD21G18A_Vectors.s rename to examples/device_composite/ses/samd21/ATSAMD21G18A_Vectors.s diff --git a/examples/device/device_composite/ses/ses_samd21/SAMD21_Startup.s b/examples/device_composite/ses/samd21/SAMD21_Startup.s similarity index 100% rename from examples/device/device_composite/ses/ses_samd21/SAMD21_Startup.s rename to examples/device_composite/ses/samd21/SAMD21_Startup.s diff --git a/examples/device/device_composite/ses/ses_samd21/SAMD21_Target.js b/examples/device_composite/ses/samd21/SAMD21_Target.js similarity index 100% rename from examples/device/device_composite/ses/ses_samd21/SAMD21_Target.js rename to examples/device_composite/ses/samd21/SAMD21_Target.js diff --git a/examples/device/device_composite/ses/ses_samd21/flash_placement.xml b/examples/device_composite/ses/samd21/flash_placement.xml similarity index 100% rename from examples/device/device_composite/ses/ses_samd21/flash_placement.xml rename to examples/device_composite/ses/samd21/flash_placement.xml diff --git a/examples/device_composite/ses/samd21/samd21.emProject b/examples/device_composite/ses/samd21/samd21.emProject new file mode 100644 index 000000000..54767199a --- /dev/null +++ b/examples/device_composite/ses/samd21/samd21.emProject @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/device/device_composite/ses/ses_samd21/thumb_crt0.s b/examples/device_composite/ses/samd21/thumb_crt0.s similarity index 100% rename from examples/device/device_composite/ses/ses_samd21/thumb_crt0.s rename to examples/device_composite/ses/samd21/thumb_crt0.s diff --git a/examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_MemoryMap.xml b/examples/device_composite/ses/samd51/ATSAMD51J19A_MemoryMap.xml similarity index 100% rename from examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_MemoryMap.xml rename to examples/device_composite/ses/samd51/ATSAMD51J19A_MemoryMap.xml diff --git a/examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_Registers.xml b/examples/device_composite/ses/samd51/ATSAMD51J19A_Registers.xml similarity index 100% rename from examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_Registers.xml rename to examples/device_composite/ses/samd51/ATSAMD51J19A_Registers.xml diff --git a/examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_Vectors.s b/examples/device_composite/ses/samd51/ATSAMD51J19A_Vectors.s similarity index 100% rename from examples/device/device_composite/ses/ses_samd51/ATSAMD51J19A_Vectors.s rename to examples/device_composite/ses/samd51/ATSAMD51J19A_Vectors.s diff --git a/examples/device/device_composite/ses/ses_samd51/SAMD51_Startup.s b/examples/device_composite/ses/samd51/SAMD51_Startup.s similarity index 100% rename from examples/device/device_composite/ses/ses_samd51/SAMD51_Startup.s rename to examples/device_composite/ses/samd51/SAMD51_Startup.s diff --git a/examples/device/device_composite/ses/ses_samd51/SAMD51_Target.js b/examples/device_composite/ses/samd51/SAMD51_Target.js similarity index 100% rename from examples/device/device_composite/ses/ses_samd51/SAMD51_Target.js rename to examples/device_composite/ses/samd51/SAMD51_Target.js diff --git a/examples/device/device_composite/ses/ses_samd51/flash_placement.xml b/examples/device_composite/ses/samd51/flash_placement.xml similarity index 100% rename from examples/device/device_composite/ses/ses_samd51/flash_placement.xml rename to examples/device_composite/ses/samd51/flash_placement.xml diff --git a/examples/device_composite/ses/samd51/samd51.emProject b/examples/device_composite/ses/samd51/samd51.emProject new file mode 100644 index 000000000..76be9cf5e --- /dev/null +++ b/examples/device_composite/ses/samd51/samd51.emProject @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/device/device_composite/ses/ses_samd51/thumb_crt0.s b/examples/device_composite/ses/samd51/thumb_crt0.s similarity index 100% rename from examples/device/device_composite/ses/ses_samd51/thumb_crt0.s rename to examples/device_composite/ses/samd51/thumb_crt0.s diff --git a/examples/device/device_composite/src/main.c b/examples/device_composite/src/main.c similarity index 100% rename from examples/device/device_composite/src/main.c rename to examples/device_composite/src/main.c diff --git a/examples/device/device_composite/src/msc_app.c b/examples/device_composite/src/msc_app.c similarity index 100% rename from examples/device/device_composite/src/msc_app.c rename to examples/device_composite/src/msc_app.c diff --git a/examples/device/device_composite/src/msc_app.h b/examples/device_composite/src/msc_app.h similarity index 100% rename from examples/device/device_composite/src/msc_app.h rename to examples/device_composite/src/msc_app.h diff --git a/examples/device/device_composite/src/msc_flash_qspi.c b/examples/device_composite/src/msc_flash_qspi.c similarity index 100% rename from examples/device/device_composite/src/msc_flash_qspi.c rename to examples/device_composite/src/msc_flash_qspi.c diff --git a/examples/device/device_composite/src/msc_flash_ram.c b/examples/device_composite/src/msc_flash_ram.c similarity index 100% rename from examples/device/device_composite/src/msc_flash_ram.c rename to examples/device_composite/src/msc_flash_ram.c diff --git a/examples/device/device_composite/src/tusb_config.h b/examples/device_composite/src/tusb_config.h similarity index 100% rename from examples/device/device_composite/src/tusb_config.h rename to examples/device_composite/src/tusb_config.h diff --git a/examples/device/device_composite/src/tusb_descriptors.c b/examples/device_composite/src/tusb_descriptors.c similarity index 100% rename from examples/device/device_composite/src/tusb_descriptors.c rename to examples/device_composite/src/tusb_descriptors.c diff --git a/examples/device/device_composite/src/segger_rtt/SEGGER_RTT.c b/lib/segger_rtt/SEGGER_RTT.c similarity index 100% rename from examples/device/device_composite/src/segger_rtt/SEGGER_RTT.c rename to lib/segger_rtt/SEGGER_RTT.c diff --git a/examples/device/device_composite/src/segger_rtt/SEGGER_RTT.h b/lib/segger_rtt/SEGGER_RTT.h similarity index 100% rename from examples/device/device_composite/src/segger_rtt/SEGGER_RTT.h rename to lib/segger_rtt/SEGGER_RTT.h diff --git a/examples/device/device_composite/src/segger_rtt/SEGGER_RTT_Conf.h b/lib/segger_rtt/SEGGER_RTT_Conf.h similarity index 100% rename from examples/device/device_composite/src/segger_rtt/SEGGER_RTT_Conf.h rename to lib/segger_rtt/SEGGER_RTT_Conf.h diff --git a/examples/device/device_composite/src/segger_rtt/SEGGER_RTT_SES.c b/lib/segger_rtt/SEGGER_RTT_SES.c similarity index 100% rename from examples/device/device_composite/src/segger_rtt/SEGGER_RTT_SES.c rename to lib/segger_rtt/SEGGER_RTT_SES.c