[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/telosa/chips/s10871 HamamatsuS10871TsrC.nc, 1.1.2.2, 1.1.2.3 HamamatsuS10871TsrP.nc, 1.1.2.3, 1.1.2.4

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/chips/s10871
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27450/s10871

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HamamatsuS10871TsrC.nc HamamatsuS10871TsrP.nc 
Log Message:
Updated telosb light sensors to match new AdcConfigure interface.

Index: HamamatsuS10871TsrC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/chips/s10871/HamamatsuS10871TsrC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** HamamatsuS10871TsrC.nc	20 Jun 2006 18:56:07 -0000	1.1.2.2
--- HamamatsuS10871TsrC.nc	25 Oct 2006 16:09:40 -0000	1.1.2.3
***************
*** 50,54 ****
  
    components HamamatsuS10871TsrP;
!   AdcReadClientC.Msp430Adc12Config -> HamamatsuS10871TsrP;
!   AdcReadStreamClientC.Msp430Adc12Config -> HamamatsuS10871TsrP;
  }
--- 50,54 ----
  
    components HamamatsuS10871TsrP;
!   AdcReadClientC.AdcConfigure -> HamamatsuS10871TsrP;
!   AdcReadStreamClientC.AdcConfigure -> HamamatsuS10871TsrP;
  }

Index: HamamatsuS10871TsrP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/telosa/chips/s10871/HamamatsuS10871TsrP.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** HamamatsuS10871TsrP.nc	20 Jun 2006 18:56:07 -0000	1.1.2.3
--- HamamatsuS10871TsrP.nc	25 Oct 2006 16:09:40 -0000	1.1.2.4
***************
*** 41,61 ****
  
  module HamamatsuS10871TsrP {
!   provides interface Msp430Adc12Config;
  }
  implementation {
  
!   async command msp430adc12_channel_config_t Msp430Adc12Config.getChannelSettings() {
!     msp430adc12_channel_config_t config = {
!       inch: INPUT_CHANNEL_A5,
!       sref: REFERENCE_VREFplus_AVss,
!       ref2_5v: REFVOLT_LEVEL_1_5,
!       adc12ssel: SHT_SOURCE_ACLK,
!       adc12div: SHT_CLOCK_DIV_1,
!       sht: SAMPLE_HOLD_4_CYCLES,
!       sampcon_ssel: SAMPCON_SOURCE_SMCLK,
!       sampcon_id: SAMPCON_CLOCK_DIV_1
!     };
! 
!     return config;
    }
  }
--- 41,61 ----
  
  module HamamatsuS10871TsrP {
!   provides interface AdcConfigure<const msp430adc12_channel_config_t*>;
  }
  implementation {
  
!   msp430adc12_channel_config_t config = {
!     inch: INPUT_CHANNEL_A5,
!     sref: REFERENCE_VREFplus_AVss,
!     ref2_5v: REFVOLT_LEVEL_1_5,
!     adc12ssel: SHT_SOURCE_ACLK,
!     adc12div: SHT_CLOCK_DIV_1,
!     sht: SAMPLE_HOLD_4_CYCLES,
!     sampcon_ssel: SAMPCON_SOURCE_SMCLK,
!     sampcon_id: SAMPCON_CLOCK_DIV_1
!   };
!   
!   async command const msp430adc12_channel_config_t* AdcConfigure.getConfiguration() {
!     return &config;
    }
  }