maa: update for 0.2.5 API

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ce86ee..12caa67 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ endif ()
 find_package (Threads REQUIRED)
 find_package (PkgConfig REQUIRED)
 # force the libmaa version to be the required version
-pkg_check_modules (MAA REQUIRED maa=0.2.3)
+pkg_check_modules (MAA REQUIRED maa=0.2.5)
 message (INFO " found libmaa version: ${MAA_VERSION}")
 
 set (CMAKE_SWIG_FLAGS "")

diff --git a/src/grove/grove.h b/src/grove/grove.h
index 2a2a103..f0f8717 100644 (file)
--- a/src/grove/grove.h
+++ b/src/grove/grove.h
@@ -48,7 +48,7 @@ class GroveLed: public Grove {
         maa_result_t off();
         maa_result_t on();
     private:
-        maa_gpio_context* m_gpio;
+        maa_gpio_context m_gpio;
 };
 
 class GroveTemp: public Grove {
@@ -58,7 +58,7 @@ class GroveTemp: public Grove {
         float raw_value();
         int value();
     private:
-        maa_aio_context* m_aio;
+        maa_aio_context m_aio;
 };
 
 class GroveLight: public Grove {
@@ -68,7 +68,7 @@ class GroveLight: public Grove {
         float raw_value();
         int value();
     private:
-        maa_aio_context* m_aio;
+        maa_aio_context m_aio;
 };
 
 }

diff --git a/src/hmc5883l/hmc5883l.h b/src/hmc5883l/hmc5883l.h
index 45df0fd..d883770 100644 (file)
--- a/src/hmc5883l/hmc5883l.h
+++ b/src/hmc5883l/hmc5883l.h
@@ -55,7 +55,7 @@ public:
 private:
     int m_coor[3];
     char m_rx_tx_buf[MAX_BUFFER_LENGTH];
-    maa_i2c_context* m_i2c;
+    maa_i2c_context m_i2c;
 };
 
 }

diff --git a/src/lcm1602/lcm1602.h b/src/lcm1602/lcm1602.h
index d8fe313..69a128a 100644 (file)
--- a/src/lcm1602/lcm1602.h
+++ b/src/lcm1602/lcm1602.h
@@ -58,7 +58,7 @@ private:
     int write4bits(char value);
     int expandWrite(char value);
     int pulseEnable(char value);
-    maa_i2c_context* m_i2c;
+    maa_i2c_context m_i2c;
 };
 
 }