X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Flib%2Fnet%2Flqi%2FMultiHopLqiP.nc;h=5291973000b28fe1d4f6b3068353fe8570fbee88;hb=29e801c794991fa16027bffe66e7e5dc06f35d30;hp=1f58f4b555db1b6b2b38c8d6ce1bbe90fb14dc87;hpb=0e0b232907e144f55080e6fed617db620776f4b5;p=tinyos-2.x.git

diff --git a/tos/lib/net/lqi/MultiHopLqiP.nc b/tos/lib/net/lqi/MultiHopLqiP.nc
index 1f58f4b5..52919730 100644
--- 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 {
@@ -99,7 +101,7 @@ implementation {
   MainC.SoftwareInit -> Router;
   
   components CC2420ActiveMessageC as CC2420;
-
+  
   StdControl = Router.StdControl;
   
   Receive = Forwarder.Receive;
@@ -111,7 +113,9 @@ implementation {
   Packet = Forwarder;
   CollectionPacket = Forwarder;
   RootControl = Router;
- 
+
+  //CC2420.SubPacket -> DataSender;
+  
   Forwarder.RouteSelectCntl -> Router.RouteControl;
   Forwarder.RouteSelect -> Router;
   Forwarder.SubSend -> DataSender;
@@ -123,6 +127,7 @@ implementation {
   Forwarder.PacketAcknowledgements -> ActiveMessageC;
   Forwarder.RootControl -> Router;
   Forwarder.Random -> RandomC;
+  Forwarder.CollectionDebug = CollectionDebug;
   
   Router.AMSend -> BeaconSender;
   Router.Receive -> BeaconReceiver;
@@ -133,4 +138,5 @@ implementation {
   Router.AMPacket -> ActiveMessageC;
   Router.Packet -> ActiveMessageC;
   Router.Leds -> NoLedsC;
+  Router.CollectionDebug = CollectionDebug;
 }