EL Driver: Removing Grove Dependency

Signed-off-by: Abhishek Malik <abhishek.malik@intel.com>

examples/c++/CMakeLists.txt

@@ -179,7 +179,7 @@ add_example (at42qt1070)
 add_example (grovemd)
 add_example (grovemd-stepper)
 add_example (pca9685)
-add_example (groveeldriver)
+add_example (eldriver)
 add_example (adafruitss)
 add_example (adafruitms1438)
 add_example (adafruitms1438-stepper)

examples/c++/eldriver.cxx

@@ -24,7 +24,7 @@
 #include <iostream>
 #include <unistd.h>
 #include <signal.h>
-#include "groveeldriver.hpp"
+#include "eldriver.hpp"
 
 using namespace std;
 
@@ -41,9 +41,9 @@ int main(int argc, char **argv)
   signal(SIGINT, sig_handler);
 
 //! [Interesting]
-  // The was tested with the Grove El Driver Module
+  // The was tested with the  El Driver Module
-  // Instantiate a Grove El Driver on digital pin D2
+  // Instantiate a  El Driver on digital pin D2
-  upm::GroveElDriver* eldriver = new upm::GroveElDriver(2);
+  upm::ElDriver* eldriver = new upm::ElDriver(2);
 
   bool lightState = true;
 

examples/javascript/eldriver.js

@@ -22,11 +22,11 @@
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-var eldriver_lib = require("jsupm_groveeldriver");
+var eldriver_lib = require("jsupm_eldriver");
 
-// The was tested with the Grove El Driver Module
+// The was tested with the  El Driver Module
-// Instantiate a Grove El Driver on digital pin D2
+// Instantiate a  El Driver on digital pin D2
-var eldriver_obj = new eldriver_lib.GroveElDriver(2);
+var eldriver_obj = new eldriver_lib.ElDriver(2);
 
 var lightState = true;
 

examples/python/eldriver.py

@@ -22,11 +22,11 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import time, sys, signal, atexit
-import pyupm_groveeldriver as upmGroveeldriver
+import pyupm_eldriver as upmeldriver
 
-# The was tested with the Grove El Driver Module
+# The was tested with the  El Driver Module
-# Instantiate a Grove El Driver on digital pin D2
+# Instantiate a  El Driver on digital pin D2
-myEldriver = upmGroveeldriver.GroveElDriver(2)
+myEldriver = upmeldriver.ElDriver(2)
 
 
 ## Exit handlers ##

src/eldriver/CMakeLists.txt

@@ -0,0 +1,5 @@
+upm_mixed_module_init (NAME eldriver
+    DESCRIPTION "upm groveeldriver sensor module"
+    CPP_HDR eldriver.hpp
+    CPP_SRC eldriver.cxx
+    REQUIRES mraa)

src/eldriver/eldriver.cxx

@@ -25,11 +25,11 @@
 #include <string>
 #include <stdexcept>
 
-#include "groveeldriver.hpp"
+#include "eldriver.hpp"
 
 using namespace upm;
 
-GroveElDriver::GroveElDriver(int pin)
+ElDriver::ElDriver(int pin)
 {
     if ( !(m_gpio = mraa_gpio_init(pin)) ) 
       {
@@ -40,12 +40,12 @@ GroveElDriver::GroveElDriver(int pin)
     mraa_gpio_dir(m_gpio, MRAA_GPIO_OUT);
 }
 
-GroveElDriver::~GroveElDriver()
+ElDriver::~ElDriver()
 {
     mraa_gpio_close(m_gpio);
 }
 
-void GroveElDriver::on()
+void ElDriver::on()
 {
 	mraa_result_t error = MRAA_SUCCESS;
 	error = mraa_gpio_write (m_gpio, HIGH);
@@ -53,7 +53,7 @@ void GroveElDriver::on()
 		mraa_result_print(error);
 }
 
-void GroveElDriver::off()
+void ElDriver::off()
 {
 	mraa_result_t error = MRAA_SUCCESS;
 	error = mraa_gpio_write (m_gpio, LOW);

src/eldriver/eldriver.hpp

@@ -30,39 +30,39 @@
 
 namespace upm {
   /**
-   * @brief Grove EL Driver Module library
+   * @brief  EL Driver Module library
-   * @defgroup groveeldriver libupm-groveeldriver
+   * @defgroup eldriver libupm-eldriver
    * @ingroup seeed gpio electric
    */
 
   /**
-   * @library groveeldriver
+   * @library eldriver
-   * @sensor groveeldriver
+   * @sensor eldriver
-   * @comname Grove EL Driver
+   * @comname  EL Driver
    * @type electric
    * @man seeed
    * @con gpio
    *
-   * @brief API for the Grove EL Driver Module
+   * @brief API for the  EL Driver Module
    * 
-   * The Grove EL Driver allows you to easily light up an
+   * The  EL Driver allows you to easily light up an
-   * EL wire with just one single Grove cable.
+   * EL wire with just one single  cable.
    *
-   * @image html groveeldriver.jpg 
+   * @image html eldriver.jpg 
-   * @snippet groveeldriver.cxx Interesting
+   * @snippet eldriver.cxx Interesting
    */
-  class GroveElDriver {
+  class ElDriver {
   public:
     /**
-     * Grove EL Driver constructor
+     *  EL Driver constructor
      *
      * @param pin Digital pin to use
      */
-    GroveElDriver(int pin);
+    ElDriver(int pin);
     /**
-     * Grove EL Driver destructor
+     *  EL Driver destructor
      */
-    ~GroveElDriver();
+    ~ElDriver();
     /**
      * Turns the EL wire on
      */

src/eldriver/javaupm_eldriver.i

@@ -1,16 +1,16 @@
-%module javaupm_groveeldriver
+%module javaupm_eldriver
 %include "../upm.i"
 
 %{
-    #include "groveeldriver.hpp"
+    #include "eldriver.hpp"
 %}
 
-%include "groveeldriver.hpp"
+%include "eldriver.hpp"
 
 %pragma(java) jniclasscode=%{
     static {
         try {
-            System.loadLibrary("javaupm_groveeldriver");
+            System.loadLibrary("javaupm_eldriver");
         } catch (UnsatisfiedLinkError e) {
             System.err.println("Native code library failed to load. \n" + e);
             System.exit(1);

src/eldriver/jsupm_eldriver.i

@@ -0,0 +1,8 @@
+%module jsupm_eldriver
+%include "../upm.i"
+
+%{
+    #include "eldriver.hpp"
+%}
+
+%include "eldriver.hpp"

src/eldriver/pyupm_eldriver.i

@@ -1,11 +1,11 @@
 // Include doxygen-generated documentation
 %include "pyupm_doxy2swig.i"
-%module pyupm_groveeldriver
+%module pyupm_eldriver
 %include "../upm.i"
 
 %feature("autodoc", "3");
 
-%include "groveeldriver.hpp"
+%include "eldriver.hpp"
 %{
-    #include "groveeldriver.hpp"
+    #include "eldriver.hpp"
 %}

src/groveeldriver/CMakeLists.txt

@@ -1,5 +0,0 @@
-set (libname "groveeldriver")
-set (libdescription "upm groveeldriver sensor module")
-set (module_src ${libname}.cxx)
-set (module_hpp ${libname}.hpp)
-upm_module_init("-lrt")

src/groveeldriver/jsupm_groveeldriver.i

@@ -1,8 +0,0 @@
-%module jsupm_groveeldriver
-%include "../upm.i"
-
-%{
-    #include "groveeldriver.hpp"
-%}
-
-%include "groveeldriver.hpp"