diff --git a/examples/rpl-tsch/Makefile b/examples/6tisch/simple-node/Makefile similarity index 97% rename from examples/rpl-tsch/Makefile rename to examples/6tisch/simple-node/Makefile index ddd2360f8..e6cb76944 100644 --- a/examples/rpl-tsch/Makefile +++ b/examples/6tisch/simple-node/Makefile @@ -1,7 +1,7 @@ CONTIKI_PROJECT = node all: $(CONTIKI_PROJECT) -CONTIKI=../.. +CONTIKI=../../.. MAKE_WITH_ORCHESTRA ?= 0 # force Orchestra from command line MAKE_WITH_SECURITY ?= 0 # force Security from command line diff --git a/examples/rpl-tsch/README.md b/examples/6tisch/simple-node/README.md similarity index 100% rename from examples/rpl-tsch/README.md rename to examples/6tisch/simple-node/README.md diff --git a/examples/rpl-tsch/node.c b/examples/6tisch/simple-node/node.c similarity index 100% rename from examples/rpl-tsch/node.c rename to examples/6tisch/simple-node/node.c diff --git a/examples/rpl-tsch/project-conf.h b/examples/6tisch/simple-node/project-conf.h similarity index 100% rename from examples/rpl-tsch/project-conf.h rename to examples/6tisch/simple-node/project-conf.h diff --git a/examples/rpl-tsch/rpl-tsch-cooja.csc b/examples/6tisch/simple-node/rpl-tsch-cooja.csc similarity index 99% rename from examples/rpl-tsch/rpl-tsch-cooja.csc rename to examples/6tisch/simple-node/rpl-tsch-cooja.csc index 64dca6559..276192cdd 100644 --- a/examples/rpl-tsch/rpl-tsch-cooja.csc +++ b/examples/6tisch/simple-node/rpl-tsch-cooja.csc @@ -25,7 +25,7 @@ org.contikios.cooja.contikimote.ContikiMoteType mtype660 RPL/TSCH Node - [CONTIKI_DIR]/examples/rpl-tsch/node.c + [CONTIKI_DIR]/examples/6tisch/simple-node/node.c make TARGET=cooja clean make TARGET=cooja node.cooja org.contikios.cooja.interfaces.Position diff --git a/examples/rpl-tsch-sixtop/Makefile b/examples/6tisch/sixtop/Makefile similarity index 94% rename from examples/rpl-tsch-sixtop/Makefile rename to examples/6tisch/sixtop/Makefile index 0cce1fe1b..42360f170 100644 --- a/examples/rpl-tsch-sixtop/Makefile +++ b/examples/6tisch/sixtop/Makefile @@ -2,7 +2,7 @@ CONTIKI_PROJECT = node-sixtop all: $(CONTIKI_PROJECT) PROJECT_SOURCEFILES += sf-simple.c -CONTIKI=../.. +CONTIKI=../../.. MAKE_WITH_SECURITY ?= 0 # force Security from command line diff --git a/examples/rpl-tsch-sixtop/README.md b/examples/6tisch/sixtop/README.md similarity index 94% rename from examples/rpl-tsch-sixtop/README.md rename to examples/6tisch/sixtop/README.md index 9aacff864..fa390ff19 100644 --- a/examples/rpl-tsch-sixtop/README.md +++ b/examples/6tisch/sixtop/README.md @@ -25,7 +25,7 @@ If the mode is 6ln (node) * Following this the application triggers another 6P Add Request to 6dr * After an interval, the application triggers a 6P Delete Request to 6dr -For the Cooja simulation, you may use the rpl-tsch-sixtop-z1.csc file in this folder. +For the Cooja simulation, you may use the rpl-tsch-sixtop-cooja.csc file in this folder. Once you run the simulation, "Mote output" window of Cooja simulator displays the following messages. diff --git a/examples/rpl-tsch-sixtop/node-sixtop.c b/examples/6tisch/sixtop/node-sixtop.c similarity index 100% rename from examples/rpl-tsch-sixtop/node-sixtop.c rename to examples/6tisch/sixtop/node-sixtop.c diff --git a/examples/rpl-tsch-sixtop/project-conf.h b/examples/6tisch/sixtop/project-conf.h similarity index 100% rename from examples/rpl-tsch-sixtop/project-conf.h rename to examples/6tisch/sixtop/project-conf.h diff --git a/examples/rpl-tsch-sixtop/rpl-tsch-sixtop-cooja.csc b/examples/6tisch/sixtop/rpl-tsch-sixtop-cooja.csc similarity index 98% rename from examples/rpl-tsch-sixtop/rpl-tsch-sixtop-cooja.csc rename to examples/6tisch/sixtop/rpl-tsch-sixtop-cooja.csc index e787aa82b..c0646919d 100644 --- a/examples/rpl-tsch-sixtop/rpl-tsch-sixtop-cooja.csc +++ b/examples/6tisch/sixtop/rpl-tsch-sixtop-cooja.csc @@ -7,7 +7,7 @@ [APPS_DIR]/collect-view [APPS_DIR]/powertracker - rpl-tsch-sixtop example + sixtop example 123456 1000000 @@ -24,7 +24,7 @@ org.contikios.cooja.contikimote.ContikiMoteType mtype204 node - [CONTIKI_DIR]/examples/rpl-tsch-sixtop/node-sixtop.c + [CONTIKI_DIR]/examples/6tisch/sixtop/node-sixtop.c make node-sixtop.cooja TARGET=cooja org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.Battery diff --git a/examples/rpl-tsch-sixtop/sf-simple.c b/examples/6tisch/sixtop/sf-simple.c similarity index 100% rename from examples/rpl-tsch-sixtop/sf-simple.c rename to examples/6tisch/sixtop/sf-simple.c diff --git a/examples/rpl-tsch-sixtop/sf-simple.h b/examples/6tisch/sixtop/sf-simple.h similarity index 100% rename from examples/rpl-tsch-sixtop/sf-simple.h rename to examples/6tisch/sixtop/sf-simple.h diff --git a/tests/02-compile-arm-ports/Makefile b/tests/02-compile-arm-ports/Makefile index 49401ab6d..88842b65b 100644 --- a/tests/02-compile-arm-ports/Makefile +++ b/tests/02-compile-arm-ports/Makefile @@ -39,9 +39,9 @@ sensniff/srf06-cc26xx:BOARD=launchpad/cc1310 \ storage/cfs-coffee/cc2538dk \ storage/cfs-coffee/openmote-cc2538 \ storage/cfs-coffee/zoul \ -rpl-tsch/zoul \ -rpl-tsch/zoul:MAKE_WITH_ORCHESTRA=1 \ -rpl-tsch/zoul:MAKE_WITH_SECURITY=1 \ +6tisch/simple-node/zoul \ +6tisch/simple-node/zoul:MAKE_WITH_ORCHESTRA=1 \ +6tisch/simple-node/zoul:MAKE_WITH_SECURITY=1 \ libs/logging/zoul \ 6tisch/etsi-plugtest-2017/zoul:BOARD=remote \ 6tisch/etsi-plugtest-2017/srf06-cc26xx:BOARD=launchpad/cc2650 diff --git a/tests/03-compile-nxp-ports/Makefile b/tests/03-compile-nxp-ports/Makefile index 559717b4b..782ca92d2 100644 --- a/tests/03-compile-nxp-ports/Makefile +++ b/tests/03-compile-nxp-ports/Makefile @@ -16,9 +16,9 @@ platform-specific/jn516x/tsch/simple-sensor-network/rpl-border-router/jn516x \ platform-specific/jn516x/tsch/tx-power-verification/rpl-border-router/jn516x \ platform-specific/jn516x/tsch/uart1-test-node/jn516x \ sensniff/jn516x \ -rpl-tsch/jn516x \ -rpl-tsch/jn516x:MAKE_WITH_ORCHESTRA=1 \ -rpl-tsch/jn516x:MAKE_WITH_SECURITY=1 \ +6tisch/simple-node/jn516x \ +6tisch/simple-node/jn516x:MAKE_WITH_ORCHESTRA=1 \ +6tisch/simple-node/jn516x:MAKE_WITH_SECURITY=1 \ libs/logging/jn516x \ 6tisch/etsi-plugtest-2017/jn516x diff --git a/tests/08-ipv6/19-cooja-rpl-tsch.csc b/tests/08-ipv6/19-cooja-rpl-tsch.csc index e2e3737bf..694d9a0c1 100644 --- a/tests/08-ipv6/19-cooja-rpl-tsch.csc +++ b/tests/08-ipv6/19-cooja-rpl-tsch.csc @@ -24,7 +24,7 @@ org.contikios.cooja.contikimote.ContikiMoteType mtype1 Cooja Mote Type #mtype1 - [CONTIKI_DIR]/examples/rpl-tsch/node.c + [CONTIKI_DIR]/examples/6tisch/simple-node/node.c make TARGET=cooja clean make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1 org.contikios.cooja.interfaces.Position diff --git a/tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc b/tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc index 7a529c880..7593ae9b2 100644 --- a/tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc +++ b/tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc @@ -24,11 +24,11 @@ org.contikios.cooja.contikimote.ContikiMoteType mtype11 Cooja Mote Type #mtype11 - [CONTIKI_DIR]/examples/rpl-tsch/node.c + [CONTIKI_DIR]/examples/6tisch/simple-node/node.c make TARGET=cooja clean make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=1 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1 [CONTIKI_DIR]/examples/rpl-tsch/node.mtype1 + EXPORT="copy">[CONTIKI_DIR]/examples/6tisch/simple-node/node.mtype1 org.contikios.cooja.interfaces.Position org.contikios.cooja.interfaces.Battery org.contikios.cooja.contikimote.interfaces.ContikiVib diff --git a/tests/08-ipv6/21-cooja-rpl-tsch-security.csc b/tests/08-ipv6/21-cooja-rpl-tsch-security.csc index d2ff6b9c3..5da4a0f32 100644 --- a/tests/08-ipv6/21-cooja-rpl-tsch-security.csc +++ b/tests/08-ipv6/21-cooja-rpl-tsch-security.csc @@ -24,7 +24,7 @@ org.contikios.cooja.contikimote.ContikiMoteType mtype11 Cooja Mote Type #mtype11 - [CONTIKI_DIR]/examples/rpl-tsch/node.c + [CONTIKI_DIR]/examples/6tisch/simple-node/node.c make TARGET=cooja clean make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1 MAKE_WITH_PERIODIC_ROUTES_PRINT=1 org.contikios.cooja.interfaces.Position