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

Use collect-view-shell instead of sky-shell

Browse source
This commit is contained in:
adamdunkels 2010-12-16 22:53:40 +00:00
parent e55c3cd471
commit 0ab552b0e4
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,9 +23,9 @@
se.sics.cooja.mspmote.SkyMoteType
<identifier>sky1</identifier>
<description>Sky Mote Type #1</description>
<source EXPORT="discard">[CONTIKI_DIR]/examples/sky-shell/sky-shell.c</source>
<commands EXPORT="discard">make sky-shell.sky TARGET=sky</commands>
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky-shell/sky-shell.sky</firmware>
<source EXPORT="discard">[CONTIKI_DIR]/examples/collect/collect-view-shell.c</source>
<commands EXPORT="discard">make collect-view-shell.sky TARGET=sky</commands>
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/collect/collect-view-shell.sky</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>

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

@ -25,9 +25,9 @@
se.sics.cooja.mspmote.SkyMoteType
<identifier>sky1</identifier>
<description>shell</description>
<source EXPORT="discard">[CONTIKI_DIR]/examples/sky-shell/sky-shell.c</source>
<commands EXPORT="discard">make sky-shell.sky TARGET=sky</commands>
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/sky-shell/sky-shell.sky</firmware>
<source EXPORT="discard">[CONTIKI_DIR]/examples/collect/collect-view-shell.c</source>
<commands EXPORT="discard">make collect-view-shell.sky TARGET=sky</commands>
<firmware EXPORT="copy">[CONTIKI_DIR]/examples/collect/collect-view-shell.sky</firmware>
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
<moteinterface>se.sics.cooja.interfaces.IPAddress</moteinterface>
@ -444,7 +444,7 @@ GENERATE_MSG(40000, "continue");
YIELD_THEN_WAIT_UNTIL(msg.equals("continue"));
node = sink_node;
log.log("Writing netcmd\n");
node.write("netcmd { repeat 10 60 { randwait 8 collect-view-data | blink | send 31 } }");
node.write("netcmd { repeat 10 60 { randwait 60 collect-view-data | blink | send 31 } }");
while(true) {
YIELD();
@ -452,10 +452,11 @@ while(true) {
/* Count sensor data packets */
if (msg.contains("ÿ")) {
// log.log("WARN: Detected bad character in: '" + msg + "'\n");
msg = msg.replace("ÿ", "");
}
log.log(time + " " + id + " " + msg + "\n");
data = msg.split(" ");
if(data[24] &amp;&amp; !msg.contains("P")) {