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 fabad2c35a1687aec03e85bdaab1bd0a35cebd41..337b8d2e7629e87003be334420b3cac5969cf62b 100644 (file)
--- a/apps/tests/TestNetwork/TestNetworkAppC.nc
+++ b/apps/tests/TestNetwork/TestNetworkAppC.nc
@@ -4,44 +4,56 @@
  * and sends packets up a collection tree. The rate is configurable
  * through dissemination.
  *
- * See TEP118: Dissemination and TEP 119: Collection for details.
+ * See TEP118: Dissemination, TEP 119: Collection, and TEP 123: The
+ * Collection Tree Protocol for details.
  * 
  * @author Philip Levis
  * @version $Revision$ $Date$
  */
 #include "TestNetwork.h"
-#include "Collection.h"
+#include "Ctp.h"
 
 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 TreeCollectionC as Collector;
   components new TimerMilliC();
   components new DemoSensorC();
   components new SerialAMSenderC(CL_TEST);
   components SerialActiveMessageC;
+#ifndef NO_DEBUG
   components new SerialAMSenderC(AM_COLLECTION_DEBUG) as UARTSender;
   components UARTDebugSenderP as DebugSender;
+#endif
   components RandomC;
+  components new QueueC(message_t*, 12);
+  components new PoolC(message_t, 12);
 
   TestNetworkC.Boot -> MainC;
   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;
   TestNetworkC.Receive -> Collector.Receive[CL_TEST];
   TestNetworkC.UARTSend -> SerialAMSenderC.AMSend;
   TestNetworkC.CollectionPacket -> Collector;
-  TestNetworkC.TreeRoutingInspect -> Collector;
+  TestNetworkC.CtpInfo -> Collector;
+  TestNetworkC.CtpCongestion -> Collector;
   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;
   DebugSender.Boot -> MainC;
@@ -49,4 +61,7 @@ implementation {
   DebugSender.MessagePool -> DebugMessagePool;
   DebugSender.SendQueue -> DebugSendQueue;
   Collector.CollectionDebug -> DebugSender;
+  TestNetworkC.CollectionDebug -> DebugSender;
+#endif
+  TestNetworkC.AMPacket -> ActiveMessageC;
 }