Electromagnet: Remove Grove Dependency

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

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)

examples/c++/electromagnet.cxx

@@ -24,7 +24,7 @@
 #include <iostream>
 #include <time.h>
 #include <signal.h>
-#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
+  // The was tested with the  Electromagnetic Module
-  // Instantiate a Grove Electromagnet on digital pin D2
+  // Instantiate a  Electromagnet on digital pin D2
-  upm::GroveElectromagnet* magnet = new upm::GroveElectromagnet(2);
+  upm::Electromagnet* magnet = new upm::Electromagnet(2);
   cout << "Starting up magnet...." << endl;
   magnet->off();
 

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");
+var electromagnet_lib = require("jsupm_electromagnet");
-// The was tested with the Grove Electromagnetic Module
+// The was tested with the  Electromagnetic Module
-// Instantiate a Grove Electromagnet on digital pin D2
+// Instantiate a  Electromagnet on digital pin D2
-var electromagnet_obj = new electromagnet_lib.GroveElectromagnet(2);
+var electromagnet_obj = new electromagnet_lib.Electromagnet(2);
 console.log("Starting up magnet....");
 electromagnet_obj.off();
 

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
+# This was tested with the  Electromagnetic Module
-# Instantiate a Grove Electromagnet on digital pin D2
+# Instantiate a  Electromagnet on digital pin D2
-myElectromagnet = upmGroveelectromagnet.GroveElectromagnet(2)
+myElectromagnet = upmelectromagnet.Electromagnet(2)
 
 
 ## Exit handlers ##

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)

src/electromagnet/electromagnet.cxx

@@ -25,11 +25,11 @@
 #include <string>
 #include <stdexcept>
 
-#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);

src/electromagnet/electromagnet.hpp

@@ -30,38 +30,38 @@
 
 namespace upm {
   /**
-   * @brief Grove Electromagnet library
+   * @brief  Electromagnet library
-   * @defgroup groveelectromagnet libupm-groveelectromagnet
+   * @defgroup electromagnet libupm-electromagnet
    * @ingroup seeed gpio electric
    */
 
   /**
-   * @library groveelectromagnet
+   * @library electromagnet
-   * @sensor groveelectromagnet
+   * @sensor electromagnet
-   * @comname Grove 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
+   * @image html electromagnet.jpg
-   * @snippet groveelectromagnet.cxx Interesting
+   * @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
      */

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);

src/electromagnet/jsupm_electromagnet.i

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

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"
 %}

src/groveelectromagnet/CMakeLists.txt

@@ -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")

src/groveelectromagnet/jsupm_groveelectromagnet.i

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