[Tinyos-2-commits] CVS: tinyos-2.x/apps/MultihopOscilloscope MultihopOscilloscope.h, 1.1.2.2, 1.1.2.3 MultihopOscilloscopeAppC.nc, 1.1.2.6, 1.1.2.7 MultihopOscilloscopeC.nc, 1.1.2.7, 1.1.2.8

[Kyle Jamieson]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	MultihopOscilloscope.h MultihopOscilloscopeAppC.nc 
	MultihopOscilloscopeC.nc 
Log Message:
Compile-fix to collection debugging, change collection AM name to collection id name.

Index: MultihopOscilloscope.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope/MultihopOscilloscope.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** MultihopOscilloscope.h	31 Oct 2006 23:00:53 -0000	1.1.2.2
--- MultihopOscilloscope.h	6 Nov 2006 22:38:49 -0000	1.1.2.3
***************
*** 23,27 ****
    /* Default sampling period. */
    DEFAULT_INTERVAL = 1024,
!   AM_OSCILLOSCOPE = 0x93
  };
  
--- 23,28 ----
    /* Default sampling period. */
    DEFAULT_INTERVAL = 1024,
!   AM_OSCILLOSCOPE = 0x93,
!   OSCILLOSCOPE_COLLECTION_ID = AM_OSCILLOSCOPE,
  };
  

Index: MultihopOscilloscopeAppC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope/MultihopOscilloscopeAppC.nc,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -d -r1.1.2.6 -r1.1.2.7
*** MultihopOscilloscopeAppC.nc	6 Nov 2006 22:33:10 -0000	1.1.2.6
--- MultihopOscilloscopeAppC.nc	6 Nov 2006 22:38:50 -0000	1.1.2.7
***************
*** 35,39 ****
    components CollectionC as Collector,  // Collection layer
      ActiveMessageC,                         // AM layer
!     new CollectionSenderC(AM_OSCILLOSCOPE), // Sends multihop RF
      SerialActiveMessageC,                   // Serial messaging
      new SerialAMSenderC(AM_OSCILLOSCOPE);   // Sends to the serial port
--- 35,39 ----
    components CollectionC as Collector,  // Collection layer
      ActiveMessageC,                         // AM layer
!     new CollectionSenderC(OSCILLOSCOPE_COLLECTION_ID), // Sends multihop RF
      SerialActiveMessageC,                   // Serial messaging
      new SerialAMSenderC(AM_OSCILLOSCOPE);   // Sends to the serial port

Index: MultihopOscilloscopeC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/MultihopOscilloscope/MultihopOscilloscopeC.nc,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** MultihopOscilloscopeC.nc	6 Nov 2006 22:33:10 -0000	1.1.2.7
--- MultihopOscilloscopeC.nc	6 Nov 2006 22:38:50 -0000	1.1.2.8
***************
*** 43,46 ****
--- 43,50 ----
      interface Read<uint16_t>;
      interface Leds;
+ 
+ #ifdef DEBUG_INFRA
+     interface CollectionDebug;
+ #endif
    }
  }
***************
*** 279,282 ****
--- 283,287 ----
     * is not desired. */
  
+ #ifdef DEBUG_INFRA
      default command error_t CollectionDebug.logEvent(uint8_t type) {
          return SUCCESS;
***************
*** 294,298 ****
          return SUCCESS;
      }
!  
  
  }
--- 299,303 ----
          return SUCCESS;
      }
! #endif 
  
  }