Moving rpl-tsch examples into folder 6tisch

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

examples/6tisch/simple-node/rpl-tsch-cooja.csc

@@ -25,7 +25,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype660</identifier>
       <description>RPL/TSCH Node</description>
-      <source>[CONTIKI_DIR]/examples/rpl-tsch/node.c</source>
+      <source>[CONTIKI_DIR]/examples/6tisch/simple-node/node.c</source>
       <commands>make TARGET=cooja clean
       make TARGET=cooja node.cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>

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
 

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.
 

examples/6tisch/sixtop/rpl-tsch-sixtop-cooja.csc

@@ -7,7 +7,7 @@
   <project EXPORT="discard">[APPS_DIR]/collect-view</project>
   <project EXPORT="discard">[APPS_DIR]/powertracker</project>
   <simulation>
-    <title>rpl-tsch-sixtop example</title>
+    <title>sixtop example</title>
     <randomseed>123456</randomseed>
     <motedelay_us>1000000</motedelay_us>
     <radiomedium>
@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype204</identifier>
       <description>node</description>
-      <source>[CONTIKI_DIR]/examples/rpl-tsch-sixtop/node-sixtop.c</source>
+      <source>[CONTIKI_DIR]/examples/6tisch/sixtop/node-sixtop.c</source>
       <commands>make node-sixtop.cooja TARGET=cooja</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>

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 \
+6tisch/simple-node/zoul \
-rpl-tsch/zoul:MAKE_WITH_ORCHESTRA=1 \
+6tisch/simple-node/zoul:MAKE_WITH_ORCHESTRA=1 \
-rpl-tsch/zoul:MAKE_WITH_SECURITY=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

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 \
+6tisch/simple-node/jn516x \
-rpl-tsch/jn516x:MAKE_WITH_ORCHESTRA=1 \
+6tisch/simple-node/jn516x:MAKE_WITH_ORCHESTRA=1 \
-rpl-tsch/jn516x:MAKE_WITH_SECURITY=1 \
+6tisch/simple-node/jn516x:MAKE_WITH_SECURITY=1 \
 libs/logging/jn516x \
 6tisch/etsi-plugtest-2017/jn516x
 

tests/08-ipv6/19-cooja-rpl-tsch.csc

@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype1</identifier>
       <description>Cooja Mote Type #mtype1</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-tsch/node.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/6tisch/simple-node/node.c</source>
       <commands EXPORT="discard">make TARGET=cooja clean
 make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>

tests/08-ipv6/20-cooja-rpl-tsch-orchestra.csc

@@ -24,11 +24,11 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype11</identifier>
       <description>Cooja Mote Type #mtype11</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-tsch/node.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/6tisch/simple-node/node.c</source>
       <commands EXPORT="discard">make TARGET=cooja clean
 make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=1 MAKE_WITH_SECURITY=0 MAKE_WITH_PERIODIC_ROUTES_PRINT=1</commands>
       <firmware
-          EXPORT="copy">[CONTIKI_DIR]/examples/rpl-tsch/node.mtype1</firmware>
+          EXPORT="copy">[CONTIKI_DIR]/examples/6tisch/simple-node/node.mtype1</firmware>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>
       <moteinterface>org.contikios.cooja.interfaces.Battery</moteinterface>
       <moteinterface>org.contikios.cooja.contikimote.interfaces.ContikiVib</moteinterface>

tests/08-ipv6/21-cooja-rpl-tsch-security.csc

@@ -24,7 +24,7 @@
       org.contikios.cooja.contikimote.ContikiMoteType
       <identifier>mtype11</identifier>
       <description>Cooja Mote Type #mtype11</description>
-      <source EXPORT="discard">[CONTIKI_DIR]/examples/rpl-tsch/node.c</source>
+      <source EXPORT="discard">[CONTIKI_DIR]/examples/6tisch/simple-node/node.c</source>
       <commands EXPORT="discard">make TARGET=cooja clean
 make node.cooja TARGET=cooja MAKE_WITH_ORCHESTRA=0 MAKE_WITH_SECURITY=1 MAKE_WITH_PERIODIC_ROUTES_PRINT=1</commands>
       <moteinterface>org.contikios.cooja.interfaces.Position</moteinterface>