[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestNetwork TestNetworkAppC.nc, 1.4, 1.5 TestNetworkC.nc, 1.4, 1.5

[Gilman Tolle]

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

Modified Files:
	TestNetworkAppC.nc TestNetworkC.nc 
Log Message:
Updated TestDissemination and TestNetwork to start the dissemination service manually. I've tried TestDissemination, but haven't tried TestNetwork. Let me know if you experience any problems.

Index: TestNetworkAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/TestNetworkAppC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestNetworkAppC.nc	12 Dec 2006 18:22:50 -0000	1.4
--- TestNetworkAppC.nc	14 Apr 2007 00:34:20 -0000	1.5
***************
*** 17,20 ****
--- 17,21 ----
  implementation {
    components TestNetworkC, MainC, LedsC, ActiveMessageC;
+   components DisseminationC;
    components new DisseminatorC(uint16_t, SAMPLE_RATE_KEY) as Object16C;
    components CollectionC as Collector;
***************
*** 36,39 ****
--- 37,41 ----
    TestNetworkC.SerialControl -> SerialActiveMessageC;
    TestNetworkC.RoutingControl -> Collector;
+   TestNetworkC.DisseminationControl -> DisseminationC;
    TestNetworkC.Leds -> LedsC;
    TestNetworkC.Timer -> TimerMilliC;

Index: TestNetworkC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestNetwork/TestNetworkC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestNetworkC.nc	12 Dec 2006 18:22:50 -0000	1.4
--- TestNetworkC.nc	14 Apr 2007 00:34:20 -0000	1.5
***************
*** 20,23 ****
--- 20,24 ----
    uses interface SplitControl as SerialControl;
    uses interface StdControl as RoutingControl;
+   uses interface StdControl as DisseminationControl;
    uses interface DisseminationValue<uint16_t> as DisseminationPeriod;
    uses interface Send;
***************
*** 64,67 ****
--- 65,69 ----
      }
      else {
+       call DisseminationControl.start();
        call RoutingControl.start();
        if (TOS_NODE_ID % 500 == 0) {