[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tmp175 HalTMP175ReaderP.nc, 1.1.2.1, 1.1.2.2

[Philip Buonadonna]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/tmp175
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14379

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HalTMP175ReaderP.nc 
Log Message:


Index: HalTMP175ReaderP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tmp175/Attic/HalTMP175ReaderP.nc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** HalTMP175ReaderP.nc	19 Jun 2006 18:20:59 -0000	1.1.2.1
--- HalTMP175ReaderP.nc	19 Jun 2006 18:23:10 -0000	1.1.2.2
***************
*** 43,47 ****
  {
    provides interface Read<uint16_t> as Temperature;
-   provides interface HalTMP175Advanced;
  
    uses interface HplTMP175;
--- 43,46 ----
***************
*** 80,212 ****
    event void HplTMP175.measureTemperatureDone(error_t tmp175_error, uint16_t val) {
      call TMP175Resource.release();
!     signal Temperature.reaDone(tmp175_error,val);
!     return;
!   }
! 
!   command error_t HalTMP175Advanced.setThermostatMode(bool useInt) {
!     error_t error;
!     uint8_t newRegVal;
! 
!     error = call TMP175Resource.immediateRequest();
!     if (error) {
!       return error;
!     }
!     mState = STATE_SET_MODE;
! 
!     if (useInt) {
!       newRegVal = mConfigRegVal | TMP175_CFG_TM;
!     }
!     else {
!       newRegVal = mConfigRegVal & ~TMP175_CFG_TM;
!     }
! 
!     error = call HplTMP715.setConfigReg(newRegVal);
!     if (error) {
!       call TMP175Resource.release();
!     }
!     else {
!       mConfigRegVal = newRegVal;
!     }
! 
!     return error;
!   }
! 
! 
!   command error_t HalTMP175Advanced.setPolarity(bool polarity) {
!     error_t error;
!     uint8_t newRegVal;
! 
!     error = call TMP175Resource.immediateRequest();
!     if (error) {
!       return error;
!     }
!     mState = STATE_SET_POLARITY;
! 
!     if (useInt) {
!       newRegVal = mConfigRegVal | TMP175_CFG_TM;
!     }
!     else {
!       newRegVal = mConfigRegVal & ~TMP175_CFG_TM;
!     }
! 
!     error = call HplTMP715.setConfigReg(newRegVal);
!     if (error) {
!       call TMP175Resource.release();
!     }
!     else {
!       mConfigRegVal = newRegVal;
!     }
! 
!     return error;
!   }
! 
!   command error_t HalTMP175Advanced.setFaultQueue(tmp175_fqd_t depth) {
! 
!   }
! 
!   command error_t HalTMP175Advanced.setResolution(tmp175_res_t res) {
! 
!   }
! 
!   command error_t HalTMP175Advanced.setTLow(uint16_t val) {
! 
!   }
! 
!   command error_t HalTMP175Advanced.setTHigh(uint16_t val) {
! 
!   }
! 
!   task void handleConfigReg() {
!     error_t lasterror;
!     atomic lasterror = mHplError;
!     call TMP175Resource.release();
!     switch (mState) {
!     case STATE_SET_MODE:
!       signal HalTMP175Advanced.setThermostatModeDone(lasterror);
!       break;
!     case STATE_SET_POLARITY:
!       signal HalTMP175Advanced.setPolarityDone(lasterror);
!       break;
!     case STATE_SET_FQ:
!       signal HalTMP175Advanced.setFaultQueueDone(lasterror);
!       break;
!     case STATE_SET_RES:
!       signal HalTMP175Advanced.setResolutionDone(lasterror);
!       break;
!     default:
!       break;
!     }
!     mState = STATE_NONE;
!     return;
!   }
! 
!   async event void HplTMP175.setConfigRegDone(error_t error) {
!     mHplError = error;
!     post handleConfigReg();
      return;
    }
  
!   async event void HplTMP175.setTLowRegDone(error_t error) {
! 
! 
!   }
! 
!   async event void HplTMP175.setTHighRegDone(error_t error) {
! 
! 
!   }
! 
!   async event void HplTMP175.alertThreshold() {
! 
! 
!   }
! 
!   default event void HalTMP175Advanced.setTHighDone(error_t error) { return; }
!   default event void HalTMP175Advanced.setThermostatModeDone(error_t error){ return; } 
!   default event void HalTMP175Advanced.setPolarityDone(error_t error){ return; }
!   default event void HalTMP175Advanced.setFaultQueueDone(error_t error){ return; }
!   default event void HalTMP175Advanced.setResolutionDone(error_t error){ return; }
!   default event void HalTMP175Advanced.setTLowDone(error_t error){ return; }
!   default event void HalTMP175Advanced.alertThreshold(){ return; }
  
  }
--- 79,87 ----
    event void HplTMP175.measureTemperatureDone(error_t tmp175_error, uint16_t val) {
      call TMP175Resource.release();
!     signal Temperature.readDone(tmp175_error,val);
      return;
    }
  
!   default event void Temperature.readDone(error_t error, uint16_t val) {return ;}
  
  }