From 613f1cde4aa19583e492d8c5e867ed0a809d874e Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Sat, 12 Jun 2021 17:28:46 +0200 Subject: [PATCH] samples: modules: canopennode: move the CANopenNode sample to modules Move the CANopenNode sample into the samples/modules directory. Signed-off-by: Henrik Brix Andersen --- .../canbus/canopen => modules/canopennode}/CMakeLists.txt | 0 .../canbus/canopen => modules/canopennode}/Kconfig | 0 .../canbus/canopen => modules/canopennode}/README.rst | 6 +++--- .../canopen => modules/canopennode}/boards/frdm_k64f.conf | 0 .../canopennode}/boards/frdm_k64f.overlay | 0 .../canopen => modules/canopennode}/boards/twr_ke18f.conf | 0 .../canopennode}/boards/twr_ke18f.overlay | 0 .../canopen => modules/canopennode}/objdict/CO_OD.c | 0 .../canopen => modules/canopennode}/objdict/CO_OD.h | 0 .../canopen => modules/canopennode}/objdict/objdict.eds | 0 .../canopen => modules/canopennode}/objdict/objdict.xml | 0 .../canbus/canopen => modules/canopennode}/prj.conf | 0 .../canopen => modules/canopennode}/prj_no_storage.conf | 0 .../canbus/canopen => modules/canopennode}/sample.yaml | 8 ++++---- .../canbus/canopen => modules/canopennode}/src/main.c | 0 15 files changed, 7 insertions(+), 7 deletions(-) rename samples/{subsys/canbus/canopen => modules/canopennode}/CMakeLists.txt (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/Kconfig (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/README.rst (99%) rename samples/{subsys/canbus/canopen => modules/canopennode}/boards/frdm_k64f.conf (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/boards/frdm_k64f.overlay (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/boards/twr_ke18f.conf (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/boards/twr_ke18f.overlay (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/objdict/CO_OD.c (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/objdict/CO_OD.h (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/objdict/objdict.eds (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/objdict/objdict.xml (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/prj.conf (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/prj_no_storage.conf (100%) rename samples/{subsys/canbus/canopen => modules/canopennode}/sample.yaml (70%) rename samples/{subsys/canbus/canopen => modules/canopennode}/src/main.c (100%) diff --git a/samples/subsys/canbus/canopen/CMakeLists.txt b/samples/modules/canopennode/CMakeLists.txt similarity index 100% rename from samples/subsys/canbus/canopen/CMakeLists.txt rename to samples/modules/canopennode/CMakeLists.txt diff --git a/samples/subsys/canbus/canopen/Kconfig b/samples/modules/canopennode/Kconfig similarity index 100% rename from samples/subsys/canbus/canopen/Kconfig rename to samples/modules/canopennode/Kconfig diff --git a/samples/subsys/canbus/canopen/README.rst b/samples/modules/canopennode/README.rst similarity index 99% rename from samples/subsys/canbus/canopen/README.rst rename to samples/modules/canopennode/README.rst index 50f6a17433b..7da9b5ab306 100644 --- a/samples/subsys/canbus/canopen/README.rst +++ b/samples/modules/canopennode/README.rst @@ -1,7 +1,7 @@ -.. _canopen-sample: +.. _canopennode-sample: -CANopen -####### +CANopenNode +########### Overview ******** diff --git a/samples/subsys/canbus/canopen/boards/frdm_k64f.conf b/samples/modules/canopennode/boards/frdm_k64f.conf similarity index 100% rename from samples/subsys/canbus/canopen/boards/frdm_k64f.conf rename to samples/modules/canopennode/boards/frdm_k64f.conf diff --git a/samples/subsys/canbus/canopen/boards/frdm_k64f.overlay b/samples/modules/canopennode/boards/frdm_k64f.overlay similarity index 100% rename from samples/subsys/canbus/canopen/boards/frdm_k64f.overlay rename to samples/modules/canopennode/boards/frdm_k64f.overlay diff --git a/samples/subsys/canbus/canopen/boards/twr_ke18f.conf b/samples/modules/canopennode/boards/twr_ke18f.conf similarity index 100% rename from samples/subsys/canbus/canopen/boards/twr_ke18f.conf rename to samples/modules/canopennode/boards/twr_ke18f.conf diff --git a/samples/subsys/canbus/canopen/boards/twr_ke18f.overlay b/samples/modules/canopennode/boards/twr_ke18f.overlay similarity index 100% rename from samples/subsys/canbus/canopen/boards/twr_ke18f.overlay rename to samples/modules/canopennode/boards/twr_ke18f.overlay diff --git a/samples/subsys/canbus/canopen/objdict/CO_OD.c b/samples/modules/canopennode/objdict/CO_OD.c similarity index 100% rename from samples/subsys/canbus/canopen/objdict/CO_OD.c rename to samples/modules/canopennode/objdict/CO_OD.c diff --git a/samples/subsys/canbus/canopen/objdict/CO_OD.h b/samples/modules/canopennode/objdict/CO_OD.h similarity index 100% rename from samples/subsys/canbus/canopen/objdict/CO_OD.h rename to samples/modules/canopennode/objdict/CO_OD.h diff --git a/samples/subsys/canbus/canopen/objdict/objdict.eds b/samples/modules/canopennode/objdict/objdict.eds similarity index 100% rename from samples/subsys/canbus/canopen/objdict/objdict.eds rename to samples/modules/canopennode/objdict/objdict.eds diff --git a/samples/subsys/canbus/canopen/objdict/objdict.xml b/samples/modules/canopennode/objdict/objdict.xml similarity index 100% rename from samples/subsys/canbus/canopen/objdict/objdict.xml rename to samples/modules/canopennode/objdict/objdict.xml diff --git a/samples/subsys/canbus/canopen/prj.conf b/samples/modules/canopennode/prj.conf similarity index 100% rename from samples/subsys/canbus/canopen/prj.conf rename to samples/modules/canopennode/prj.conf diff --git a/samples/subsys/canbus/canopen/prj_no_storage.conf b/samples/modules/canopennode/prj_no_storage.conf similarity index 100% rename from samples/subsys/canbus/canopen/prj_no_storage.conf rename to samples/modules/canopennode/prj_no_storage.conf diff --git a/samples/subsys/canbus/canopen/sample.yaml b/samples/modules/canopennode/sample.yaml similarity index 70% rename from samples/subsys/canbus/canopen/sample.yaml rename to samples/modules/canopennode/sample.yaml index b0715bae974..c6d4171fb83 100644 --- a/samples/subsys/canbus/canopen/sample.yaml +++ b/samples/modules/canopennode/sample.yaml @@ -1,5 +1,5 @@ sample: - name: CANopen sample + name: CANopenNode sample common: tags: can canopen depends_on: can @@ -10,11 +10,11 @@ common: regex: - "(.*)CANopen stack initialized" tests: - sample.subsys.canbus.canopen: + sample.modules.canopennode: tags: introduction - sample.subsys.canbus.canopen.program_download: + sample.modules.canopennode.program_download: build_only: true extra_configs: - CONFIG_BOOTLOADER_MCUBOOT=y - sample.subsys.canbus.canopen.no_storage: + sample.modules.canopennode.no_storage: extra_args: CONF_FILE=prj_no_storage.conf diff --git a/samples/subsys/canbus/canopen/src/main.c b/samples/modules/canopennode/src/main.c similarity index 100% rename from samples/subsys/canbus/canopen/src/main.c rename to samples/modules/canopennode/src/main.c