From f4315db035287d9a3c1c3c1c3b75cc56f55c78a8 Mon Sep 17 00:00:00 2001 From: Abhishek Malik Date: Tue, 13 Sep 2016 11:58:56 -0700 Subject: [PATCH] Electromagnet: Remove Grove Dependency Signed-off-by: Abhishek Malik --- examples/c++/CMakeLists.txt | 2 +- ...oveelectromagnet.cxx => electromagnet.cxx} | 8 +++--- ...groveelectromagnet.js => electromagnet.js} | 8 +++--- ...groveelectromagnet.py => electromagnet.py} | 8 +++--- src/electromagnet/CMakeLists.txt | 5 ++++ .../electromagnet.cxx} | 10 +++---- .../electromagnet.hpp} | 28 +++++++++---------- .../javaupm_electromagnet.i} | 8 +++--- src/electromagnet/jsupm_electromagnet.i | 8 ++++++ .../pyupm_electromagnet.i} | 6 ++-- src/groveelectromagnet/CMakeLists.txt | 5 ---- .../jsupm_groveelectromagnet.i | 8 ------ 12 files changed, 52 insertions(+), 52 deletions(-) rename examples/c++/{groveelectromagnet.cxx => electromagnet.cxx} (90%) rename examples/javascript/{groveelectromagnet.js => electromagnet.js} (88%) rename examples/python/{groveelectromagnet.py => electromagnet.py} (88%) create mode 100644 src/electromagnet/CMakeLists.txt rename src/{groveelectromagnet/groveelectromagnet.cxx => electromagnet/electromagnet.cxx} (90%) rename src/{groveelectromagnet/groveelectromagnet.hpp => electromagnet/electromagnet.hpp} (74%) rename src/{groveelectromagnet/javaupm_groveelectromagnet.i => electromagnet/javaupm_electromagnet.i} (59%) create mode 100644 src/electromagnet/jsupm_electromagnet.i rename src/{groveelectromagnet/pyupm_groveelectromagnet.i => electromagnet/pyupm_electromagnet.i} (54%) delete mode 100644 src/groveelectromagnet/CMakeLists.txt delete mode 100644 src/groveelectromagnet/jsupm_groveelectromagnet.i diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt index 3f08e249..51b35545 100644 --- a/examples/c++/CMakeLists.txt +++ b/examples/c++/CMakeLists.txt @@ -168,7 +168,7 @@ add_example (hmtrp) add_example (nunchuck) add_example (otp538u) add_example (collision) -add_example (groveelectromagnet) +add_example (electromagnet) add_example (emg) add_example (o2) add_example (gsr) diff --git a/examples/c++/groveelectromagnet.cxx b/examples/c++/electromagnet.cxx similarity index 90% rename from examples/c++/groveelectromagnet.cxx rename to examples/c++/electromagnet.cxx index bbd4d33e..ca2dbb38 100644 --- a/examples/c++/groveelectromagnet.cxx +++ b/examples/c++/electromagnet.cxx @@ -24,7 +24,7 @@ #include #include #include -#include "groveelectromagnet.hpp" +#include "electromagnet.hpp" using namespace std; @@ -46,9 +46,9 @@ int main(int argc, char **argv) signal(SIGINT, sig_handler); //! [Interesting] - // The was tested with the Grove Electromagnetic Module - // Instantiate a Grove Electromagnet on digital pin D2 - upm::GroveElectromagnet* magnet = new upm::GroveElectromagnet(2); + // The was tested with the Electromagnetic Module + // Instantiate a Electromagnet on digital pin D2 + upm::Electromagnet* magnet = new upm::Electromagnet(2); cout << "Starting up magnet...." << endl; magnet->off(); diff --git a/examples/javascript/groveelectromagnet.js b/examples/javascript/electromagnet.js similarity index 88% rename from examples/javascript/groveelectromagnet.js rename to examples/javascript/electromagnet.js index 8a75b713..90a7d9b8 100644 --- a/examples/javascript/groveelectromagnet.js +++ b/examples/javascript/electromagnet.js @@ -22,10 +22,10 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -var electromagnet_lib = require("jsupm_groveelectromagnet"); -// The was tested with the Grove Electromagnetic Module -// Instantiate a Grove Electromagnet on digital pin D2 -var electromagnet_obj = new electromagnet_lib.GroveElectromagnet(2); +var electromagnet_lib = require("jsupm_electromagnet"); +// The was tested with the Electromagnetic Module +// Instantiate a Electromagnet on digital pin D2 +var electromagnet_obj = new electromagnet_lib.Electromagnet(2); console.log("Starting up magnet...."); electromagnet_obj.off(); diff --git a/examples/python/groveelectromagnet.py b/examples/python/electromagnet.py similarity index 88% rename from examples/python/groveelectromagnet.py rename to examples/python/electromagnet.py index c84af688..a658971c 100644 --- a/examples/python/groveelectromagnet.py +++ b/examples/python/electromagnet.py @@ -22,11 +22,11 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import time, sys, signal, atexit -import pyupm_groveelectromagnet as upmGroveelectromagnet +import pyupm_electromagnet as upmelectromagnet -# This was tested with the Grove Electromagnetic Module -# Instantiate a Grove Electromagnet on digital pin D2 -myElectromagnet = upmGroveelectromagnet.GroveElectromagnet(2) +# This was tested with the Electromagnetic Module +# Instantiate a Electromagnet on digital pin D2 +myElectromagnet = upmelectromagnet.Electromagnet(2) ## Exit handlers ## diff --git a/src/electromagnet/CMakeLists.txt b/src/electromagnet/CMakeLists.txt new file mode 100644 index 00000000..336be1a2 --- /dev/null +++ b/src/electromagnet/CMakeLists.txt @@ -0,0 +1,5 @@ +upm_mixed_module_init (NAME electromagnet + DESCRIPTION "upm electromagnet sensor module" + CPP_HDR electromagnet.hpp + CPP_SRC electromagnet.cxx + REQUIRES mraa) \ No newline at end of file diff --git a/src/groveelectromagnet/groveelectromagnet.cxx b/src/electromagnet/electromagnet.cxx similarity index 90% rename from src/groveelectromagnet/groveelectromagnet.cxx rename to src/electromagnet/electromagnet.cxx index e7206f7e..e055b49e 100644 --- a/src/groveelectromagnet/groveelectromagnet.cxx +++ b/src/electromagnet/electromagnet.cxx @@ -25,11 +25,11 @@ #include #include -#include "groveelectromagnet.hpp" +#include "electromagnet.hpp" using namespace upm; -GroveElectromagnet::GroveElectromagnet(int pin) +Electromagnet::Electromagnet(int pin) { if ( !(m_gpio = mraa_gpio_init(pin)) ) { @@ -40,12 +40,12 @@ GroveElectromagnet::GroveElectromagnet(int pin) mraa_gpio_dir(m_gpio, MRAA_GPIO_OUT); } -GroveElectromagnet::~GroveElectromagnet() +Electromagnet::~Electromagnet() { mraa_gpio_close(m_gpio); } -void GroveElectromagnet::on() +void Electromagnet::on() { mraa_result_t error = MRAA_SUCCESS; error = mraa_gpio_write (m_gpio, HIGH); @@ -53,7 +53,7 @@ void GroveElectromagnet::on() mraa_result_print(error); } -void GroveElectromagnet::off() +void Electromagnet::off() { mraa_result_t error = MRAA_SUCCESS; error = mraa_gpio_write (m_gpio, LOW); diff --git a/src/groveelectromagnet/groveelectromagnet.hpp b/src/electromagnet/electromagnet.hpp similarity index 74% rename from src/groveelectromagnet/groveelectromagnet.hpp rename to src/electromagnet/electromagnet.hpp index c39ae4ca..53e8221d 100644 --- a/src/groveelectromagnet/groveelectromagnet.hpp +++ b/src/electromagnet/electromagnet.hpp @@ -30,38 +30,38 @@ namespace upm { /** - * @brief Grove Electromagnet library - * @defgroup groveelectromagnet libupm-groveelectromagnet + * @brief Electromagnet library + * @defgroup electromagnet libupm-electromagnet * @ingroup seeed gpio electric */ /** - * @library groveelectromagnet - * @sensor groveelectromagnet - * @comname Grove Electromagnet + * @library electromagnet + * @sensor electromagnet + * @comname Electromagnet * @type electric * @man seeed * @con gpio * - * @brief API for the Grove Electromagnet + * @brief API for the Electromagnet * - * The Grove Electromagnet can hold up to 1 kg (approximately 2.2 lbs) + * The Electromagnet can hold up to 1 kg (approximately 2.2 lbs) * - * @image html groveelectromagnet.jpg - * @snippet groveelectromagnet.cxx Interesting + * @image html electromagnet.jpg + * @snippet electromagnet.cxx Interesting */ - class GroveElectromagnet { + class Electromagnet { public: /** - * Grove Electromagnet constructor + * Electromagnet constructor * * @param pin Digital pin to use */ - GroveElectromagnet(int pin); + Electromagnet(int pin); /** - * Grove Electromagnet destructor + * Electromagnet destructor */ - ~GroveElectromagnet(); + ~Electromagnet(); /** * Turns the magnet on */ diff --git a/src/groveelectromagnet/javaupm_groveelectromagnet.i b/src/electromagnet/javaupm_electromagnet.i similarity index 59% rename from src/groveelectromagnet/javaupm_groveelectromagnet.i rename to src/electromagnet/javaupm_electromagnet.i index ecfffde1..96f0c246 100644 --- a/src/groveelectromagnet/javaupm_groveelectromagnet.i +++ b/src/electromagnet/javaupm_electromagnet.i @@ -1,16 +1,16 @@ -%module javaupm_groveelectromagnet +%module javaupm_electromagnet %include "../upm.i" %{ - #include "groveelectromagnet.hpp" + #include "electromagnet.hpp" %} -%include "groveelectromagnet.hpp" +%include "electromagnet.hpp" %pragma(java) jniclasscode=%{ static { try { - System.loadLibrary("javaupm_groveelectromagnet"); + System.loadLibrary("javaupm_electromagnet"); } catch (UnsatisfiedLinkError e) { System.err.println("Native code library failed to load. \n" + e); System.exit(1); diff --git a/src/electromagnet/jsupm_electromagnet.i b/src/electromagnet/jsupm_electromagnet.i new file mode 100644 index 00000000..268aa899 --- /dev/null +++ b/src/electromagnet/jsupm_electromagnet.i @@ -0,0 +1,8 @@ +%module jsupm_electromagnet +%include "../upm.i" + +%{ + #include "electromagnet.hpp" +%} + +%include "electromagnet.hpp" diff --git a/src/groveelectromagnet/pyupm_groveelectromagnet.i b/src/electromagnet/pyupm_electromagnet.i similarity index 54% rename from src/groveelectromagnet/pyupm_groveelectromagnet.i rename to src/electromagnet/pyupm_electromagnet.i index 82492c30..9faf5d61 100644 --- a/src/groveelectromagnet/pyupm_groveelectromagnet.i +++ b/src/electromagnet/pyupm_electromagnet.i @@ -1,11 +1,11 @@ // Include doxygen-generated documentation %include "pyupm_doxy2swig.i" -%module pyupm_groveelectromagnet +%module pyupm_electromagnet %include "../upm.i" %feature("autodoc", "3"); -%include "groveelectromagnet.hpp" +%include "electromagnet.hpp" %{ - #include "groveelectromagnet.hpp" + #include "electromagnet.hpp" %} diff --git a/src/groveelectromagnet/CMakeLists.txt b/src/groveelectromagnet/CMakeLists.txt deleted file mode 100644 index a12d3715..00000000 --- a/src/groveelectromagnet/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set (libname "groveelectromagnet") -set (libdescription "upm groveelectromagnet sensor module") -set (module_src ${libname}.cxx) -set (module_hpp ${libname}.hpp) -upm_module_init("-lrt") diff --git a/src/groveelectromagnet/jsupm_groveelectromagnet.i b/src/groveelectromagnet/jsupm_groveelectromagnet.i deleted file mode 100644 index 62d5ac9b..00000000 --- a/src/groveelectromagnet/jsupm_groveelectromagnet.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_groveelectromagnet -%include "../upm.i" - -%{ - #include "groveelectromagnet.hpp" -%} - -%include "groveelectromagnet.hpp"