[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/tmp175
HalTMP175Advanced.nc, NONE, 1.1.2.1 HalTMP175ControlP.nc, NONE,
1.1.2.1 HalTMP175ReaderP.nc, NONE, 1.1.2.1 HplTMP175LogicP.nc,
1.1.2.1, 1.1.2.2 TMP175.h, 1.1.2.1, 1.1.2.2
Philip Buonadonna
philipb at users.sourceforge.net
Mon Jun 19 11:21:02 PDT 2006
Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/tmp175
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13119
Modified Files:
Tag: tinyos-2_0_devel-BRANCH
HplTMP175LogicP.nc TMP175.h
Added Files:
Tag: tinyos-2_0_devel-BRANCH
HalTMP175Advanced.nc HalTMP175ControlP.nc HalTMP175ReaderP.nc
Log Message:
--- NEW FILE: HalTMP175Advanced.nc ---
/*
* Copyright (c) 2005-2006 Arch Rock Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
* - Neither the name of the Arched Rock Corporation nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* ARCHED ROCK OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE
*/
/**
* HalTMP175Advanced is the HAL control interface for the TI TMP175
* Digital Temperature Sensor.
*
* @author Phil Buonadonna <pbuonadonna at archrock.com>
* @version $Revision: 1.1.2.1 $ $Date: 2006/06/19 18:20:59 $
*/
interface HalTMP175Advanced {
command error_t setThermostatMode(bool useInt);
event void setThermostatModeDone(error_t error);
command error_t setPolarity(bool polarity);
event void setPolarityDone(error_t error);
command error_t setFaultQueue(tmp175_fqd_t depth);
event void setFaultQueueDone(error_t error);
command error_t setResolution(tmp175_res_t res);
event void setResolutionDone(error_t error);
command error_t setTLow(uint16_t val);
event void setTLowDone(error_t error);
command error_t setTHigh(uint16_t val);
event void setTHighDone(error_t error);
event void alertThreshold();
}
--- NEW FILE: HalTMP175ControlP.nc ---
/*
* Copyright (c) 2005-2006 Arch Rock Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
* - Neither the name of the Arched Rock Corporation nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* ARCHED ROCK OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE
*/
/**
* HalTMP175ControlP device specific Hal interfaces for the TI TMP175 Chip.
*
* Note that only the data path uses split phase resource arbitration
*
* @author Phil Buonadonna <pbuonadonna at archrock.com>
* @version $Revision: 1.1.2.1 $ $Date: 2006/06/19 18:20:59 $
*/
generic module HplTMP175ReaderP()
{
provides interface HalTMP175Advanced;
uses interface HplTMP175;
uses interface Resource as TMP175Resource;
}
implementation {
enum {
STATE_SET_MODE,
STATE_SET_POLARITY,
STATE_SET_FQ,
STATE_SET_RES,
STATE_NONE;
};
uint8_t mState = STATE_NONE;
uint8_t mConfigRegVal = 0;
error_t mHplError;
static error_t setCfg(uint8_t nextState, uint32_t val) {
error_t error;
mState = nextState;
error = call HplTMP715.setConfigReg(val);
if (error) {
call TMP175Resource.release();
}
else {
mConfigRegVal = newRegVal;
}
return error;
}
command error_t HalTMP175Advanced.setThermostatMode(bool useInt) {
error_t error;
uint8_t newRegVal;
error = call TMP175Resource.immediateRequest();
if (error) {
return error;
}
newRegVal = (useInt) ? (mConfigRegVal | TMP175_CFG_TM) : (mConfigRegVal & ~TMP175_CFG_TM);
error = setCfg(STATE_SET_MODE, newRegVal);
return error;
}
command error_t HalTMP175Advanced.setPolarity(bool polarity) {
error_t error;
uint8_t newRegVal;
error = call TMP175Resource.immediateRequest();
if (error) {
return error;
}
newRegVal = (polarity) ? (mConfigRegVal | TMP175_CFG_POL) : (mConfigRegVal & ~TMP175_CFG_POL);
error = setCfg(STATE_SET_MODE, newRegVal);
return error;
}
command error_t HalTMP175Advanced.setFaultQueue(tmp175_fqd_t depth) {
error_t error;
uint8_t newRegVal;
if ((uint8_t)depth > 3) {
error = EINVAL;
return error;
}
error = call TMP175Resource.immediateRequest();
if (error) {
return error;
}
newRegVal = (mConfigRegVal & ~TMP175_CFG_FQ(3)) | (TMP175_CFG_FQ(depth));
error = setCfg(STATE_SET_FQ, newRegVal);
return error;
}
command error_t HalTMP175Advanced.setResolution(tmp175_res_t res) {
error_t error;
uint8_t newRegVal;
if ((uint8_t)res > 3) {
error = EINVAL;
return error;
}
error = call TMP175Resource.immediateRequest();
if (error) {
return error;
}
newRegVal = (mConfigRegVal & ~TMP175_CFG_RES(3)) | (TMP175_CFG_RES(res));
error = setCfg(STATE_SET_RES, newRegVal);
return error;
}
command error_t HalTMP175Advanced.setTLow(uint16_t val) {
error_t error;
error = call TMP175Resource.immediateRequest();
if (error) {
return error;
}
error = call HplTMP175.setTLowReg(val << 4);
if (error) {
call TMP175Resource.release();
}
return error;
}
command error_t HalTMP175Advanced.setTHigh(uint16_t val) {
error_t error;
error = call TMP175Resource.immediateRequest();
if (error) {
return error;
}
error = call HplTMP175.setTHighReg(val << 4);
if (error) {
call TMP175Resource.release();
}
return error;
}
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; }
}
--- NEW FILE: HalTMP175ReaderP.nc ---
/*
* Copyright (c) 2005-2006 Arch Rock Corporation
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
* - Neither the name of the Arched Rock Corporation nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* ARCHED ROCK OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE
*/
/**
* HalTMP175ReaderP provides the service level HIL and device
* specific Hal interfaces for the TI TMP175 Chip.
*
* Note that only the data path uses split phase resource arbitration
*
* @author Phil Buonadonna <pbuonadonna at archrock.com>
* @version $Revision: 1.1.2.1 $ $Date: 2006/06/19 18:20:59 $
*/
generic module HplTMP175ReaderP()
{
provides interface Read<uint16_t> as Temperature;
provides interface HalTMP175Advanced;
uses interface HplTMP175;
uses interface Resource as TMP175Resource;
}
implementation {
enum {
STATE_SET_MODE,
STATE_SET_POLARITY,
STATE_SET_FQ,
STATE_SET_RES,
STATE_NONE
};
uint8_t mState = STATE_NONE;
uint8_t mConfigRegVal = 0;
error_t mHplError;
command error_t Temperature.read() {
return call TMP175Resource.request();
}
event void TMP175Resource.granted() {
error_t error;
error = call HplTMP175.measureTemperature();
if (error) {
call TMP175Resource.release();
signal Temperature.readDone(error,0);
}
return;
}
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; }
}
Index: HplTMP175LogicP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tmp175/Attic/HplTMP175LogicP.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
*** HplTMP175LogicP.nc 25 May 2006 22:54:34 -0000 1.1.2.1
--- HplTMP175LogicP.nc 19 Jun 2006 18:20:59 -0000 1.1.2.2
***************
*** 70,74 ****
norace error_t mmSSError;
! static error_t doSetReg(uint8_t nextState, uint8_t reg, uint8_t val) {
error_r error = SUCCESS;
--- 70,74 ----
norace error_t mmSSError;
! static error_t doSetReg(uint8_t nextState, uint8_t reg, uint16_t val) {
error_r error = SUCCESS;
***************
*** 87,91 ****
mI2CBuffer[1] = val;
! error = call I2CPacket.writePacket(devAddr,2,mI2CBuffer);
if (error)
--- 87,117 ----
mI2CBuffer[1] = val;
! error = call I2CPacket.write((I2C_START | I2C_STOP),devAddr,2,mI2CBuffer);
!
! if (error)
! atomic mState = STATE_IDLE;
!
! return error;
! }
!
! static error_t doSetRegWord(uint8_t nextState, uint8_t reg, uint16_t val) {
! error_r error = SUCCESS;
!
! atomic {
! if (mState == STATE_IDLE) {
! mState = nextState;
! }
! else {
! error = EBUSY;
! }
! }
! if (error)
! return error;
!
! mI2CBuffer[0] = reg;
! mI2CBuffer[1] = (val >> 8) & 0xFF;
! mI2CBuffer[2] = val & 0xFF;
!
! error = call I2CPacket.writePacket((I2C_START | I2C_STOP),devAddr,3,mI2CBuffer);
if (error)
***************
*** 164,172 ****
command error_t HplTMP175.setTLowReg(uint16_t val){
! return doSetReg(STATE_SETLOW,TMP175_PTR_TLOW,val);
}
command error_t HplTMP175.setTHighReg(uint16_t val){
! return doSetReg(STATE_SETTHIGH,TMP175_PTR_THIGH,val);
}
--- 190,198 ----
command error_t HplTMP175.setTLowReg(uint16_t val){
! return doSetRegWord(STATE_SETLOW,TMP175_PTR_TLOW,val);
}
command error_t HplTMP175.setTHighReg(uint16_t val){
! return doSetRegWord(STATE_SETTHIGH,TMP175_PTR_THIGH,val);
}
Index: TMP175.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/tmp175/Attic/TMP175.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** TMP175.h 25 May 2006 22:54:34 -0000 1.1.2.1
--- TMP175.h 19 Jun 2006 18:20:59 -0000 1.1.2.2
***************
*** 52,54 ****
--- 52,68 ----
#define TMP175_CFG_SD (1 << 0)
+ typedef enum {
+ TMP175_FQD_1 = 0,
+ TMP175_FQD_2 = 1,
+ TMP175_FQD_4 = 2,
+ TMP175_FQD_6 = 3
+ } tmp175_fqd_t;
+
+ typedef enum {
+ TMP175_RES_9BIT,
+ TMP175_RES_10BIT,
+ TMP175_RES_11BIT,
+ TMP175_RES_12BIT
+ } tmp175_res_t;
+
#endif /* _TMP175_H */
More information about the Tinyos-2-commits
mailing list