X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Ftossim%2Fexamples%2Fpackets.py;h=4f639eaa18cda8659b56ebb31ddaedb8d0e681b6;hb=99dac2db88f7c0077521eaf0f8f4764bbef6539d;hp=465d4bbdae7be8997443c3cc8cc96b39cbf0a6ce;hpb=686778d898b3a51cc7b25f05dd94c6de73486c86;p=tinyos-2.x.git

diff --git a/tos/lib/tossim/examples/packets.py b/tos/lib/tossim/examples/packets.py
index 465d4bbd..4f639eaa 100644
--- a/tos/lib/tossim/examples/packets.py
+++ b/tos/lib/tossim/examples/packets.py
@@ -23,8 +23,15 @@ for line in lines:
   if (len(s) > 0):
     if (s[0] == "gain"):
       r.add(int(s[1]), int(s[2]), float(s[3]))
-    elif (s[0] == "noise"):
-      r.setNoise(int(s[1]), float(s[2]), float(s[3]))
+
+noise = open("meyer-heavy.txt", "r")
+lines = noise.readlines()
+for line in lines:
+  str = line.strip()
+  if (str != ""):
+    val = int(str)
+    for i in range(0, 2):
+      t.getNode(i).addNoiseTraceReading(val)
 
 for i in range(0, 60):
   t.runNextEvent();
@@ -36,7 +43,7 @@ pkt.setData(msg.data)
 pkt.setType(msg.get_amType())
 pkt.setDestination(0)
 
-print "Delivering " + msg.__str__() + " to 0 at " + str(t.time() + 3);
+print "Delivering ", msg, " to 0 at ", str(t.time() + 3);
 pkt.deliver(0, t.time() + 3)