loudness: merge groveloudness and hyld9767 into a single driver

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

src/loudness/CMakeLists.txt

@@ -0,0 +1,5 @@
+set (libname "loudness")
+set (libdescription "upm loudness sensors")
+set (module_src ${libname}.cxx)
+set (module_h ${libname}.h)
+upm_module_init()

src/loudness/javaupm_loudness.i

@@ -0,0 +1,8 @@
+%module javaupm_loudness
+%include "../upm.i"
+
+%{
+    #include "loudness.h"
+%}
+
+%include "loudness.h"

src/loudness/jsupm_loudness.i

@@ -0,0 +1,8 @@
+%module jsupm_loudness
+%include "../upm.i"
+
+%{
+    #include "loudness.h"
+%}
+
+%include "loudness.h"

src/loudness/loudness.cxx

@@ -0,0 +1,48 @@
+/*
+ * 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 <iostream>
+
+#include "loudness.h"
+
+using namespace std;
+using namespace upm;
+
+Loudness::Loudness(int pin, float aref) :
+  m_aio(pin)
+{
+  m_aRes = m_aio.getBit();
+  m_aref = aref;
+}
+
+Loudness::~Loudness()
+{
+}
+
+float Loudness::loudness()
+{
+  int val = m_aio.read();
+
+  return(val * (m_aref / float(1 << m_aRes)));
+}

src/loudness/loudness.h

@@ -0,0 +1,96 @@
+/*
+ * 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 <mraa/aio.hpp>
+
+namespace upm {
+  /**
+   * @brief Generic loudness sensors
+   * @defgroup loudness libupm-loudness
+   * @ingroup dfrobot seeed analog sound
+   */
+
+  /**
+   * @library loudness
+   * @sensor loudness
+   * @comname Loudness Sensor
+   * @altname Grove loudness hyld9767
+   * @type sound
+   * @man dfrobot seeed
+   * @web http://www.dfrobot.com/index.php?route=product/product&product_id=83
+   * @con analog
+   *
+   * @brief API for the Loudness Sensor
+   *
+   * This sensor family returns an analog voltage proportional to the
+   * loudness of the ambient environment.  It's output does not
+   * correspond to a particular sound level in decibels.  The higher
+   * the output voltage, the louder the ambient noise level.
+   *
+   * This device uses an electret microphone for sound input.
+   *
+   * This driver was developed using the DFRobot Loudness Sensor V2
+   * and the Grove Loudness sensor.
+   *
+   * @image html groveloudness.jpg
+   * @snippet loudness.cxx Interesting
+   */
+
+  class Loudness {
+  public:
+
+    /**
+     * Loudness constructor
+     *
+     * @param pin Analog pin to use
+     * @param aref Analog reference voltage; default is 5.0 V
+     */
+    Loudness(int pin, float aref=5.0);
+
+    /**
+     * Loudness destructor
+     */
+    ~Loudness();
+
+    /**
+     * Returns the voltage detected on the analog pin
+     *
+     * @return The detected voltage
+     */
+    float loudness();
+
+  protected:
+    mraa::Aio m_aio;
+
+  private:
+    float m_aref;
+    // ADC resolution
+    int m_aRes;
+  };
+}
+
+

src/loudness/pyupm_loudness.i

@@ -0,0 +1,9 @@
+%module pyupm_loudness
+%include "../upm.i"
+
+%feature("autodoc", "3");
+
+%include "loudness.h"
+%{
+    #include "loudness.h"
+%}