alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

ads1x15: fixed case logic in getThresh() function

Browse Source 
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu 2017-05-30 15:14:09 -07:00
parent 8186d093ec
commit c64d04d084
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ads1x15/ads1x15.cxx
View File

@ -116,7 +116,7 @@ ADS1X15::setContinuous(bool mode){
float float
ADS1X15::getThresh(ADSTHRESH reg){ ADS1X15::getThresh(ADSTHRESH reg){
if( THRESH_HIGH && THRESH_LOW) return getLastSample(reg); if(reg == THRESH_HIGH || reg == THRESH_LOW) return getLastSample(reg);
else return 0.0; else return 0.0;
} }
@ -137,7 +137,7 @@ ADS1X15::setThresh(ADSTHRESH reg, float value){
case 2: case 2:
case 3: case 3:
set_value = value / getMultiplier(); set_value = value / getMultiplier();
set_value = set_value << m_bitShift; set_value = set_value << m_bitShift;
if(i2c->writeWordReg(reg, swapWord(set_value)) != mraa::SUCCESS){ if(i2c->writeWordReg(reg, swapWord(set_value)) != mraa::SUCCESS){
throw std::runtime_error(std::string(__FUNCTION__) + ": I2c.write() failed"); throw std::runtime_error(std::string(__FUNCTION__) + ": I2c.write() failed");
return; return;

2
src/ads1x15/ads1x15.hpp
View File

@ -390,7 +390,7 @@ namespace upm {
* @param reg ADSTHRES enum value. * @param reg ADSTHRES enum value.
* Returns 0.0 unless THRESH_HIGH or THRESH_LOW requested. * Returns 0.0 unless THRESH_HIGH or THRESH_LOW requested.
*/ */
float getThresh(ADSTHRESH reg = THRESH_LOW); float getThresh(ADSTHRESH reg = THRESH_DEFAULT);
/** /**
* Sets threshold levels or configures for conversion ready * Sets threshold levels or configures for conversion ready