From a15f424753ecc4a2a03f56abef2d40c807fff9bf Mon Sep 17 00:00:00 2001 From: fros4943 Date: Wed, 3 Feb 2010 15:22:58 +0000 Subject: [PATCH] added application-level mote (/tools/cooja/examples/appmote_rimeabc) to cross-level test --- tools/cooja/contiki_tests/crosslevel.csc | 407 ++++++++++++++-------- tools/cooja/contiki_tests/crosslevel.info | 2 +- 2 files changed, 271 insertions(+), 138 deletions(-) diff --git a/tools/cooja/contiki_tests/crosslevel.csc b/tools/cooja/contiki_tests/crosslevel.csc index 4c3bd397f..b78c7969b 100644 --- a/tools/cooja/contiki_tests/crosslevel.csc +++ b/tools/cooja/contiki_tests/crosslevel.csc @@ -59,7 +59,7 @@ se.sics.cooja.contikimote.ContikiMoteType - mtype686 + mtype135 Contiki Mote Type #1 [CONTIKI_DIR]/examples/rime/example-abc.c make example-abc.cooja TARGET=cooja @@ -81,46 +81,53 @@ false Rime + + se.sics.cooja.motes.ImportAppMoteType + apptype1 + Application Mote Type #apptype1 + [CONTIKI_DIR]\tools\cooja\examples\appmote_rimeabc + RimeABC + se.sics.cooja.contikimote.ContikiMote se.sics.cooja.interfaces.Position - -2.7427179779871587 - -17.498426286221605 + 199.49101781472754 + -95.62813700240686 0.0 se.sics.cooja.contikimote.interfaces.ContikiMoteID - 1 + 6 - mtype686 + mtype135 se.sics.cooja.contikimote.ContikiMote se.sics.cooja.interfaces.Position - -1.3167654732910574 - 21.002291340573123 + 98.81565434011203 + 11.842061334190785 0.0 se.sics.cooja.contikimote.interfaces.ContikiMoteID - 2 + 12 - mtype686 + mtype135 se.sics.cooja.mspmote.SkyMote se.sics.cooja.interfaces.Position - 99.92586236013211 - -18.924378790917704 + -6.590009891330797 + -126.908292993505 0.0 se.sics.cooja.mspmote.interfaces.MspMoteID - 3 + 1 sky1 @@ -129,29 +136,29 @@ se.sics.cooja.interfaces.Position - 102.77776736952431 - 18.150386331180922 + -2.909991539436897 + -95.62813700240686 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 2 + + sky1 + + + se.sics.cooja.mspmote.ESBMote + + + se.sics.cooja.interfaces.Position + 96.4505039616984 + -95.62813700240686 0.0 se.sics.cooja.mspmote.interfaces.MspMoteID 4 - sky1 - - - se.sics.cooja.mspmote.ESBMote - - - se.sics.cooja.interfaces.Position - 198.31658518416305 - -18.924378790917704 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 5 - esb1 @@ -159,66 +166,8 @@ se.sics.cooja.interfaces.Position - 196.890632679467 - 19.57633883587702 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 6 - - esb1 - - - se.sics.cooja.contikimote.ContikiMote - - se.sics.cooja.interfaces.Position - 295.28135550349793 - -18.924378790917704 - 0.0 - - - se.sics.cooja.contikimote.interfaces.ContikiMoteID - 7 - - mtype686 - - - se.sics.cooja.mspmote.SkyMote - - - se.sics.cooja.interfaces.Position - 293.8554029988019 - 16.72443382648482 - 0.0 - - - se.sics.cooja.mspmote.interfaces.MspMoteID - 8 - - sky1 - - - se.sics.cooja.contikimote.ContikiMote - - se.sics.cooja.interfaces.Position - 399.0339262783647 - -17.46710863775396 - 0.0 - - - se.sics.cooja.contikimote.interfaces.ContikiMoteID - 9 - - mtype686 - - - se.sics.cooja.mspmote.ESBMote - - - se.sics.cooja.interfaces.Position - 401.18433133198937 - 15.878266080338506 + -1.2018609210334443 + 15.546413751270247 0.0 @@ -227,18 +176,32 @@ esb1 + + se.sics.cooja.contikimote.ContikiMote + + se.sics.cooja.interfaces.Position + -3.557828103468252 + 112.32835838975996 + 0.0 + + + se.sics.cooja.contikimote.interfaces.ContikiMoteID + 16 + + mtype135 + se.sics.cooja.mspmote.SkyMote se.sics.cooja.interfaces.Position - 479.0051389972142 - -15.553186635152876 + 197.65100863878064 + -130.5883113453989 0.0 se.sics.cooja.mspmote.interfaces.MspMoteID - 11 + 5 sky1 @@ -247,16 +210,174 @@ se.sics.cooja.interfaces.Position - 478.3433974354351 - 18.789928952166647 + -3.0540371295731754 + -15.940581793905181 0.0 se.sics.cooja.mspmote.interfaces.MspMoteID - 12 + 9 esb1 + + se.sics.cooja.mspmote.SkyMote + + + se.sics.cooja.interfaces.Position + 92.7704856098045 + -128.74830216945196 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 3 + + sky1 + + + se.sics.cooja.mspmote.ESBMote + + + se.sics.cooja.interfaces.Position + 98.81565434011203 + -17.792758002444913 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 11 + + esb1 + + + RimeABC + + se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID + 14 + + + se.sics.cooja.interfaces.Position + 199.74274129227032 + 4.324930898273846 + 0.0 + + apptype1 + + + RimeABC + + se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID + 8 + + + se.sics.cooja.interfaces.Position + 291.4419800282441 + -99.28851117819308 + 0.0 + + apptype1 + + + RimeABC + + se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID + 19 + + + se.sics.cooja.interfaces.Position + -5.495536655521387 + 179.73520343003455 + 0.0 + + apptype1 + + + RimeABC + + se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID + 20 + + + se.sics.cooja.interfaces.Position + -3.8119538152129264 + 201.62178035404452 + 0.0 + + apptype1 + + + RimeABC + + se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID + 18 + + + se.sics.cooja.interfaces.Position + 100.5701822839116 + 109.02472413707922 + 0.0 + + apptype1 + + + se.sics.cooja.mspmote.SkyMote + + + se.sics.cooja.interfaces.Position + 289.58980381970434 + -130.77550672336852 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 7 + + sky1 + + + se.sics.cooja.mspmote.ESBMote + + + se.sics.cooja.interfaces.Position + 196.5661698954619 + -22.675925974597682 + 0.0 + + + se.sics.cooja.mspmote.interfaces.MspMoteID + 13 + + esb1 + + + se.sics.cooja.contikimote.ContikiMote + + se.sics.cooja.interfaces.Position + 100.5701822839116 + 85.45456437276077 + 0.0 + + + se.sics.cooja.contikimote.interfaces.ContikiMoteID + 17 + + mtype135 + + + se.sics.cooja.contikimote.ContikiMote + + se.sics.cooja.interfaces.Position + -5.14611380187246 + 83.73921581848423 + 0.0 + + + se.sics.cooja.contikimote.interfaces.ContikiMoteID + 15 + + mtype135 + se.sics.cooja.plugins.SimControl @@ -272,37 +393,20 @@ - 460 - 2 - 178 - 400 - 568 - false - - - se.sics.cooja.plugins.Visualizer - - se.sics.cooja.plugins.skins.IDVisualizerSkin - se.sics.cooja.plugins.skins.UDGMVisualizerSkin - se.sics.cooja.plugins.skins.MoteTypeVisualizerSkin - se.sics.cooja.plugins.skins.TrafficVisualizerSkin - se.sics.cooja.plugins.skins.AddressVisualizerSkin - 0.6868927097814259 0.0 0.0 0.6868927097814259 19.429407529520386 57.09333478544578 - - 401 - 4 - 177 + 953 + 0 + 130 0 - 569 + 524 false se.sics.cooja.plugins.RadioLogger - 265 + 695 5 - 371 - 0 - 199 + 152 + 260 + 369 false @@ -310,8 +414,9 @@ true - 596 - 0 - 569 + 692 + 2 + 367 264 0 false @@ -368,16 +477,40 @@ while (true) { 9 10 11 + 12 + 13 + 14 + 15 + 16 + 17 + 18 + 19 109 12 - 862 - 1 - 219 + 956 + 6 + 310 -1 - 746 + 655 + false + + + se.sics.cooja.plugins.Visualizer + + se.sics.cooja.plugins.skins.IDVisualizerSkin + se.sics.cooja.plugins.skins.MoteTypeVisualizerSkin + se.sics.cooja.plugins.skins.UDGMVisualizerSkin + se.sics.cooja.plugins.skins.TrafficVisualizerSkin + 0.5766712294536613 0.0 0.0 0.5766712294536613 36.4700887534336 117.76935499005339 + + 264 + 1 + 321 + 0 + 201 false diff --git a/tools/cooja/contiki_tests/crosslevel.info b/tools/cooja/contiki_tests/crosslevel.info index 3e2f374e4..627ae4d89 100644 --- a/tools/cooja/contiki_tests/crosslevel.info +++ b/tools/cooja/contiki_tests/crosslevel.info @@ -1 +1 @@ -Cross-level communication. Cooja+Sky+ESB running Rime example-abc. +Cross-level communication test. Cooja+Sky+ESB+App running nullmac and Rime example-abc. Requires compilation in /tools/cooja/examples/appmote_rimeabc.