Restore to before LQI-based changes that were checked in by mistake.

diff --git a/apps/MultihopOscilloscope/Makefile b/apps/MultihopOscilloscope/Makefile
index 64913b5b6b1c35305dd563f893bc7440d5a064bb..821c1b6e2559964d19b7c70ec0a9cda2d32ea5be 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/lqi
+CFLAGS += -I$(TOSDIR)/lib/net/ -I$(TOSDIR)/lib/net/ctp  -I$(TOSDIR)/lib/net/le
 
 include $(MAKERULES)

diff --git a/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc b/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc
index cefe674780336b7463f4a99074fd7691e7332f5a..f6fd2eff79041dbc304a642df69467351ea45a72 100644 (file)
--- a/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc
+++ b/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc
@@ -56,7 +56,7 @@ implementation {
   
   components new PoolC(message_t, 20) as DebugMessagePool,
     new QueueC(message_t*, 20) as DebugSendQueue,
-    new SerialAMSenderC(AM_LQI_DEBUG) as DebugSerialSender,
+    new SerialAMSenderC(AM_CTP_DEBUG) as DebugSerialSender,
     UARTDebugSenderP as DebugSender;
 
   DebugSender.Boot -> MainC;