groveButton: Corrected GroveButtonSample and GroveButton_intrSample

Signed-off-by: Stefan Andritoiu <stefan.andritoiu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

examples/java/GroveButtonSample.java

@@ -24,19 +24,10 @@
 
 public class GroveButtonSample {
 
-	static {
-		try {
-			System.loadLibrary("javaupm_grove");
-		} catch (UnsatisfiedLinkError e) {
-			System.err.println("error in loading native library");
-			System.exit(-1);
-		}
-	}
-
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]
-		// Create the button object using UART
-		upm_grove.GroveButton button = new upm_grove.GroveButton(0);
+		// Create the button object using GPIO pin 2
+		upm_grove.GroveButton button = new upm_grove.GroveButton(2);
 
 		while (true) {
 			System.out.println(button.name() + " value is " + button.value());

examples/java/GroveButton_intrSample.java

@@ -1,5 +1,3 @@
-import upm_grove.IsrCallback;
-
 /*
  * Author: Stefan Andritoiu <stefan.andritoiu@intel.com>
  * Copyright (c) 2015 Intel Corporation.
@@ -24,6 +22,8 @@ import upm_grove.IsrCallback;
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+import upm_grove.IsrCallback;
+
 //NOT TESTED!!!
 public class GroveButton_intrSample {
 
@@ -31,7 +31,7 @@ public class GroveButton_intrSample {
 
 	static {
 		try {
-			System.loadLibrary("javaupm_grove");
+			System.loadLibrary("mraajava");
 		} catch (UnsatisfiedLinkError e) {
 			System.err.println("error in loading native library");
 			System.exit(-1);
@@ -43,7 +43,7 @@ public class GroveButton_intrSample {
 		upm_grove.GroveButton b = new upm_grove.GroveButton(2);
 
 		IsrCallback callback = new ButtonISR();
-		b.installISR(0, callback);
+		b.installISR(mraa.Edge.EDGE_RISING.swigValue(), callback);
 
 		while (true) {
 			System.out.println("Counter: " + counter);
@@ -60,6 +60,6 @@ class ButtonISR extends IsrCallback {
 
 	public void run() {
 		GroveButton_intrSample.counter++;
-		System.out.println("+++++++++");
+		System.out.println("Button pressed!");
 	}
 }