[Tinyos-2-commits] CVS: tinyos-2.x/apps/MultihopOscilloscope Makefile, 1.3, 1.4 MultihopOscilloscopeAppC.nc, 1.3, 1.4

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28261

Modified Files:
	Makefile MultihopOscilloscopeAppC.nc 
Log Message:
Added logging.


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile	7 Nov 2006 19:30:34 -0000	1.3
--- Makefile	13 Apr 2007 00:02:17 -0000	1.4
***************
*** 1,4 ****
  COMPONENT=MultihopOscilloscopeAppC
! CFLAGS += -I$(TOSDIR)/lib/net/ -I$(TOSDIR)/lib/net/ctp -I$(TOSDIR)/lib/net/le -I.
  
  include $(MAKERULES)
--- 1,4 ----
  COMPONENT=MultihopOscilloscopeAppC
! CFLAGS += -I$(TOSDIR)/lib/net/ -I$(TOSDIR)/lib/net/lqi
  
  include $(MAKERULES)

Index: MultihopOscilloscopeAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MultihopOscilloscopeAppC.nc	7 Nov 2006 19:30:34 -0000	1.3
--- MultihopOscilloscopeAppC.nc	13 Apr 2007 00:02:17 -0000	1.4
***************
*** 54,64 ****
    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,
      UARTDebugSenderP as DebugSender;
  
--- 54,61 ----
    MultihopOscilloscopeC.UARTMessagePool -> UARTMessagePoolP;
    MultihopOscilloscopeC.UARTQueue -> UARTQueueP;
!   
    components new PoolC(message_t, 20) as DebugMessagePool,
      new QueueC(message_t*, 20) as DebugSendQueue,
!     new SerialAMSenderC(AM_LQI_DEBUG) as DebugSerialSender,
      UARTDebugSenderP as DebugSender;
  
***************
*** 68,70 ****
--- 65,68 ----
    DebugSender.SendQueue -> DebugSendQueue;
    Collector.CollectionDebug -> DebugSender;
+ 
  }