[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/sensors sensors.h, 1.4, 1.5 BatteryLevelSensorC.nc, 1.4, 1.5

[akoepke]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2761/tos/platforms/eyesIFX/sensors

Modified Files:
	sensors.h BatteryLevelSensorC.nc 
Log Message:
use ACLK as clock source for ADC -- may use less energy


Index: sensors.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/sensors.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sensors.h	12 Dec 2006 18:23:41 -0000	1.4
--- sensors.h	10 Mar 2007 21:58:37 -0000	1.5
***************
*** 54,59 ****
  
    INTERNAL_VOLTAGE_REF_2_5V,
    INTERNAL_TEMP_HIGH_FREQ,
! 
    // add more entries here
  
--- 54,61 ----
  
    INTERNAL_VOLTAGE_REF_2_5V,
+   INTERNAL_VOLTAGE_REF_2_5V_LOW_FREQ,
+   
    INTERNAL_TEMP_HIGH_FREQ,
!   INTERNAL_TEMP_LOW_FREQ,
    // add more entries here
  
***************
*** 77,82 ****
      {
          INPUT_CHANNEL_A2, REFERENCE_VREFplus_AVss, REFVOLT_LEVEL_1_5,
!         SHT_SOURCE_SMCLK, SHT_CLOCK_DIV_1, SAMPLE_HOLD_64_CYCLES,
!         SAMPCON_SOURCE_SMCLK, SAMPCON_CLOCK_DIV_1
      },
      /* PHOTO_SENSOR_VCC */
--- 79,84 ----
      {
          INPUT_CHANNEL_A2, REFERENCE_VREFplus_AVss, REFVOLT_LEVEL_1_5,
!         SHT_SOURCE_ACLK, SHT_CLOCK_DIV_1, SAMPLE_HOLD_4_CYCLES,
!         SAMPCON_SOURCE_ACLK, SAMPCON_CLOCK_DIV_1
      },
      /* PHOTO_SENSOR_VCC */
***************
*** 101,106 ****
      {
          INPUT_CHANNEL_A0, REFERENCE_VREFplus_AVss, REFVOLT_LEVEL_1_5,
!         SHT_SOURCE_SMCLK, SHT_CLOCK_DIV_1, SAMPLE_HOLD_16_CYCLES,
!         SAMPCON_SOURCE_SMCLK, SAMPCON_CLOCK_DIV_1
      },
      /* RSSI_SENSOR_VCC */
--- 103,108 ----
      {
          INPUT_CHANNEL_A0, REFERENCE_VREFplus_AVss, REFVOLT_LEVEL_1_5,
!         SHT_SOURCE_ACLK, SHT_CLOCK_DIV_1, SAMPLE_HOLD_4_CYCLES,
!         SAMPCON_SOURCE_ACLK, SAMPCON_CLOCK_DIV_1
      },
      /* RSSI_SENSOR_VCC */
***************
*** 128,131 ****
--- 130,139 ----
          SAMPCON_SOURCE_SMCLK, SAMPCON_CLOCK_DIV_1
      },
+     /* INTERNAL_VOLTAGE_REF_2_5V_LOW_FREQ */
+     {
+         SUPPLY_VOLTAGE_HALF_CHANNEL, REFERENCE_VREFplus_AVss, REFVOLT_LEVEL_2_5,
+         SHT_SOURCE_ACLK, SHT_CLOCK_DIV_1, SAMPLE_HOLD_4_CYCLES,
+         SAMPCON_SOURCE_ACLK, SAMPCON_CLOCK_DIV_1
+     },
      /* INTERNAL_TEMP_HIGH_FREQ */
      {
***************
*** 134,137 ****
--- 142,151 ----
          SAMPCON_SOURCE_SMCLK, SAMPCON_CLOCK_DIV_1
      },
+     /* INTERNAL_TEMP_LOW_FREQ */
+     {
+         TEMPERATURE_DIODE_CHANNEL, REFERENCE_VREFplus_AVss, REFVOLT_LEVEL_1_5,
+         SHT_SOURCE_ACLK, SHT_CLOCK_DIV_1, SAMPLE_HOLD_4_CYCLES,
+         SAMPCON_SOURCE_ACLK, SAMPCON_CLOCK_DIV_1
+     },
      /* your stuff here */
      /* SENSOR_SENTINEL */

Index: BatteryLevelSensorC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/BatteryLevelSensorC.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BatteryLevelSensorC.nc	12 Dec 2006 18:23:41 -0000	1.4
--- BatteryLevelSensorC.nc	10 Mar 2007 21:58:37 -0000	1.5
***************
*** 49,57 ****
      components new AdcReadClientC() as AdcReadClient;
      Read = AdcReadClient;
!     AdcReadClient.AdcConfigure -> Settings.AdcConfigure[INTERNAL_VOLTAGE_REF_2_5V];
    
      components new AdcReadNowClientC() as AdcReadNowClient;
      ReadNow = AdcReadNowClient;
      ReadNowResource = AdcReadNowClient;
!     AdcReadNowClient.AdcConfigure -> Settings.AdcConfigure[INTERNAL_VOLTAGE_REF_2_5V];
  }
--- 49,57 ----
      components new AdcReadClientC() as AdcReadClient;
      Read = AdcReadClient;
!     AdcReadClient.AdcConfigure -> Settings.AdcConfigure[INTERNAL_VOLTAGE_REF_2_5V_LOW_FREQ];
    
      components new AdcReadNowClientC() as AdcReadNowClient;
      ReadNow = AdcReadNowClient;
      ReadNowResource = AdcReadNowClient;
!     AdcReadNowClient.AdcConfigure -> Settings.AdcConfigure[INTERNAL_VOLTAGE_REF_2_5V_LOW_FREQ];
  }