[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestDissemination Makefile, 1.3, 1.4 test.py, 1.2, 1.3

[Kaisen Lin]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/TestDissemination
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20545

Modified Files:
	Makefile test.py 
Log Message:
Fixed TestDissemination TOSSIM script to use CPM

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestDissemination/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	14 Sep 2007 00:25:19 -0000	1.3
--- Makefile	18 Dec 2007 19:23:51 -0000	1.4
***************
*** 1,5 ****
--- 1,10 ----
  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)

Index: test.py
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestDissemination/test.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test.py	12 Jul 2006 16:59:19 -0000	1.2
--- test.py	18 Dec 2007 19:23:51 -0000	1.3
***************
*** 19,23 ****
  #t.addChannel("AM", sys.stdout);
  #t.addChannel("TestDisseminationC", sys.stdout);
! t.addChannel("Dissemination", sys.stdout);
  #t.addChannel("Gain", sys.stdout);
  #t.addChannel("TossimPacketModelC", sys.stdout);
--- 19,24 ----
  #t.addChannel("AM", sys.stdout);
  #t.addChannel("TestDisseminationC", sys.stdout);
! t.addChannel("Dissemination", sys.stdout)
! t.addChannel("TestDisseminationC", sys.stdout)
  #t.addChannel("Gain", sys.stdout);
  #t.addChannel("TossimPacketModelC", sys.stdout);
***************
*** 32,40 ****
      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);
    m.bootAtTime((t.ticksPerSecond() / 50) * i + 43);
   
--- 33,42 ----
      if (s[0] == "gain"):
        r.add(int(s[1]), int(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);