deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated tests to match new collect-view-data command syntax

Browse source
This commit is contained in:
adamdunkels 2010-10-12 12:05:43 +00:00
parent ed2228ff6f
commit 3edd8ff316
2 changed files with 19 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
tools/cooja/contiki_tests/sky_shell_collect.csc
View file

@ -24,8 +24,7 @@
<identifier>sky1</identifier> <identifier>sky1</identifier>
<description>Sky Mote Type #1</description> <description>Sky Mote Type #1</description>
<source EXPORT="discard">[CONTIKI_DIR]/examples/sky-shell/sky-shell.c</source> <source EXPORT="discard">[CONTIKI_DIR]/examples/sky-shell/sky-shell.c</source>
<commands EXPORT="discard">make clean TARGET=sky <commands EXPORT="discard">make sky-shell.sky TARGET=sky</commands>
make sky-shell.sky TARGET=sky</commands>
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky-shell/sky-shell.sky</firmware> <firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky-shell/sky-shell.sky</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface> <moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface> <moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
@ -405,7 +404,7 @@ GENERATE_MSG(20000, "continue");
YIELD_THEN_WAIT_UNTIL(msg.equals("continue")); YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
node = sink_node; node = sink_node;
log.log("Writing netcmd\n"); log.log("Writing netcmd\n");
node.write("netcmd { repeat 10 30 { randwait 30 sky-alldata | blink | send } }"); node.write("netcmd { repeat 10 30 { randwait 30 collect-view-data | blink | send } }");
while(true) { while(true) {
YIELD(); YIELD();
@ -432,20 +431,13 @@ while(true) {
data_len2 = parseInt(data[8]); data_len2 = parseInt(data[8]);
clock = parseInt(data[9]); clock = parseInt(data[9]);
timesyncedtime = parseInt(data[10]); timesyncedtime = parseInt(data[10]);
light1 = parseInt(data[11]); time_cpu = parseInt(data[11]);
light2 = parseInt(data[12]); time_lpm = parseInt(data[12]);
temperature = parseInt(data[13]); time_transmit = parseInt(data[13]);
humidity = parseInt(data[14]); time_listen = parseInt(data[14]);
rssi = parseInt(data[15]); best_neighbor = parseInt(data[15]);
time_cpu = parseInt(data[16]); best_neighbor_etx = parseInt(data[16]);
time_lpm = parseInt(data[17]); best_neighbor_rtmetrix = 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_cpu += time_cpu;
total_lpm += time_lpm; total_lpm += time_lpm;

27
tools/cooja/contiki_tests/sky_shell_collect_lossy.csc
View file

@ -440,11 +440,11 @@ sink_node = node;
YIELD_THEN_WAIT_UNTIL(id == sink); YIELD_THEN_WAIT_UNTIL(id == sink);
log.log("Writing collect command\n"); log.log("Writing collect command\n");
node.write("collect | timestamp | blink | binprint &amp;"); node.write("collect | timestamp | blink | binprint &amp;");
GENERATE_MSG(20000, "continue"); GENERATE_MSG(40000, "continue");
YIELD_THEN_WAIT_UNTIL(msg.equals("continue")); YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
node = sink_node; node = sink_node;
log.log("Writing netcmd\n"); log.log("Writing netcmd\n");
node.write("netcmd { repeat 10 60 { randwait 8 sky-alldata | blink | send 31 } }"); node.write("netcmd { repeat 10 60 { randwait 8 collect-view-data | blink | send 31 } }");
while(true) { while(true) {
YIELD(); YIELD();
@ -458,7 +458,7 @@ while(true) {
data = msg.split(" "); data = msg.split(" ");
if(data[24] &amp;&amp; !msg.contains("stats")) { if(data[24] &amp;&amp; !msg.contains("P")) {
len = parseInt(data[0]); len = parseInt(data[0]);
timestamp1 = parseInt(data[1]); timestamp1 = parseInt(data[1]);
@ -471,20 +471,13 @@ while(true) {
data_len2 = parseInt(data[8]); data_len2 = parseInt(data[8]);
clock = parseInt(data[9]); clock = parseInt(data[9]);
timesyncedtime = parseInt(data[10]); timesyncedtime = parseInt(data[10]);
light1 = parseInt(data[11]); time_cpu = parseInt(data[11]);
light2 = parseInt(data[12]); time_lpm = parseInt(data[12]);
temperature = parseInt(data[13]); time_transmit = parseInt(data[13]);
humidity = parseInt(data[14]); time_listen = parseInt(data[14]);
rssi = parseInt(data[15]); best_neighbor = parseInt(data[15]);
time_cpu = parseInt(data[16]); best_neighbor_etx = parseInt(data[16]);
time_lpm = parseInt(data[17]); best_neighbor_rtmetrix = 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_cpu += time_cpu;
total_lpm += time_lpm; total_lpm += time_lpm;