[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork TestNetwork.h, 1.1.2.2, 1.1.2.3 TestNetworkAppC.nc, 1.1.2.6, 1.1.2.7 TestNetworkC.nc, 1.1.2.8, 1.1.2.9

[Kyle Jamieson]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	TestNetwork.h TestNetworkAppC.nc TestNetworkC.nc 
Log Message:
Include more info about collection in testnetwork packets.

Index: TestNetwork.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/TestNetwork.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** TestNetwork.h	2 Jun 2006 20:51:13 -0000	1.1.2.2
--- TestNetwork.h	14 Jun 2006 14:38:37 -0000	1.1.2.3
***************
*** 5,9 ****
--- 5,13 ----
  
  typedef nx_struct TestNetworkMsg {
+   nx_uint8_t source;
+   nx_uint8_t parent;
+   nx_uint16_t metric;
    nx_uint16_t data;
+   nx_uint8_t hopcount;
  } TestNetworkMsg;
  

Index: TestNetworkAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/TestNetworkAppC.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** TestNetworkAppC.nc	9 Jun 2006 01:46:57 -0000	1.1.2.6
--- TestNetworkAppC.nc	14 Jun 2006 14:38:37 -0000	1.1.2.7
***************
*** 36,38 ****
--- 36,39 ----
    TestNetworkC.UARTSend -> SerialAMSenderC.AMSend;
    TestNetworkC.CollectionPacket -> Collector;
+   TestNetworkC.TreeRoutingInspect -> Collector;
  }

Index: TestNetworkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/Attic/TestNetworkC.nc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** TestNetworkC.nc	10 Jun 2006 21:19:50 -0000	1.1.2.8
--- TestNetworkC.nc	14 Jun 2006 14:38:37 -0000	1.1.2.9
***************
*** 28,31 ****
--- 28,32 ----
    uses interface AMSend as UARTSend;
    uses interface CollectionPacket;
+   uses interface TreeRoutingInspect;
  }
  implementation {
***************
*** 75,79 ****
--- 76,92 ----
    event void ReadSensor.readDone(error_t err, uint16_t val) {
      TestNetworkMsg* msg = (TestNetworkMsg*)call Send.getPayload(&packet);
+     uint8_t hopcount;
+     uint16_t metric;
+     am_addr_t parent;
+ 
+     call TreeRoutingInspect.getParent(&parent);
+     call TreeRoutingInspect.getHopcount(&hopcount);
+     call TreeRoutingInspect.getMetric(&metric);
+ 
      msg->data = val;
+     msg->parent = parent;
+     msg->hopcount = hopcount;
+     msg->metric = metric;
+ 
      if (err != SUCCESS) {
        dbg("App", "%s: read done failed.\n", __FUNCTION__);