[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork TestNetworkAppC.nc, 1.1.2.12, 1.1.2.13 TestNetworkC.nc, 1.1.2.14, 1.1.2.15

[Omprakash Gnawali]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	TestNetworkAppC.nc TestNetworkC.nc 
Log Message:
it compiles now

Index: TestNetworkAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/TestNetworkAppC.nc,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -d -r1.1.2.12 -r1.1.2.13
*** TestNetworkAppC.nc	29 Aug 2006 17:24:08 -0000	1.1.2.12
--- TestNetworkAppC.nc	3 Oct 2006 00:18:43 -0000	1.1.2.13
***************
*** 18,23 ****
    components TestNetworkC, MainC, LedsC, ActiveMessageC;
    components new DisseminatorC(uint16_t, SAMPLE_RATE_KEY) as Object16C;
-   components new CtpSenderC(CL_TEST);
    components CollectionC as Collector;
    components new TimerMilliC();
    components new DemoSensorC();
--- 18,23 ----
    components TestNetworkC, MainC, LedsC, ActiveMessageC;
    components new DisseminatorC(uint16_t, SAMPLE_RATE_KEY) as Object16C;
    components CollectionC as Collector;
+   components new CollectionSenderC(CL_TEST);
    components new TimerMilliC();
    components new DemoSensorC();
***************
*** 35,39 ****
    TestNetworkC.Timer -> TimerMilliC;
    TestNetworkC.DisseminationPeriod -> Object16C;
!   TestNetworkC.Send -> CtpSenderC;
    TestNetworkC.ReadSensor -> DemoSensorC;
    TestNetworkC.RootControl -> Collector;
--- 35,39 ----
    TestNetworkC.Timer -> TimerMilliC;
    TestNetworkC.DisseminationPeriod -> Object16C;
!   TestNetworkC.Send -> CollectionSenderC;
    TestNetworkC.ReadSensor -> DemoSensorC;
    TestNetworkC.RootControl -> Collector;

Index: TestNetworkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/TestNetworkC.nc,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -C2 -d -r1.1.2.14 -r1.1.2.15
*** TestNetworkC.nc	29 Aug 2006 17:24:08 -0000	1.1.2.14
--- TestNetworkC.nc	3 Oct 2006 00:18:43 -0000	1.1.2.15
***************
*** 89,94 ****
  
      call CtpInfo.getParent(&parent);
!     call CtpInfo.getHopcount(&hopcount);
!     call CtpInfo.getMetric(&metric);
  
      msg->source = TOS_NODE_ID;
--- 89,94 ----
  
      call CtpInfo.getParent(&parent);
!     //    call CtpInfo.getHopcount(&hopcount);
!     call CtpInfo.getEtx(&metric);
  
      msg->source = TOS_NODE_ID;