Fixed TestDissemination TOSSIM script to use CPM

diff --git a/apps/tests/TestDissemination/Makefile b/apps/tests/TestDissemination/Makefile
index 2d64141dbf9049741b615cdef07cedacb2cdc721..dcb1052931ab9b3db4b021106d19557851330674 100644 (file)
--- a/apps/tests/TestDissemination/Makefile
+++ b/apps/tests/TestDissemination/Makefile
@@ -1,6 +1,11 @@
 COMPONENT=TestDisseminationAppC
+
+### For Drip:
 CFLAGS += -I$(TOSDIR)/lib/net -I%T/lib/net/drip
 
+### For DIP:
+#CFLAGS += -I$(TOSDIR)/lib/net -I%T/lib/net/dip -I%T/lib/net/dip/interfaces
+
 
 include $(MAKERULES)
 

diff --git a/apps/tests/TestDissemination/test.py b/apps/tests/TestDissemination/test.py
index 7592492291745416259ea983caab605aca610d68..4aa400d6a4a3bab2adaaf02d467653459dd693d4 100644 (file)
--- a/apps/tests/TestDissemination/test.py
+++ b/apps/tests/TestDissemination/test.py
@@ -18,7 +18,8 @@ t.init()
 #t.addChannel("LedsC", sys.stdout);
 #t.addChannel("AM", sys.stdout);
 #t.addChannel("TestDisseminationC", sys.stdout);
-t.addChannel("Dissemination", sys.stdout);
+t.addChannel("Dissemination", sys.stdout)
+t.addChannel("TestDisseminationC", sys.stdout)
 #t.addChannel("Gain", sys.stdout);
 #t.addChannel("TossimPacketModelC", sys.stdout);
 
@@ -31,11 +32,12 @@ 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]))
 
 for i in range(0, 225):
   m = t.getNode(i);
+  for j in range (0, 100):
+    m.addNoiseTraceReading(-105)
+  m.createNoiseModel()
   m.bootAtTime((t.ticksPerSecond() / 50) * i + 43);
  
 while (t.time() / t.ticksPerSecond() < 600):