[Tinyos-commits] CVS: tinyos-1.x/tos/platform/telos Humidity.h, 1.1, 1.2 HumidityM.nc, 1.3, 1.4

[Joe Polastre]

Update of /cvsroot/tinyos/tinyos-1.x/tos/platform/telos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14238

Modified Files:
	Humidity.h HumidityM.nc 
Log Message:
abstract away the power pins, fixed a typo


Index: Humidity.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/telos/Humidity.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Humidity.h	13 Jun 2005 21:00:50 -0000	1.1
--- Humidity.h	13 Jun 2005 21:28:33 -0000	1.2
***************
*** 26,30 ****
  
  #ifndef _H_HUMIDITY_SENSIRION_H
! #define _H_HUMIDITY_SENSIRIONH_
  
  #define HUMIDITY_TIMEOUT_MS          30
--- 26,30 ----
  
  #ifndef _H_HUMIDITY_SENSIRION_H
! #define _H_HUMIDITY_SENSIRION_H
  
  #define HUMIDITY_TIMEOUT_MS          30
***************
*** 38,41 ****
--- 38,45 ----
  };
  
+ void HUMIDITY_MAKE_PWR_OUTPUT() { TOSH_MAKE_HUM_PWR_OUTPUT(); }
+ void HUMIDITY_MAKE_PWR_INPUT() { TOSH_MAKE_HUM_PWR_INPUT(); }
+ void HUMIDITY_SET_PWR() { TOSH_SET_HUM_PWR_PIN(); }
+ void HUMIDITY_CLEAR_PWR() { TOSH_CLR_HUM_PWR_PIN(); }
  void HUMIDITY_MAKE_CLOCK_OUTPUT() { TOSH_MAKE_HUM_SCL_OUTPUT(); }
  void HUMIDITY_MAKE_CLOCK_INPUT() { TOSH_MAKE_HUM_SCL_INPUT(); }

Index: HumidityM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/platform/telos/HumidityM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HumidityM.nc	13 Jun 2005 20:59:50 -0000	1.3
--- HumidityM.nc	13 Jun 2005 21:28:33 -0000	1.4
***************
*** 61,65 ****
  
    enum { IDLE = 0, WARM_UP, POWER_OFF, SAMPLE, 
!          MICAWB_HUMIDITY, MICAWB_HUMIDITY_TEMP, WAIT_FOR_BUS };
  
    task void initDone() {
--- 61,65 ----
  
    enum { IDLE = 0, WARM_UP, POWER_OFF, SAMPLE, 
!          HUMIDITY, HUMIDITY_TEMP, WAIT_FOR_BUS };
  
    task void initDone() {
***************
*** 86,91 ****
      // turn the sensor on
      call TimerControl.start();
!     TOSH_MAKE_HUM_PWR_OUTPUT();
!     TOSH_SET_HUM_PWR_PIN();
      state = WARM_UP;
      call Timer.start(TIMER_ONE_SHOT, 80);
--- 86,91 ----
      // turn the sensor on
      call TimerControl.start();
!     HUMIDITY_MAKE_PWR_OUTPUT();
!     HUMIDITY_SET_PWR();
      state = WARM_UP;
      call Timer.start(TIMER_ONE_SHOT, 80);
***************
*** 97,101 ****
      // turn the sensor off
      call SensorControl.stop();
!     TOSH_CLR_HUM_PWR_PIN();
      post stopDone();
      return SUCCESS;
--- 97,101 ----
      // turn the sensor off
      call SensorControl.stop();
!     HUMIDITY_CLEAR_PWR();
      post stopDone();
      return SUCCESS;
***************
*** 108,115 ****
      }
      else if (state == SAMPLE) {
!       if (id == MICAWB_HUMIDITY) {
          return call HumSensor.getData();
        }
!       else if (id == MICAWB_HUMIDITY_TEMP)
          return call TempSensor.getData();
      }
--- 108,115 ----
      }
      else if (state == SAMPLE) {
!       if (id == HUMIDITY) {
          return call HumSensor.getData();
        }
!       else if (id == HUMIDITY_TEMP)
          return call TempSensor.getData();
      }
***************
*** 131,135 ****
      {
        state = SAMPLE;
!       id = MICAWB_HUMIDITY;
        call SensorControl.start();
        return call Timer.start(TIMER_ONE_SHOT, 11);
--- 131,135 ----
      {
        state = SAMPLE;
!       id = HUMIDITY;
        call SensorControl.start();
        return call Timer.start(TIMER_ONE_SHOT, 11);
***************
*** 143,147 ****
      {
        state = SAMPLE;
!       id = MICAWB_HUMIDITY_TEMP;
        call SensorControl.start();
        return call Timer.start(TIMER_ONE_SHOT, 11);
--- 143,147 ----
      {
        state = SAMPLE;
!       id = HUMIDITY_TEMP;
        call SensorControl.start();
        return call Timer.start(TIMER_ONE_SHOT, 11);