Tolerate loosing one packet in 01-sky-shell-collect.csc

This commit is contained in:
Moritz 'Morty' Strübe 2013-11-07 19:11:34 +01:00
parent 71eea754d6
commit 08047d1a27

View file

@ -33,7 +33,7 @@
<moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.MspMoteID</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyButton</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyFlash</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyByteRadio</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.Msp802154Radio</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.MspSerial</moteinterface>
<moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface> <moteinterface>se.sics.cooja.mspmote.interfaces.SkyLED</moteinterface>
</motetype> </motetype>
@ -371,7 +371,7 @@ total_latency = 0;
nodes_starting = true; nodes_starting = true;
for(i = 1; i &lt;= nrNodes; i++) { for(i = 1; i &lt;= nrNodes; i++) {
booted[i] = false; booted[i] = false;
received[i] = "__________"; received[i] = "___________";
hops[i] = received[i]; hops[i] = received[i];
} }
@ -404,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 collect-view-data | blink | send } }"); node.write("netcmd { repeat 11 30 { randwait 30 collect-view-data | blink | send } }");
while(true) { while(true) {
YIELD(); YIELD();
@ -471,7 +471,7 @@ while(true) {
num_reported = 0; num_reported = 0;
for(i = 1; i &lt;= nrNodes; i++) { for(i = 1; i &lt;= nrNodes; i++) {
if(i != sink) { if(i != sink) {
if(!isNaN(received[i])) { if(received[i].split("_").length -1 &lt;= 1) {
num_reported++; num_reported++;
} }
} }