[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/ds2745 HplDS2745.nc, 1.1.2.1, 1.1.2.2 HplDS2745LogicP.nc, 1.1.2.1, 1.1.2.2

[Kaisen Lin]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HplDS2745.nc HplDS2745LogicP.nc 
Log Message:
DS2745 fixes

Index: HplDS2745.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/ds2745/Attic/HplDS2745.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
*** HplDS2745.nc	11 Aug 2006 00:06:31 -0000	1.1.2.1
--- HplDS2745.nc	11 Aug 2006 18:53:24 -0000	1.1.2.2
***************
*** 110,114 ****
     * @return SUCCESS if the measurement will be made
     */
!   command measureAccCurrent();
  
    /**
--- 110,114 ----
     * @return SUCCESS if the measurement will be made
     */
!   command error_t measureAccCurrent();
  
    /**

Index: HplDS2745LogicP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/ds2745/Attic/HplDS2745LogicP.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
*** HplDS2745LogicP.nc	11 Aug 2006 00:06:31 -0000	1.1.2.1
--- HplDS2745LogicP.nc	11 Aug 2006 18:53:24 -0000	1.1.2.2
***************
*** 60,64 ****
      STATE_SETCONFIG,
      STATE_READTEMP,
!     STATE_READVOLTAGE
      STATE_READCURRENT,
      STATE_READACCCURRENT,
--- 60,64 ----
      STATE_SETCONFIG,
      STATE_READTEMP,
!     STATE_READVOLTAGE,
      STATE_READCURRENT,
      STATE_READACCCURRENT,
***************
*** 69,75 ****
    uint8_t mI2CBuffer[4];
    uint8_t mState;
!   norace error_t mSSError;
  
!   static errot_t doReadReg(uint8_t nextSTate, uint8_t reg) {
      error_t error = SUCCESS;
  	
--- 69,75 ----
    uint8_t mI2CBuffer[4];
    uint8_t mState;
!   norace error_t mSSError = SUCCESS;
  
!   static error_t doReadReg(uint8_t nextState, uint8_t reg) {
      error_t error = SUCCESS;
  	
***************
*** 123,127 ****
    task void StartDone() {
      atomic mState = STATE_IDLE;
!     signal SplitControl.startDone();
      return;
    }
--- 123,127 ----
    task void StartDone() {
      atomic mState = STATE_IDLE;
!     signal SplitControl.startDone(mSSError);
      return;
    }
***************
*** 186,194 ****
    }
  
!   command error_t HplDS2745.setOffsetBias(uint16_t val) { 
      return doSetReg(STATE_SETBIAS,DS2745_PTR_OFFSETBIAS,val); 
    }
  
!   command error_t HplDS2745.setAccOffsetBias(uint16_t val) {
      return doSetReg(STATE_SETACCBIAS,DS2745_PTR_ACCBIAS,val); 
    }
--- 186,194 ----
    }
  
!   command error_t HplDS2745.setOffsetBias(int8_t val) { 
      return doSetReg(STATE_SETBIAS,DS2745_PTR_OFFSETBIAS,val); 
    }
  
!   command error_t HplDS2745.setAccOffsetBias(int8_t val) {
      return doSetReg(STATE_SETACCBIAS,DS2745_PTR_ACCBIAS,val); 
    }
***************
*** 243,247 ****
      case STATE_READACCCURRENT:
        if (error) 
! 	signal HplDS2745.measureAccCurrentDoneDone(error,0);
        else
  	error = call I2CPacket.read((I2C_START | I2C_STOP),devAddr,2,mI2CBuffer);
--- 243,247 ----
      case STATE_READACCCURRENT:
        if (error) 
! 	signal HplDS2745.measureAccCurrentDone(error,0);
        else
  	error = call I2CPacket.read((I2C_START | I2C_STOP),devAddr,2,mI2CBuffer);