[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tsl2561
HalTsl2561ControlP.nc, 1.1.2.1, 1.1.2.2 HplTSL2561LogicP.nc,
1.1.2.2, 1.1.2.3
Philip Buonadonna
philipb at users.sourceforge.net
Thu Nov 2 18:07:52 PST 2006
Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/tsl2561
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv1336
Modified Files:
Tag: tinyos-2_0_devel-BRANCH
HalTsl2561ControlP.nc HplTSL2561LogicP.nc
Log Message:
- Fixed bug in state management
- Fixed bug with setting multibyte command values
Index: HalTsl2561ControlP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tsl2561/HalTsl2561ControlP.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
*** HalTsl2561ControlP.nc 6 Jul 2006 23:19:47 -0000 1.1.2.1
--- HalTsl2561ControlP.nc 3 Nov 2006 02:07:50 -0000 1.1.2.2
***************
*** 141,144 ****
--- 141,145 ----
return status;
state = S_PERSIST;
+ iControlRegisterShadow &= ~TSL256X_INTERRUPT_PERSIST(0xF);
iControlRegisterShadow |= TSL256X_INTERRUPT_PERSIST(val);
***************
*** 177,194 ****
if(state != S_IDLE)
return FAIL;
! status = call Resource.immediateRequest();
! if(status != SUCCESS)
! return status;
state = S_ENALERT;
iControlRegisterShadow &= ~TSL256X_INTERRUPT_INTR(3); // strip off interrupt select
if(enable)
iControlRegisterShadow |= TSL256X_INTERRUPT_INTR(1);
!
! call HplTSL256x.setINTERRUPT(iControlRegisterShadow);
return SUCCESS;
}
event void Resource.granted() {
! // using immediate requests only
}
--- 178,204 ----
if(state != S_IDLE)
return FAIL;
!
state = S_ENALERT;
iControlRegisterShadow &= ~TSL256X_INTERRUPT_INTR(3); // strip off interrupt select
if(enable)
iControlRegisterShadow |= TSL256X_INTERRUPT_INTR(1);
!
! status = call Resource.immediateRequest();
! if(status != SUCCESS) {
! status = call Resource.request();
! return status;
! }
! else {
! call HplTSL256x.setINTERRUPT(iControlRegisterShadow);
! }
return SUCCESS;
}
event void Resource.granted() {
! // Only use Queued requests for alertEnable
! if (state == S_ENALERT) {
! call HplTSL256x.setINTERRUPT(iControlRegisterShadow);
! }
! return;
}
Index: HplTSL2561LogicP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tsl2561/HplTSL2561LogicP.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** HplTSL2561LogicP.nc 6 Jul 2006 23:19:47 -0000 1.1.2.2
--- HplTSL2561LogicP.nc 3 Nov 2006 02:07:50 -0000 1.1.2.3
***************
*** 52,55 ****
--- 52,56 ----
uses interface GpioInterrupt as InterruptAlert;
+ uses interface Leds;
uses interface GeneralIO as InterruptPin;
}
***************
*** 80,88 ****
norace error_t mSSError;
! static error_t doWriteReg(uint8_t nextState, uint8_t reg, uint8_t val) {
error_t error = SUCCESS;
atomic {
! if (mState == STATE_IDLE) {
mState = nextState;
}
--- 81,89 ----
norace error_t mSSError;
! static error_t doWriteReg(uint8_t nextState, uint8_t reg, uint16_t val, uint8_t size) {
error_t error = SUCCESS;
atomic {
! if ((mState == STATE_IDLE) || (mState == STATE_STARTING)) {
mState = nextState;
}
***************
*** 94,101 ****
return error;
! mI2CBuffer[0] = (TSL256X_COMMAND_CMD | TSL256X_COMMAND_ADDRESS(reg));
! mI2CBuffer[1] = val;
! error = call I2CPacket.write(I2C_START | I2C_STOP,devAddr,2,mI2CBuffer);
if (error)
--- 95,103 ----
return error;
! mI2CBuffer[0] = (TSL256X_COMMAND_CMD | reg);
! mI2CBuffer[1] = (uint8_t)(val & 0xFF);
! mI2CBuffer[2] = (uint8_t)((val >> 8) & 0xFF);
! error = call I2CPacket.write(I2C_START | I2C_STOP,devAddr,(size + 1),mI2CBuffer);
if (error)
***************
*** 119,123 ****
return error;
! mI2CBuffer[0] = (TSL256X_COMMAND_CMD | TSL256X_COMMAND_ADDRESS(reg));
error = call I2CPacket.write(I2C_START,devAddr,1,mI2CBuffer);
--- 121,125 ----
return error;
! mI2CBuffer[0] = (TSL256X_COMMAND_CMD | reg );
error = call I2CPacket.write(I2C_START,devAddr,1,mI2CBuffer);
***************
*** 141,145 ****
task void StartDone() {
- atomic mState = STATE_IDLE;
signal SplitControl.startDone(mSSError);
return;
--- 143,146 ----
***************
*** 147,151 ****
task void StopDone() {
- atomic mState = STATE_STOPPED;
signal SplitControl.stopDone(mSSError);
return;
--- 148,151 ----
***************
*** 154,158 ****
command error_t Init.init() {
call InterruptPin.makeInput();
! call InterruptAlert.enableFallingEdge();
mState = STATE_STOPPED;
interruptBit = FALSE;
--- 154,158 ----
command error_t Init.init() {
call InterruptPin.makeInput();
! call InterruptAlert.enableRisingEdge();
mState = STATE_STOPPED;
interruptBit = FALSE;
***************
*** 164,168 ****
atomic {
if (mState == STATE_STOPPED) {
! mState = STATE_IDLE;
}
else {
--- 164,168 ----
atomic {
if (mState == STATE_STOPPED) {
! mState = STATE_STARTING;
}
else {
***************
*** 174,184 ****
return error;
! return doWriteReg(STATE_STARTING,TSL256X_PTR_CONTROL,(TSL256X_CONTROL_POWER_ON));
}
command error_t SplitControl.stop() {
! return doWriteReg(STATE_STOPPING,TSL256X_PTR_CONTROL,(TSL256X_CONTROL_POWER_OFF));
}
-
command error_t HplTSL256x.measureCh0() {
--- 174,185 ----
return error;
! return doWriteReg(STATE_STARTING,(TSL256X_COMMAND_CLEAR | TSL256X_PTR_CONTROL),
! (TSL256X_CONTROL_POWER_ON),1);
}
command error_t SplitControl.stop() {
! return doWriteReg(STATE_STOPPING,(TSL256X_COMMAND_CLEAR | TSL256X_PTR_CONTROL),
! (TSL256X_CONTROL_POWER_OFF),1);
}
command error_t HplTSL256x.measureCh0() {
***************
*** 191,211 ****
command error_t HplTSL256x.setCONTROL(uint8_t val) {
! return doWriteReg(STATE_SETCONTROL,TSL256X_PTR_CONTROL,val);
}
command error_t HplTSL256x.setTIMING(uint8_t val) {
! return doWriteReg(STATE_SETTIMING,TSL256X_PTR_TIMING,val);
}
command error_t HplTSL256x.setTHRESHLOW(uint16_t val) {
! return doWriteReg(STATE_SETLOW,TSL256X_PTR_THRESHLOWLOW,val);
}
command error_t HplTSL256x.setTHRESHHIGH(uint16_t val) {
! return doWriteReg(STATE_SETHIGH,TSL256X_PTR_THRESHHIGHLOW,val);
}
command error_t HplTSL256x.setINTERRUPT(uint8_t val) {
! return doWriteReg(STATE_SETINTERRUPT,TSL256X_PTR_INTERRUPT,val);
}
--- 192,214 ----
command error_t HplTSL256x.setCONTROL(uint8_t val) {
! return doWriteReg(STATE_SETCONTROL,TSL256X_PTR_CONTROL,val,1);
}
command error_t HplTSL256x.setTIMING(uint8_t val) {
! return doWriteReg(STATE_SETTIMING,TSL256X_PTR_TIMING,val,1);
}
command error_t HplTSL256x.setTHRESHLOW(uint16_t val) {
! // As it turns out, you have to use the SMB Write Word flag to use this command
! return doWriteReg(STATE_SETLOW,(TSL256X_COMMAND_WORD | TSL256X_PTR_THRESHLOWLOW),val,2);
}
command error_t HplTSL256x.setTHRESHHIGH(uint16_t val) {
! // As it turns out, you have to use the SMB Write Word flag to use this command
! return doWriteReg(STATE_SETHIGH,(TSL256X_COMMAND_WORD | TSL256X_PTR_THRESHHIGHLOW),val,2);
}
command error_t HplTSL256x.setINTERRUPT(uint8_t val) {
! return doWriteReg(STATE_SETINTERRUPT,(TSL256X_COMMAND_CLEAR | TSL256X_PTR_INTERRUPT),val,1);
}
***************
*** 244,266 ****
async event void I2CPacket.writeDone(error_t i2c_error, uint16_t chipAddr, uint8_t len, uint8_t *buf) {
error_t error = i2c_error;
! /*
! if(interruptBit) {
! interruptBit = FALSE;
! return;
! }
! */
switch (mState) {
case STATE_STARTING:
mSSError = error;
- //---
- /*
- mState = STATE_CLRINTERRUPTS;
- interruptBit = TRUE;
- clearInterrupt();
- break;
- case STATE_CLRINTERRUPTS:
- mSSError = error;
- */
- //---
mState = STATE_IDLE;
post StartDone();
--- 247,254 ----
async event void I2CPacket.writeDone(error_t i2c_error, uint16_t chipAddr, uint8_t len, uint8_t *buf) {
error_t error = i2c_error;
!
switch (mState) {
case STATE_STARTING:
mSSError = error;
mState = STATE_IDLE;
post StartDone();
***************
*** 310,314 ****
// This alert is decoupled from whatever state the TSL2561 is in.
// Upper layers must handle dealing with this alert appropriately.
-
signal HplTSL256x.alertThreshold();
--- 298,301 ----
***************
*** 316,320 ****
// if you get interrupted while someone is reading...
// ... the I2C bus may become inconsistent?
! clearInterrupt();
return;
--- 303,307 ----
// if you get interrupted while someone is reading...
// ... the I2C bus may become inconsistent?
! //clearInterrupt();
return;
More information about the Tinyos-2-commits
mailing list