From ddab71e8961c6eba1a324688a672a76c0dd5a20e Mon Sep 17 00:00:00 2001 From: Sisinty Sasmita Patra Date: Tue, 13 Sep 2016 15:03:26 -0700 Subject: [PATCH] Water: Removed grove dependency * Renamed all files from grovewater to water * Replaced all instances of grovewater with water * Updated all CMake files Signed-off-by: Sisinty Sasmita Patra --- docs/images/{grovewater.jpg => water.jpg} | Bin doxy/samples.mapping.txt | 2 +- examples/c++/CMakeLists.txt | 2 +- examples/c++/{grovewater.cxx => water.cxx} | 6 ++-- examples/java/CMakeLists.txt | 2 +- ...GroveWaterSample.java => WaterSample.java} | 8 ++--- .../javascript/{grovewater.js => water.js} | 6 ++-- examples/python/{grovewater.py => water.py} | 6 ++-- src/grovewater/CMakeLists.txt | 5 ---- src/grovewater/jsupm_grovewater.i | 8 ----- src/water/CMakeLists.txt | 5 ++++ .../javaupm_water.i} | 8 ++--- src/water/jsupm_water.i | 8 +++++ .../pyupm_water.i} | 6 ++-- .../grovewater.cxx => water/water.cxx} | 8 ++--- .../grovewater.hpp => water/water.hpp} | 28 +++++++++--------- 16 files changed, 54 insertions(+), 54 deletions(-) rename docs/images/{grovewater.jpg => water.jpg} (100%) rename examples/c++/{grovewater.cxx => water.cxx} (92%) rename examples/java/{GroveWaterSample.java => WaterSample.java} (90%) rename examples/javascript/{grovewater.js => water.js} (91%) rename examples/python/{grovewater.py => water.py} (92%) delete mode 100644 src/grovewater/CMakeLists.txt delete mode 100644 src/grovewater/jsupm_grovewater.i create mode 100644 src/water/CMakeLists.txt rename src/{grovewater/javaupm_grovewater.i => water/javaupm_water.i} (64%) create mode 100644 src/water/jsupm_water.i rename src/{grovewater/pyupm_grovewater.i => water/pyupm_water.i} (60%) rename src/{grovewater/grovewater.cxx => water/water.cxx} (93%) rename src/{grovewater/grovewater.hpp => water/water.hpp} (78%) diff --git a/docs/images/grovewater.jpg b/docs/images/water.jpg similarity index 100% rename from docs/images/grovewater.jpg rename to docs/images/water.jpg diff --git a/doxy/samples.mapping.txt b/doxy/samples.mapping.txt index c7c25098..eb52eee6 100644 --- a/doxy/samples.mapping.txt +++ b/doxy/samples.mapping.txt @@ -22,7 +22,7 @@ grovescam.cxx GROVESCAMSample.java slide.cxx SlideSample.java grovespeaker.cxx GroveSpeakerSample.java vdiv.cxx VDivSample.java -grovewater.cxx GroveWaterSample.java +water.cxx WaterSample.java grovewfs.cxx GroveWFSSample.java guvas12d.cxx GUVAS12DSample.java h3lis331dl.cxx H3LIS331DLSample.java diff --git a/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt index afcbe08e..5e7042e6 100644 --- a/examples/c++/CMakeLists.txt +++ b/examples/c++/CMakeLists.txt @@ -147,7 +147,7 @@ add_example (ehr) add_example (ta12200) add_example (grovelinefinder) add_example (vdiv) -add_example (grovewater) +add_example (water) add_example (guvas12d) add_example (mpr121) add_example (yg1006) diff --git a/examples/c++/grovewater.cxx b/examples/c++/water.cxx similarity index 92% rename from examples/c++/grovewater.cxx rename to examples/c++/water.cxx index e13f8e7d..c7605451 100644 --- a/examples/c++/grovewater.cxx +++ b/examples/c++/water.cxx @@ -25,7 +25,7 @@ #include #include #include -#include "grovewater.hpp" +#include "water.hpp" using namespace std; @@ -43,8 +43,8 @@ int main () signal(SIGINT, sig_handler); //! [Interesting] - // Instantiate a Grove Water sensor on digital pin D2 - upm::GroveWater* water = new upm::GroveWater(2); + // Instantiate a Water sensor on digital pin D2 + upm::Water* water = new upm::Water(2); while (shouldRun) { diff --git a/examples/java/CMakeLists.txt b/examples/java/CMakeLists.txt index b3417698..a9937240 100644 --- a/examples/java/CMakeLists.txt +++ b/examples/java/CMakeLists.txt @@ -53,7 +53,7 @@ add_example(SlideSample slide) add_example(GroveSpeakerSample grovespeaker) add_example(TemperatureSample temperature) add_example(VDivSample vdiv) -add_example(GroveWaterSample grovewater) +add_example(WaterSample water) add_example(GroveWFSSample grovewfs) add_example(GUVAS12DSample guvas12d) add_example(H3LIS331DLSample h3lis331dl) diff --git a/examples/java/GroveWaterSample.java b/examples/java/WaterSample.java similarity index 90% rename from examples/java/GroveWaterSample.java rename to examples/java/WaterSample.java index f275df77..b4ae2427 100644 --- a/examples/java/GroveWaterSample.java +++ b/examples/java/WaterSample.java @@ -22,12 +22,12 @@ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -public class GroveWaterSample { +public class WaterSample { public static void main(String[] args) throws InterruptedException { // ! [Interesting] - // Instantiate a Grove Water sensor on digital pin D2 - upm_grovewater.GroveWater water = new upm_grovewater.GroveWater(2); + // Instantiate a Water sensor on digital pin D2 + upm_water.Water water = new upm_water.Water(2); while (true) { boolean val = water.isWet(); @@ -42,4 +42,4 @@ public class GroveWaterSample { // ! [Interesting] } -} \ No newline at end of file +} diff --git a/examples/javascript/grovewater.js b/examples/javascript/water.js similarity index 91% rename from examples/javascript/grovewater.js rename to examples/javascript/water.js index d953106e..836de486 100644 --- a/examples/javascript/grovewater.js +++ b/examples/javascript/water.js @@ -23,10 +23,10 @@ */ // Load Grove module -var waterSensor = require('jsupm_grovewater'); +var waterSensor = require('jsupm_water'); -// Instantiate a Grove Water sensor on digital pin D2 -var water = new waterSensor.GroveWater(2); +// Instantiate a Water sensor on digital pin D2 +var water = new waterSensor.Water(2); // Read whether the sensor is wet/dry, waiting one second between readings function readWaterState() diff --git a/examples/python/grovewater.py b/examples/python/water.py similarity index 92% rename from examples/python/grovewater.py rename to examples/python/water.py index 54a3d149..ff7f73b9 100644 --- a/examples/python/grovewater.py +++ b/examples/python/water.py @@ -22,10 +22,10 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import time, sys, signal, atexit -import pyupm_grovewater as upmGrovewater +import pyupm_water as upmwater -# Instantiate a Grove Water sensor on digital pin D2 -myWaterSensor = upmGrovewater.GroveWater(2) +# Instantiate a Water sensor on digital pin D2 +myWaterSensor = upmwater.Water(2) ## Exit handlers ## diff --git a/src/grovewater/CMakeLists.txt b/src/grovewater/CMakeLists.txt deleted file mode 100644 index 6561276b..00000000 --- a/src/grovewater/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set (libname "grovewater") -set (libdescription "upm grove water module") -set (module_src ${libname}.cxx) -set (module_hpp ${libname}.hpp) -upm_module_init() diff --git a/src/grovewater/jsupm_grovewater.i b/src/grovewater/jsupm_grovewater.i deleted file mode 100644 index 48c5deeb..00000000 --- a/src/grovewater/jsupm_grovewater.i +++ /dev/null @@ -1,8 +0,0 @@ -%module jsupm_grovewater -%include "../upm.i" - -%{ - #include "grovewater.hpp" -%} - -%include "grovewater.hpp" diff --git a/src/water/CMakeLists.txt b/src/water/CMakeLists.txt new file mode 100644 index 00000000..5873f29e --- /dev/null +++ b/src/water/CMakeLists.txt @@ -0,0 +1,5 @@ +upm_mixed_module_init (NAME water + DESCRIPTION "UPM water sensor module" + CPP_HDR water.hpp + CPP_SRC water.cxx + REQUIRES mraa) diff --git a/src/grovewater/javaupm_grovewater.i b/src/water/javaupm_water.i similarity index 64% rename from src/grovewater/javaupm_grovewater.i rename to src/water/javaupm_water.i index 0c074171..2b89df58 100644 --- a/src/grovewater/javaupm_grovewater.i +++ b/src/water/javaupm_water.i @@ -1,16 +1,16 @@ -%module javaupm_grovewater +%module javaupm_water %include "../upm.i" %{ - #include "grovewater.hpp" + #include "water.hpp" %} -%include "grovewater.hpp" +%include "water.hpp" %pragma(java) jniclasscode=%{ static { try { - System.loadLibrary("javaupm_grovewater"); + System.loadLibrary("javaupm_water"); } catch (UnsatisfiedLinkError e) { System.err.println("Native code library failed to load. \n" + e); System.exit(1); diff --git a/src/water/jsupm_water.i b/src/water/jsupm_water.i new file mode 100644 index 00000000..7d353140 --- /dev/null +++ b/src/water/jsupm_water.i @@ -0,0 +1,8 @@ +%module jsupm_water +%include "../upm.i" + +%{ + #include "water.hpp" +%} + +%include "water.hpp" diff --git a/src/grovewater/pyupm_grovewater.i b/src/water/pyupm_water.i similarity index 60% rename from src/grovewater/pyupm_grovewater.i rename to src/water/pyupm_water.i index 0af321c7..8fd04551 100644 --- a/src/grovewater/pyupm_grovewater.i +++ b/src/water/pyupm_water.i @@ -1,11 +1,11 @@ // Include doxygen-generated documentation %include "pyupm_doxy2swig.i" -%module pyupm_grovewater +%module pyupm_water %include "../upm.i" %feature("autodoc", "3"); -%include "grovewater.hpp" +%include "water.hpp" %{ - #include "grovewater.hpp" + #include "water.hpp" %} diff --git a/src/grovewater/grovewater.cxx b/src/water/water.cxx similarity index 93% rename from src/grovewater/grovewater.cxx rename to src/water/water.cxx index 9220adcf..f62f7072 100644 --- a/src/grovewater/grovewater.cxx +++ b/src/water/water.cxx @@ -26,12 +26,12 @@ #include #include -#include "grovewater.hpp" +#include "water.hpp" using namespace upm; using namespace std; -GroveWater::GroveWater(int pin) +Water::Water(int pin) { if ( !(m_gpio = mraa_gpio_init(pin)) ) { @@ -43,12 +43,12 @@ GroveWater::GroveWater(int pin) mraa_gpio_dir(m_gpio, MRAA_GPIO_IN); } -GroveWater::~GroveWater() +Water::~Water() { mraa_gpio_close(m_gpio); } -bool GroveWater::isWet() +bool Water::isWet() { return (!mraa_gpio_read(m_gpio) ? true : false); } diff --git a/src/grovewater/grovewater.hpp b/src/water/water.hpp similarity index 78% rename from src/grovewater/grovewater.hpp rename to src/water/water.hpp index 50e74b4e..6d83f64b 100644 --- a/src/grovewater/grovewater.hpp +++ b/src/water/water.hpp @@ -28,39 +28,39 @@ namespace upm { /** - * @brief Grove Water Sensor library - * @defgroup grovewater libupm-grovewater + * @brief Water Sensor library + * @defgroup water libupm-water * @ingroup seeed gpio liquid eak */ /** - * @library grovewater - * @sensor grovewater - * @comname Grove Water Sensor + * @library water + * @sensor water + * @comname Water Sensor * @type liquid * @man seeed * @con gpio * @kit eak * - * @brief API for the Grove Water Sensor + * @brief API for the Water Sensor * - * UPM module for the Grove Water sensor + * UPM module for the Water sensor * - * @image html grovewater.jpg - * @snippet grovewater.cxx Interesting + * @image html water.jpg + * @snippet water.cxx Interesting */ - class GroveWater { + class Water { public: /** - * Grove digital water sensor constructor + * digital water sensor constructor * * @param pin Digital pin to use */ - GroveWater(int pin); + Water(int pin); /** - * GroveWater destructor + * Water destructor */ - ~GroveWater(); + ~Water(); /** * Gets the water (wet/not wet) value from the sensor *