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

grovetemp: added a scaling factor to allow adjusting ADC values

Browse Source 
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu 2016-05-06 11:38:32 -07:00
parent e3b59eb05b
commit 61f7803d92
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/grove/grove.cxx
View File

@ -109,7 +109,7 @@ bool GroveRelay::isOff()
//// GroveTemp //// //// GroveTemp ////
GroveTemp::GroveTemp(unsigned int pin) GroveTemp::GroveTemp(unsigned int pin, float scale)
{ {
if ( !(m_aio = mraa_aio_init(pin)) ) { if ( !(m_aio = mraa_aio_init(pin)) ) {
throw std::invalid_argument(std::string(__FUNCTION__) + throw std::invalid_argument(std::string(__FUNCTION__) +
@ -117,6 +117,7 @@ GroveTemp::GroveTemp(unsigned int pin)
return; return;
} }
m_name = "Temperature Sensor"; m_name = "Temperature Sensor";
m_scale = scale;
} }
GroveTemp::~GroveTemp() GroveTemp::~GroveTemp()
@ -126,7 +127,7 @@ GroveTemp::~GroveTemp()
int GroveTemp::value () int GroveTemp::value ()
{ {
int a = mraa_aio_read(m_aio); int a = mraa_aio_read(m_aio) * m_scale;
float r = (float)(1023.0-a)*10000.0/a; float r = (float)(1023.0-a)*10000.0/a;
float t = 1.0/(log(r/10000.0)/3975.0 + 1.0/298.15)-273.15; float t = 1.0/(log(r/10000.0)/3975.0 + 1.0/298.15)-273.15;
return (int) round(t); return (int) round(t);

5
src/grove/grove.hpp
View File

@ -171,8 +171,10 @@ class GroveTemp: public Grove {
* Grove analog temperature sensor constructor * Grove analog temperature sensor constructor
* *
* @param pin Analog pin to use * @param pin Analog pin to use
* @param scale Scaling factor for raw analog value from the ADC,
* useful for mixed 3.3V/5V boards
*/ */
GroveTemp(unsigned int pin); GroveTemp(unsigned int pin, float scale = 1.0);
/** /**
* GroveTemp destructor * GroveTemp destructor
*/ */
@ -191,6 +193,7 @@ class GroveTemp: public Grove {
int value(); int value();
private: private:
mraa_aio_context m_aio; mraa_aio_context m_aio;
float m_scale;
}; };
/** /**