From 84f402abd9fbd3c10edc45f7d16afd395fafeb67 Mon Sep 17 00:00:00 2001 From: Abhishek Malik Date: Tue, 13 Sep 2016 11:28:25 -0700 Subject: [PATCH] EL Driver: Removing Grove Dependency Signed-off-by: Abhishek Malik --- examples/c++/CMakeLists.txt | 2 +- .../c++/{groveeldriver.cxx => eldriver.cxx} | 8 ++--- .../{groveeldriver.js => eldriver.js} | 8 ++--- .../python/{groveeldriver.py => eldriver.py} | 8 ++--- src/eldriver/CMakeLists.txt | 5 ++++ .../eldriver.cxx} | 10 +++---- .../eldriver.hpp} | 30 +++++++++---------- .../javaupm_eldriver.i} | 8 ++--- src/eldriver/jsupm_eldriver.i | 8 +++++ .../pyupm_eldriver.i} | 6 ++-- src/groveeldriver/CMakeLists.txt | 5 ---- src/groveeldriver/jsupm_groveeldriver.i | 8 ----- 12 files changed, 53 insertions(+), 53 deletions(-) rename examples/c++/{groveeldriver.cxx => eldriver.cxx} (89%) rename examples/javascript/{groveeldriver.js => eldriver.js} (88%) rename examples/python/{groveeldriver.py => eldriver.py} (89%) create mode 100644 src/eldriver/CMakeLists.txt rename src/{groveeldriver/groveeldriver.cxx => eldriver/eldriver.cxx} (92%) rename src/{groveeldriver/groveeldriver.hpp => eldriver/eldriver.hpp} (74%) rename src/{groveeldriver/javaupm_groveeldriver.i => eldriver/javaupm_eldriver.i} (62%) create mode 100644 src/eldriver/jsupm_eldriver.i rename src/{groveeldriver/pyupm_groveeldriver.i => eldriver/pyupm_eldriver.i} (58%) delete mode 100644 src/groveeldriver/CMakeLists.txt delete mode 100644 src/groveeldriver/jsupm_groveeldriver.i diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt index 2cfb7cac..3f08e249 100644 --- a/examples/c++/CMakeLists.txt +++ b/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) diff --git a/examples/c++/groveeldriver.cxx b/examples/c++/eldriver.cxx similarity index 89% rename from examples/c++/groveeldriver.cxx rename to examples/c++/eldriver.cxx index 9c1d561d..7a139e3d 100644 --- a/examples/c++/groveeldriver.cxx +++ b/examples/c++/eldriver.cxx @@ -24,7 +24,7 @@ #include #include #include -#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 - // Instantiate a Grove El Driver on digital pin D2 - upm::GroveElDriver* eldriver = new upm::GroveElDriver(2); + // The was tested with the El Driver Module + // Instantiate a El Driver on digital pin D2 + upm::ElDriver* eldriver = new upm::ElDriver(2); bool lightState = true; diff --git a/examples/javascript/groveeldriver.js b/examples/javascript/eldriver.js similarity index 88% rename from examples/javascript/groveeldriver.js rename to examples/javascript/eldriver.js index 0cf03c90..ddc92d29 100644 --- a/examples/javascript/groveeldriver.js +++ b/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 -// Instantiate a Grove El Driver on digital pin D2 -var eldriver_obj = new eldriver_lib.GroveElDriver(2); +// The was tested with the El Driver Module +// Instantiate a El Driver on digital pin D2 +var eldriver_obj = new eldriver_lib.ElDriver(2); var lightState = true; diff --git a/examples/python/groveeldriver.py b/examples/python/eldriver.py similarity index 89% rename from examples/python/groveeldriver.py rename to examples/python/eldriver.py index c9fd9360..fc94db2a 100644 --- a/examples/python/groveeldriver.py +++ b/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 -# Instantiate a Grove El Driver on digital pin D2 -myEldriver = upmGroveeldriver.GroveElDriver(2) +# The was tested with the El Driver Module +# Instantiate a El Driver on digital pin D2 +myEldriver = upmeldriver.ElDriver(2) ## Exit handlers ## diff --git a/src/eldriver/CMakeLists.txt b/src/eldriver/CMakeLists.txt new file mode 100644 index 00000000..7a91df5d --- /dev/null +++ b/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) \ No newline at end of file diff --git a/src/groveeldriver/groveeldriver.cxx b/src/eldriver/eldriver.cxx similarity index 92% rename from src/groveeldriver/groveeldriver.cxx rename to src/eldriver/eldriver.cxx index 322d6660..796f18b5 100644 --- a/src/groveeldriver/groveeldriver.cxx +++ b/src/eldriver/eldriver.cxx @@ -25,11 +25,11 @@ #include #include -#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); diff --git a/src/groveeldriver/groveeldriver.hpp b/src/eldriver/eldriver.hpp similarity index 74% rename from src/groveeldriver/groveeldriver.hpp rename to src/eldriver/eldriver.hpp index 7ed7963b..787b8492 100644 --- a/src/groveeldriver/groveeldriver.hpp +++ b/src/eldriver/eldriver.hpp @@ -30,39 +30,39 @@ namespace upm { /** - * @brief Grove EL Driver Module library - * @defgroup groveeldriver libupm-groveeldriver + * @brief EL Driver Module library + * @defgroup eldriver libupm-eldriver * @ingroup seeed gpio electric */ /** - * @library groveeldriver - * @sensor groveeldriver - * @comname Grove EL Driver + * @library eldriver + * @sensor eldriver + * @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 - * EL wire with just one single Grove cable. + * The EL Driver allows you to easily light up an + * EL wire with just one single cable. * - * @image html groveeldriver.jpg - * @snippet groveeldriver.cxx Interesting + * @image html eldriver.jpg + * @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 */ diff --git a/src/groveeldriver/javaupm_groveeldriver.i b/src/eldriver/javaupm_eldriver.i similarity index 62% rename from src/groveeldriver/javaupm_groveeldriver.i rename to src/eldriver/javaupm_eldriver.i index f6e67877..1a2abc0d 100644 --- a/src/groveeldriver/javaupm_groveeldriver.i +++ b/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); diff --git a/src/eldriver/jsupm_eldriver.i b/src/eldriver/jsupm_eldriver.i new file mode 100644 index 00000000..93ca498f --- /dev/null +++ b/src/eldriver/jsupm_eldriver.i @@ -0,0 +1,8 @@ +%module jsupm_eldriver +%include "../upm.i" + +%{ + #include "eldriver.hpp" +%} + +%include "eldriver.hpp" diff --git a/src/groveeldriver/pyupm_groveeldriver.i b/src/eldriver/pyupm_eldriver.i similarity index 58% rename from src/groveeldriver/pyupm_groveeldriver.i rename to src/eldriver/pyupm_eldriver.i index 002797d3..19eb2bc5 100644 --- a/src/groveeldriver/pyupm_groveeldriver.i +++ b/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" %} diff --git a/src/groveeldriver/CMakeLists.txt b/src/groveeldriver/CMakeLists.txt deleted file mode 100644 index 2ed19797..00000000 --- a/src/groveeldriver/CMakeLists.txt +++ /dev/null @@ -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") diff --git a/src/groveeldriver/jsupm_groveeldriver.i b/src/groveeldriver/jsupm_groveeldriver.i deleted file mode 100644 index bfd05ac1..00000000 --- a/src/groveeldriver/jsupm_groveeldriver.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_groveeldriver -%include "../upm.i" - -%{ - #include "groveeldriver.hpp" -%} - -%include "groveeldriver.hpp"