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

[Kyle Jamieson]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile TestNetworkAppC.nc TestNetworkC.nc 
Log Message:
Updated TestNetwork app for CTP.

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Makefile,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -C2 -d -r1.1.2.9 -r1.1.2.10
*** Makefile	12 Jul 2006 07:33:46 -0000	1.1.2.9
--- Makefile	29 Aug 2006 17:24:08 -0000	1.1.2.10
***************
*** 1,8 ****
  COMPONENT=TestNetworkAppC
- CFLAGS += -I$(TOSDIR)/lib/net -I$(TOSDIR)/lib/net/collection
  
! TFLAGS +=  -I$(TOSDIR)/../apps/tests/TestDissemination \
            -I$(TOSDIR)/../support/sdk/c \
! 	  -I$(TOSDIR)/types \
            -I.
  
--- 1,11 ----
  COMPONENT=TestNetworkAppC
  
! CFLAGS += -I$(TOSDIR)/lib/net \
!           -I$(TOSDIR)/lib/net/le \
!           -I$(TOSDIR)/lib/net/ctp
! 
! TFLAGS += -I$(TOSDIR)/../apps/tests/TestDissemination \
            -I$(TOSDIR)/../support/sdk/c \
!           -I$(TOSDIR)/types \
            -I.
  

Index: TestNetworkAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/TestNetworkAppC.nc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -C2 -d -r1.1.2.11 -r1.1.2.12
*** TestNetworkAppC.nc	16 Jun 2006 12:55:23 -0000	1.1.2.11
--- TestNetworkAppC.nc	29 Aug 2006 17:24:08 -0000	1.1.2.12
***************
*** 5,9 ****
   * through dissemination.
   *
!  * See TEP118: Dissemination and TEP 119: Collection for details.
   * 
   * @author Philip Levis
--- 5,10 ----
   * through dissemination.
   *
!  * See TEP118: Dissemination, TEP 119: Collection, and TEP 123: The
!  * Collection Tree Protocol for details.
   * 
   * @author Philip Levis
***************
*** 11,15 ****
   */
  #include "TestNetwork.h"
! #include "Collection.h"
  
  configuration TestNetworkAppC {}
--- 12,16 ----
   */
  #include "TestNetwork.h"
! #include "Ctp.h"
  
  configuration TestNetworkAppC {}
***************
*** 17,22 ****
    components TestNetworkC, MainC, LedsC, ActiveMessageC;
    components new DisseminatorC(uint16_t, SAMPLE_RATE_KEY) as Object16C;
!   components new CollectionSenderC(CL_TEST);
!   components TreeCollectionC 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 new CtpSenderC(CL_TEST);
!   components CollectionC as Collector;
    components new TimerMilliC();
    components new DemoSensorC();
***************
*** 34,38 ****
    TestNetworkC.Timer -> TimerMilliC;
    TestNetworkC.DisseminationPeriod -> Object16C;
!   TestNetworkC.Send -> CollectionSenderC;
    TestNetworkC.ReadSensor -> DemoSensorC;
    TestNetworkC.RootControl -> Collector;
--- 35,39 ----
    TestNetworkC.Timer -> TimerMilliC;
    TestNetworkC.DisseminationPeriod -> Object16C;
!   TestNetworkC.Send -> CtpSenderC;
    TestNetworkC.ReadSensor -> DemoSensorC;
    TestNetworkC.RootControl -> Collector;
***************
*** 40,44 ****
    TestNetworkC.UARTSend -> SerialAMSenderC.AMSend;
    TestNetworkC.CollectionPacket -> Collector;
!   TestNetworkC.TreeRoutingInspect -> Collector;
    TestNetworkC.Random -> RandomC;
  
--- 41,45 ----
    TestNetworkC.UARTSend -> SerialAMSenderC.AMSend;
    TestNetworkC.CollectionPacket -> Collector;
!   TestNetworkC.CtpInfo -> Collector;
    TestNetworkC.Random -> RandomC;
  

Index: TestNetworkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/TestNetworkC.nc,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -d -r1.1.2.13 -r1.1.2.14
*** TestNetworkC.nc	19 Jun 2006 21:21:38 -0000	1.1.2.13
--- TestNetworkC.nc	29 Aug 2006 17:24:08 -0000	1.1.2.14
***************
*** 28,32 ****
    uses interface AMSend as UARTSend;
    uses interface CollectionPacket;
!   uses interface TreeRoutingInspect;
    uses interface Random;
  }
--- 28,32 ----
    uses interface AMSend as UARTSend;
    uses interface CollectionPacket;
!   uses interface CtpInfo;
    uses interface Random;
  }
***************
*** 88,94 ****
      am_addr_t parent;
  
!     call TreeRoutingInspect.getParent(&parent);
!     call TreeRoutingInspect.getHopcount(&hopcount);
!     call TreeRoutingInspect.getMetric(&metric);
  
      msg->source = TOS_NODE_ID;
--- 88,94 ----
      am_addr_t parent;
  
!     call CtpInfo.getParent(&parent);
!     call CtpInfo.getHopcount(&hopcount);
!     call CtpInfo.getMetric(&metric);
  
      msg->source = TOS_NODE_ID;