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

[Phil Levis]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	Makefile MultihopOscilloscopeAppC.nc 
Log Message:
Updated for CTP.


Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope/Makefile,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Makefile	26 Jun 2006 17:33:44 -0000	1.1.2.1
--- Makefile	8 Sep 2006 20:13:00 -0000	1.1.2.2
***************
*** 1,4 ****
  COMPONENT=MultihopOscilloscopeAppC
! CFLAGS += -I$(TOSDIR)/lib/net/collection
  
  include $(MAKERULES)
--- 1,4 ----
  COMPONENT=MultihopOscilloscopeAppC
! CFLAGS += -I$(TOSDIR)/lib/net/ -I$(TOSDIR)/lib/net/ctp -I$(TOSDIR)/lib/net/le -I.
  
  include $(MAKERULES)

Index: MultihopOscilloscopeAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** MultihopOscilloscopeAppC.nc	26 Jun 2006 17:33:44 -0000	1.1.2.1
--- MultihopOscilloscopeAppC.nc	8 Sep 2006 20:13:00 -0000	1.1.2.2
***************
*** 22,25 ****
--- 22,27 ----
      new DemoSensorC() as Sensor;
  
+   MainC.SoftwareInit -> Sensor;
+   
    MultihopOscilloscopeC.Boot -> MainC;
    MultihopOscilloscopeC.Timer -> TimerMilliC;
***************
*** 31,35 ****
    // Serial Communication, and TEP 119: Collection.
    //
!   components TreeCollectionC as Collector,  // Collection layer
      ActiveMessageC,                         // AM layer
      new CollectionSenderC(AM_OSCILLOSCOPE), // Sends multihop RF
--- 33,37 ----
    // Serial Communication, and TEP 119: Collection.
    //
!   components CollectionC as Collector,  // Collection layer
      ActiveMessageC,                         // AM layer
      new CollectionSenderC(AM_OSCILLOSCOPE), // Sends multihop RF
***************
*** 52,56 ****
    components new PoolC(message_t, 10) as DebugMessagePool,
      new QueueC(message_t*, 10) as DebugSendQueue,
!     new SerialAMSenderC(AM_COLLECTION_DEBUG) as DebugSerialSender,
      UARTDebugSenderP as DebugSender;
  
--- 54,58 ----
    components new PoolC(message_t, 10) as DebugMessagePool,
      new QueueC(message_t*, 10) as DebugSendQueue,
!     new SerialAMSenderC(AM_CTP_DEBUG) as DebugSerialSender,
      UARTDebugSenderP as DebugSender;