[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork TestNetworkAppC.nc, 1.1.2.9, 1.1.2.10 TestNetworkC.nc, 1.1.2.10, 1.1.2.11

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	TestNetworkAppC.nc TestNetworkC.nc 
Log Message:
Added wiring to RandomC.


Index: TestNetworkAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/TestNetworkAppC.nc,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** TestNetworkAppC.nc	14 Jun 2006 21:52:38 -0000	1.1.2.9
--- TestNetworkAppC.nc	15 Jun 2006 17:21:45 -0000	1.1.2.10
***************
*** 25,28 ****
--- 25,29 ----
    components new SerialAMSenderC(AM_COLLECTION_DEBUG) as UARTSender;
    components UARTDebugSenderP as DebugSender;
+   components RandomC;
  
    TestNetworkC.Boot -> MainC;
***************
*** 40,43 ****
--- 41,45 ----
    TestNetworkC.CollectionPacket -> Collector;
    TestNetworkC.TreeRoutingInspect -> Collector;
+   TestNetworkC.Random -> RandomC;
  
    DebugSender.Boot -> MainC;

Index: TestNetworkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/TestNetworkC.nc,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -C2 -d -r1.1.2.10 -r1.1.2.11
*** TestNetworkC.nc	15 Jun 2006 02:11:53 -0000	1.1.2.10
--- TestNetworkC.nc	15 Jun 2006 17:21:46 -0000	1.1.2.11
***************
*** 72,76 ****
        return;
      }
!     dbg("TestNetworkC", "TestDisseminationC: Timer fired.\n");
      busy = TRUE;
    }
--- 72,76 ----
        return;
      }
!     //dbg("TestNetworkC", "TestDisseminationC: Timer fired.\n");
      busy = TRUE;
    }
***************
*** 128,132 ****
    event message_t* 
    Receive.receive(message_t* msg, void* payload, uint8_t len) {
!     dbg("TestNetworkC,Traffic,Route", "Received packet at %s from node %hhu.\n", sim_time_string(), call CollectionPacket.getOrigin(msg));
      call Leds.led1Toggle();    
      if (!uartbusy) {
--- 128,132 ----
    event message_t* 
    Receive.receive(message_t* msg, void* payload, uint8_t len) {
!     dbg("TestNetworkC", "Received packet at %s from node %hhu.\n", sim_time_string(), call CollectionPacket.getOrigin(msg));
      call Leds.led1Toggle();    
      if (!uartbusy) {