From a15f424753ecc4a2a03f56abef2d40c807fff9bf Mon Sep 17 00:00:00 2001
From: fros4943 <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 @@
     </motetype>
     <motetype>
       se.sics.cooja.contikimote.ContikiMoteType
-      <identifier>mtype686</identifier>
+      <identifier>mtype135</identifier>
       <description>Contiki Mote Type #1</description>
       <contikiapp>[CONTIKI_DIR]/examples/rime/example-abc.c</contikiapp>
       <commands>make example-abc.cooja TARGET=cooja</commands>
@@ -81,46 +81,53 @@
       <symbols>false</symbols>
       <commstack>Rime</commstack>
     </motetype>
+    <motetype>
+      se.sics.cooja.motes.ImportAppMoteType
+      <identifier>apptype1</identifier>
+      <description>Application Mote Type #apptype1</description>
+      <motepath>[CONTIKI_DIR]\tools\cooja\examples\appmote_rimeabc</motepath>
+      <moteclass>RimeABC</moteclass>
+    </motetype>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>-2.7427179779871587</x>
-        <y>-17.498426286221605</y>
+        <x>199.49101781472754</x>
+        <y>-95.62813700240686</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
         se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>1</id>
+        <id>6</id>
       </interface_config>
-      <motetype_identifier>mtype686</motetype_identifier>
+      <motetype_identifier>mtype135</motetype_identifier>
     </mote>
     <mote>
       se.sics.cooja.contikimote.ContikiMote
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>-1.3167654732910574</x>
-        <y>21.002291340573123</y>
+        <x>98.81565434011203</x>
+        <y>11.842061334190785</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
         se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>2</id>
+        <id>12</id>
       </interface_config>
-      <motetype_identifier>mtype686</motetype_identifier>
+      <motetype_identifier>mtype135</motetype_identifier>
     </mote>
     <mote>
       se.sics.cooja.mspmote.SkyMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>99.92586236013211</x>
-        <y>-18.924378790917704</y>
+        <x>-6.590009891330797</x>
+        <y>-126.908292993505</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
         se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>3</id>
+        <id>1</id>
       </interface_config>
       <motetype_identifier>sky1</motetype_identifier>
     </mote>
@@ -129,29 +136,29 @@
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>102.77776736952431</x>
-        <y>18.150386331180922</y>
+        <x>-2.909991539436897</x>
+        <y>-95.62813700240686</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>2</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.ESBMote
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>96.4505039616984</x>
+        <y>-95.62813700240686</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
         se.sics.cooja.mspmote.interfaces.MspMoteID
         <id>4</id>
       </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.ESBMote
-      <breakpoints />
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>198.31658518416305</x>
-        <y>-18.924378790917704</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>5</id>
-      </interface_config>
       <motetype_identifier>esb1</motetype_identifier>
     </mote>
     <mote>
@@ -159,66 +166,8 @@
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>196.890632679467</x>
-        <y>19.57633883587702</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>6</id>
-      </interface_config>
-      <motetype_identifier>esb1</motetype_identifier>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>295.28135550349793</x>
-        <y>-18.924378790917704</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>7</id>
-      </interface_config>
-      <motetype_identifier>mtype686</motetype_identifier>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <breakpoints />
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>293.8554029988019</x>
-        <y>16.72443382648482</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>8</id>
-      </interface_config>
-      <motetype_identifier>sky1</motetype_identifier>
-    </mote>
-    <mote>
-      se.sics.cooja.contikimote.ContikiMote
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>399.0339262783647</x>
-        <y>-17.46710863775396</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.contikimote.interfaces.ContikiMoteID
-        <id>9</id>
-      </interface_config>
-      <motetype_identifier>mtype686</motetype_identifier>
-    </mote>
-    <mote>
-      se.sics.cooja.mspmote.ESBMote
-      <breakpoints />
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>401.18433133198937</x>
-        <y>15.878266080338506</y>
+        <x>-1.2018609210334443</x>
+        <y>15.546413751270247</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
@@ -227,18 +176,32 @@
       </interface_config>
       <motetype_identifier>esb1</motetype_identifier>
     </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>-3.557828103468252</x>
+        <y>112.32835838975996</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>16</id>
+      </interface_config>
+      <motetype_identifier>mtype135</motetype_identifier>
+    </mote>
     <mote>
       se.sics.cooja.mspmote.SkyMote
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>479.0051389972142</x>
-        <y>-15.553186635152876</y>
+        <x>197.65100863878064</x>
+        <y>-130.5883113453989</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
         se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>11</id>
+        <id>5</id>
       </interface_config>
       <motetype_identifier>sky1</motetype_identifier>
     </mote>
@@ -247,16 +210,174 @@
       <breakpoints />
       <interface_config>
         se.sics.cooja.interfaces.Position
-        <x>478.3433974354351</x>
-        <y>18.789928952166647</y>
+        <x>-3.0540371295731754</x>
+        <y>-15.940581793905181</y>
         <z>0.0</z>
       </interface_config>
       <interface_config>
         se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>12</id>
+        <id>9</id>
       </interface_config>
       <motetype_identifier>esb1</motetype_identifier>
     </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>92.7704856098045</x>
+        <y>-128.74830216945196</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>3</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.ESBMote
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>98.81565434011203</x>
+        <y>-17.792758002444913</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>11</id>
+      </interface_config>
+      <motetype_identifier>esb1</motetype_identifier>
+    </mote>
+    <mote>
+      RimeABC
+      <interface_config>
+        se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
+        <id>14</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>199.74274129227032</x>
+        <y>4.324930898273846</y>
+        <z>0.0</z>
+      </interface_config>
+      <motetype_identifier>apptype1</motetype_identifier>
+    </mote>
+    <mote>
+      RimeABC
+      <interface_config>
+        se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
+        <id>8</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>291.4419800282441</x>
+        <y>-99.28851117819308</y>
+        <z>0.0</z>
+      </interface_config>
+      <motetype_identifier>apptype1</motetype_identifier>
+    </mote>
+    <mote>
+      RimeABC
+      <interface_config>
+        se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
+        <id>19</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>-5.495536655521387</x>
+        <y>179.73520343003455</y>
+        <z>0.0</z>
+      </interface_config>
+      <motetype_identifier>apptype1</motetype_identifier>
+    </mote>
+    <mote>
+      RimeABC
+      <interface_config>
+        se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
+        <id>20</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>-3.8119538152129264</x>
+        <y>201.62178035404452</y>
+        <z>0.0</z>
+      </interface_config>
+      <motetype_identifier>apptype1</motetype_identifier>
+    </mote>
+    <mote>
+      RimeABC
+      <interface_config>
+        se.sics.cooja.motes.AbstractApplicationMoteType$SimpleMoteID
+        <id>18</id>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>100.5701822839116</x>
+        <y>109.02472413707922</y>
+        <z>0.0</z>
+      </interface_config>
+      <motetype_identifier>apptype1</motetype_identifier>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>289.58980381970434</x>
+        <y>-130.77550672336852</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>7</id>
+      </interface_config>
+      <motetype_identifier>sky1</motetype_identifier>
+    </mote>
+    <mote>
+      se.sics.cooja.mspmote.ESBMote
+      <breakpoints />
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>196.5661698954619</x>
+        <y>-22.675925974597682</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>13</id>
+      </interface_config>
+      <motetype_identifier>esb1</motetype_identifier>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>100.5701822839116</x>
+        <y>85.45456437276077</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>17</id>
+      </interface_config>
+      <motetype_identifier>mtype135</motetype_identifier>
+    </mote>
+    <mote>
+      se.sics.cooja.contikimote.ContikiMote
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>-5.14611380187246</x>
+        <y>83.73921581848423</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.contikimote.interfaces.ContikiMoteID
+        <id>15</id>
+      </interface_config>
+      <motetype_identifier>mtype135</motetype_identifier>
+    </mote>
   </simulation>
   <plugin>
     se.sics.cooja.plugins.SimControl
@@ -272,37 +393,20 @@
     <plugin_config>
       <filter />
     </plugin_config>
-    <width>460</width>
-    <z>2</z>
-    <height>178</height>
-    <location_x>400</location_x>
-    <location_y>568</location_y>
-    <minimized>false</minimized>
-  </plugin>
-  <plugin>
-    se.sics.cooja.plugins.Visualizer
-    <plugin_config>
-      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
-      <skin>se.sics.cooja.plugins.skins.UDGMVisualizerSkin</skin>
-      <skin>se.sics.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
-      <skin>se.sics.cooja.plugins.skins.TrafficVisualizerSkin</skin>
-      <skin>se.sics.cooja.plugins.skins.AddressVisualizerSkin</skin>
-      <viewport>0.6868927097814259 0.0 0.0 0.6868927097814259 19.429407529520386 57.09333478544578</viewport>
-    </plugin_config>
-    <width>401</width>
-    <z>4</z>
-    <height>177</height>
+    <width>953</width>
+    <z>0</z>
+    <height>130</height>
     <location_x>0</location_x>
-    <location_y>569</location_y>
+    <location_y>524</location_y>
     <minimized>false</minimized>
   </plugin>
   <plugin>
     se.sics.cooja.plugins.RadioLogger
-    <width>265</width>
+    <width>695</width>
     <z>5</z>
-    <height>371</height>
-    <location_x>0</location_x>
-    <location_y>199</location_y>
+    <height>152</height>
+    <location_x>260</location_x>
+    <location_y>369</location_y>
     <minimized>false</minimized>
   </plugin>
   <plugin>
@@ -310,8 +414,9 @@
     <plugin_config>
       <script>TIMEOUT(120000);
 
+NR_NODES = 20;
 var nr_packets = new Array();
-for (i=1; i &lt;= 12; i++) {
+for (i=1; i &lt;= NR_NODES; i++) {
   nr_packets[i] = 0;
 }
 
@@ -325,20 +430,24 @@ while (true) {
     log.log("Node " + id + " received message: " + nr_packets[id] + "\n");
 
     log.log("TEST STATUS: ");
-    log.log(" C-C " + nr_packets[1] + "-" + nr_packets[2]);
-    log.log(" S-S " + nr_packets[3] + "-" + nr_packets[4]);
-    log.log(" E-E " + nr_packets[5] + "-" + nr_packets[6]);
-    log.log(" C-S " + nr_packets[7] + "-" + nr_packets[8]);
-    log.log(" C-E " + nr_packets[9] + "-" + nr_packets[10]);
-    log.log(" S-E " + nr_packets[11] + "-" + nr_packets[12]);
+    log.log(" S-S " + nr_packets[1] + "-" + nr_packets[2]);
+    log.log(" S-E " + nr_packets[3] + "-" + nr_packets[4]);
+    log.log(" S-C " + nr_packets[5] + "-" + nr_packets[6]);
+    log.log(" S-A " + nr_packets[7] + "-" + nr_packets[8]);
+    log.log(" E-E " + nr_packets[9] + "-" + nr_packets[10]);
+    log.log(" E-C " + nr_packets[11] + "-" + nr_packets[12]);
+    log.log(" E-A " + nr_packets[13] + "-" + nr_packets[14]);
+    log.log(" C-C " + nr_packets[15] + "-" + nr_packets[16]);
+    log.log(" C-A " + nr_packets[17] + "-" + nr_packets[18]);
+    log.log(" A-A " + nr_packets[19] + "-" + nr_packets[20]);
     log.log("\n");
   }
 
-  /* Did all nodes (1-12) receive at least three messages? */
-  for (i = 1; i &lt;= 12; i++) {
+  /* Did all NR_NODES receive at least three messages? */
+  for (i = 1; i &lt;= NR_NODES; i++) {
     if (nr_packets[i] &lt; 3) break;
   }
-  if (i == 13) {
+  if (i == NR_NODES+1) {
     log.testOK();
   }
 
@@ -346,9 +455,9 @@ while (true) {
 }</script>
       <active>true</active>
     </plugin_config>
-    <width>596</width>
-    <z>0</z>
-    <height>569</height>
+    <width>692</width>
+    <z>2</z>
+    <height>367</height>
     <location_x>264</location_x>
     <location_y>0</location_y>
     <minimized>false</minimized>
@@ -368,16 +477,40 @@ while (true) {
       <mote>9</mote>
       <mote>10</mote>
       <mote>11</mote>
+      <mote>12</mote>
+      <mote>13</mote>
+      <mote>14</mote>
+      <mote>15</mote>
+      <mote>16</mote>
+      <mote>17</mote>
+      <mote>18</mote>
+      <mote>19</mote>
       <showRadioRXTX />
       <showRadioHW />
       <split>109</split>
       <zoom>12</zoom>
     </plugin_config>
-    <width>862</width>
-    <z>1</z>
-    <height>219</height>
+    <width>956</width>
+    <z>6</z>
+    <height>310</height>
     <location_x>-1</location_x>
-    <location_y>746</location_y>
+    <location_y>655</location_y>
+    <minimized>false</minimized>
+  </plugin>
+  <plugin>
+    se.sics.cooja.plugins.Visualizer
+    <plugin_config>
+      <skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.MoteTypeVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.UDGMVisualizerSkin</skin>
+      <skin>se.sics.cooja.plugins.skins.TrafficVisualizerSkin</skin>
+      <viewport>0.5766712294536613 0.0 0.0 0.5766712294536613 36.4700887534336 117.76935499005339</viewport>
+    </plugin_config>
+    <width>264</width>
+    <z>1</z>
+    <height>321</height>
+    <location_x>0</location_x>
+    <location_y>201</location_y>
     <minimized>false</minimized>
   </plugin>
 </simconf>
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.