From bb7944a201e8401dfc838011360e6fc1317abdfb Mon Sep 17 00:00:00 2001 From: fros4943 Date: Mon, 29 Mar 2010 14:14:09 +0000 Subject: [PATCH] workaround to survive the bad characters that are sometimes printed by mspsim-based motes + make clean before compilation --- .../cooja/contiki_tests/sky_shell_collect.csc | 1186 +++++++++-------- 1 file changed, 596 insertions(+), 590 deletions(-) diff --git a/tools/cooja/contiki_tests/sky_shell_collect.csc b/tools/cooja/contiki_tests/sky_shell_collect.csc index bcf2c0ea0..181f64148 100644 --- a/tools/cooja/contiki_tests/sky_shell_collect.csc +++ b/tools/cooja/contiki_tests/sky_shell_collect.csc @@ -1,590 +1,596 @@ - - - [CONTIKI_DIR]/tools/cooja/apps/mrm - [CONTIKI_DIR]/tools/cooja/apps/mspsim - [CONTIKI_DIR]/tools/cooja/apps/avrora - [CONTIKI_DIR]/tools/cooja/apps/native_gateway - - My simulation - 0 - generated - 1000000 - - se.sics.cooja.radiomediums.UDGM - 50.0 - 150.0 - 1.0 - 1.0 - - - 40000 - - - se.sics.cooja.mspmote.SkyMoteType - sky1 - Sky Mote Type #1 - [CONTIKI_DIR]/examples/sky-shell/sky-shell.c - make sky-shell.sky TARGET=sky - [CONTIKI_DIR]/examples/sky-shell/sky-shell.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.MspSerial - se.sics.cooja.mspmote.interfaces.SkyLED - - - - - se.sics.cooja.interfaces.Position - 69.8193406818502 - 86.08116624448307 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 1 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 23.73597351424919 - 23.64085389583863 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 2 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 96.89503278354498 - 61.516110156918224 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 3 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 7.611970631754317 - 50.863062569941086 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 4 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 97.77577457011573 - 36.50885983165134 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 5 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 81.84280607291373 - 12.262433268451778 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 6 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 48.76918142113213 - 76.28996665071358 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 7 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 10.516199800941727 - 71.39959931668729 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 8 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 69.48672858021564 - 2.274435761561955 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 9 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 84.25868612469665 - 32.943146693468975 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 10 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 13.670969901144792 - 63.99238378992226 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 11 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 72.51554571631638 - 47.00560695436694 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 12 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 9.789480819347663 - 73.70566372866651 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 13 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 32.19085060633389 - 72.59300816076136 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 14 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 80.2677099635723 - 98.0702168139253 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 15 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 9.946705912815235 - 52.10151176834845 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 16 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 2.43737538721972 - 56.151002617425625 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 17 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 27.435525284930186 - 61.81996286556931 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 18 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 70.60927462351833 - 98.32577014155726 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 19 - - sky1 - - - - - se.sics.cooja.interfaces.Position - 43.3203771155477 - 11.948622865702085 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 20 - - sky1 - - - - se.sics.cooja.plugins.ScriptRunner - - - true - - 602 - 0 - 508 - 257 - 0 - false - - - se.sics.cooja.plugins.SimControl - 259 - 5 - 200 - 4 - 0 - false - - - se.sics.cooja.plugins.Visualizer - - se.sics.cooja.plugins.skins.IDVisualizerSkin - se.sics.cooja.plugins.skins.UDGMVisualizerSkin - 2.2620479837704246 0.0 0.0 2.2620479837704246 11.65652309586307 5.218753534979797 - - 260 - 3 - 296 - 0 - 197 - false - - - se.sics.cooja.plugins.SimControl - 259 - 6 - 200 - 4 - 0 - false - - - se.sics.cooja.plugins.Visualizer - - se.sics.cooja.plugins.skins.IDVisualizerSkin - se.sics.cooja.plugins.skins.UDGMVisualizerSkin - 3.1695371670945955 0.0 0.0 3.1695371670945955 -64.4008177427222 -14.683213177997528 - - 260 - 4 - 296 - 0 - 197 - false - - - se.sics.cooja.plugins.LogListener - - - - 720 - 2 - 486 - 695 - 2 - false - - - se.sics.cooja.plugins.TimeLine - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - - - - 118 - 9 - - 1440 - 1 - 425 - 0 - 405 - false - - - + + + [CONTIKI_DIR]/tools/cooja/apps/mrm + [CONTIKI_DIR]/tools/cooja/apps/mspsim + [CONTIKI_DIR]/tools/cooja/apps/avrora + [CONTIKI_DIR]/tools/cooja/apps/native_gateway + + My simulation + 0 + generated + 1000000 + + se.sics.cooja.radiomediums.UDGM + 50.0 + 150.0 + 1.0 + 1.0 + + + 40000 + + + se.sics.cooja.mspmote.SkyMoteType + sky1 + Sky Mote Type #1 + [CONTIKI_DIR]/examples/sky-shell/sky-shell.c + make clean TARGET=sky +make sky-shell.sky TARGET=sky + [CONTIKI_DIR]/examples/sky-shell/sky-shell.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.MspSerial + se.sics.cooja.mspmote.interfaces.SkyLED + + + + + se.sics.cooja.interfaces.Position + 69.8193406818502 + 86.08116624448307 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 1 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 23.73597351424919 + 23.64085389583863 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 2 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 96.89503278354498 + 61.516110156918224 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 3 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 7.611970631754317 + 50.863062569941086 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 4 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 97.77577457011573 + 36.50885983165134 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 5 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 81.84280607291373 + 12.262433268451778 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 6 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 48.76918142113213 + 76.28996665071358 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 7 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 10.516199800941727 + 71.39959931668729 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 8 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 69.48672858021564 + 2.274435761561955 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 9 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 84.25868612469665 + 32.943146693468975 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 10 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 13.670969901144792 + 63.99238378992226 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 11 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 72.51554571631638 + 47.00560695436694 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 12 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 9.789480819347663 + 73.70566372866651 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 13 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 32.19085060633389 + 72.59300816076136 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 14 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 80.2677099635723 + 98.0702168139253 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 15 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 9.946705912815235 + 52.10151176834845 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 16 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 2.43737538721972 + 56.151002617425625 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 17 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 27.435525284930186 + 61.81996286556931 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 18 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 70.60927462351833 + 98.32577014155726 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 19 + + sky1 + + + + + se.sics.cooja.interfaces.Position + 43.3203771155477 + 11.948622865702085 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 20 + + sky1 + + + + se.sics.cooja.plugins.ScriptRunner + + + true + + 602 + 0 + 508 + 257 + 0 + false + + + se.sics.cooja.plugins.SimControl + 259 + 5 + 200 + 4 + 0 + false + + + se.sics.cooja.plugins.Visualizer + + se.sics.cooja.plugins.skins.IDVisualizerSkin + se.sics.cooja.plugins.skins.UDGMVisualizerSkin + 2.2620479837704246 0.0 0.0 2.2620479837704246 11.65652309586307 5.218753534979797 + + 260 + 3 + 296 + 0 + 197 + false + + + se.sics.cooja.plugins.SimControl + 259 + 4 + 200 + 4 + 0 + false + + + se.sics.cooja.plugins.Visualizer + + se.sics.cooja.plugins.skins.IDVisualizerSkin + se.sics.cooja.plugins.skins.UDGMVisualizerSkin + 3.1695371670945955 0.0 0.0 3.1695371670945955 -64.4008177427222 -14.683213177997528 + + 260 + 4 + 296 + 0 + 197 + false + + + se.sics.cooja.plugins.LogListener + + + + 720 + 2 + 486 + 695 + 2 + false + + + se.sics.cooja.plugins.TimeLine + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 + + + 118 + 9 + + 1440 + 1 + 425 + 0 + 405 + false + + +