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

cmake: add dependency on mraa v1.0.0

Browse Source 
Merged conflict in grove.cxx GroveTemp::value where new
scale factor was added.  Changed to apply scale factor
post error-check.

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Brendan Le Foll 2016-04-25 15:07:36 +01:00 committed by Noel Eck
parent 48d5426350
commit 05730dba68
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -10,7 +10,7 @@ find_package (PkgConfig REQUIRED)
# Force a libmraa search and minimum required version every time a config is generated # Force a libmraa search and minimum required version every time a config is generated
unset(MRAA_FOUND CACHE) unset(MRAA_FOUND CACHE)
pkg_check_modules (MRAA REQUIRED mraa>=0.9.1) pkg_check_modules (MRAA REQUIRED mraa>=1.0.0)
message (INFO " found mraa version: ${MRAA_VERSION}") message (INFO " found mraa version: ${MRAA_VERSION}")
# Appends the cmake/modules path to MAKE_MODULE_PATH variable. # Appends the cmake/modules path to MAKE_MODULE_PATH variable.

2
src/grove/grove.cxx
View File

@ -129,7 +129,7 @@ int GroveTemp::value ()
{ {
float a = (float) mraa_aio_read(m_aio); float a = (float) mraa_aio_read(m_aio);
if (a == -1.0) return -1; if (a == -1.0) return -1;
// Apply scale factore after error check // Apply scale factor after error check
a *= m_scale; a *= 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;