Added initial interfaces and some sensors implementing them

src/si7005/si7005.cxx

@@ -82,7 +82,7 @@ SI7005::SI7005 (int bus, int pin) {
     m_i2c = new mraa::I2c(m_bus);
     status = m_i2c->address(m_controlAddr);
     if (!isAvailable())
-        UPM_THROW("config failure");
+        throw std::runtime_error(std::string(__FUNCTION__) + ": config failure");
 }
 
 SI7005::~SI7005() {
@@ -102,6 +102,11 @@ SI7005::getTemperatureCelsius () {
     return static_cast<int>(last_temperature + 0.5);
 }
 
+float
+SI7005::getTemperature() {
+    return getTemperatureCelsius();
+}
+
 uint16_t
 SI7005::getHumidityRaw () {
     return getMeasurement( SI7005_CONFIG_HUMIDITY );
@@ -117,6 +122,10 @@ SI7005::getHumidityRelative () {
     return static_cast<int>(linearHumidity + 0.5);
 }
 
+float
+SI7005::getHumidity () {
+    return getHumidityRelative();
+}
 
 uint16_t SI7005::getMeasurement(uint8_t configValue) {
 
@@ -149,7 +158,7 @@ uint16_t SI7005::getMeasurement(uint8_t configValue) {
 
     // Check we got the data we need
     if(length != SI7005_REG_DATA_LENGTH)
-        UPM_THROW("read error");
+        throw std::runtime_error(std::string(__FUNCTION__) + ": read error");
 
     // Merge MSB and LSB
     rawData  = ((uint16_t)( data[SI7005_REG_DATA_LOW] & 0xFFFF )) + ( (uint16_t)(( data[SI7005_REG_DATA_HIGH] & 0xFFFF ) << 8 ));

src/si7005/si7005.hpp

@@ -25,8 +25,8 @@
 
 #include <mraa/i2c.hpp>
 
-#include "interfaces/iTemperatureSensor.hpp"
-#include "interfaces/iHumiditySensor.hpp"
+#include <interfaces/iTemperature.hpp>
+#include <interfaces/iHumidity.hpp>
 
 /* ADDRESS AND NOT_FOUND VALUE */
 #define SI7005_ADDRESS                     ( 0x40 )
@@ -59,7 +59,7 @@ namespace upm {
  *
  * @snippet si7005.cxx Interesting
  */
-class SI7005 : public ITemperatureSensor, public IHumiditySensor {
+class SI7005 : virtual public iTemperature, virtual public iHumidity {
     public:
         /**
          * Instantiates a SI7005 object
@@ -84,6 +84,13 @@ class SI7005 : public ITemperatureSensor, public IHumiditySensor {
          */
         int getTemperatureCelsius ();
 
+        /**
+         * Get the current temperature.
+         *
+         * @return The last temperature reading in Celsius
+         */
+        virtual float getTemperature();
+
         /**
          * Get relative humidity measurement.
          */
@@ -94,6 +101,13 @@ class SI7005 : public ITemperatureSensor, public IHumiditySensor {
          */
         int getHumidityRelative ();
 
+        /**
+         * Get the current relative humidity.
+         *
+         * @return The last humidity reading
+         */
+        virtual float getHumidity();
+
         /**
          * Returns sensor module name
          */

src/si7005/si7005.i

@@ -2,13 +2,6 @@
 
 /* BEGIN Java syntax  ------------------------------------------------------- */
 #ifdef SWIGJAVA
-%include "arrays_java.i";
-%include "../java_buffer.i"
-%typemap(javaimports) SWIGTYPE %{import upm_interfaces.*;%}
-
-%import "../interfaces/javaupm_iTemperatureSensor.i"
-%import "../interfaces/javaupm_iHumiditySensor.i"
-
 JAVA_JNI_LOADLIBRARY(javaupm_si7005)
 #endif
 /* END Java syntax */