diff --git a/cooja/simulation-prng.csc b/cooja/simulation-prng.csc index df5bce6..113dfff 100644 --- a/cooja/simulation-prng.csc +++ b/cooja/simulation-prng.csc @@ -8,7 +8,7 @@ [APPS_DIR]/powertracker My simulation - generated + 1 1000000 org.contikios.cooja.radiomediums.UDGM @@ -64,8 +64,8 @@ org.contikios.cooja.interfaces.Position - 2.8401240027287944 - 20.180398464401506 + 53.09193301249495 + 51.73556976035091 0.0 @@ -82,8 +82,8 @@ org.contikios.cooja.interfaces.Position - 62.70457624916895 - 5.461823348621493 + 96.42054585477612 + 68.51308818534717 0.0 @@ -100,8 +100,8 @@ org.contikios.cooja.interfaces.Position - -42.50529195002628 - 95.99347517915606 + 28.288717658759253 + 95.5885768074478 0.0 @@ -118,8 +118,8 @@ org.contikios.cooja.interfaces.Position - -64.0342030412418 - -76.45182374542104 + 15.766261883357657 + 13.205730860350783 0.0 @@ -136,8 +136,8 @@ org.contikios.cooja.interfaces.Position - 26.546391605398625 - -59.30002353310728 + 4.055322650147753 + 54.05225656749616 0.0 @@ -154,8 +154,8 @@ org.contikios.cooja.interfaces.Position - -84.85459248648142 - 98.55316515771543 + 83.36080874126749 + 69.14227824411343 0.0 @@ -172,8 +172,8 @@ org.contikios.cooja.interfaces.Position - 73.08943636820524 - -36.58257187319245 + 58.64938567406202 + 46.2605492265615 0.0 @@ -190,8 +190,8 @@ org.contikios.cooja.interfaces.Position - -98.8057360093751 - -73.06961837300403 + 56.08488999102958 + 97.76384479739446 0.0 @@ -208,8 +208,8 @@ org.contikios.cooja.interfaces.Position - 23.471662544709446 - 53.225517361008684 + 91.38979502566124 + 94.37928793173187 0.0 @@ -226,8 +226,8 @@ org.contikios.cooja.interfaces.Position - -13.565530041615915 - -80.11928625014107 + 35.91383296948861 + 97.2673119821112 0.0 @@ -244,8 +244,8 @@ org.contikios.cooja.interfaces.Position - -34.51438626745433 - -81.09816665820632 + 47.71068988720166 + 75.47050686208277 0.0 @@ -262,8 +262,8 @@ org.contikios.cooja.interfaces.Position - 71.70626744929694 - -46.85016956041235 + 33.85553508722398 + 8.403791290765138 0.0 @@ -280,8 +280,8 @@ org.contikios.cooja.interfaces.Position - -41.520309705555846 - 71.44077281376488 + 86.96724082337165 + 45.98633029738626 0.0 @@ -298,8 +298,8 @@ org.contikios.cooja.interfaces.Position - 43.08727383704024 - 69.28339212423197 + 73.25623743646457 + 69.86147834292208 0.0 @@ -316,8 +316,8 @@ org.contikios.cooja.interfaces.Position - 1.1574329431798276 - -10.80591664080768 + 14.843186661781315 + 89.25573884325185 0.0 @@ -334,8 +334,8 @@ org.contikios.cooja.interfaces.Position - 86.63895925194797 - 16.352747256872362 + 65.90943273925322 + 78.36297705481104 0.0 @@ -352,8 +352,8 @@ org.contikios.cooja.interfaces.Position - 70.93169772866406 - 20.543994795105263 + 87.2796217860686 + 76.56736092588233 0.0 @@ -370,8 +370,8 @@ org.contikios.cooja.interfaces.Position - 39.091328725160054 - 55.941084547841 + 25.7634401883041 + 83.65941722120878 0.0 @@ -388,8 +388,8 @@ org.contikios.cooja.interfaces.Position - 16.453276006224286 - -59.66650954910484 + 39.72918340338105 + 79.74184053826752 0.0 @@ -406,8 +406,8 @@ org.contikios.cooja.interfaces.Position - -4.390747291039673 - 87.26687348716987 + 91.98777279279888 + 8.977031794409719 0.0 @@ -424,8 +424,8 @@ org.contikios.cooja.interfaces.Position - -91.67228068349867 - -31.508149118910467 + 0.6944796346997073 + 10.630459611640386 0.0 @@ -442,8 +442,8 @@ org.contikios.cooja.interfaces.Position - 53.98786953015234 - -66.86616338929652 + 19.73092440955816 + 3.576331661536858 0.0 @@ -456,168 +456,6 @@ z12 - - - - org.contikios.cooja.interfaces.Position - 30.80831962466192 - 51.80268003334382 - 0.0 - - - org.contikios.cooja.mspmote.interfaces.MspClock - 1.0 - - - org.contikios.cooja.mspmote.interfaces.MspMoteID - 23 - - z12 - - - - - org.contikios.cooja.interfaces.Position - 81.0646699044992 - -79.55330040239726 - 0.0 - - - org.contikios.cooja.mspmote.interfaces.MspClock - 1.0 - - - org.contikios.cooja.mspmote.interfaces.MspMoteID - 24 - - z12 - - - - - org.contikios.cooja.interfaces.Position - -29.078011851630833 - 53.4674864072434 - 0.0 - - - org.contikios.cooja.mspmote.interfaces.MspClock - 1.0 - - - org.contikios.cooja.mspmote.interfaces.MspMoteID - 25 - - z12 - - - - - org.contikios.cooja.interfaces.Position - -18.275675734835886 - 30.46886342152942 - 0.0 - - - org.contikios.cooja.mspmote.interfaces.MspClock - 1.0 - - - org.contikios.cooja.mspmote.interfaces.MspMoteID - 26 - - z12 - - - - - org.contikios.cooja.interfaces.Position - 81.7369940927974 - 33.90815409313575 - 0.0 - - - org.contikios.cooja.mspmote.interfaces.MspClock - 1.0 - - - org.contikios.cooja.mspmote.interfaces.MspMoteID - 27 - - z12 - - - - - org.contikios.cooja.interfaces.Position - 30.75563686385422 - 55.40035529973554 - 0.0 - - - org.contikios.cooja.mspmote.interfaces.MspClock - 1.0 - - - org.contikios.cooja.mspmote.interfaces.MspMoteID - 28 - - z12 - - - - - org.contikios.cooja.interfaces.Position - -38.71906313508564 - 88.66374116285508 - 0.0 - - - org.contikios.cooja.mspmote.interfaces.MspClock - 1.0 - - - org.contikios.cooja.mspmote.interfaces.MspMoteID - 29 - - z12 - - - - - org.contikios.cooja.interfaces.Position - 16.30310917244114 - 14.567282002160084 - 0.0 - - - org.contikios.cooja.mspmote.interfaces.MspClock - 1.0 - - - org.contikios.cooja.mspmote.interfaces.MspMoteID - 30 - - z12 - - - - - org.contikios.cooja.interfaces.Position - -7.756304235356026 - 39.799774604890644 - 0.0 - - - org.contikios.cooja.mspmote.interfaces.MspClock - 1.0 - - - org.contikios.cooja.mspmote.interfaces.MspMoteID - 31 - - z12 - org.contikios.cooja.plugins.SimControl @@ -635,7 +473,7 @@ org.contikios.cooja.plugins.skins.GridVisualizerSkin org.contikios.cooja.plugins.skins.TrafficVisualizerSkin org.contikios.cooja.plugins.skins.UDGMVisualizerSkin - 2.631613289609486 0.0 0.0 2.631613289609486 346.00912570327847 269.9189081106048 + 5.160859370773246 0.0 0.0 5.160859370773246 81.19356119515358 24.72727272727279 672 1 @@ -681,15 +519,6 @@ 19 20 21 - 22 - 23 - 24 - 25 - 26 - 27 - 28 - 29 - 30 @@ -701,19 +530,6 @@ 0 818 - - org.contikios.cooja.serialsocket.SerialSocketServer - 0 - - 60001 - false - - 362 - 2 - 116 - 301 - 654 - org.contikios.cooja.plugins.RadioLogger @@ -735,7 +551,7 @@ YIELD(); -WAIT_UNTIL(id == 1 && msg.equals("detected 30")); +WAIT_UNTIL(id == 1 && msg.equals("detected 21")); // log.log("[ANAWS] ROUTE-DISCOVERY AT " + String(time) + "\n"); log.log("ALL-ROUTE-DISCOVERY " + sim.getSimulationTime() + " [us]\n"); @@ -744,10 +560,23 @@ log.testOK(); false 600 - 0 + 2 700 958 39 + + org.contikios.cooja.serialsocket.SerialSocketServer + 0 + + 60001 + false + + 362 + 0 + 116 + 276 + 639 +