Fix the issue with tos-deluge not timing out properly.

[tinyos-2.x.git] / apps / MultihopOscilloscope / MultihopOscilloscopeAppC.nc

diff --git a/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc b/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc
index 164cb0c64e4fa38d4e97cf822324c2e3fd427d98..f6fd2eff79041dbc304a642df69467351ea45a72 100644 (file)
--- a/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc
+++ b/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc
@@ -21,6 +21,8 @@ implementation {
   components MainC, MultihopOscilloscopeC, LedsC, new TimerMilliC(), 
     new DemoSensorC() as Sensor;
 
+  //MainC.SoftwareInit -> Sensor;
+  
   MultihopOscilloscopeC.Boot -> MainC;
   MultihopOscilloscopeC.Timer -> TimerMilliC;
   MultihopOscilloscopeC.Read -> Sensor;
@@ -30,7 +32,7 @@ implementation {
   // Communication components.  These are documented in TEP 113:
   // Serial Communication, and TEP 119: Collection.
   //
-  components TreeCollectionC as Collector,  // Collection layer
+  components CollectionC as Collector,  // Collection layer
     ActiveMessageC,                         // AM layer
     new CollectionSenderC(AM_OSCILLOSCOPE), // Sends multihop RF
     SerialActiveMessageC,                   // Serial messaging
@@ -46,12 +48,15 @@ implementation {
   MultihopOscilloscopeC.Receive -> Collector.Receive[AM_OSCILLOSCOPE];
   MultihopOscilloscopeC.RootControl -> Collector;
 
-  //
-  // Components for debugging collection.
-  //
-  components new PoolC(message_t, 10) as DebugMessagePool,
-    new QueueC(message_t*, 10) as DebugSendQueue,
-    new SerialAMSenderC(AM_COLLECTION_DEBUG) as DebugSerialSender,
+  components new PoolC(message_t, 10) as UARTMessagePoolP,
+    new QueueC(message_t*, 10) as UARTQueueP;
+
+  MultihopOscilloscopeC.UARTMessagePool -> UARTMessagePoolP;
+  MultihopOscilloscopeC.UARTQueue -> UARTQueueP;
+  
+  components new PoolC(message_t, 20) as DebugMessagePool,
+    new QueueC(message_t*, 20) as DebugSendQueue,
+    new SerialAMSenderC(AM_CTP_DEBUG) as DebugSerialSender,
     UARTDebugSenderP as DebugSender;
 
   DebugSender.Boot -> MainC;
@@ -59,4 +64,5 @@ implementation {
   DebugSender.MessagePool -> DebugMessagePool;
   DebugSender.SendQueue -> DebugSendQueue;
   Collector.CollectionDebug -> DebugSender;
+
 }