mq4: Initial implementation

Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

src/gas/CMakeLists.txt

@@ -1,5 +1,5 @@
 set (libname "gas")
 set (libdescription "Gas sensors")
-set (module_src ${libname}.cxx mq2.cxx mq3.cxx mq5.cxx mq7.cxx mq8.cxx mq9.cxx tp401.cxx)
-set (module_h ${libname}.h mq2.h mq3.h mq5.h mq7.h mq8.h mq9.h tp401.h)
+set (module_src ${libname}.cxx mq2.cxx mq3.cxx mq4.cxx mq5.cxx mq7.cxx mq8.cxx mq9.cxx tp401.cxx)
+set (module_h ${libname}.h mq2.h mq3.h mq4.h mq5.h mq7.h mq8.h mq9.h tp401.h)
 upm_module_init()

src/gas/javaupm_gas.i

@@ -6,6 +6,7 @@
     #include "gas.h"
     #include "mq2.h"
     #include "mq3.h"
+    #include "mq4.h"
     #include "mq5.h"
     #include "mq7.h"
     #include "mq8.h"
@@ -46,6 +47,7 @@
 %include "gas.h"
 %include "mq2.h"
 %include "mq3.h"
+%include "mq4.h"
 %include "mq5.h"
 %include "mq7.h"
 %include "mq8.h"

src/gas/jsupm_gas.i

@@ -23,6 +23,11 @@
     #include "mq3.h"
 %}
 
+%include "mq4.h"
+%{
+    #include "mq4.h"
+%}
+
 %include "mq5.h"
 %{
     #include "mq5.h"

src/gas/mq4.cxx

@@ -0,0 +1,35 @@
+/*
+ * Author: Jon Trulson <jtrulson@ics.com>
+ * Copyright (c) 2015 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "mq4.h"
+
+using namespace upm;
+
+MQ4::MQ4 (int gasPin) : Gas (gasPin)
+{
+}
+
+MQ4::~MQ4 ()
+{
+}

src/gas/mq4.h

@@ -0,0 +1,75 @@
+/*
+ * Author: Jon Trulson <jtrulson@ics.com>
+ * Copyright (c) 2015 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#pragma once
+
+#include <iostream>
+#include <string>
+#include "gas.h"
+
+namespace upm {
+  /**
+   * @library gas
+   * @sensor mq4
+   * @comname DFRobot MQ4 Gas Sensor
+   * @type gaseous
+   * @man dfrobot
+   * @con analog
+   *
+   * @brief API for the DFRobot MQ4 Gas Sensor
+   *
+   * The MQ4 Gas Sensor module is useful for detecting CH4 (Methane),
+   * and natural gas concentrations in the air.  It has a
+   * detection range of 100-10000 ppm.
+   *
+   * For optimum use, it requires calibration after a pre-heat time of
+   * at least 24 hours.  See the datasheet for details.
+   *
+   * @image html mq2-5.jpeg
+   * @snippet mq4.cxx Interesting
+   */
+    class MQ4 : public Gas {
+        public:
+            /**
+             * MQ4 constructor
+             *
+             * @param gasPin Analog pin where the sensor is connected
+             */
+            MQ4 (int gasPin);
+
+            /**
+             * MQ4 destructor
+             */
+            ~MQ4 ();
+
+            /**
+             * Returns the name of the sensor
+             */
+            std::string name()
+            {
+                return m_name;
+            }
+        private:
+            std::string m_name;
+    };
+}

src/gas/pyupm_gas.i

@@ -25,6 +25,11 @@
     #include "mq3.h"
 %}
 
+%include "mq4.h"
+%{
+    #include "mq4.h"
+%}
+
 %include "mq5.h"
 %{
     #include "mq5.h"