[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/eyesIFX/sensors DemoSensorC.nc, 1.1.2.5, 1.1.2.5.8.1 DemoSensorNowC.nc, 1.1.2.2, 1.1.2.2.8.1 DemoSensorStreamC.nc, 1.1.2.1, 1.1.2.1.8.1 RssiSensorVccC.nc, 1.1.2.1, 1.1.2.1.2.1

[Philipp Huppertz]

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

Modified Files:
      Tag: tos-2-msp430-usart-configure-candidate
	DemoSensorC.nc DemoSensorNowC.nc DemoSensorStreamC.nc 
	RssiSensorVccC.nc 
Log Message:
- optimized usart configure using unions

Index: DemoSensorC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/DemoSensorC.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.5.8.1
diff -C2 -d -r1.1.2.5 -r1.1.2.5.8.1
*** DemoSensorC.nc	4 Feb 2006 01:36:04 -0000	1.1.2.5
--- DemoSensorC.nc	5 Oct 2006 08:37:47 -0000	1.1.2.5.8.1
***************
*** 56,62 ****
  {
    components SensorSettingsC as Settings;
- 
    components new AdcReadClientC() as AdcReadClient;
!   Read = AdcReadClient;
    AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
  }
--- 56,64 ----
  {
    components SensorSettingsC as Settings;
    components new AdcReadClientC() as AdcReadClient;
!   components new ReadShiftC(4) as ReadShift;
! 
!   Read = ReadShift;
!   ReadShift.ReadRaw -> AdcReadClient;
    AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
  }

Index: DemoSensorNowC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/DemoSensorNowC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.2.8.1
diff -C2 -d -r1.1.2.2 -r1.1.2.2.8.1
*** DemoSensorNowC.nc	31 Jan 2006 18:53:36 -0000	1.1.2.2
--- DemoSensorNowC.nc	5 Oct 2006 08:37:47 -0000	1.1.2.2.8.1
***************
*** 58,64 ****
  {
    components SensorSettingsC as Settings;
-              
    components new AdcReadNowClientC() as AdcReadNowClient;
!   ReadNow = AdcReadNowClient;
    Resource = AdcReadNowClient;
    AdcReadNowClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];  
--- 58,66 ----
  {
    components SensorSettingsC as Settings;
    components new AdcReadNowClientC() as AdcReadNowClient;
!   components new ReadNowShiftC(4) as ReadNowShift;
!   
!   ReadNow = ReadNowShift;
!   ReadNowShift.ReadNowRaw -> AdcReadNowClient;
    Resource = AdcReadNowClient;
    AdcReadNowClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];  

Index: DemoSensorStreamC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/DemoSensorStreamC.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.8.1
diff -C2 -d -r1.1.2.1 -r1.1.2.1.8.1
*** DemoSensorStreamC.nc	4 Feb 2006 01:36:04 -0000	1.1.2.1
--- DemoSensorStreamC.nc	5 Oct 2006 08:37:47 -0000	1.1.2.1.8.1
***************
*** 56,62 ****
  {
    components SensorSettingsC as Settings;
- 
    components new AdcReadStreamClientC() as AdcReadStreamClient;
!   ReadStream = AdcReadStreamClient;
    AdcReadStreamClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
  }
--- 56,64 ----
  {
    components SensorSettingsC as Settings;
    components new AdcReadStreamClientC() as AdcReadStreamClient;
!   components new ReadStreamShiftC(4) as ReadStreamShift;
!     
!   ReadStream = ReadStreamShift;
!   ReadStreamShift.ReadStreamRaw -> AdcReadStreamClient;
    AdcReadStreamClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[PHOTO_SENSOR_DEFAULT];
  }

Index: RssiSensorVccC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/eyesIFX/sensors/RssiSensorVccC.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
diff -C2 -d -r1.1.2.1 -r1.1.2.1.2.1
*** RssiSensorVccC.nc	31 May 2006 13:53:03 -0000	1.1.2.1
--- RssiSensorVccC.nc	5 Oct 2006 08:37:47 -0000	1.1.2.1.2.1
***************
*** 45,52 ****
  
  #include <sensors.h>
! generic configuration RssiSensorVccC()
  {
      provides {
-         interface Read<uint16_t> as Read;
          interface ReadNow<uint16_t> as ReadNow;
          interface Resource as ReadNowResource;
--- 45,51 ----
  
  #include <sensors.h>
! configuration RssiSensorVccC
  {
      provides {
          interface ReadNow<uint16_t> as ReadNow;
          interface Resource as ReadNowResource;
***************
*** 56,67 ****
  {
      components SensorSettingsC as Settings;
!              
!     components new AdcReadClientC() as AdcReadClient;
!     Read = AdcReadClient;
!     AdcReadClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[RSSI_SENSOR_VCC];
!   
!     components new AdcReadNowClientC() as AdcReadNowClient;
!     ReadNow = AdcReadNowClient;
!     ReadNowResource = AdcReadNowClient;
!     AdcReadNowClient.Msp430Adc12Config -> Settings.Msp430Adc12Config[RSSI_SENSOR_VCC];
  }
--- 55,64 ----
  {
      components SensorSettingsC as Settings;
!     components RssiSensorVccP as RssiSensor;
!     components new Msp430Adc12FastClientC() as AdcReadNowClient;
!     
!     ReadNow = RssiSensor;
!     ReadNowResource = RssiSensor;
!     RssiSensor.SubResource -> AdcReadNowClient;
!     RssiSensor.FastChannel -> AdcReadNowClient;
  }