diff --git a/tools/cooja/contiki_tests/cooja_helloworld.csc b/tools/cooja/contiki_tests/cooja_helloworld.csc
index 6eae7e9a7..8d7f6fa5a 100644
--- a/tools/cooja/contiki_tests/cooja_helloworld.csc
+++ b/tools/cooja/contiki_tests/cooja_helloworld.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -18,7 +18,7 @@
se.sics.cooja.contikimote.ContikiMoteType
- mtype4
+ mtype82
Contiki Mote Type #1
../../../examples/hello-world/hello-world.c
make hello-world.cooja TARGET=cooja
@@ -34,15 +34,15 @@
se.sics.cooja.contikimote.interfaces.ContikiPIR
se.sics.cooja.contikimote.interfaces.ContikiClock
se.sics.cooja.contikimote.interfaces.ContikiLED
- se.sics.cooja.contikimote.interfaces.ContikiLog
se.sics.cooja.contikimote.interfaces.ContikiCFS
se.sics.cooja.interfaces.Mote2MoteRelations
+ se.sics.cooja.interfaces.RimeAddress
false
Rime
se.sics.cooja.contikimote.ContikiMote
- mtype4
+ mtype82
se.sics.cooja.interfaces.Position
69.64867743029201
@@ -57,41 +57,56 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
1
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.4.7
-
- se.sics.cooja.plugins.SimControl
- 248
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Log output: printf()'s
+
+ 259
1
- 200
- 0
- 0
- false
-
-
- se.sics.cooja.plugins.VisState
- 300
- 2
- 300
- 600
- 0
+ 198
+ 2
+ 203
false
se.sics.cooja.plugins.LogListener
- 256
- 900
+ 259
+ 2
+ 217
+ 2
+ 403
+ false
+
+
+ se.sics.cooja.plugins.SimControl
+ 259
+ 3
+ 200
+ 2
+ 3
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 592
0
- 209
- 0
- 591
+ 618
+ 264
+ 3
false
diff --git a/tools/cooja/contiki_tests/cooja_helloworld.js b/tools/cooja/contiki_tests/cooja_helloworld.js
deleted file mode 100644
index 4f3fd415d..000000000
--- a/tools/cooja/contiki_tests/cooja_helloworld.js
+++ /dev/null
@@ -1,4 +0,0 @@
-TIMEOUT(2000, log.log("last message: " + msg + "\n"));
-
-WAIT_UNTIL(msg.equals('Hello, world'));
-log.testOK();
diff --git a/tools/cooja/contiki_tests/cooja_ipv6_udp.csc b/tools/cooja/contiki_tests/cooja_ipv6_udp.csc
index 92dfc0b94..3ae77a49d 100644
--- a/tools/cooja/contiki_tests/cooja_ipv6_udp.csc
+++ b/tools/cooja/contiki_tests/cooja_ipv6_udp.csc
@@ -1,11 +1,14 @@
+ ../apps/mrm
+ ../apps/mspsim
+ ../apps/avrora
+ ../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -15,7 +18,7 @@
se.sics.cooja.contikimote.ContikiMoteType
- mtype17
+ mtype232
Receiver
../../../examples/udp-receiver-ipv6/example-udp-receiver.c
make example-udp-receiver.cooja TARGET=cooja DEFINES=WITH_UIP6=1,UIP_CONF_IPV6=1,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x2,UDP_ADDR_F=0x2ff,UDP_ADDR_G=0xfe02,UDP_ADDR_H=0x0202
@@ -38,7 +41,7 @@
se.sics.cooja.contikimote.ContikiMoteType
- mtype18
+ mtype330
Sender
../../../examples/udp-sender-ipv6/example-udp-sender.c
make example-udp-sender.cooja TARGET=cooja DEFINES=WITH_UIP6=1,UIP_CONF_IPV6=1,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x301,UDP_ADDR_F=0x1ff,UDP_ADDR_G=0xfe01,UDP_ADDR_H=0x101
@@ -61,7 +64,7 @@
se.sics.cooja.contikimote.ContikiMote
- mtype17
+ mtype232
se.sics.cooja.interfaces.Position
98.76075470611741
@@ -76,14 +79,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
1
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- fe80.0000.0000.0000.0301.01ff.fe01.0101
-
se.sics.cooja.contikimote.ContikiMote
- mtype18
+ mtype330
se.sics.cooja.interfaces.Position
58.59043340181549
@@ -98,65 +97,81 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
2
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- fe80.0000.0000.0000.0002.02ff.fe02.0202
-
se.sics.cooja.plugins.SimControl
248
- 5
+ 4
200
0
0
false
-
- se.sics.cooja.plugins.Visualizer
-
- Radio environment (UDGM)
-
- 300
- 3
- 300
- 714
- 0
- false
-
se.sics.cooja.plugins.LogListener
ID:1
- 256
- 1014
- 1
- 284
- 0
- 564
+ 249
+ 2
+ 181
+ 1
+ 521
false
se.sics.cooja.plugins.Visualizer
- printf()'s + LEDs
+ Radio environment (UDGM)
- 300
- 4
- 300
- 414
- 1
+ 246
+ 3
+ 121
+ 1
+ 201
false
se.sics.cooja.plugins.RadioLogger
- 1014
- 2
- 261
+ 246
+ 1
+ 198
0
- 301
+ 323
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 0
+ 700
+ 250
+ -1
false
diff --git a/tools/cooja/contiki_tests/cooja_ipv6_udp.js b/tools/cooja/contiki_tests/cooja_ipv6_udp.js
deleted file mode 100644
index b32fa8c0c..000000000
--- a/tools/cooja/contiki_tests/cooja_ipv6_udp.js
+++ /dev/null
@@ -1,21 +0,0 @@
-TIMEOUT(100000, log.log("last msg: " + msg + "\n")); /* print last msg at timeout */
-
-WAIT_UNTIL(msg.contains("Created connection"));
-YIELD_THEN_WAIT_UNTIL(msg.contains("Created connection"));
-
-log.log("Both nodes booted\n");
-
-count = 0;
-while (count++ < 5) {
- /* Message from sender process to receiver process */
- YIELD_THEN_WAIT_UNTIL(msg.contains("Sender sending"));
- YIELD_THEN_WAIT_UNTIL(msg.contains("Receiver received"));
- log.log(count + ": Sender -> Receiver OK\n");
-
- /* Message from receiver process to sender process */
- YIELD_THEN_WAIT_UNTIL(msg.contains("Receiver sending"));
- YIELD_THEN_WAIT_UNTIL(msg.contains("Sender received"));
- log.log(count + ": Receiver -> Sender OK\n");
-}
-
-log.testOK(); /* Report test success and quit */
diff --git a/tools/cooja/contiki_tests/crosslevel.csc b/tools/cooja/contiki_tests/crosslevel.csc
index 9b10bd92e..dcc353a34 100644
--- a/tools/cooja/contiki_tests/crosslevel.csc
+++ b/tools/cooja/contiki_tests/crosslevel.csc
@@ -4,11 +4,10 @@
../apps/mspsim
../apps/avrora
../apps/native_gateway
- C:/home/nes/contiki/checkpointing-demo
My simulation
0
- 123456
+ generated
5000000
se.sics.cooja.radiomediums.UDGM
@@ -54,7 +53,7 @@
se.sics.cooja.contikimote.ContikiMoteType
- mtype2
+ mtype914
Contiki Mote Type #1
../../../examples/rime/example-abc.c
make example-abc.cooja TARGET=cooja
@@ -77,7 +76,7 @@
se.sics.cooja.contikimote.ContikiMote
- mtype2
+ mtype914
se.sics.cooja.interfaces.Position
0.0
@@ -95,7 +94,7 @@
se.sics.cooja.contikimote.ContikiMote
- mtype2
+ mtype914
se.sics.cooja.interfaces.Position
0.0
@@ -114,6 +113,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
100.0
@@ -128,6 +128,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
100.0
@@ -142,6 +143,7 @@
se.sics.cooja.mspmote.ESBMote
esb1
+
se.sics.cooja.interfaces.Position
200.0
@@ -156,6 +158,7 @@
se.sics.cooja.mspmote.ESBMote
esb1
+
se.sics.cooja.interfaces.Position
200.0
@@ -169,7 +172,7 @@
se.sics.cooja.contikimote.ContikiMote
- mtype2
+ mtype914
se.sics.cooja.interfaces.Position
300.0
@@ -188,6 +191,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
300.0
@@ -201,7 +205,7 @@
se.sics.cooja.contikimote.ContikiMote
- mtype2
+ mtype914
se.sics.cooja.interfaces.Position
400.0
@@ -220,6 +224,7 @@
se.sics.cooja.mspmote.ESBMote
esb1
+
se.sics.cooja.interfaces.Position
400.0
@@ -235,7 +240,7 @@
se.sics.cooja.plugins.SimControl
265
- 1
+ 4
200
0
0
@@ -244,14 +249,13 @@
se.sics.cooja.plugins.LogListener
-
- 256
+ rec
- 632
+ 265
3
- 143
- -2
- 650
+ 169
+ 0
+ 402
false
@@ -261,21 +265,64 @@
Radio environment (UDGM)
Addresses: IP or Rime
- 364
- 0
- 200
- 265
- 0
+ 267
+ 2
+ 177
+ -1
+ 570
false
se.sics.cooja.plugins.RadioLogger
- 631
- 4
- 452
+ 265
+ 0
+ 203
0
199
false
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 596
+ 1
+ 744
+ 267
+ 3
+ false
+
diff --git a/tools/cooja/contiki_tests/crosslevel.js b/tools/cooja/contiki_tests/crosslevel.js
deleted file mode 100644
index dc3f01dc4..000000000
--- a/tools/cooja/contiki_tests/crosslevel.js
+++ /dev/null
@@ -1,31 +0,0 @@
-TIMEOUT(120000);
-
-var nr_packets = new Array();
-for (i=1; i <= 10; i++) {
- nr_packets[i] = 0;
-}
-
-while (true) {
-
- /* Listen for receive notifications */
- if (msg.contains('abc message received')) {
-
- /* Log receiving node */
- nr_packets[id] ++;
- log.log("Node " + id + " received message: " + nr_packets[id] + "\n");
-
- log.log("TEST STATUS: ");
- for (i = 1; i <= 10; i++) {
- log.log(nr_packets[i] + " ");
- }
- log.log("\n");
- }
-
- /* Did all nodes (1-10) receive at least one message? */
- for (i = 1; i <= 10; i++) {
- if (nr_packets[i] < 1) break;
- if (i == 10) log.testOK();
- }
-
- YIELD();
-}
diff --git a/tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc b/tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc
index b462fdddb..3ddcf7240 100644
--- a/tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc
+++ b/tools/cooja/contiki_tests/ip_cooja_telnet_ping.csc
@@ -1,11 +1,14 @@
+ ../apps/mrm
+ ../apps/mspsim
+ ../apps/avrora
+ ../apps/native_gateway
My simulation
1
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -15,7 +18,7 @@
se.sics.cooja.contikimote.ContikiMoteType
- mtype1
+ mtype511
Contiki Mote Type #1
../../../examples/telnet-server/telnet-server.c
make telnet-server.cooja TARGET=cooja DEFINES=WITH_UIP=1
@@ -39,7 +42,7 @@
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype511
se.sics.cooja.interfaces.Position
44.40540999693696
@@ -59,7 +62,7 @@
se.sics.cooja.plugins.SimControl
248
- 4
+ 1
200
2
2
@@ -73,39 +76,81 @@
Radio environment (UDGM)
LEDs
- 300
+ 247
3
110
- 723
- 0
+ 3
+ 203
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 0
+ 700
+ 251
+ 1
false
se.sics.cooja.plugins.NativeIPGateway
0
- \Device\NPF_{53CBA059-40AA-4822-BB53-7A5B9AFE77D6}
+ \Device\NPF_{6AE59250-8082-40D4-B2F4-89EC57DD3321}
true
388
2
331
- 635
- 109
- false
-
-
- se.sics.cooja.plugins.MoteInterfaceViewer
- 0
-
- Serial port
- 0,0
-
- 388
- 1
- 234
- 635
- 420
+ 0
+ 313
false
diff --git a/tools/cooja/contiki_tests/ip_cooja_telnet_ping.js b/tools/cooja/contiki_tests/ip_cooja_telnet_ping.js
deleted file mode 100644
index 637dfdac5..000000000
--- a/tools/cooja/contiki_tests/ip_cooja_telnet_ping.js
+++ /dev/null
@@ -1,44 +0,0 @@
-TIMEOUT(30000);
-
-/* conf */
-nrReplies = 0;
-ipAddress = "172.16.0.1";
-osName = java.lang.System.getProperty("os.name").toLowerCase();
-if (osName.startsWith("win")) {
- pingCmd = "ping -n 10 " + ipAddress;
-} else {
- pingCmd = "ping -c 10 " + ipAddress;
-}
-replyMsg = "from " + ipAddress;
-
-/* mote startup */
-WAIT_UNTIL(msg.contains('Telnet server'));
-
-/* override simulation delay, test times out is too fast otherwise */
-mote.getSimulation().setDelayTime(1);
-
-/* start ping process */
-var runnableObj = new Object();
-runnableObj.run = function() {
- pingProcess = new java.lang.Runtime.getRuntime().exec(pingCmd);
- log.log("cmd> " + pingCmd + "\n");
-
- stdIn = new java.io.BufferedReader(new java.io.InputStreamReader(pingProcess.getInputStream()));
- while ((line = stdIn.readLine()) != null) {
- log.log("> " + line + "\n");
- if (line.contains(replyMsg)) {
- nrReplies++;
- //log.log("reply #" + nrReplies + "\n");
- }
- }
- pingProcess.destroy();
-
- if (nrReplies > 5) {
- log.testOK(); /* Report test success and quit */
- } else {
- log.log("Only " + nrReplies + "/10 ping replies was received\n");
- log.testFailed();
- }
-}
-var thread = new java.lang.Thread(new java.lang.Runnable(runnableObj));
-thread.start();
diff --git a/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc b/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
index 458413701..7f79d005b 100644
--- a/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
+++ b/tools/cooja/contiki_tests/ip_sky_telnet_ping.csc
@@ -1,11 +1,14 @@
+ ../apps/mrm
+ ../apps/mspsim
+ ../apps/avrora
+ ../apps/native_gateway
My simulation
- 0
- 1
- 123456
- 1000
+ 1
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -34,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
86.60672552430381
@@ -64,9 +68,9 @@
388
2
- 331
- 627
- 107
+ 332
+ 2
+ 401
false
@@ -78,9 +82,9 @@
385
1
- 234
- 629
- 420
+ 239
+ 2
+ 201
false
@@ -90,11 +94,75 @@
Addresses: IP or Rime
Radio environment (UDGM)
- 300
+ 140
3
- 107
- 714
- 1
+ 201
+ 249
+ 0
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 603
+ 0
+ 732
+ 389
+ 0
false
diff --git a/tools/cooja/contiki_tests/ip_sky_telnet_ping.js b/tools/cooja/contiki_tests/ip_sky_telnet_ping.js
deleted file mode 100644
index facca5f6b..000000000
--- a/tools/cooja/contiki_tests/ip_sky_telnet_ping.js
+++ /dev/null
@@ -1,52 +0,0 @@
-TIMEOUT(30000);
-
-/* conf */
-nrReplies = 0;
-ipAddress = "172.16.1.0";
-osName = java.lang.System.getProperty("os.name").toLowerCase();
-if (osName.startsWith("win")) {
- pingOnceCmd = "ping -n 1 " + ipAddress;
- pingCmd = "ping -n 10 " + ipAddress;
-} else {
- pingOnceCmd = "ping -c 1 " + ipAddress;
- pingCmd = "ping -c 10 " + ipAddress;
-}
-replyMsg = "from " + ipAddress;
-
-/* wait for mote startup */
-WAIT_UNTIL(msg.contains('Sky telnet process'));
-
-/* make gateway */
-pingOnceProcess = new java.lang.Runtime.getRuntime().exec(pingOnceCmd);
-GENERATE_MSG(5000, "continue");
-WAIT_UNTIL(msg.equals("continue"));
-log.log("cont\n");
-
-/* override simulation delay, test will time out is too fast otherwise */
-mote.getSimulation().setDelayTime(1);
-
-/* start ping process */
-var runnableObj = new Object();
-runnableObj.run = function() {
- pingProcess = new java.lang.Runtime.getRuntime().exec(pingCmd);
- log.log("cmd> " + pingCmd + "\n");
-
- stdIn = new java.io.BufferedReader(new java.io.InputStreamReader(pingProcess.getInputStream()));
- while ((line = stdIn.readLine()) != null) {
- log.log("> " + line + "\n");
- if (line.contains(replyMsg)) {
- nrReplies++;
- //log.log("reply #" + nrReplies + "\n");
- }
- }
- pingProcess.destroy();
-
- if (nrReplies > 5) {
- log.testOK(); /* Report test success and quit */
- } else {
- log.log("Only " + nrReplies + "/10 ping replies was received\n");
- log.testFailed();
- }
-}
-var thread = new java.lang.Thread(new java.lang.Runnable(runnableObj));
-thread.start();
diff --git a/tools/cooja/contiki_tests/ip_sky_webserver_wget.csc b/tools/cooja/contiki_tests/ip_sky_webserver_wget.csc
index 3355a3a5e..bc77058dc 100644
--- a/tools/cooja/contiki_tests/ip_sky_webserver_wget.csc
+++ b/tools/cooja/contiki_tests/ip_sky_webserver_wget.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make sky-shell-webserver.sky TARGET=sky
../../../examples/sky-shell-webserver/sky-shell-webserver.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
16.08449565170202
@@ -51,10 +52,11 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
- 38.40617555763694
- 38.97825356716085
+ 42.81612608990057
+ 41.95359330906976
0.0
@@ -65,6 +67,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
70.00470747576063
@@ -79,6 +82,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
99.0932428018975
@@ -94,19 +98,24 @@
se.sics.cooja.plugins.SimControl
248
- 2
+ 3
200
0
0
false
- se.sics.cooja.plugins.VisUDGM
- 435
- 0
- 195
- 255
- 6
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Addresses: IP or Rime
+ Radio environment (UDGM)
+
+ 305
+ 2
+ 201
+ 248
+ 0
false
@@ -114,12 +123,13 @@
3
Serial port
+ 0,0
- 684
- 3
- 324
- 10
- 547
+ 551
+ 4
+ 258
+ 2
+ 471
false
@@ -127,12 +137,83 @@
0
Serial port
+ 0,0
- 682
+ 553
1
- 334
- 10
- 207
+ 272
+ 1
+ 200
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 610
+ 0
+ 730
+ 552
+ 0
false
diff --git a/tools/cooja/contiki_tests/ip_sky_webserver_wget.js b/tools/cooja/contiki_tests/ip_sky_webserver_wget.js
deleted file mode 100644
index 911272fb2..000000000
--- a/tools/cooja/contiki_tests/ip_sky_webserver_wget.js
+++ /dev/null
@@ -1,46 +0,0 @@
-TIMEOUT(90000, log.log("last message: " + msg + "\n"));
-
-mote1 = null;
-mote4 = null;
-nr_boot = 0;
-
-/* Wait until all nodes have booted */
-while (true) {
- if (msg.contains('Starting')) {
- nr_boot++;
- if (id == 1) mote1 = mote;
- if (id == 4) mote4 = mote;
- }
- if (nr_boot == 4) break;
- YIELD();
-}
-log.log("All motes booted\n");
-
-/* Wait one second */
-GENERATE_MSG(1000, "continue");
-WAIT_UNTIL(msg.equals("continue"));
-
-/* Create file on node 1 */
-log.log("Node 1 creating data\n");
-write(mote1, "echo FROM1 | write node1file.txt\n");
-
-/* Download node1file.txt to node 4 */
-log.log("Node 4 downloading from node 1\n");
-write(mote4, "wget 172.16.1.0/node1file.txt | write node4file.txt\n");
-WAIT_UNTIL(id == 4 && msg.contains("FROM1"));
-
-/* Wait one second */
-GENERATE_MSG(1000, "continue");
-WAIT_UNTIL(msg.equals("continue"));
-
-/* Extend data */
-log.log("Node 4 appending data\n");
-write(mote4, "echo FROM4 | append node4file.txt\n");
-
-/* Download node2file.txt at node 1 */
-log.log("Node 1 downloading from node 4\n");
-write(mote1, "wget 172.16.4.0/node4file.txt\n");
-
-WAIT_UNTIL(id == 1 && msg.contains("FROM4"));
-
-log.testOK();
diff --git a/tools/cooja/contiki_tests/multithreading.csc b/tools/cooja/contiki_tests/multithreading.csc
index 323dab7d2..5ddfc6fca 100644
--- a/tools/cooja/contiki_tests/multithreading.csc
+++ b/tools/cooja/contiki_tests/multithreading.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make multi-threading.sky TARGET=sky
../../../examples/multi-threading/multi-threading.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
83.20518861404864
@@ -52,32 +53,81 @@
se.sics.cooja.plugins.SimControl
265
- 1
+ 3
200
0
0
false
- se.sics.cooja.plugins.VisState
- 300
- 0
- 300
- 638
- 0
+ se.sics.cooja.plugins.Visualizer
+
+ 263
+ 2
+ 292
+ 1
+ 202
false
se.sics.cooja.plugins.LogListener
- 256
- 938
- 2
+ 865
+ 0
209
- 1
- 746
+ 3
+ 701
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 1
+ 700
+ 267
+ 1
false
diff --git a/tools/cooja/contiki_tests/multithreading.js b/tools/cooja/contiki_tests/multithreading.js
deleted file mode 100644
index 30d95074e..000000000
--- a/tools/cooja/contiki_tests/multithreading.js
+++ /dev/null
@@ -1,38 +0,0 @@
-TIMEOUT(60000, log.log("nrLowAlpha: " + nrLowAlpha + "\nnrHighAlpha: " + nrHighAlpha + "\nnrLowCount: " + nrLowCount + "\nnrHighCount: " + nrHighCount + "\n"));
-
-lowAlpha = "BA";
-highAlpha = "JIHGFEDCBA";
-lowCount = "10";
-highCount = "9876543210";
-
-nrLowAlpha = 0;
-nrHighAlpha = 0;
-nrLowCount = 0;
-nrHighCount = 0;
-
-while (true) {
-
- if (msg.equals(lowCount)) {
- //log.log("Count is low\n");
- nrLowCount++;
- } else if (msg.equals(lowAlpha)) {
- //log.log("Alpha is low\n");
- nrLowAlpha++;
- } else if (msg.equals(highCount)) {
- //log.log("Count is high\n");
- nrHighCount++;
- } else if (msg.equals(highAlpha)) {
- //log.log("Alpha is high\n");
- nrHighAlpha++;
- }
-
- if (nrLowCount >= 5 &&
- nrLowAlpha >= 5 &&
- nrLowCount >= 5 &&
- nrHighCount >= 5 &&
- nrHighAlpha >= 5) {
- log.testOK();
- }
- YIELD();
-}
-
diff --git a/tools/cooja/contiki_tests/rime_abc.csc b/tools/cooja/contiki_tests/rime_abc.csc
index b3f8027e8..60ed7b89b 100644
--- a/tools/cooja/contiki_tests/rime_abc.csc
+++ b/tools/cooja/contiki_tests/rime_abc.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 5000
+ generated
+ 5000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make example-abc.sky TARGET=sky
../../../examples/rime/example-abc.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
33.53152221759984
@@ -51,6 +52,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
54.67966631314053
@@ -66,32 +68,67 @@
se.sics.cooja.plugins.SimControl
313
- 2
+ 3
199
- 30
- 30
+ -1
+ 0
false
- se.sics.cooja.plugins.VisUDGM
- 300
- 1
- 122
- 367
- 23
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Radio environment (UDGM)
+
+ 312
+ 2
+ 123
+ 0
+ 198
false
se.sics.cooja.plugins.LogListener
- 256
- 573
+ 311
0
- 242
- 23
- 235
+ 377
+ 1
+ 320
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 601
+ 1
+ 697
+ 312
+ 0
false
diff --git a/tools/cooja/contiki_tests/rime_abc.js b/tools/cooja/contiki_tests/rime_abc.js
deleted file mode 100644
index cd6c17ce5..000000000
--- a/tools/cooja/contiki_tests/rime_abc.js
+++ /dev/null
@@ -1,22 +0,0 @@
-TIMEOUT(100000, log.log("Node 1: " + nr_packets[1] + ".\nNode 2: " + nr_packets[2] + ".\n"));
-
-nr_packets = new Array();
-nr_packets[1] = 0;
-nr_packets[2] = 0;
-
-while (true) {
- /* Only handle receive messages */
- YIELD_THEN_WAIT_UNTIL(msg.contains('received'));
-
- /* Count received packets */
- nr_packets[id]++;
- //log.log("Node " + id + " received " + nr_packets[id] + " messages\n");
-
- if (nr_packets[1] >= 30 && nr_packets[2] >= 30) {
- log.log("Node 1: " + nr_packets[1] + ".\nNode 2: " + nr_packets[2] + ".\n");
- log.testOK(); /* Report test success */
- }
-
-}
-
-
diff --git a/tools/cooja/contiki_tests/rime_collect.csc b/tools/cooja/contiki_tests/rime_collect.csc
index 3f89033c5..4b4e7a429 100644
--- a/tools/cooja/contiki_tests/rime_collect.csc
+++ b/tools/cooja/contiki_tests/rime_collect.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
Rime collect test
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -18,7 +18,7 @@
se.sics.cooja.contikimote.ContikiMoteType
- mtype1
+ mtype528
Contiki Mote Type #1
../../../examples/rime/example-collect.c
make example-collect.cooja TARGET=cooja
@@ -34,7 +34,6 @@
se.sics.cooja.contikimote.interfaces.ContikiPIR
se.sics.cooja.contikimote.interfaces.ContikiClock
se.sics.cooja.contikimote.interfaces.ContikiLED
- se.sics.cooja.contikimote.interfaces.ContikiLog
se.sics.cooja.contikimote.interfaces.ContikiCFS
se.sics.cooja.interfaces.Mote2MoteRelations
false
@@ -42,7 +41,7 @@
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
50.829139451170256
@@ -57,14 +56,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
1
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.9.16
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
66.70779372167401
@@ -79,14 +74,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
2
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.10.16
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
41.129223698257974
@@ -101,14 +92,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
3
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.16.4
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
3.896453344832884
@@ -123,14 +110,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
4
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.17.2
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
66.34456950462831
@@ -145,14 +128,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
5
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.8.8
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
70.88189625059834
@@ -167,14 +146,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
6
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.16.12
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
19.09803704982651
@@ -189,14 +164,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
7
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.8.4
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
89.63745297998314
@@ -211,14 +182,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
8
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.3.6
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
13.348832186584092
@@ -233,14 +200,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
9
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.15.15
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
1.674784139064478
@@ -255,14 +218,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
10
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.4.19
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
47.87142051729898
@@ -277,14 +236,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
11
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.5.7
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
26.88271893793631
@@ -299,14 +254,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
12
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.17.17
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
56.02971812708909
@@ -321,14 +272,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
13
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.13.11
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
95.69470045280002
@@ -343,14 +290,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
14
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.14.17
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
31.731698652367335
@@ -365,14 +308,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
15
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.16.19
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
2.8792353689463424
@@ -387,14 +326,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
16
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.2.4
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
51.07177717821779
@@ -409,14 +344,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
17
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.8.9
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
43.42318694224158
@@ -431,14 +362,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
18
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.16.4
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
87.22205782780289
@@ -453,14 +380,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
19
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.6.15
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype528
se.sics.cooja.interfaces.Position
1.6332448872152683
@@ -475,27 +398,28 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
20
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.18.5
-
se.sics.cooja.plugins.SimControl
223
- 1
+ 3
227
0
0
false
- se.sics.cooja.plugins.VisState
- 300
+ se.sics.cooja.plugins.Visualizer
+
+ Addresses: IP or Rime
+ Mote IDs
+ Radio environment (UDGM)
+
+ 200
0
- 300
- 723
+ 225
+ 222
0
false
@@ -503,13 +427,155 @@
se.sics.cooja.plugins.LogListener
- 256
- 1023
+ 420
2
- 207
+ 489
0
- 461
+ 225
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 1
+ 714
+ 420
+ 0
false
diff --git a/tools/cooja/contiki_tests/rime_collect.js b/tools/cooja/contiki_tests/rime_collect.js
deleted file mode 100644
index 2bbb775df..000000000
--- a/tools/cooja/contiki_tests/rime_collect.js
+++ /dev/null
@@ -1,131 +0,0 @@
-TIMEOUT(300000, log.log("Timeout\n"));
-
-function
-print_stats()
-{
- log.log("Received " + total_received + " messages, " +
- (total_received / nrNodes) + " messages/node, " +
- total_lost + " lost, " +
- (total_lost / nrNodes) + " lost/node, " +
- total_dups + " dups, " +
- (total_dups / nrNodes) + " dups/node, " +
- (total_hops / total_received) + " hops/message\n");
- log.log("Seqnos: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(seqnos[i] + " ");
- }
- log.log("\n");
- log.log("Lost: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(lost[i] + " ");
- }
- log.log("\n");
- log.log("Dups: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(dups[i] + " ");
- }
- log.log("\n");
- log.log("Hops: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(hops[i] + " ");
- }
- log.log("\n");
- log.log("Received: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(count[i] + " ");
- }
- log.log("\n");
-}
-
-/* Conf. */
-booted = new Array();
-count = new Array();
-hops = new Array();
-seqnos = new Array();
-lost = new Array();
-dups = new Array();
-nrNodes = 20;
-total_received = 0;
-total_lost = 0;
-total_hops = 0;
-total_dups = 0;
-nodes_starting = true;
-for(i = 1; i <= nrNodes; i++) {
- booted[i] = false;
- count[i] = 0;
- hops[i] = 0;
- seqnos[i] = -1;
- lost[i] = 0;
- dups[i] = 0;
-}
-
-/* Wait until all nodes have started */
-while(nodes_starting) {
- YIELD_THEN_WAIT_UNTIL(msg.startsWith('Starting'));
-
- log.log("Node " + id + " booted\n");
- booted[id] = true;
-
- for(i = 1; i <= nrNodes; i++) {
- if(!booted[i]) {
- break;
- }
- if(i == nrNodes) {
- nodes_starting = false;
- }
- }
-}
-
-/* Create sink */
-log.log("All nodes booted, creating sink at node " + id + "\n");
-mote.getInterfaces().getButton().clickButton()
-
-while(true) {
- YIELD();
-
- /* Count sensor data packets */
- if(msg.startsWith("Sink")) {
- node_text = msg.split(" ")[4];
- seqno_text = msg.split(" ")[6];
- hops_text = msg.split(" ")[8];
- if(node_text) {
- source = parseInt(node_text);
- seqno = parseInt(seqno_text);
- hop = parseInt(hops_text);
- count[source]++;
- hops[source] = hop;
- seqno_gap = seqno - seqnos[source];
- seqnos[source] = seqno;
-
- total_received++;
- total_hops += hop;
-
- if(seqno_gap == 2) {
- total_lost += seqno_gap - 1;
- lost[source] += seqno_gap - 1;
- } else if(seqno_gap == 0) {
- total_dups += 1;
- dups[source] += 1;
- }
- }
- /* Fail if the sink has received more than 10 messages from any node. */
- for(i = 1; i <= nrNodes; i++) {
- if(count[i] > 10) {
- print_stats();
- log.testFailed(); /* We are done! */
- }
- }
-
- /* Wait until the sink have received at least two messages from every node */
- for(i = 1; i <= nrNodes; i++) {
- if(count[i] < 2) {
- break;
- }
- if(i == nrNodes) {
- print_stats();
- log.testOK();
- }
- }
- print_stats();
- }
-}
diff --git a/tools/cooja/contiki_tests/rime_collect_sky.csc b/tools/cooja/contiki_tests/rime_collect_sky.csc
index 9983d2ef8..4ae394e6c 100644
--- a/tools/cooja/contiki_tests/rime_collect_sky.csc
+++ b/tools/cooja/contiki_tests/rime_collect_sky.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make example-collect.sky TARGET=sky
../../../examples/rime/example-collect.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
87.29845932913939
@@ -51,6 +52,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
94.30809966340686
@@ -65,6 +67,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
82.40423567500785
@@ -79,6 +82,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
26.185019854469438
@@ -93,6 +97,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
1.9530156130507015
@@ -107,6 +112,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
48.35216700543414
@@ -121,6 +127,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
24.825985087266833
@@ -135,6 +142,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
8.356165164293616
@@ -149,6 +157,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
45.11740613004886
@@ -163,6 +172,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
68.9908548386292
@@ -177,6 +187,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
13.181122543889046
@@ -191,6 +202,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
2.1749985906538427
@@ -205,6 +217,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
37.79795217518357
@@ -219,6 +232,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
64.4595177394984
@@ -233,6 +247,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
81.85663737096085
@@ -247,6 +262,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
44.74952276297882
@@ -261,6 +277,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
96.11333426285873
@@ -275,6 +292,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
21.651464136783527
@@ -289,6 +307,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
83.6006916200628
@@ -303,6 +322,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
1.3446070721664705
@@ -317,33 +337,179 @@
se.sics.cooja.plugins.SimControl
- 223
- 1
+ 247
+ 3
227
0
0
false
- se.sics.cooja.plugins.VisState
- 300
- 0
- 300
- 390
- 0
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Radio environment (UDGM)
+
+ 224
+ 1
+ 225
+ 247
+ 1
false
se.sics.cooja.plugins.LogListener
- 256
- 690
+ 469
2
- 207
+ 473
0
- 439
+ 226
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 0
+ 700
+ 469
+ 0
false
diff --git a/tools/cooja/contiki_tests/rime_collect_sky.js b/tools/cooja/contiki_tests/rime_collect_sky.js
deleted file mode 100644
index 2bbb775df..000000000
--- a/tools/cooja/contiki_tests/rime_collect_sky.js
+++ /dev/null
@@ -1,131 +0,0 @@
-TIMEOUT(300000, log.log("Timeout\n"));
-
-function
-print_stats()
-{
- log.log("Received " + total_received + " messages, " +
- (total_received / nrNodes) + " messages/node, " +
- total_lost + " lost, " +
- (total_lost / nrNodes) + " lost/node, " +
- total_dups + " dups, " +
- (total_dups / nrNodes) + " dups/node, " +
- (total_hops / total_received) + " hops/message\n");
- log.log("Seqnos: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(seqnos[i] + " ");
- }
- log.log("\n");
- log.log("Lost: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(lost[i] + " ");
- }
- log.log("\n");
- log.log("Dups: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(dups[i] + " ");
- }
- log.log("\n");
- log.log("Hops: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(hops[i] + " ");
- }
- log.log("\n");
- log.log("Received: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(count[i] + " ");
- }
- log.log("\n");
-}
-
-/* Conf. */
-booted = new Array();
-count = new Array();
-hops = new Array();
-seqnos = new Array();
-lost = new Array();
-dups = new Array();
-nrNodes = 20;
-total_received = 0;
-total_lost = 0;
-total_hops = 0;
-total_dups = 0;
-nodes_starting = true;
-for(i = 1; i <= nrNodes; i++) {
- booted[i] = false;
- count[i] = 0;
- hops[i] = 0;
- seqnos[i] = -1;
- lost[i] = 0;
- dups[i] = 0;
-}
-
-/* Wait until all nodes have started */
-while(nodes_starting) {
- YIELD_THEN_WAIT_UNTIL(msg.startsWith('Starting'));
-
- log.log("Node " + id + " booted\n");
- booted[id] = true;
-
- for(i = 1; i <= nrNodes; i++) {
- if(!booted[i]) {
- break;
- }
- if(i == nrNodes) {
- nodes_starting = false;
- }
- }
-}
-
-/* Create sink */
-log.log("All nodes booted, creating sink at node " + id + "\n");
-mote.getInterfaces().getButton().clickButton()
-
-while(true) {
- YIELD();
-
- /* Count sensor data packets */
- if(msg.startsWith("Sink")) {
- node_text = msg.split(" ")[4];
- seqno_text = msg.split(" ")[6];
- hops_text = msg.split(" ")[8];
- if(node_text) {
- source = parseInt(node_text);
- seqno = parseInt(seqno_text);
- hop = parseInt(hops_text);
- count[source]++;
- hops[source] = hop;
- seqno_gap = seqno - seqnos[source];
- seqnos[source] = seqno;
-
- total_received++;
- total_hops += hop;
-
- if(seqno_gap == 2) {
- total_lost += seqno_gap - 1;
- lost[source] += seqno_gap - 1;
- } else if(seqno_gap == 0) {
- total_dups += 1;
- dups[source] += 1;
- }
- }
- /* Fail if the sink has received more than 10 messages from any node. */
- for(i = 1; i <= nrNodes; i++) {
- if(count[i] > 10) {
- print_stats();
- log.testFailed(); /* We are done! */
- }
- }
-
- /* Wait until the sink have received at least two messages from every node */
- for(i = 1; i <= nrNodes; i++) {
- if(count[i] < 2) {
- break;
- }
- if(i == nrNodes) {
- print_stats();
- log.testOK();
- }
- }
- print_stats();
- }
-}
diff --git a/tools/cooja/contiki_tests/rime_rucb.csc b/tools/cooja/contiki_tests/rime_rucb.csc
index a4e02374f..a6bdb9281 100644
--- a/tools/cooja/contiki_tests/rime_rucb.csc
+++ b/tools/cooja/contiki_tests/rime_rucb.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
25.0
@@ -18,7 +18,7 @@
se.sics.cooja.contikimote.ContikiMoteType
- mtype1
+ mtype296
Contiki Mote #1
../../../examples/rime/example-rucb.c
make example-rucb.cooja TARGET=cooja
@@ -34,7 +34,6 @@
se.sics.cooja.contikimote.interfaces.ContikiPIR
se.sics.cooja.contikimote.interfaces.ContikiClock
se.sics.cooja.contikimote.interfaces.ContikiLED
- se.sics.cooja.contikimote.interfaces.ContikiLog
se.sics.cooja.contikimote.interfaces.ContikiCFS
se.sics.cooja.interfaces.Mote2MoteRelations
false
@@ -42,7 +41,7 @@
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype296
se.sics.cooja.interfaces.Position
0.0
@@ -57,14 +56,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
51
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.17.20
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype296
se.sics.cooja.interfaces.Position
14.102564102564104
@@ -79,14 +74,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
52
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.1.11
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype296
se.sics.cooja.interfaces.Position
-32.16814655285737
@@ -101,14 +92,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
53
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.18.13
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype296
se.sics.cooja.interfaces.Position
-1.5917258339289355
@@ -123,14 +110,10 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
54
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.5.21
-
se.sics.cooja.contikimote.ContikiMote
- mtype1
+ mtype296
se.sics.cooja.interfaces.Position
26.334899854939632
@@ -145,10 +128,6 @@
se.sics.cooja.contikimote.interfaces.ContikiMoteID
55
-
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- 10.10.11.6
-
@@ -164,40 +143,41 @@
se.sics.cooja.plugins.LogListener
- 256
- 692
+ 798
2
- 209
+ 289
0
- 434
+ 354
false
- se.sics.cooja.plugins.VisUDGM
- 216
- 4
- 197
- 477
- 0
- false
-
-
- se.sics.cooja.plugins.VisTraffic
- 208
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Radio environment (UDGM)
+
+ 265
0
- 203
- 266
- -2
+ 155
+ 0
+ 200
false
- se.sics.cooja.plugins.RadioLogger
- 687
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 534
1
- 233
- 3
- 201
+ 354
+ 264
+ 0
false
diff --git a/tools/cooja/contiki_tests/rime_rucb.js b/tools/cooja/contiki_tests/rime_rucb.js
deleted file mode 100644
index d34689a34..000000000
--- a/tools/cooja/contiki_tests/rime_rucb.js
+++ /dev/null
@@ -1,4 +0,0 @@
-TIMEOUT(120000);
-
-WAIT_UNTIL(msg.startsWith('Completion time'));
-log.testOK();
diff --git a/tools/cooja/contiki_tests/rime_runicast.csc b/tools/cooja/contiki_tests/rime_runicast.csc
index 3c36b5ca8..aced91038 100644
--- a/tools/cooja/contiki_tests/rime_runicast.csc
+++ b/tools/cooja/contiki_tests/rime_runicast.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 10000
+ generated
+ 10000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make example-runicast.sky TARGET=sky
../../../examples/rime/example-runicast.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
3.0783332685337617
@@ -51,6 +52,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
1.1986251808192212
@@ -65,6 +67,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
34.432838059195255
@@ -79,6 +82,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
150.85510197745134
@@ -94,7 +98,7 @@
se.sics.cooja.plugins.SimControl
265
- 3
+ 4
200
0
0
@@ -104,19 +108,22 @@
se.sics.cooja.plugins.LogListener
received
- 256
- 692
- 2
- 209
+ 539
+ 0
+ 319
0
- 434
+ 325
false
- se.sics.cooja.plugins.VisUDGM
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Radio environment (UDGM)
+
263
- 1
+ 2
125
1
200
@@ -124,20 +131,76 @@
se.sics.cooja.plugins.RadioLogger
- 427
- 4
- 432
+ 276
+ 1
+ 324
264
1
false
- se.sics.cooja.plugins.VisTraffic
- 263
- 0
- 110
- 1
- 324
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 503
+ 3
+ 643
+ 539
+ 1
false
diff --git a/tools/cooja/contiki_tests/rime_runicast.js b/tools/cooja/contiki_tests/rime_runicast.js
deleted file mode 100644
index 3221bb5cd..000000000
--- a/tools/cooja/contiki_tests/rime_runicast.js
+++ /dev/null
@@ -1,53 +0,0 @@
-TIMEOUT(240000);
-
-nr_recv = 0;
-nr_timedout = 0;
-nr_sent = 0;
-
-while (nr_sent < 10) {
-
-/* Count received packets */
-if (msg.contains('received') && !msg.contains('DUPLICATE')) {
- nr_recv++;
- log.log("RECV=" + nr_recv + ", sent=" + nr_sent + ", timedout=" + nr_timedout + "\n");
-}
-
-/* Count timed out packets */
-else if (msg.contains('timed out')) {
- nr_timedout++;
- log.log("recv=" + nr_recv + ", sent=" + nr_sent + ", TIMEDOUT=" + nr_timedout + "\n");
-}
-
-/* Count sent packets */
-else if (msg.contains('sent to')) {
- nr_sent++;
- log.log("recv=" + nr_recv + ", SENT=" + nr_sent + ", timedout=" + nr_timedout + "\n");
-}
-
-YIELD();
-}
-
-/* Make sure received counter matches sent counter */
-if (nr_recv < nr_sent-3) {
- log.log("Error: Received << Sent!\n");
- log.log("recv=" + nr_recv + ", sent=" + nr_sent + ", timedout=" + nr_timedout + "\n");
- log.testFailed();
-}
-
-else if (nr_recv > nr_sent+3) {
- log.log("Error: Received >> Sent!\n");
- log.log("recv=" + nr_recv + ", sent=" + nr_sent + ", timedout=" + nr_timedout + "\n");
- log.testFailed();
-}
-
-/* Make sure some packets timed out (all from node 4) */
-else if (nr_timedout < 2) {
- log.log("Error: Too few packets timed out!\n");
- log.log("recv=" + nr_recv + ", sent=" + nr_sent + ", timedout=" + nr_timedout + "\n");
- log.testFailed();
-}
-
-else {
- log.log("recv=" + nr_recv + ", sent=" + nr_sent + ", timedout=" + nr_timedout + "\n");
- log.testOK();
-}
diff --git a/tools/cooja/contiki_tests/rime_trickle.csc b/tools/cooja/contiki_tests/rime_trickle.csc
index 2325e026b..f5c7269fe 100644
--- a/tools/cooja/contiki_tests/rime_trickle.csc
+++ b/tools/cooja/contiki_tests/rime_trickle.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
41.0
@@ -24,7 +24,7 @@
make example-trickle.sky TARGET=sky
../../../examples/rime/example-trickle.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
21.25615651441164
@@ -51,6 +52,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
29.258648178869528
@@ -65,6 +67,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
53.58390840870132
@@ -79,6 +82,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
4.089137066756255
@@ -93,6 +97,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
84.2311285004563
@@ -107,6 +112,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
40.97868508483131
@@ -121,6 +127,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
34.348646576361716
@@ -135,6 +142,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
76.46661251540715
@@ -149,6 +157,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
87.91615665417679
@@ -163,6 +172,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
25.396991214895582
@@ -176,34 +186,74 @@
- se.sics.cooja.plugins.VisUDGM
- 300
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Radio environment (UDGM)
+
+ 310
2
- 300
- 14
- 206
+ 169
+ 2
+ 199
false
se.sics.cooja.plugins.SimControl
313
- 0
+ 3
199
- 14
- 5
+ 1
+ 0
false
se.sics.cooja.plugins.LogListener
- 256
- 573
+ 310
1
- 349
- 339
- 8
+ 331
+ 3
+ 368
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 0
+ 700
+ 314
+ 0
false
diff --git a/tools/cooja/contiki_tests/rime_trickle.js b/tools/cooja/contiki_tests/rime_trickle.js
deleted file mode 100644
index e97e2d6ba..000000000
--- a/tools/cooja/contiki_tests/rime_trickle.js
+++ /dev/null
@@ -1,25 +0,0 @@
-TIMEOUT(120000, log.log(nr_packets[1] + ", " + nr_packets[2] + ", " + nr_packets[3] + ", " + nr_packets[4] + ", " + nr_packets[5] + ", " + nr_packets[6] + ", " + nr_packets[7] + ", " + nr_packets[8] + ", " + nr_packets[9] + ", " + nr_packets[10] + "\n"));
-
-nr_packets = new Array();
-for (i=1; i <= 10; i++) {
- nr_packets[i] = 0;
-}
-
-WAIT_UNTIL(id == 1 && msg.contains('Starting'));
-log.log("Node 1 started. Clicking node button.\n");
-mote.getInterfaces().getButton().clickButton()
-
-while (true) {
- /* Only handle receive messages */
- YIELD_THEN_WAIT_UNTIL(msg.contains('received'));
-
- /* Remember receiving node */
- log.log(id + " received a message\n");
- nr_packets[id]++;
-
- /* Did all nodes (2-10) receive a message? */
- for (i = 2; i <= 10; i++) {
- if (nr_packets[i] < 1) break;
- if (i == 10) log.testOK(); /* Report test success */
- }
-}
diff --git a/tools/cooja/contiki_tests/sky_checkpointing.csc b/tools/cooja/contiki_tests/sky_checkpointing.csc
index 8e7dd383f..703e071e8 100644
--- a/tools/cooja/contiki_tests/sky_checkpointing.csc
+++ b/tools/cooja/contiki_tests/sky_checkpointing.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make sky-checkpoint.sky TARGET=sky
../../../examples/sky-shell/sky-checkpoint.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
3.537694077190867
@@ -59,38 +60,135 @@
false
- se.sics.cooja.plugins.VisState
- 300
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Radio environment (UDGM)
+
+ 246
2
- 300
- 724
- 0
+ 210
+ 2
+ 199
false
se.sics.cooja.plugins.LogListener
- 256
- 1024
- 0
- 209
+ 849
+ 1
+ 246
0
- 446
+ 409
false
- se.sics.cooja.plugins.MoteInterfaceViewer
- 0
+ se.sics.cooja.plugins.ScriptRunner
- Serial port
+
+ true
- 424
- 1
- 502
- 579
- 27
+ 604
+ 0
+ 409
+ 246
+ 0
false
diff --git a/tools/cooja/contiki_tests/sky_checkpointing.js b/tools/cooja/contiki_tests/sky_checkpointing.js
deleted file mode 100644
index b020b312d..000000000
--- a/tools/cooja/contiki_tests/sky_checkpointing.js
+++ /dev/null
@@ -1,94 +0,0 @@
-TIMEOUT(120000, log.log("timeout at phase " + phase + ". last message: " + msg + "\n"));
-phase=0;
-
-/* Wait until node has booted */
-WAIT_UNTIL(msg.startsWith('Starting'));
-log.log("Shell started\n");
-phase++;
-
-/* 1. BACKGROUND PROCESS - NO CHECKPOINTING */
-node.write("repeat 10 1 echo bg process &");
-log.log("Starting background process without checkpointing\n");
-expected=10;
-while (expected > 0) {
- YIELD_THEN_WAIT_UNTIL(msg.contains('bg process'));
- expected--;
-}
-
-/* Make sure background process has exited */
-GENERATE_MSG(3000, "continue");
-while (!msg.contains('continue')) {
- YIELD();
- if (msg.contains('bg process')) {
- log.log("Too many bg messages at phase: " + phase + "\n");
- log.testFailed(); /* We are done! */
- while (true) YIELD();
- }
-}
-log.log("Background process without checkpointing done\n\n");
-phase++;
-
-/* 2. BACKGROUND PROCESS - CHECKPOINTING EVERY SECOND */
-node.write("repeat 10 1 echo bg process &");
-log.log("Starting background process with periodic checkpointing\n");
-expected=10;
-while (expected > 0) {
- YIELD_THEN_WAIT_UNTIL(msg.contains('bg process'));
- expected--;
- node.write("checkpoint file" + expected);
-}
-
-/* Make sure background process has exited */
-GENERATE_MSG(3000, "continue");
-while (!msg.contains('continue')) {
- YIELD();
- if (msg.contains('bg process')) {
- log.log("Too many bg messages at phase: " + phase + "\n");
- log.testFailed(); /* We are done! */
- while (true) YIELD();
- }
-}
-log.log("Background process with periodic checkpointing done\n\n");
-phase++;
-
-/* 3. LIST ALL FILES */
-node.write("ls");
-YIELD_THEN_WAIT_UNTIL(msg.contains('file9'));
-YIELD_THEN_WAIT_UNTIL(msg.contains('file8'));
-YIELD_THEN_WAIT_UNTIL(msg.contains('file7'));
-YIELD_THEN_WAIT_UNTIL(msg.contains('file6'));
-YIELD_THEN_WAIT_UNTIL(msg.contains('file5'));
-YIELD_THEN_WAIT_UNTIL(msg.contains('file4'));
-YIELD_THEN_WAIT_UNTIL(msg.contains('file3'));
-YIELD_THEN_WAIT_UNTIL(msg.contains('file2'));
-YIELD_THEN_WAIT_UNTIL(msg.contains('file1'));
-YIELD_THEN_WAIT_UNTIL(msg.contains('file0'));
-GENERATE_MSG(1000, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.contains('continue'));
-log.log("All checkpoints are stored in the filesystem\n\n");
-phase++;
-
-/* 4. ROLLBACK TO RESTORE BACKGROUND PROCESS */
-node.write("rollback file7");
-log.log("Rollingt back background process at count 7\n");
-expected=7;
-while (expected > 0) {
- YIELD_THEN_WAIT_UNTIL(msg.contains('bg process'));
- expected--;
-}
-
-/* Make sure background process has exited */
-GENERATE_MSG(3000, "continue");
-while (!msg.contains('continue')) {
- YIELD();
- if (msg.contains('bg process')) {
- log.log("Too many bg messages at phase: " + phase + "\n");
- log.testFailed(); /* We are done! */
- while (true) YIELD();
- }
-}
-log.log("Background process was rolled back successfully\n\n");
-phase++;
-
-
-log.testOK(); /* We are done! */
diff --git a/tools/cooja/contiki_tests/sky_coffee.csc b/tools/cooja/contiki_tests/sky_coffee.csc
index 3eededfbd..f1a4c26c3 100644
--- a/tools/cooja/contiki_tests/sky_coffee.csc
+++ b/tools/cooja/contiki_tests/sky_coffee.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
test
0
- 1
- 123456
- 0
+ generated
+ 0
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make test-coffee.sky TARGET=sky
../../../examples/sky/test-coffee.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
97.11078411573273
@@ -52,32 +53,78 @@
se.sics.cooja.plugins.SimControl
248
- 2
+ 3
200
0
0
false
- se.sics.cooja.plugins.VisState
- 300
- 1
- 300
- 1239
- 0
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Log output: printf()'s
+
+ 246
+ 2
+ 170
+ 1
+ 200
false
se.sics.cooja.plugins.LogListener
- 256
- 1539
- 0
+ 846
+ 1
209
- 0
- 945
+ 2
+ 370
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 601
+ 0
+ 370
+ 247
+ 0
false
diff --git a/tools/cooja/contiki_tests/sky_coffee.js b/tools/cooja/contiki_tests/sky_coffee.js
deleted file mode 100644
index 8f454e10c..000000000
--- a/tools/cooja/contiki_tests/sky_coffee.js
+++ /dev/null
@@ -1,31 +0,0 @@
-TIMEOUT(60000);
-
-fileOK = null;
-gcOK = null;
-
-while (fileOK == null || gcOK == null) {
- YIELD();
-
- if (msg.startsWith('Coffee file test: 0')) {
- fileOK = true;
- } else if (msg.startsWith('Coffee file test')) {
- fileOK = false;
- } else if (msg.startsWith('Coffee garbage collection test: 0')) {
- gcOK = true;
- } else if (msg.startsWith('Coffee garbage collection test')) {
- gcOK = false;
- }
-
-}
-
-if (gcOK == false) {
- log.log("coffee garbage collection failed\n");
-}
-if (fileOK == false) {
- log.log("coffee file test failed\n");
-}
-if (!fileOK || !gcOK) {
- log.testFailed();
-} else {
- log.testOK();
-}
diff --git a/tools/cooja/contiki_tests/sky_collect.csc b/tools/cooja/contiki_tests/sky_collect.csc
index 857f977dc..a77e10880 100644
--- a/tools/cooja/contiki_tests/sky_collect.csc
+++ b/tools/cooja/contiki_tests/sky_collect.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 10000
+ generated
+ 10000000
se.sics.cooja.radiomediums.UDGM
30.0
@@ -24,7 +24,7 @@
make sky-collect.sky TARGET=sky
../../../examples/sky/sky-collect.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
9.333811152651393
@@ -51,6 +52,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
33.040227185226826
@@ -65,6 +67,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
-2.2559922410521516
@@ -79,6 +82,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
12.959353575718179
@@ -93,6 +97,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
15.917348901177405
@@ -107,6 +112,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
26.735174243053933
@@ -121,6 +127,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
41.5254792748469
@@ -136,41 +143,108 @@
se.sics.cooja.plugins.SimControl
265
- 2
+ 3
200
0
0
false
- se.sics.cooja.plugins.LogListener
+ se.sics.cooja.plugins.Visualizer
-
- 256
+ Mote IDs
+ Radio environment (UDGM)
- 1168
- 0
- 240
- -1
- 618
- false
-
-
- se.sics.cooja.plugins.VisUDGM
- 300
+ 264
1
- 300
- 31
- 287
+ 185
+ 0
+ 200
false
- se.sics.cooja.plugins.RadioLogger
- 424
- 3
- 595
- 988
- 13
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 2
+ 385
+ 266
+ 0
+ false
+
+
+ se.sics.cooja.plugins.TimeLine
+
+ 0
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+
+ 109
+ 9
+
+ 866
+ 0
+ 152
+ 0
+ 384
false
diff --git a/tools/cooja/contiki_tests/sky_collect.js b/tools/cooja/contiki_tests/sky_collect.js
deleted file mode 100644
index 38cc2e6d9..000000000
--- a/tools/cooja/contiki_tests/sky_collect.js
+++ /dev/null
@@ -1,52 +0,0 @@
-TIMEOUT(300000, log.log("received/node: " + count[1] + " " + count[2] + " " + count[3] + " " + count[4] + " " + count[5] + " " + count[6] + " " + count[7] + "\n"));
-
-/* Conf. */
-booted = new Array();
-count = new Array();
-nrNodes = 7;
-nodes_starting = true;
-for (i = 1; i <= nrNodes; i++) {
- booted[i] = false;
- count[i] = 0;
-}
-
-/* Wait until all nodes have started */
-while (nodes_starting) {
- YIELD_THEN_WAIT_UNTIL(msg.startsWith('Starting'));
-
- log.log("Node " + id + " booted\n");
- booted[id] = true;
-
- for (i = 1; i <= nrNodes; i++) {
- if (!booted[i]) break;
- if (i == nrNodes) nodes_starting = false;
- }
-}
-
-/* Create sink */
-log.log("All nodes booted, creating sink at node " + id + "\n");
-mote.getInterfaces().getButton().clickButton()
-
-while (true) {
- YIELD();
-
- /* Count sensor data packets */
- source = msg.split(" ")[0];
- count[source]++;
- log.log("Got data from node " + source + ": tot=" + count[source] + "\n");
-
- /* Fail if any node has transmitted more than 20 packets */
- for (i = 1; i <= nrNodes; i++) {
- if (count[i] > 20) {
- log.log("received/node: " + count[1] + " " + count[2] + " " + count[3] + " " + count[4] + " " + count[5] + " " + count[6] + " " + count[7] + "\n");
- log.testFailed(); /* We are done! */
- }
- }
-
- /* Wait until we have received data from all nodes */
- for (i = 1; i <= nrNodes; i++) {
- if (count[i] < 5) break;
- if (i == nrNodes) log.testOK();
- }
-
-}
diff --git a/tools/cooja/contiki_tests/sky_deluge.csc b/tools/cooja/contiki_tests/sky_deluge.csc
index 3d4aad31f..a27328bed 100644
--- a/tools/cooja/contiki_tests/sky_deluge.csc
+++ b/tools/cooja/contiki_tests/sky_deluge.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
Deluge
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make APPS=deluge test-deluge.sky TARGET=sky
../../../examples/sky/test-deluge.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
22.464792491653174
@@ -51,6 +52,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
16.167564578306468
@@ -65,6 +67,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
63.42409596590043
@@ -80,32 +83,73 @@
se.sics.cooja.plugins.SimControl
282
- 2
- 187
+ 4
+ 212
0
0
false
- se.sics.cooja.plugins.VisState
- 300
- 0
- 300
- 390
- 0
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Radio environment (UDGM)
+
+ 283
+ 2
+ 144
+ -1
+ 212
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 1
+ 357
+ 281
+ 1
+ false
+
+
+ se.sics.cooja.plugins.TimeLine
+
+ 0
+ 1
+ 2
+
+ 109
+ 9
+
+ 882
+ 3
+ 149
+ -1
+ 357
false
se.sics.cooja.plugins.LogListener
- version
- 256
+
- 690
- 1
- 328
- 0
- 319
+ 882
+ 0
+ 195
+ -1
+ 504
false
diff --git a/tools/cooja/contiki_tests/sky_deluge.js b/tools/cooja/contiki_tests/sky_deluge.js
deleted file mode 100644
index ce40273e8..000000000
--- a/tools/cooja/contiki_tests/sky_deluge.js
+++ /dev/null
@@ -1,9 +0,0 @@
-TIMEOUT(100000, log.log("last msg: " + msg + "\n")); /* print last msg at timeout */
-
-WAIT_UNTIL(id == 3 && msg.contains("version 1"));
-log.log("Node 3 got version 1\n");
-
-WAIT_UNTIL(id == 5 && msg.contains("version 1"));
-log.log("Node 5 got version 1\n");
-
-log.testOK(); /* Report test success and quit */
diff --git a/tools/cooja/contiki_tests/sky_helloworld.csc b/tools/cooja/contiki_tests/sky_helloworld.csc
index f7183f642..d00a8de76 100644
--- a/tools/cooja/contiki_tests/sky_helloworld.csc
+++ b/tools/cooja/contiki_tests/sky_helloworld.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
Hello World (Sky)
0
- 1
- 123456
- 0
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make hello-world.sky TARGET=sky
../../../examples/hello-world/hello-world.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
64.11203103628397
@@ -52,32 +53,26 @@
se.sics.cooja.plugins.SimControl
248
- 2
+ 1
200
0
0
false
- se.sics.cooja.plugins.VisState
- 300
- 1
- 300
- 1239
- 0
- false
-
-
- se.sics.cooja.plugins.LogListener
+ se.sics.cooja.plugins.ScriptRunner
-
- 256
+
+ true
- 1539
+ 541
0
- 209
- 0
- 945
+ 448
+ 248
+ -1
false
diff --git a/tools/cooja/contiki_tests/sky_helloworld.js b/tools/cooja/contiki_tests/sky_helloworld.js
deleted file mode 100644
index 4f3fd415d..000000000
--- a/tools/cooja/contiki_tests/sky_helloworld.js
+++ /dev/null
@@ -1,4 +0,0 @@
-TIMEOUT(2000, log.log("last message: " + msg + "\n"));
-
-WAIT_UNTIL(msg.equals('Hello, world'));
-log.testOK();
diff --git a/tools/cooja/contiki_tests/sky_ipv6_routing.csc b/tools/cooja/contiki_tests/sky_ipv6_routing.csc
index 0d3c2bf21..48b0021e7 100644
--- a/tools/cooja/contiki_tests/sky_ipv6_routing.csc
+++ b/tools/cooja/contiki_tests/sky_ipv6_routing.csc
@@ -1,178 +1,196 @@
-
-
-
- IPv6 UDP multi-hop
- 0
- 1
- 123456
- 1000
-
- se.sics.cooja.radiomediums.UDGM
- 50.0
- 100.0
- 1.0
- 1.0
-
-
- se.sics.cooja.mspmote.SkyMoteType
- sky1
- Sky Mote Type #server
-
- make udp-server.sky TARGET=sky DEFINES=WITH_NULLMAC,WITH_UIP6
- ../../../examples/udp-ipv6/udp-server.sky
- se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
- se.sics.cooja.interfaces.Mote2MoteRelations
- se.sics.cooja.mspmote.interfaces.MspClock
- se.sics.cooja.mspmote.interfaces.MspMoteID
- se.sics.cooja.mspmote.interfaces.SkyButton
- se.sics.cooja.mspmote.interfaces.SkyFlash
- se.sics.cooja.mspmote.interfaces.SkyByteRadio
- se.sics.cooja.mspmote.interfaces.SkySerial
- se.sics.cooja.mspmote.interfaces.SkyLED
-
-
- se.sics.cooja.mspmote.SkyMoteType
- sky2
- Sky Mote Type #client
-
- make udp-client.sky TARGET=sky DEFINES=WITH_NULLMAC,WITH_UIP6
- ../../../examples/udp-ipv6/udp-client.sky
- se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
- se.sics.cooja.interfaces.Mote2MoteRelations
- se.sics.cooja.mspmote.interfaces.MspClock
- se.sics.cooja.mspmote.interfaces.MspMoteID
- se.sics.cooja.mspmote.interfaces.SkyButton
- se.sics.cooja.mspmote.interfaces.SkyFlash
- se.sics.cooja.mspmote.interfaces.SkyByteRadio
- se.sics.cooja.mspmote.interfaces.SkySerial
- se.sics.cooja.mspmote.interfaces.SkyLED
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
- se.sics.cooja.interfaces.Position
- 4.429858922161034
- 67.09174884241352
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
- fe80.0000.0000.0000.0212.7401.0001.0101
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 1
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky2
-
- se.sics.cooja.interfaces.Position
- 11.713143611799719
- 95.89136566345172
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
- fe80.0000.0000.0000.0212.7402.0002.0202
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 2
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
- se.sics.cooja.interfaces.Position
- 24.363059125382698
- 41.714385769558
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
- fe80.0000.0000.0000.0212.7403.0003.0303
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 3
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
- se.sics.cooja.interfaces.Position
- 96.42924447549179
- 57.78187718095034
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
- fe80.0000.0000.0000.0212.7404.0004.0404
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 4
-
-
-
- se.sics.cooja.mspmote.SkyMote
- sky1
-
- se.sics.cooja.interfaces.Position
- 58.387304457658814
- 39.38419308594967
- 0.0
-
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
- fe80.0000.0000.0000.0212.7405.0005.0505
-
-
- se.sics.cooja.mspmote.interfaces.MspMoteID
- 5
-
-
-
-
- se.sics.cooja.plugins.SimControl
- 282
- 1
- 187
- 0
- 0
- false
-
-
- se.sics.cooja.plugins.Visualizer
-
- Radio environment (UDGM)
-
- 300
- 3
- 300
- 503
- 0
- false
-
-
- se.sics.cooja.plugins.LogListener
-
-
- 256
-
- 1021
- 2
- 190
- -7
- 276
- false
-
-
-
+
+
+ ../apps/mrm
+ ../apps/mspsim
+ ../apps/avrora
+ ../apps/native_gateway
+
+ IPv6 UDP multi-hop
+ 0
+ generated
+ 1000000
+
+ se.sics.cooja.radiomediums.UDGM
+ 50.0
+ 100.0
+ 1.0
+ 1.0
+
+
+ se.sics.cooja.mspmote.SkyMoteType
+ sky1
+ Sky Mote Type #server
+
+ make udp-server.sky TARGET=sky DEFINES=WITH_NULLMAC,WITH_UIP6
+ ../../../examples/udp-ipv6/udp-server.sky
+ se.sics.cooja.interfaces.Position
+ se.sics.cooja.interfaces.IPAddress
+ se.sics.cooja.interfaces.Mote2MoteRelations
+ se.sics.cooja.mspmote.interfaces.MspClock
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ se.sics.cooja.mspmote.interfaces.SkyButton
+ se.sics.cooja.mspmote.interfaces.SkyFlash
+ se.sics.cooja.mspmote.interfaces.SkyByteRadio
+ se.sics.cooja.mspmote.interfaces.SkySerial
+ se.sics.cooja.mspmote.interfaces.SkyLED
+
+
+ se.sics.cooja.mspmote.SkyMoteType
+ sky2
+ Sky Mote Type #client
+
+ make udp-client.sky TARGET=sky DEFINES=WITH_NULLMAC,WITH_UIP6
+ ../../../examples/udp-ipv6/udp-client.sky
+ se.sics.cooja.interfaces.Position
+ se.sics.cooja.interfaces.IPAddress
+ se.sics.cooja.interfaces.Mote2MoteRelations
+ se.sics.cooja.mspmote.interfaces.MspClock
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ se.sics.cooja.mspmote.interfaces.SkyButton
+ se.sics.cooja.mspmote.interfaces.SkyFlash
+ se.sics.cooja.mspmote.interfaces.SkyByteRadio
+ se.sics.cooja.mspmote.interfaces.SkySerial
+ se.sics.cooja.mspmote.interfaces.SkyLED
+
+
+ se.sics.cooja.mspmote.SkyMote
+ sky1
+
+
+ se.sics.cooja.interfaces.Position
+ 4.429858922161034
+ 67.09174884241352
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 1
+
+
+
+ se.sics.cooja.mspmote.SkyMote
+ sky2
+
+
+ se.sics.cooja.interfaces.Position
+ 11.713143611799719
+ 95.89136566345172
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 2
+
+
+
+ se.sics.cooja.mspmote.SkyMote
+ sky1
+
+
+ se.sics.cooja.interfaces.Position
+ 24.363059125382698
+ 41.714385769558
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 3
+
+
+
+ se.sics.cooja.mspmote.SkyMote
+ sky1
+
+
+ se.sics.cooja.interfaces.Position
+ 96.42924447549179
+ 57.78187718095034
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 4
+
+
+
+ se.sics.cooja.mspmote.SkyMote
+ sky1
+
+
+ se.sics.cooja.interfaces.Position
+ 58.387304457658814
+ 39.38419308594967
+ 0.0
+
+
+ se.sics.cooja.mspmote.interfaces.MspMoteID
+ 5
+
+
+
+
+ se.sics.cooja.plugins.SimControl
+ 282
+ 4
+ 204
+ 0
+ 0
+ false
+
+
+ se.sics.cooja.plugins.Visualizer
+
+ Radio environment (UDGM)
+ Mote IDs
+ Addresses: IP or Rime
+
+ 800
+ 2
+ 183
+ 221
+ 426
+ false
+
+
+ se.sics.cooja.plugins.LogListener
+
+
+
+ 1019
+ 3
+ 190
+ 3
+ 610
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 738
+ 0
+ 425
+ 282
+ 1
+ false
+
+
+ se.sics.cooja.plugins.RadioLogger
+ 500
+ 1
+ 406
+ 2
+ 204
+ false
+
+
+
diff --git a/tools/cooja/contiki_tests/sky_ipv6_routing.js b/tools/cooja/contiki_tests/sky_ipv6_routing.js
deleted file mode 100644
index 7e95567d8..000000000
--- a/tools/cooja/contiki_tests/sky_ipv6_routing.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Make test automatically fail (timeout) after 100 simulated seconds */
-TIMEOUT(100000, log.log("last msg: " + msg + "\n")); /* print last msg at timeout */
-
-log.log("waiting for server response at mote 2\n");
-WAIT_UNTIL(id == 2 && msg.startsWith("Response from the server"));
-
-log.log("ok, reporting success now\n");
-log.testOK(); /* Report test success and quit */
diff --git a/tools/cooja/contiki_tests/sky_ipv6_udp.csc b/tools/cooja/contiki_tests/sky_ipv6_udp.csc
index 30b3f3f0d..406beb06b 100644
--- a/tools/cooja/contiki_tests/sky_ipv6_udp.csc
+++ b/tools/cooja/contiki_tests/sky_ipv6_udp.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123457
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make example-udp-sender.sky TARGET=sky DEFINES=WITH_UIP6,WITH_NULLMAC,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7402,UDP_ADDR_G=0x02,UDP_ADDR_H=0x202
../../../examples/udp-sender-ipv6/example-udp-sender.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -42,7 +42,7 @@
make example-udp-receiver.sky TARGET=sky DEFINES=WITH_UIP6,WITH_NULLMAC,UDP_ADDR_A=0xfe80,UDP_ADDR_B=0,UDP_ADDR_C=0,UDP_ADDR_D=0,UDP_ADDR_E=0x0212,UDP_ADDR_F=0x7401,UDP_ADDR_G=0x01,UDP_ADDR_H=0x101
../../../examples/udp-receiver-ipv6/example-udp-receiver.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -55,6 +55,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
65.934608127183
@@ -69,6 +70,7 @@
se.sics.cooja.mspmote.SkyMote
sky2
+
se.sics.cooja.interfaces.Position
67.66105781539623
@@ -84,7 +86,7 @@
se.sics.cooja.plugins.SimControl
248
- 2
+ 3
200
0
0
@@ -94,31 +96,59 @@
se.sics.cooja.plugins.LogListener
- 256
- 1067
+ 816
1
- 300
- 0
- 523
+ 333
+ 1
+ 365
false
- se.sics.cooja.plugins.RadioLogger
- 1062
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Addresses: IP or Rime
+ Radio environment (UDGM)
+
+ 246
0
- 309
- 6
- 207
+ 167
+ 0
+ 198
false
- se.sics.cooja.plugins.VisUDGM
- 300
- 3
- 108
- 766
- 11
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 572
+ 2
+ 700
+ 246
+ -1
false
diff --git a/tools/cooja/contiki_tests/sky_ipv6_udp.js b/tools/cooja/contiki_tests/sky_ipv6_udp.js
deleted file mode 100644
index b32fa8c0c..000000000
--- a/tools/cooja/contiki_tests/sky_ipv6_udp.js
+++ /dev/null
@@ -1,21 +0,0 @@
-TIMEOUT(100000, log.log("last msg: " + msg + "\n")); /* print last msg at timeout */
-
-WAIT_UNTIL(msg.contains("Created connection"));
-YIELD_THEN_WAIT_UNTIL(msg.contains("Created connection"));
-
-log.log("Both nodes booted\n");
-
-count = 0;
-while (count++ < 5) {
- /* Message from sender process to receiver process */
- YIELD_THEN_WAIT_UNTIL(msg.contains("Sender sending"));
- YIELD_THEN_WAIT_UNTIL(msg.contains("Receiver received"));
- log.log(count + ": Sender -> Receiver OK\n");
-
- /* Message from receiver process to sender process */
- YIELD_THEN_WAIT_UNTIL(msg.contains("Receiver sending"));
- YIELD_THEN_WAIT_UNTIL(msg.contains("Sender received"));
- log.log(count + ": Receiver -> Sender OK\n");
-}
-
-log.testOK(); /* Report test success and quit */
diff --git a/tools/cooja/contiki_tests/sky_shell_basic_commands.csc b/tools/cooja/contiki_tests/sky_shell_basic_commands.csc
index 77119182a..695996b6f 100644
--- a/tools/cooja/contiki_tests/sky_shell_basic_commands.csc
+++ b/tools/cooja/contiki_tests/sky_shell_basic_commands.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make sky-shell.sky TARGET=sky
../../../examples/sky-shell/sky-shell.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
62.86427076032819
@@ -52,33 +53,54 @@
se.sics.cooja.plugins.SimControl
302
- 1
- 187
+ 2
+ 205
0
0
false
-
- se.sics.cooja.plugins.VisState
- 300
- 0
- 300
- 390
- 0
- false
-
se.sics.cooja.plugins.LogListener
- 256
690
- 2
+ 1
190
0
457
false
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 0
+ 648
+ 303
+ 0
+ false
+
diff --git a/tools/cooja/contiki_tests/sky_shell_basic_commands.js b/tools/cooja/contiki_tests/sky_shell_basic_commands.js
deleted file mode 100644
index e1866ca87..000000000
--- a/tools/cooja/contiki_tests/sky_shell_basic_commands.js
+++ /dev/null
@@ -1,15 +0,0 @@
-TIMEOUT(2000, log.log("last message: " + msg + "\n"));
-
-/* Wait until node has booted */
-WAIT_UNTIL(msg.startsWith('Starting'));
-log.log("Shell started\n");
-
-/* Test command: ps */
-node.write("ps");
-WAIT_UNTIL(msg.startsWith('Event timer'));
-
-/* Test command: help */
-node.write("help");
-WAIT_UNTIL(msg.startsWith('write '));
-
-log.testOK(); /* We are done! */
diff --git a/tools/cooja/contiki_tests/sky_shell_collect.csc b/tools/cooja/contiki_tests/sky_shell_collect.csc
index b9c9a9acc..c099dee70 100644
--- a/tools/cooja/contiki_tests/sky_shell_collect.csc
+++ b/tools/cooja/contiki_tests/sky_shell_collect.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make sky-shell.sky TARGET=sky
../../../examples/sky-shell/sky-shell.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
87.29845932913939
@@ -51,6 +52,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
94.30809966340686
@@ -65,6 +67,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
82.40423567500785
@@ -79,6 +82,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
26.185019854469438
@@ -93,6 +97,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
1.9530156130507015
@@ -107,6 +112,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
48.35216700543414
@@ -121,6 +127,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
24.825985087266833
@@ -135,6 +142,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
8.356165164293616
@@ -149,6 +157,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
45.11740613004886
@@ -163,6 +172,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
68.9908548386292
@@ -177,6 +187,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
13.181122543889046
@@ -191,6 +202,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
2.1749985906538427
@@ -205,6 +217,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
37.79795217518357
@@ -219,6 +232,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
64.4595177394984
@@ -233,6 +247,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
81.85663737096085
@@ -247,6 +262,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
44.74952276297882
@@ -261,6 +277,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
96.11333426285873
@@ -275,6 +292,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
21.651464136783527
@@ -289,6 +307,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
83.6006916200628
@@ -303,6 +322,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
1.3446070721664705
@@ -316,25 +336,232 @@
- se.sics.cooja.plugins.SimControl
- 223
+ se.sics.cooja.plugins.LogListener
+
+
+
+ 690
1
- 227
+ 207
0
+ 493
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 2
+ 700
+ 259
0
false
- se.sics.cooja.plugins.LogListener
-
-
- 256
-
- 690
- 0
- 207
+ se.sics.cooja.plugins.SimControl
+ 259
+ 3
+ 200
0
- 439
+ -1
+ false
+
+
+ se.sics.cooja.plugins.Visualizer
+
+ Mote IDs
+ Radio environment (UDGM)
+
+ 260
+ 0
+ 296
+ 0
+ 197
false
diff --git a/tools/cooja/contiki_tests/sky_shell_collect.js b/tools/cooja/contiki_tests/sky_shell_collect.js
deleted file mode 100644
index a3f426d1f..000000000
--- a/tools/cooja/contiki_tests/sky_shell_collect.js
+++ /dev/null
@@ -1,183 +0,0 @@
-TIMEOUT(300000, log.log("Timeout\n"));
-
-function
-print_stats()
-{
- log.log("Received " + total_received + " messages, " +
- (total_received / nrNodes) + " messages/node, " +
- total_lost + " lost, " +
- (total_lost / nrNodes) + " lost/node, " +
- total_dups + " dups, " +
- (total_dups / nrNodes) + " dups/node, " +
- (total_hops / total_received) + " hops/message\n");
- log.log("Seqnos: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(seqnos[i] + " ");
- }
- log.log("\n");
- log.log("Lost: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(lost[i] + " ");
- }
- log.log("\n");
- log.log("Dups: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(dups[i] + " ");
- }
- log.log("\n");
- log.log("Hops: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(hops[i] + " ");
- }
- log.log("\n");
- log.log("Received: ");
- for(i = 1; i <= nrNodes; i++) {
- log.log(count[i] + " ");
- }
- log.log("\n");
- log.log("Stats: cpu " + 100 * total_cpu / (total_cpu + total_lpm) +
- "% lpm " + 100 * total_lpm / (total_cpu + total_lpm) +
- "% rx " + 100 * total_listen / (total_cpu + total_lpm) +
- "% tx " + 100 * total_transmit / (total_cpu + total_lpm) +
- "% average latency " + total_latency / (4096 * total_received) +
- " ms \n");
-
-}
-
-/* Conf. */
-booted = new Array();
-count = new Array();
-hops = new Array();
-seqnos = new Array();
-lost = new Array();
-dups = new Array();
-nrNodes = 20;
-total_received = 0;
-total_lost = 0;
-total_hops = 0;
-total_dups = 0;
-
-total_cpu = total_lpm = total_listen = total_transmit = 0;
-
-total_latency = 0;
-
-nodes_starting = true;
-for(i = 1; i <= nrNodes; i++) {
- booted[i] = false;
- count[i] = 0;
- hops[i] = 0;
- seqnos[i] = -1;
- lost[i] = 0;
- dups[i] = 0;
-}
-
-/* Wait until all nodes have started */
-while(nodes_starting) {
- YIELD_THEN_WAIT_UNTIL(msg.startsWith('Starting'));
-
- log.log("Node " + id + " booted\n");
- booted[id] = true;
-
- for(i = 1; i <= nrNodes; i++) {
- if(!booted[i]) {
- break;
- }
- if(i == nrNodes) {
- nodes_starting = false;
- }
- }
-}
-
-/* Create sink */
-log.log("All nodes booted, creating sink at node " + id + "\n");
-sink = id;
-
-/* Wait for prompt */
-YIELD_THEN_WAIT_UNTIL(id == sink);
-/*mote.getInterfaces().getButton().clickButton()*/
-log.log("Writing netcmd\n");
-node.write("netcmd { repeat 0 20 { randwait 20 sky-alldata | blink | send } }");
-YIELD_THEN_WAIT_UNTIL(id == sink);
-log.log("Writing collect command\n");
-node.write("collect | timestamp | blink | binprint &");
-
-while(true) {
- YIELD();
-
- /* Count sensor data packets */
- data = msg.split(" ");
-
- if(data[24]) {
-
- len = parseInt(data[0]);
- timestamp1 = parseInt(data[1]);
- timestamp2 = parseInt(data[2]);
- timesynched_timestamp = parseInt(data[3]);
- node_id = parseInt(data[4]);
- seqno = parseInt(data[5]);
- hop = parseInt(data[6]);
- latency = parseInt(data[7]);
- data_len2 = parseInt(data[8]);
- clock = parseInt(data[9]);
- timesyncedtime = parseInt(data[10]);
- light1 = parseInt(data[11]);
- light2 = parseInt(data[12]);
- temperature = parseInt(data[13]);
- humidity = parseInt(data[14]);
- rssi = parseInt(data[15]);
- time_cpu = parseInt(data[16]);
- time_lpm = parseInt(data[17]);
- time_transmit = parseInt(data[18]);
- time_listen = parseInt(data[19]);
- best_neighbor = parseInt(data[20]);
- best_neighbor_etx = parseInt(data[21]);
- best_neighbor_rtmetrix = parseInt(data[22]);
- battery_voltage = parseInt(data[23]);
- battery_indicator = parseInt(data[24]);
-
- total_cpu += time_cpu;
- total_lpm += time_lpm;
- total_transmit += time_transmit;
- total_listen += time_listen;
-
- total_latency += latency;
-
- source = node_id;
- count[source]++;
- hops[source] = hop;
- seqno_gap = seqno - seqnos[source];
- seqnos[source] = seqno;
-
- total_received++;
- total_hops += hop;
-
- if(seqno_gap == 2) {
- total_lost += seqno_gap - 1;
- lost[source] += seqno_gap - 1;
- } else if(seqno_gap == 0) {
- total_dups += 1;
- dups[source] += 1;
- }
- }
- /* Fail if the sink has received more than 10 messages from any node. */
- for(i = 1; i <= nrNodes; i++) {
- if(i != sink && count[i] > 10) {
- print_stats();
- log.testFailed(); /* We are done! */
- }
- }
-
- /* Wait until the sink have received at least two messages from
- every node, except the sink, which doesn't send packets. */
- for(i = 1; i <= nrNodes; i++) {
- if(i != sink) {
- if(count[i] < 2) {
- break;
- }
- if(i == nrNodes) {
- print_stats();
- log.testOK();
- }
- }
- }
-}
diff --git a/tools/cooja/contiki_tests/sky_shell_compilation_test.csc b/tools/cooja/contiki_tests/sky_shell_compilation_test.csc
index 77119182a..bc01ee109 100644
--- a/tools/cooja/contiki_tests/sky_shell_compilation_test.csc
+++ b/tools/cooja/contiki_tests/sky_shell_compilation_test.csc
@@ -2,13 +2,13 @@
../apps/mrm
../apps/mspsim
+ ../apps/avrora
../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -24,7 +24,7 @@
make sky-shell.sky TARGET=sky
../../../examples/sky-shell/sky-shell.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -37,6 +37,7 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
62.86427076032819
@@ -52,18 +53,9 @@
se.sics.cooja.plugins.SimControl
302
- 1
- 187
- 0
- 0
- false
-
-
- se.sics.cooja.plugins.VisState
- 300
0
- 300
- 390
+ 204
+ 0
0
false
@@ -71,7 +63,6 @@
se.sics.cooja.plugins.LogListener
- 256
690
2
@@ -80,5 +71,21 @@
457
false
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 1
+ 458
+ 300
+ -1
+ false
+
diff --git a/tools/cooja/contiki_tests/sky_shell_compilation_test.js b/tools/cooja/contiki_tests/sky_shell_compilation_test.js
deleted file mode 100644
index b7fb0cf6a..000000000
--- a/tools/cooja/contiki_tests/sky_shell_compilation_test.js
+++ /dev/null
@@ -1,4 +0,0 @@
-TIMEOUT(2000, log.log("last message: " + msg + "\n"));
-
-WAIT_UNTIL(msg.startsWith('Contiki'));
-log.testOK();
diff --git a/tools/cooja/contiki_tests/sky_shell_download.csc b/tools/cooja/contiki_tests/sky_shell_download.csc
index e4af3f5fd..a785a701d 100644
--- a/tools/cooja/contiki_tests/sky_shell_download.csc
+++ b/tools/cooja/contiki_tests/sky_shell_download.csc
@@ -1,11 +1,14 @@
+ ../apps/mrm
+ ../apps/mspsim
+ ../apps/avrora
+ ../apps/native_gateway
My simulation
0
- 1
generated
- 1000
+ 1000000
se.sics.cooja.radiomediums.UDGM
100.0
@@ -21,7 +24,7 @@
make sky-checkpoint.sky TARGET=sky
../../../examples/sky-shell/sky-checkpoint.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -34,16 +37,13 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
-16.136777727943556
85.85963282955879
0.0
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
-
-
se.sics.cooja.mspmote.interfaces.MspMoteID
1
@@ -52,16 +52,13 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
11.712359274594053
84.42239042889724
0.0
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
-
-
se.sics.cooja.mspmote.interfaces.MspMoteID
2
@@ -70,11 +67,11 @@
se.sics.cooja.plugins.SimControl
- 248
+ 268
4
- 200
- 375
- 0
+ 201
+ 0
+ 1
false
@@ -84,11 +81,11 @@
Serial port
0,0
- 372
- 5
- 482
- 0
- 173
+ 359
+ 3
+ 485
+ 2
+ 201
false
@@ -98,11 +95,11 @@
Serial port
0,0
- 399
- 3
- 483
- 625
- 172
+ 384
+ 2
+ 488
+ 390
+ 199
false
@@ -111,19 +108,96 @@
Radio environment (UDGM)
Mote IDs
- 400
+ 126
1
- 171
- 624
- 0
+ 198
+ 649
+ 1
false
- se.sics.cooja.plugins.RadioLogger
- 376
- 2
- 172
- -1
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 573
+ 0
+ 688
+ 80
0
false
diff --git a/tools/cooja/contiki_tests/sky_shell_download.js b/tools/cooja/contiki_tests/sky_shell_download.js
deleted file mode 100644
index 6c62838a0..000000000
--- a/tools/cooja/contiki_tests/sky_shell_download.js
+++ /dev/null
@@ -1,76 +0,0 @@
-TIMEOUT(150000); /* print last msg at timeout */
-
-log.log("Random seed: " + mote.getSimulation().getRandomSeed() + "\n");
-
-/* Wait for nodes to boot */
-mote1 = null;
-mote2 = null;
-while (mote1 == null || mote2 == null) {
- if (id == 1) {
- mote1 = mote;
- }
- if (id == 2) {
- mote2 = mote;
- }
- YIELD();
-}
-GENERATE_MSG(2000, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-
-/* Generate initial file */
-fileID = 1;
-command = "echo *mote1data" + fileID + " | write file" + fileID + ".txt\n";
-log.log("mote1> " + command);
-write(mote1, command);
-YIELD_THEN_WAIT_UNTIL(id == 1 && msg.contains("Contiki>"));
-
-/* Download and append files */
-while (fileID < 20) {
- /* Mote 1 -> Mote 2 */
- srcFile = "file" + fileID + ".txt";
- fileID++;
- dstFile = "file" + fileID + ".txt";
- command = "download 1.0 " + srcFile + " | write " + dstFile + " | null\n";
- log.log("mote2> " + command);
- write(mote2, command);
- YIELD_THEN_WAIT_UNTIL(id == 2 && msg.contains("Contiki>"));
- command = "echo *mote2data" + fileID + " | append " + dstFile + " | null\n";
- log.log("mote2> " + command);
- write(mote2, command);
- YIELD_THEN_WAIT_UNTIL(id == 2 && msg.contains("Contiki>"));
-
- /* Mote 2 -> Mote 1 */
- srcFile = "file" + fileID + ".txt";
- fileID++;
- dstFile = "file" + fileID + ".txt";
- command = "download 2.0 " + srcFile + " | write " + dstFile + " | null\n";
- log.log("mote1> " + command);
- write(mote1, command);
- YIELD_THEN_WAIT_UNTIL(id == 1 && msg.contains("Contiki>"));
- command = "echo *mote1data" + fileID + " | append " + dstFile + " | null\n";
- log.log("mote1> " + command);
- write(mote1, command);
- YIELD_THEN_WAIT_UNTIL(id == 1 && msg.contains("Contiki>"));
-}
-
-/* List files, verify contents */
-/* XXX Beware of strange line breaks! (generated by shell's read command) */
-log.log("Locating file21.txt on mote 1\n");
-write(mote1, "ls\n");
-YIELD_THEN_WAIT_UNTIL(id == 1 && msg.contains("file21.txt"));
-if (!msg.contains("264 ")) {
- log.log("Bad file size, should be 264 bytes: " + msg + "\n");
- log.testFailed();
-}
-YIELD_THEN_WAIT_UNTIL(id == 1 && msg.contains("Contiki>"));
-log.log("Verifying file21.txt contents on mote 1\n");
-write(mote1, "read file21.txt\n");
-YIELD_THEN_WAIT_UNTIL(msg.contains("mote1data1"));
-YIELD_THEN_WAIT_UNTIL(msg.contains("mote2data2"));
-// ..
-YIELD_THEN_WAIT_UNTIL(msg.contains("mote2data16") || msg.contains("mote2data18"));
-YIELD_THEN_WAIT_UNTIL(msg.contains("mote1data19") || msg.contains("mote1data21"));
-
-log.log("Test finished at time: " + mote.getSimulation().getSimulationTime() + "\n");
-
-log.testOK(); /* Report test success and quit */
diff --git a/tools/cooja/contiki_tests/sky_shell_exec_serial.csc b/tools/cooja/contiki_tests/sky_shell_exec_serial.csc
index 5026192d8..ca07104d0 100644
--- a/tools/cooja/contiki_tests/sky_shell_exec_serial.csc
+++ b/tools/cooja/contiki_tests/sky_shell_exec_serial.csc
@@ -1,11 +1,14 @@
+ ../apps/mrm
+ ../apps/mspsim
+ ../apps/avrora
+ ../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -18,14 +21,16 @@
sky1
Sky Mote Type #sky1
- make hello-world.ce TARGET=sky
+ echo COMPILING CONTIKI EXECUTABLE
+make hello-world.ce TARGET=sky
+echo COMPILING FIRMWARE WITH CORE
make sky-shell-exec.sky TARGET=sky
make sky-shell-exec.sky CORE=sky-shell-exec.sky TARGET=sky
make sky-shell-exec.sky CORE=sky-shell-exec.sky TARGET=sky
../../../examples/sky-shell-exec/sky-shell-exec.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -38,6 +43,7 @@ make sky-shell-exec.sky CORE=sky-shell-exec.sky TARGET=sky
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
56.18151486126417
@@ -53,37 +59,12 @@ make sky-shell-exec.sky CORE=sky-shell-exec.sky TARGET=sky
se.sics.cooja.plugins.SimControl
248
- 5
+ 3
200
0
0
false
-
- se.sics.cooja.plugins.Visualizer
-
- printf()'s + LEDs
-
- 300
- 4
- 300
- 1020
- 0
- false
-
-
- se.sics.cooja.plugins.LogListener
-
-
- 256
-
- 1347
- 1
- 675
- 0
- 337
- false
-
se.sics.cooja.plugins.MoteInterfaceViewer
0
@@ -91,21 +72,96 @@ make sky-shell-exec.sky CORE=sky-shell-exec.sky TARGET=sky
Serial port
0,0
- 845
- 2
+ 545
+ 1
551
- 11
- 249
+ 3
+ 347
false
se.sics.cooja.mspmote.plugins.MspStackWatcher
0
- 613
- 3
- 300
+ 566
+ 2
+ 201
247
- 12
+ -1
+ false
+
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 600
+ 0
+ 700
+ 215
+ 199
false
diff --git a/tools/cooja/contiki_tests/sky_shell_exec_serial.js b/tools/cooja/contiki_tests/sky_shell_exec_serial.js
deleted file mode 100644
index 649de2c68..000000000
--- a/tools/cooja/contiki_tests/sky_shell_exec_serial.js
+++ /dev/null
@@ -1,63 +0,0 @@
-TIMEOUT(50000, log.log("last msg: " + msg + "\n")); /* print last msg at timeout */
-
-helloworld = new java.io.File("../../../examples/sky-shell-exec/hello-world.ce");
-log.log("Running test on: " + helloworld.getAbsolutePath() + "\n");
-if (!helloworld.exists()) {
- log.log("hello-world.ce does not exist\n");
- log.testFailed();
-}
-
-log.log("Waiting for node startup\n");
-WAIT_UNTIL(msg.contains('1.0: Contiki>'));
-
-log.log("Preparing node for incoming data\n");
-node.write("write hello-world.b64");
-GENERATE_MSG(1000, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-
-log.log("Uploading hello-world.b64:\n");
-cmdarr = "sh -c xxx".split(" ");
-cmdarr[2] = "../../tools/base64-encode < hello-world.ce";
-process = new java.lang.Runtime.getRuntime().exec(cmdarr, null, helloworld.getParentFile());
-stdIn = new java.io.BufferedReader(new java.io.InputStreamReader(process.getInputStream()));
-while ((line = stdIn.readLine()) != null) {
- node.write(line + "\n");
-
- YIELD();
-
- if (msg.startsWith(line)) {
- log.log("UPLOADED: " + line + "\n");
- } else {
- log.log("Serial port upload failed:\n" + line + "\n" + msg + "\n");
- log.testFailed();
- }
-}
-process.destroy();
-GENERATE_MSG(500, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-node.write("~K\n");
-GENERATE_MSG(500, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-
-log.log("Converting base64 to binary hello-world.ce\n");
-node.write("read hello-world.b64 | dec64 | write hello-world.ce | null");
-GENERATE_MSG(3000, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-
-log.log("Listing filesystem to make sure hello-world.ce exists\n");
-GENERATE_MSG(500, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-node.write("ls\n");
-WAIT_UNTIL(msg.contains("hello-world.ce"));
-
-log.log("Starting hello world\n");
-GENERATE_MSG(500, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-node.write("exec hello-world.ce\n");
-WAIT_UNTIL(msg.contains("OK"));
-log.log("> ELF loader returned OK\n");
-WAIT_UNTIL(msg.contains("Hello, world"));
-log.log("> Hello world process started\n");
-
-log.log("Finished!\n");
-log.testOK();
diff --git a/tools/cooja/contiki_tests/sky_shell_sendcmd.csc b/tools/cooja/contiki_tests/sky_shell_sendcmd.csc
index 8393a8770..dd34ba172 100644
--- a/tools/cooja/contiki_tests/sky_shell_sendcmd.csc
+++ b/tools/cooja/contiki_tests/sky_shell_sendcmd.csc
@@ -1,11 +1,14 @@
+ ../apps/mrm
+ ../apps/mspsim
+ ../apps/avrora
+ ../apps/native_gateway
My simulation
0
- 1
- 123456
- 1000
+ generated
+ 1000000
se.sics.cooja.radiomediums.UDGM
50.0
@@ -21,7 +24,7 @@
make sky-checkpoint.sky TARGET=sky
../../../examples/sky-shell/sky-checkpoint.sky
se.sics.cooja.interfaces.Position
- se.sics.cooja.mspmote.interfaces.MspIPAddress
+ se.sics.cooja.interfaces.IPAddress
se.sics.cooja.interfaces.Mote2MoteRelations
se.sics.cooja.mspmote.interfaces.MspClock
se.sics.cooja.mspmote.interfaces.MspMoteID
@@ -34,16 +37,13 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
85.95630230780736
-3.1198604890271326
0.0
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
-
-
se.sics.cooja.mspmote.interfaces.MspMoteID
1
@@ -52,16 +52,13 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
49.907666469432186
13.102030707681678
0.0
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
-
-
se.sics.cooja.mspmote.interfaces.MspMoteID
2
@@ -70,16 +67,13 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
63.205651488651284
29.26179327208891
0.0
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
-
-
se.sics.cooja.mspmote.interfaces.MspMoteID
3
@@ -88,16 +82,13 @@
se.sics.cooja.mspmote.SkyMote
sky1
+
se.sics.cooja.interfaces.Position
30.60420340759257
44.54754287360952
0.0
-
- se.sics.cooja.mspmote.interfaces.MspIPAddress
-
-
se.sics.cooja.mspmote.interfaces.MspMoteID
4
@@ -107,7 +98,7 @@
se.sics.cooja.plugins.SimControl
248
- 2
+ 3
200
0
0
@@ -120,18 +111,17 @@
Log output: printf()'s
Radio environment (UDGM)
- 300
- 3
- 300
- 724
- 0
+ 246
+ 2
+ 243
+ 1
+ 202
false
se.sics.cooja.plugins.LogListener
- 256
1024
1
@@ -140,5 +130,59 @@
446
false
+
+ se.sics.cooja.plugins.ScriptRunner
+
+
+ true
+
+ 775
+ 0
+ 656
+ 246
+ 0
+ false
+
diff --git a/tools/cooja/contiki_tests/sky_shell_sendcmd.js b/tools/cooja/contiki_tests/sky_shell_sendcmd.js
deleted file mode 100644
index 936fcff57..000000000
--- a/tools/cooja/contiki_tests/sky_shell_sendcmd.js
+++ /dev/null
@@ -1,44 +0,0 @@
-TIMEOUT(150000);
-
-log.log("Random seed: " + mote.getSimulation().getRandomSeed() + "\n");
-
-/* Wait for nodes to boot */
-mote1 = null;
-while (mote1 == null) {
- if (id == 1) {
- mote1 = mote;
- }
- YIELD();
-}
-GENERATE_MSG(2000, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-
-/* Send command: mote 1 -> mote 2*/
-command = "sendcmd 2.0 echo hello\n";
-log.log("mote1> " + command);
-write(mote1, command);
-YIELD_THEN_WAIT_UNTIL(id == 2 && msg.contains("hello"));
-log.log("mote2: " + msg + "\n");
-GENERATE_MSG(1000, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-
-/* Send command: mote 1 -> mote 2*/
-command = "sendcmd 2.0 {echo hello again}\n";
-log.log("mote1> " + command);
-write(mote1, command);
-YIELD_THEN_WAIT_UNTIL(id == 2 && msg.contains("hello again"));
-log.log("mote2: " + msg + "\n");
-GENERATE_MSG(1000, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-
-/* Send command: mote 1 -> mote 2 -> mote 3 -> mote 4 */
-command = "sendcmd 2.0 {sendcmd 3.0 {sendcmd 4.0 echo multihop}}\n";
-log.log("mote1> " + command);
-write(mote1, command);
-YIELD_THEN_WAIT_UNTIL(id == 4 && msg.contains("multihop"));
-log.log("mote4: " + msg + "\n");
-GENERATE_MSG(1000, "continue");
-YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
-
-log.log("Test finished at time: " + mote.getSimulation().getSimulationTime() + "\n");
-log.testOK(); /* Report test success and quit */