Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / apps / tests / TestNetwork / TestNetworkAppC.nc

diff --git a/apps/tests/TestNetwork/TestNetworkAppC.nc b/apps/tests/TestNetwork/TestNetworkAppC.nc
index cbe5078b6d71946b05dd21419be069ea19eb7644..337b8d2e7629e87003be334420b3cac5969cf62b 100644 (file)
--- a/apps/tests/TestNetwork/TestNetworkAppC.nc
+++ b/apps/tests/TestNetwork/TestNetworkAppC.nc
@@ -16,7 +16,8 @@
 configuration TestNetworkAppC {}
 implementation {
   components TestNetworkC, MainC, LedsC, ActiveMessageC;
-  components new DisseminatorC(uint16_t, SAMPLE_RATE_KEY) as Object16C;
+  components DisseminationC;
+  components new DisseminatorC(uint32_t, SAMPLE_RATE_KEY) as Object32C;
   components CollectionC as Collector;
   components new CollectionSenderC(CL_TEST);
   components new TimerMilliC();
@@ -35,9 +36,10 @@ implementation {
   TestNetworkC.RadioControl -> ActiveMessageC;
   TestNetworkC.SerialControl -> SerialActiveMessageC;
   TestNetworkC.RoutingControl -> Collector;
+  TestNetworkC.DisseminationControl -> DisseminationC;
   TestNetworkC.Leds -> LedsC;
   TestNetworkC.Timer -> TimerMilliC;
-  TestNetworkC.DisseminationPeriod -> Object16C;
+  TestNetworkC.DisseminationPeriod -> Object32C;
   TestNetworkC.Send -> CollectionSenderC;
   TestNetworkC.ReadSensor -> DemoSensorC;
   TestNetworkC.RootControl -> Collector;
@@ -49,7 +51,8 @@ implementation {
   TestNetworkC.Random -> RandomC;
   TestNetworkC.Pool -> PoolC;
   TestNetworkC.Queue -> QueueC;
-
+  TestNetworkC.RadioPacket -> ActiveMessageC;
+  
 #ifndef NO_DEBUG
   components new PoolC(message_t, 10) as DebugMessagePool;
   components new QueueC(message_t*, 10) as DebugSendQueue;