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 <sisinty.s.patra@intel.com>

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

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)

examples/c++/water.cxx

@@ -25,7 +25,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
-#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)
     {

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)

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]
 	}
 
-}
+}

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

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 ##

src/grovewater/CMakeLists.txt

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

src/grovewater/jsupm_grovewater.i

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

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)

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

src/water/jsupm_water.i

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

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

src/water/water.cxx

@@ -26,12 +26,12 @@
 #include <string>
 #include <stdexcept>
 
-#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);
 }

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
      *