Added logging.

diff --git a/apps/MultihopOscilloscope/Makefile b/apps/MultihopOscilloscope/Makefile
index bf701217b2ecaff936a2dc54adc291e3048e4988..64913b5b6b1c35305dd563f893bc7440d5a064bb 100644 (file)
--- a/apps/MultihopOscilloscope/Makefile
+++ b/apps/MultihopOscilloscope/Makefile
@@ -1,4 +1,4 @@
 COMPONENT=MultihopOscilloscopeAppC
-CFLAGS += -I$(TOSDIR)/lib/net/ -I$(TOSDIR)/lib/net/ctp -I$(TOSDIR)/lib/net/le -I.
+CFLAGS += -I$(TOSDIR)/lib/net/ -I$(TOSDIR)/lib/net/lqi
 
 include $(MAKERULES)

diff --git a/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc b/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc
index 8c5d8fad1da03df257b92d5f8fe0eb67bff831f5..cefe674780336b7463f4a99074fd7691e7332f5a 100644 (file)
--- a/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc
+++ b/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc
@@ -53,13 +53,10 @@ implementation {
 
   MultihopOscilloscopeC.UARTMessagePool -> UARTMessagePoolP;
   MultihopOscilloscopeC.UARTQueue -> UARTQueueP;
-
-  //
-  // Components for debugging collection.
-  //
+  
   components new PoolC(message_t, 20) as DebugMessagePool,
     new QueueC(message_t*, 20) as DebugSendQueue,
-    new SerialAMSenderC(AM_CTP_DEBUG) as DebugSerialSender,
+    new SerialAMSenderC(AM_LQI_DEBUG) as DebugSerialSender,
     UARTDebugSenderP as DebugSender;
 
   DebugSender.Boot -> MainC;
@@ -67,4 +64,5 @@ implementation {
   DebugSender.MessagePool -> DebugMessagePool;
   DebugSender.SendQueue -> DebugSendQueue;
   Collector.CollectionDebug -> DebugSender;
+
 }