From 9bfda4219d0a894247216a1924bff58b5c2dfc51 Mon Sep 17 00:00:00 2001 From: Stefan Andritoiu Date: Mon, 23 Nov 2015 17:22:10 +0200 Subject: [PATCH] groveButton: Corrected GroveButtonSample and GroveButton_intrSample Signed-off-by: Stefan Andritoiu Signed-off-by: Mihai Tudor Panu --- examples/java/GroveButtonSample.java | 13 ++----------- examples/java/GroveButton_intrSample.java | 10 +++++----- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/examples/java/GroveButtonSample.java b/examples/java/GroveButtonSample.java index c04601ef..9be6e2fc 100644 --- a/examples/java/GroveButtonSample.java +++ b/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()); diff --git a/examples/java/GroveButton_intrSample.java b/examples/java/GroveButton_intrSample.java index abe7ab09..6da7b784 100644 --- a/examples/java/GroveButton_intrSample.java +++ b/examples/java/GroveButton_intrSample.java @@ -1,5 +1,3 @@ -import upm_grove.IsrCallback; - /* * Author: Stefan Andritoiu * 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!"); } } \ No newline at end of file