Fix script to new radio model, removed printf from sim_noise.

diff --git a/tos/lib/tossim/examples/packets.py b/tos/lib/tossim/examples/packets.py
index 465d4bbdae7be8997443c3cc8cc96b39cbf0a6ce..4f639eaa18cda8659b56ebb31ddaedb8d0e681b6 100644 (file)
--- 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)
 
 

diff --git a/tos/lib/tossim/sim_noise.c b/tos/lib/tossim/sim_noise.c
index 8fdaf307aaeef27ab132359c09f4f5eb56a9f7c4..437974fb72ce7c227fbd93cd4e365663423f25be 100644 (file)
--- a/tos/lib/tossim/sim_noise.c
+++ b/tos/lib/tossim/sim_noise.c
@@ -246,7 +246,7 @@ void makePmfDistr(uint16_t node_id)__attribute__ ((C, spontaneous))
   arrangeKey(node_id);
   for(i = NOISE_HISTORY; i < noiseData[node_id].noiseTraceIndex; i++) {
     if (i == NOISE_HISTORY) {
-      printf("Inserting first element.\n");
+      //printf("Inserting first element.\n");
     }
     pKey[NOISE_HISTORY-1] = search_bin_num(noiseData[node_id].noiseTrace[i]);
     sim_noise_dist(node_id);