[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork Makefile, 1.1.2.7, 1.1.2.8 TestNetworkAppC.nc, 1.1.2.7, 1.1.2.8 test.py, 1.1.2.4, 1.1.2.5

[Rodrigo Fonseca]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile TestNetworkAppC.nc test.py 
Log Message:


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/Makefile,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** Makefile	14 Jun 2006 18:57:43 -0000	1.1.2.7
--- Makefile	14 Jun 2006 20:51:17 -0000	1.1.2.8
***************
*** 23,27 ****
  $(eval $(call mig_templ,test_network_msg,TestNetwork.h,TestNetworkMsg))
  $(eval $(call mig_templ,set_rate_msg,$(TOSDIR)/lib/net/DisseminationEngine.h,dissemination_message))
! $(eval $(call mig_templ,collection_debug_msg,$(TOSDIR)/lib/net/collection/UartDbgMsg.h,CollectionDebugMsg))
  
  %.o: %.c
--- 23,27 ----
  $(eval $(call mig_templ,test_network_msg,TestNetwork.h,TestNetworkMsg))
  $(eval $(call mig_templ,set_rate_msg,$(TOSDIR)/lib/net/DisseminationEngine.h,dissemination_message))
! $(eval $(call mig_templ,collection_debug_msg,$(TOSDIR)/lib/net/collection/CollectionDebugMsg.h,CollectionDebugMsg))
  
  %.o: %.c

Index: TestNetworkAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/TestNetworkAppC.nc,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** TestNetworkAppC.nc	14 Jun 2006 14:38:37 -0000	1.1.2.7
--- TestNetworkAppC.nc	14 Jun 2006 20:51:17 -0000	1.1.2.8
***************
*** 22,25 ****
--- 22,27 ----
    components new SerialAMSenderC(CL_TEST);
    components SerialActiveMessageC;
+   components new SerialAMSenderC(0x09) as UARTSender;
+   components UARTDebugSenderP as DebugSender;
  
    TestNetworkC.Boot -> MainC;
***************
*** 37,39 ****
--- 39,45 ----
    TestNetworkC.CollectionPacket -> Collector;
    TestNetworkC.TreeRoutingInspect -> Collector;
+ 
+   DebugSender.Boot -> MainC;
+   DebugSender.UARTSend -> UARTSender;
+   Collector.CollectionDebug -> DebugSender;
  }

Index: test.py
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/test.py,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** test.py	10 Jun 2006 21:19:50 -0000	1.1.2.4
--- test.py	14 Jun 2006 20:51:17 -0000	1.1.2.5
***************
*** 9,24 ****
  r = t.radio()
  
! f = open("topo-50.txt", "r")
  lines = f.readlines()
  for line in lines:
    s = line.split()
    if (len(s) > 0):
!     if s[0] == "gain" and int(s[1]) % 5 == 0 and int(s[2]) % 5 == 0:
        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, 10):
!   m = t.getNode(i * 5);
    time = randint(t.ticksPerSecond(), 10 * t.ticksPerSecond())
    m.bootAtTime(time)
--- 9,24 ----
  r = t.radio()
  
! f = open("topo.10x10.txt", "r")
  lines = f.readlines()
  for line in lines:
    s = line.split()
    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, 100):
!   m = t.getNode(i);
    time = randint(t.ticksPerSecond(), 10 * t.ticksPerSecond())
    m.bootAtTime(time)
***************
*** 28,33 ****
  
  #t.addChannel("AM", sys.stdout)
! #t.addChannel("TreeRouting", sys.stdout)
! #t.addChannel("TestNetworkC", sys.stdout)
  #t.addChannel("TestNetworkC", sys.stdout)
  t.addChannel("Route", sys.stdout)
--- 28,33 ----
  
  #t.addChannel("AM", sys.stdout)
! t.addChannel("TreeRouting", sys.stdout)
! t.addChannel("TestNetworkC", sys.stdout)
  #t.addChannel("TestNetworkC", sys.stdout)
  t.addChannel("Route", sys.stdout)
***************
*** 38,42 ****
  t.addChannel("Acks", sys.stdout)
  
! while (t.time() < 300 * t.ticksPerSecond()):
    t.runNextEvent()
  
--- 38,42 ----
  t.addChannel("Acks", sys.stdout)
  
! while (t.time() < 1000 * t.ticksPerSecond()):
    t.runNextEvent()