From 6cc5c9691de8d89c7ef0d34a830163f0ee048bbc Mon Sep 17 00:00:00 2001
From: Abhishek Malik <abhishek.malik@intel.com>
Date: Thu, 28 Sep 2017 18:23:28 -0700
Subject: [PATCH] Examples: Removing MRAA reference from examples

Signed-off-by: Abhishek Malik <abhishek.malik@intel.com>
---
 examples/c++/gprs.cxx             |  2 +-
 examples/c++/grovegprs.cxx        |  2 +-
 examples/c++/si1132.cxx           |  5 +++--
 examples/c++/t6713-co2-sensor.cxx |  2 +-
 examples/c++/t6713.cxx            |  5 +++--
 src/gprs/gprs.cxx                 | 10 ++++++++--
 src/gprs/gprs.hpp                 |  2 +-
 src/grovegprs/grovegprs.cxx       | 10 ++++++++--
 src/grovegprs/grovegprs.hpp       |  2 +-
 9 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/examples/c++/gprs.cxx b/examples/c++/gprs.cxx
index 9b546799..cdf0498a 100644
--- a/examples/c++/gprs.cxx
+++ b/examples/c++/gprs.cxx
@@ -71,7 +71,7 @@ main(int argc, char** argv)
     upm::GPRS sensor(0);
 
     // Set the baud rate, 19200 baud is the default.
-    if (sensor.setBaudRate(19200) != mraa::SUCCESS) {
+    if (sensor.setBaudRate(19200) != 0) {
         cerr << "Failed to set tty baud rate" << endl;
         return 1;
     }
diff --git a/examples/c++/grovegprs.cxx b/examples/c++/grovegprs.cxx
index 8d0e34d9..1d991772 100644
--- a/examples/c++/grovegprs.cxx
+++ b/examples/c++/grovegprs.cxx
@@ -71,7 +71,7 @@ main(int argc, char** argv)
     upm::GroveGPRS sensor(0);
 
     // Set the baud rate, 19200 baud is the default.
-    if (sensor.setBaudRate(19200) != mraa::SUCCESS) {
+    if (sensor.setBaudRate(19200) != 0) {
         cerr << "Failed to set tty baud rate" << endl;
         return 1;
     }
diff --git a/examples/c++/si1132.cxx b/examples/c++/si1132.cxx
index 4cd47710..59ad5cff 100644
--- a/examples/c++/si1132.cxx
+++ b/examples/c++/si1132.cxx
@@ -28,13 +28,14 @@
 #include "si1132.hpp"
 #include "upm_utilities.h"
 
-#define FT4222_I2C_BUS 1
+#define FT4222_I2C_BUS  1
+#define DEFAULT_I2C_BUS 0
 
 int
 main()
 {
     //! [Interesting]
-    upm::SI1132 lightSensor(mraa_get_sub_platform_id(FT4222_I2C_BUS));
+    upm::SI1132 lightSensor(DEFAULT_I2C_BUS);
     while (true) {
         float value = lightSensor.getVisibleLux();
         std::cout << "Light level = " << value << " lux" << std::endl;
diff --git a/examples/c++/t6713-co2-sensor.cxx b/examples/c++/t6713-co2-sensor.cxx
index 849c5d16..444c66ef 100644
--- a/examples/c++/t6713-co2-sensor.cxx
+++ b/examples/c++/t6713-co2-sensor.cxx
@@ -40,7 +40,7 @@ int
 main()
 {
     /* Create an instance of the T6713 sensor */
-    upm::T6713 sensor(mraa_get_sub_platform_id(FT4222_I2C_BUS));
+    upm::T6713 sensor(EDISON_I2C_BUS);
 
     /* Show usage from the ICO2Sensor interface */
     upm::ICO2Sensor* cO2Sensor = static_cast<upm::ICO2Sensor*>(&sensor);
diff --git a/examples/c++/t6713.cxx b/examples/c++/t6713.cxx
index e0f14c0d..853f9f6b 100644
--- a/examples/c++/t6713.cxx
+++ b/examples/c++/t6713.cxx
@@ -28,13 +28,14 @@
 #include "t6713.hpp"
 #include "upm_utilities.h"
 
-#define FT4222_I2C_BUS 0
+#define FT4222_I2C_BUS  0
+#define DEFAULT_I2C_BUS 0
 
 int
 main()
 {
     //! [Interesting]
-    upm::T6713 cO2Sensor(mraa_get_sub_platform_id(FT4222_I2C_BUS));
+    upm::T6713 cO2Sensor(DEFAULT_I2C_BUS);
 
     while (true) {
         uint16_t value = cO2Sensor.getPpm();
diff --git a/src/gprs/gprs.cxx b/src/gprs/gprs.cxx
index 9a51f094..23c12402 100644
--- a/src/gprs/gprs.cxx
+++ b/src/gprs/gprs.cxx
@@ -65,8 +65,14 @@ int GPRS::writeDataStr(std::string data)
   return m_uart.writeStr(data);
 }
 
-mraa::Result GPRS::setBaudRate(int baud)
+int GPRS::setBaudRate(int baud)
 {
-  return m_uart.setBaudRate(baud);
+  int ret_code = m_uart.setBaudRate(baud);
+  if (ret_code != MRAA_SUCCESS) {
+    return ret_code;
+  } else {
+    return 0;
+  }
+  //return m_uart.setBaudRate(baud);
 }
 
diff --git a/src/gprs/gprs.hpp b/src/gprs/gprs.hpp
index e927aa99..3e4e7de9 100644
--- a/src/gprs/gprs.hpp
+++ b/src/gprs/gprs.hpp
@@ -142,7 +142,7 @@ namespace upm {
      * @param baud Desired baud rate.
      * @return true if successful
      */
-    mraa::Result setBaudRate(int baud=19200);
+    int setBaudRate(int baud=19200);
 
 
   protected:
diff --git a/src/grovegprs/grovegprs.cxx b/src/grovegprs/grovegprs.cxx
index defd92aa..4347d5f1 100644
--- a/src/grovegprs/grovegprs.cxx
+++ b/src/grovegprs/grovegprs.cxx
@@ -65,8 +65,14 @@ int GroveGPRS::writeDataStr(std::string data)
   return m_uart.writeStr(data);
 }
 
-mraa::Result GroveGPRS::setBaudRate(int baud)
+int GroveGPRS::setBaudRate(int baud)
 {
-  return m_uart.setBaudRate(baud);
+  int ret_code = m_uart.setBaudRate(baud);
+  if (ret_code != mraa::SUCCESS) {
+    return ret_code;
+  } else {
+    return 0;
+  }
+  //return m_uart.setBaudRate(baud);
 }
 
diff --git a/src/grovegprs/grovegprs.hpp b/src/grovegprs/grovegprs.hpp
index 24dec4ba..3c9e34f7 100644
--- a/src/grovegprs/grovegprs.hpp
+++ b/src/grovegprs/grovegprs.hpp
@@ -143,7 +143,7 @@ namespace upm {
      * @param baud Desired baud rate.
      * @return true if successful
      */
-    mraa::Result setBaudRate(int baud=19200);
+    int setBaudRate(int baud=19200);
 
 
   protected: