From 3753a1be5c696b705e08ecde21f11a26513379ca Mon Sep 17 00:00:00 2001 From: Sisinty Sasmita Patra Date: Tue, 13 Sep 2016 12:06:37 -0700 Subject: [PATCH] Button: Removed grove dependency * Renamed all files from groverrotary to rotary * Replaced all instances of groverrotary with rotary * Updated all CMake files Signed-off-by: Sisinty Sasmita Patra --- docs/images/{grovebutton.jpg => button.jpg} | Bin doxy/samples.mapping.txt | 2 +- examples/c++/CMakeLists.txt | 2 +- examples/c++/{grovebutton.cxx => button.cxx} | 2 +- ...oveButtonSample.java => ButtonSample.java} | 6 ++--- ...intrSample.java => Button_intrSample.java} | 8 +++---- examples/java/CMakeLists.txt | 4 ++-- .../javascript/{grovebutton.js => button.js} | 2 +- examples/python/{grovebutton.py => button.py} | 2 +- src/button/CMakeLists.txt | 5 +++++ .../grovebutton.cxx => button/button.cxx} | 16 ++++++------- .../grovebutton.hpp => button/button.hpp} | 21 +++++++++--------- src/button/javaupm_button.i | 19 ++++++++++++++++ src/button/jsupm_button.i | 8 +++++++ src/button/pyupm_button.i | 11 +++++++++ src/grove/CMakeLists.txt | 4 ++-- src/grove/grove.hpp | 2 +- src/grove/javaupm_grove.i | 4 ++-- src/grove/jsupm_grove.i | 4 ++-- src/grove/pyupm_grove.i | 4 ++-- 20 files changed, 84 insertions(+), 42 deletions(-) rename docs/images/{grovebutton.jpg => button.jpg} (100%) rename examples/c++/{grovebutton.cxx => button.cxx} (96%) rename examples/java/{GroveButtonSample.java => ButtonSample.java} (93%) rename examples/java/{GroveButton_intrSample.java => Button_intrSample.java} (92%) rename examples/javascript/{grovebutton.js => button.js} (97%) rename examples/python/{grovebutton.py => button.py} (97%) create mode 100644 src/button/CMakeLists.txt rename src/{grove/grovebutton.cxx => button/button.cxx} (86%) rename src/{grove/grovebutton.hpp => button/button.hpp} (89%) create mode 100644 src/button/javaupm_button.i create mode 100644 src/button/jsupm_button.i create mode 100644 src/button/pyupm_button.i diff --git a/docs/images/grovebutton.jpg b/docs/images/button.jpg similarity index 100% rename from docs/images/grovebutton.jpg rename to docs/images/button.jpg diff --git a/doxy/samples.mapping.txt b/doxy/samples.mapping.txt index 6d73d4af..c7c25098 100644 --- a/doxy/samples.mapping.txt +++ b/doxy/samples.mapping.txt @@ -10,7 +10,7 @@ cjq4435.cxx CJQ4435Sample.java ds1307.cxx DS1307Sample.java enc03r.cxx ENC03RSample.java es08a.cxx ES08ASample.java -grovebutton.cxx GroveButtonSample.java +button.cxx ButtonSample.java groveehr.cxx GroveEHRSample.java groveled.cxx GroveLEDSample.java grovelinefinder.cxx GroveLineFinderSample.java diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt index 6bd292d8..2cfb7cac 100644 --- a/examples/c++/CMakeLists.txt +++ b/examples/c++/CMakeLists.txt @@ -91,7 +91,7 @@ add_example (led) add_example (relay) add_example (light) add_example (temperature) -add_example (grovebutton) +add_example (button) add_example (rotary) add_example (slide) add_example (buzzer-sound) diff --git a/examples/c++/grovebutton.cxx b/examples/c++/button.cxx similarity index 96% rename from examples/c++/grovebutton.cxx rename to examples/c++/button.cxx index 3534d16f..5baf12d9 100644 --- a/examples/c++/grovebutton.cxx +++ b/examples/c++/button.cxx @@ -33,7 +33,7 @@ main(int argc, char **argv) //! [Interesting] // Create the button object using GPIO pin 0 - upm::GroveButton* button = new upm::GroveButton(0); + upm::Button* button = new upm::Button(0); // Read the input and print, waiting one second between readings while( 1 ) { diff --git a/examples/java/GroveButtonSample.java b/examples/java/ButtonSample.java similarity index 93% rename from examples/java/GroveButtonSample.java rename to examples/java/ButtonSample.java index 9be6e2fc..6b656629 100644 --- a/examples/java/GroveButtonSample.java +++ b/examples/java/ButtonSample.java @@ -22,12 +22,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -public class GroveButtonSample { +public class ButtonSample { public static void main(String[] args) throws InterruptedException { // ! [Interesting] // Create the button object using GPIO pin 2 - upm_grove.GroveButton button = new upm_grove.GroveButton(2); + upm_button.Button button = new upm_button.Button(2); while (true) { System.out.println(button.name() + " value is " + button.value()); @@ -37,4 +37,4 @@ public class GroveButtonSample { // ! [Interesting] } -} \ No newline at end of file +} diff --git a/examples/java/GroveButton_intrSample.java b/examples/java/Button_intrSample.java similarity index 92% rename from examples/java/GroveButton_intrSample.java rename to examples/java/Button_intrSample.java index ad0d72ee..7dd46c59 100644 --- a/examples/java/GroveButton_intrSample.java +++ b/examples/java/Button_intrSample.java @@ -22,13 +22,13 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -public class GroveButton_intrSample { +public class Button_intrSample { public static int counter = 0; public static void main(String[] args) throws InterruptedException { // ! [Interesting] - upm_grove.GroveButton b = new upm_grove.GroveButton(2); + upm_button.Button b = new upm_button.Button(2); ButtonISR callback = new ButtonISR(); b.installISR(2, callback); @@ -47,7 +47,7 @@ class ButtonISR implements Runnable { } public void run() { - GroveButton_intrSample.counter++; + Button_intrSample.counter++; System.out.println("Button pressed!"); } -} \ No newline at end of file +} diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt index b54d471d..b3417698 100644 --- a/examples/java/CMakeLists.txt +++ b/examples/java/CMakeLists.txt @@ -30,8 +30,8 @@ add_example(CJQ4435Sample cjq4435) add_example(DS1307Sample ds1307) add_example(ENC03RSample enc03r) add_example(ES08ASample servo) -add_example(GroveButtonSample grove) -add_example(GroveButton_intrSample grove) +add_example(ButtonSample button) +add_example(Button_intrSample button) add_example(Collision collision) add_example(EHRSample ehr) add_example(Emg emg) diff --git a/examples/javascript/grovebutton.js b/examples/javascript/button.js similarity index 97% rename from examples/javascript/grovebutton.js rename to examples/javascript/button.js index 428396ad..0ddeb837 100644 --- a/examples/javascript/grovebutton.js +++ b/examples/javascript/button.js @@ -26,7 +26,7 @@ var groveSensor = require('jsupm_grove'); // Create the button object using GPIO pin 0 -var button = new groveSensor.GroveButton(0); +var button = new groveSensor.Button(0); // Read the input and print, waiting one second between readings function readButtonValue() { diff --git a/examples/python/grovebutton.py b/examples/python/button.py similarity index 97% rename from examples/python/grovebutton.py rename to examples/python/button.py index c62c399a..eaac3eee 100644 --- a/examples/python/grovebutton.py +++ b/examples/python/button.py @@ -24,7 +24,7 @@ import time import pyupm_grove as grove # Create the button object using GPIO pin 0 -button = grove.GroveButton(0) +button = grove.Button(0) # Read the input and print, waiting one second between readings while 1: diff --git a/src/button/CMakeLists.txt b/src/button/CMakeLists.txt new file mode 100644 index 00000000..b12c0dba --- /dev/null +++ b/src/button/CMakeLists.txt @@ -0,0 +1,5 @@ +upm_mixed_module_init (NAME button + DESCRIPTION "UPM Button Module: button" + CPP_HDR button.hpp + CPP_SRC button.cxx + REQUIRES mraa) diff --git a/src/grove/grovebutton.cxx b/src/button/button.cxx similarity index 86% rename from src/grove/grovebutton.cxx rename to src/button/button.cxx index a4926285..e1f553c7 100644 --- a/src/grove/grovebutton.cxx +++ b/src/button/button.cxx @@ -28,11 +28,11 @@ #include #include -#include "grovebutton.hpp" +#include "button.hpp" using namespace upm; -GroveButton::GroveButton(unsigned int pin) +Button::Button(unsigned int pin) { if ( !(m_gpio = mraa_gpio_init(pin)) ) { throw std::invalid_argument(std::string(__FUNCTION__) + @@ -43,29 +43,29 @@ GroveButton::GroveButton(unsigned int pin) m_name = "Button Sensor"; } -GroveButton::~GroveButton() +Button::~Button() { mraa_gpio_close(m_gpio); } -std::string GroveButton::name() +std::string Button::name() { return m_name; } -int GroveButton::value() +int Button::value() { return mraa_gpio_read(m_gpio); } #ifdef JAVACALLBACK -void GroveButton::installISR(mraa::Edge level, jobject runnable) +void Button::installISR(mraa::Edge level, jobject runnable) { installISR(level, mraa_java_isr_callback, runnable); } #endif -void GroveButton::installISR(mraa::Edge level, void (*isr)(void *), void *arg) +void Button::installISR(mraa::Edge level, void (*isr)(void *), void *arg) { if (m_isrInstalled) uninstallISR(); @@ -75,7 +75,7 @@ void GroveButton::installISR(mraa::Edge level, void (*isr)(void *), void *arg) m_isrInstalled = true; } -void GroveButton::uninstallISR() +void Button::uninstallISR() { mraa_gpio_isr_exit(m_gpio); m_isrInstalled = false; diff --git a/src/grove/grovebutton.hpp b/src/button/button.hpp similarity index 89% rename from src/grove/grovebutton.hpp rename to src/button/button.hpp index 72eb4734..3f521131 100644 --- a/src/grove/grovebutton.hpp +++ b/src/button/button.hpp @@ -28,39 +28,38 @@ #include #include -#include "grovebase.hpp" namespace upm { /** - * @library grove - * @sensor grovebutton - * @comname Grove Button + * @library button + * @sensor button libupm-button + * @comname Button * @altname Grove Touch Sensor * @type button touch * @man seeed * @con gpio * @kit gsk * - * @brief API for the Grove Button + * @brief API for the Button * - * Basic UPM module for the Grove button + * Basic UPM module for the button sensor * - * @image html grovebutton.jpg - * @snippet grovebutton.cxx Interesting + * @image html button.jpg + * @snippet button.cxx Interesting */ -class GroveButton: public Grove { +class Button{ public: /** * Grove button constructor * * @param gpio Pin to use */ - GroveButton(unsigned int pin); + Button(unsigned int pin); /** * Grove button destructor */ - ~GroveButton(); + ~Button(); /** * Gets the name of the sensor * diff --git a/src/button/javaupm_button.i b/src/button/javaupm_button.i new file mode 100644 index 00000000..6485991a --- /dev/null +++ b/src/button/javaupm_button.i @@ -0,0 +1,19 @@ +%module javaupm_button +%include "../upm.i" + +%{ + #include "button.hpp" +%} + +%include "button.hpp" + +%pragma(java) jniclasscode=%{ + static { + try { + System.loadLibrary("javaupm_button"); + } catch (UnsatisfiedLinkError e) { + System.err.println("Native code library failed to load. \n" + e); + System.exit(1); + } + } +%} diff --git a/src/button/jsupm_button.i b/src/button/jsupm_button.i new file mode 100644 index 00000000..bc1c4b3c --- /dev/null +++ b/src/button/jsupm_button.i @@ -0,0 +1,8 @@ +%module jsupm_button +%include "../upm.i" + +%{ + #include "button.hpp" +%} + +%include "button.hpp" diff --git a/src/button/pyupm_button.i b/src/button/pyupm_button.i new file mode 100644 index 00000000..27fd9372 --- /dev/null +++ b/src/button/pyupm_button.i @@ -0,0 +1,11 @@ +// Include doxygen-generated documentation +%include "pyupm_doxy2swig.i" +%module pyupm_button +%include "../upm.i" + +%feature("autodoc", "3"); + +%include "button.hpp" +%{ + #include "button.hpp" +%} diff --git a/src/grove/CMakeLists.txt b/src/grove/CMakeLists.txt index 5c44a346..2319031c 100644 --- a/src/grove/CMakeLists.txt +++ b/src/grove/CMakeLists.txt @@ -1,7 +1,7 @@ upm_mixed_module_init (NAME grove DESCRIPTION "upm grove module" - CPP_HDR grovebutton.hpp groveled.hpp + CPP_HDR groveled.hpp grovetemp.hpp grovebase.hpp grove.hpp - CPP_SRC grovebutton.cxx groveled.cxx + CPP_SRC groveled.cxx grovetemp.cxx REQUIRES mraa) diff --git a/src/grove/grove.hpp b/src/grove/grove.hpp index 6bdaf3de..6d42fcee 100644 --- a/src/grove/grove.hpp +++ b/src/grove/grove.hpp @@ -25,6 +25,6 @@ */ #pragma once -#include +#include #include #include diff --git a/src/grove/javaupm_grove.i b/src/grove/javaupm_grove.i index 1af48fcc..770d3ba8 100644 --- a/src/grove/javaupm_grove.i +++ b/src/grove/javaupm_grove.i @@ -14,9 +14,9 @@ #include "grovebase.hpp" %} -%include "grovebutton.hpp" +%include "button.hpp" %{ - #include "grovebutton.hpp" + #include "button.hpp" %} %include "groveled.hpp" diff --git a/src/grove/jsupm_grove.i b/src/grove/jsupm_grove.i index 367c9a8d..036044f1 100644 --- a/src/grove/jsupm_grove.i +++ b/src/grove/jsupm_grove.i @@ -11,9 +11,9 @@ #include "grovebase.hpp" %} -%include "grovebutton.hpp" +%include "button.hpp" %{ - #include "grovebutton.hpp" + #include "button.hpp" %} %include "groveled.hpp" diff --git a/src/grove/pyupm_grove.i b/src/grove/pyupm_grove.i index 234085bf..15872651 100644 --- a/src/grove/pyupm_grove.i +++ b/src/grove/pyupm_grove.i @@ -15,9 +15,9 @@ #include "grovebase.hpp" %} -%include "grovebutton.hpp" +%include "button.hpp" %{ - #include "grovebutton.hpp" + #include "button.hpp" %} %include "groveled.hpp"