From 05730dba687c49dcc2b7f0ba7d1850fe66f60c1e Mon Sep 17 00:00:00 2001 From: Brendan Le Foll Date: Mon, 25 Apr 2016 15:07:36 +0100 Subject: [PATCH] cmake: add dependency on mraa v1.0.0 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 Signed-off-by: Noel Eck --- CMakeLists.txt | 2 +- src/grove/grove.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4072796a..907d3582 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ find_package (PkgConfig REQUIRED) # Force a libmraa search and minimum required version every time a config is generated 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}") # Appends the cmake/modules path to MAKE_MODULE_PATH variable. diff --git a/src/grove/grove.cxx b/src/grove/grove.cxx index 99733de8..b0be12d8 100644 --- a/src/grove/grove.cxx +++ b/src/grove/grove.cxx @@ -129,7 +129,7 @@ int GroveTemp::value () { float a = (float) mraa_aio_read(m_aio); if (a == -1.0) return -1; - // Apply scale factore after error check + // Apply scale factor after error check a *= 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;