diff --git a/src/grove/grove.cxx b/src/grove/grove.cxx index 6140f20c..1cc39129 100644 --- a/src/grove/grove.cxx +++ b/src/grove/grove.cxx @@ -109,7 +109,7 @@ bool GroveRelay::isOff() //// GroveTemp //// -GroveTemp::GroveTemp(unsigned int pin) +GroveTemp::GroveTemp(unsigned int pin, float scale) { if ( !(m_aio = mraa_aio_init(pin)) ) { throw std::invalid_argument(std::string(__FUNCTION__) + @@ -117,6 +117,7 @@ GroveTemp::GroveTemp(unsigned int pin) return; } m_name = "Temperature Sensor"; + m_scale = scale; } GroveTemp::~GroveTemp() @@ -126,7 +127,7 @@ GroveTemp::~GroveTemp() 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 t = 1.0/(log(r/10000.0)/3975.0 + 1.0/298.15)-273.15; return (int) round(t); diff --git a/src/grove/grove.hpp b/src/grove/grove.hpp index 1ef60e92..a3e13c68 100644 --- a/src/grove/grove.hpp +++ b/src/grove/grove.hpp @@ -171,8 +171,10 @@ class GroveTemp: public Grove { * Grove analog temperature sensor constructor * * @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 */ @@ -191,6 +193,7 @@ class GroveTemp: public Grove { int value(); private: mraa_aio_context m_aio; + float m_scale; }; /**