Instrumented.

[tinyos-2.x.git] / tos / lib / net / lqi / MultiHopLqiP.nc

diff --git a/tos/lib/net/lqi/MultiHopLqiP.nc b/tos/lib/net/lqi/MultiHopLqiP.nc
index 4b84194a23b265a910460ea66471e7fc0060fa8c..5291973000b28fe1d4f6b3068353fe8570fbee88 100644 (file)
--- a/tos/lib/net/lqi/MultiHopLqiP.nc
+++ b/tos/lib/net/lqi/MultiHopLqiP.nc
@@ -78,6 +78,8 @@ configuration MultiHopLqiP {
     interface CollectionPacket;
   }
 
+  uses interface CollectionDebug;
+
 }
 
 implementation {
@@ -87,6 +89,7 @@ implementation {
     new AMSenderC(AM_LQI_BEACON_MSG) as BeaconSender,
     new AMReceiverC(AM_LQI_BEACON_MSG) as BeaconReceiver,
     new AMSenderC(AM_LQI_DATA_MSG) as DataSender,
+    new AMSenderC(AM_LQI_DATA_MSG) as DataSenderMine,
     new AMReceiverC(AM_LQI_DATA_MSG) as DataReceiver,
     new TimerMilliC(), 
     NoLedsC, LedsC,
@@ -98,7 +101,7 @@ implementation {
   MainC.SoftwareInit -> Router;
   
   components CC2420ActiveMessageC as CC2420;
-
+  
   StdControl = Router.StdControl;
   
   Receive = Forwarder.Receive;
@@ -110,16 +113,21 @@ implementation {
   Packet = Forwarder;
   CollectionPacket = Forwarder;
   RootControl = Router;
- 
+
+  //CC2420.SubPacket -> DataSender;
+  
   Forwarder.RouteSelectCntl -> Router.RouteControl;
   Forwarder.RouteSelect -> Router;
   Forwarder.SubSend -> DataSender;
+  Forwarder.SubSendMine -> DataSenderMine;
   Forwarder.SubReceive -> DataReceiver;
   Forwarder.Leds -> LedsC;
   Forwarder.AMPacket -> ActiveMessageC;
   Forwarder.SubPacket -> ActiveMessageC;
   Forwarder.PacketAcknowledgements -> ActiveMessageC;
   Forwarder.RootControl -> Router;
+  Forwarder.Random -> RandomC;
+  Forwarder.CollectionDebug = CollectionDebug;
   
   Router.AMSend -> BeaconSender;
   Router.Receive -> BeaconReceiver;
@@ -130,4 +138,5 @@ implementation {
   Router.AMPacket -> ActiveMessageC;
   Router.Packet -> ActiveMessageC;
   Router.Leds -> NoLedsC;
+  Router.CollectionDebug = CollectionDebug;
 }