[Firebug-cvs] fireboard/beta/tos/sensorboards/mts400 SensirionHumidityM.nc,1.2,1.3

[Michael N. <mne...@us...>]

Update of /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv968

Modified Files:
	SensirionHumidityM.nc 
Log Message:
async calls to set switches moved to tasks

Index: SensirionHumidityM.nc
===================================================================
RCS file: /cvsroot/firebug/fireboard/beta/tos/sensorboards/mts400/SensirionHumidityM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SensirionHumidityM.nc	24 May 2005 21:57:34 -0000	1.2
--- SensirionHumidityM.nc	4 Jul 2005 02:34:14 -0000	1.3
***************
*** 186,190 ****
  	if (l_state == OPENSCK) {                                //SCK line enabled
          atomic state = OPENDATA;
!         return call SwitchI2W.set(MICAWB_HUMIDITY_DATA,1);
      } else if (l_state == OPENDATA) {                       //Data line enabled
          atomic state = TIMER;
--- 186,190 ----
  	if (l_state == OPENSCK) {                                //SCK line enabled
          atomic state = OPENDATA;
! 	return call SwitchI2W.set(MICAWB_HUMIDITY_DATA,1);
      } else if (l_state == OPENDATA) {                       //Data line enabled
          atomic state = TIMER;
***************
*** 194,198 ****
      } else if (l_state == CLOSESCK) {
          atomic state = CLOSEDATA;
!         return call SwitchI2W.set(MICAWB_HUMIDITY_DATA,0);
      } else if (l_state == CLOSEDATA) {
          uint16_t l_result;
--- 194,198 ----
      } else if (l_state == CLOSESCK) {
          atomic state = CLOSEDATA;
! 	return call SwitchI2W.set(MICAWB_HUMIDITY_DATA,0);
      } else if (l_state == CLOSEDATA) {
          uint16_t l_result;
***************
*** 248,251 ****
--- 248,261 ----
    }
  
+ task void setHumiditySCLKon() {
+     call SwitchI2W.set(MICAWB_HUMIDITY_SCLK,1);
+     return;
+ }
+ 
+ task void setHumiditySCLKoff() {
+     call SwitchI2W.set(MICAWB_HUMIDITY_SCLK,0);
+     return;
+ }
+ 
  async  command result_t Humidity.getData() {
  	char l_state;
***************
*** 257,261 ****
        	state = OPENSCK;
        }
!       return call SwitchI2W.set(MICAWB_HUMIDITY_SCLK,1);
      } 
  	atomic state = IDLE;
--- 267,272 ----
        	state = OPENSCK;
        }
!       post setHumiditySCLKon();
!       return SUCCESS;
      } 
  	atomic state = IDLE;
***************
*** 272,276 ****
        	state = OPENSCK;
        }
!       return call SwitchI2W.set(MICAWB_HUMIDITY_SCLK,1);
      }
      atomic state = IDLE;
--- 283,288 ----
        	state = OPENSCK;
        }
!       post setHumiditySCLKon();
!       return SUCCESS;
      }
      atomic state = IDLE;
***************
*** 298,302 ****
      if (l_state == BUSY) {
        atomic state = CLOSESCK;
!       return call SwitchI2W.set(MICAWB_HUMIDITY_SCLK,0);
      }
      return SUCCESS;
--- 310,315 ----
      if (l_state == BUSY) {
        atomic state = CLOSESCK;
!       post setHumiditySCLKoff();
!       return SUCCESS;
      }
      return SUCCESS;
***************
*** 318,322 ****
      if (l_state == BUSY) {
        atomic state = CLOSESCK;
!       return call SwitchI2W.set(MICAWB_HUMIDITY_SCLK,0);
      }
      return SUCCESS;
--- 331,336 ----
      if (l_state == BUSY) {
        atomic state = CLOSESCK;
!       post setHumiditySCLKoff();
!       return SUCCESS;
      }
      return SUCCESS;