mirror of
https://github.com/eclipse/upm.git
synced 2025-03-24 01:10:22 +03:00
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>
This commit is contained in:
parent
dddba3e8a4
commit
9bfda4219d
@ -24,19 +24,10 @@
|
|||||||
|
|
||||||
public class GroveButtonSample {
|
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 {
|
public static void main(String[] args) throws InterruptedException {
|
||||||
// ! [Interesting]
|
// ! [Interesting]
|
||||||
// Create the button object using UART
|
// Create the button object using GPIO pin 2
|
||||||
upm_grove.GroveButton button = new upm_grove.GroveButton(0);
|
upm_grove.GroveButton button = new upm_grove.GroveButton(2);
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
System.out.println(button.name() + " value is " + button.value());
|
System.out.println(button.name() + " value is " + button.value());
|
||||||
|
@ -1,5 +1,3 @@
|
|||||||
import upm_grove.IsrCallback;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Author: Stefan Andritoiu <stefan.andritoiu@intel.com>
|
* Author: Stefan Andritoiu <stefan.andritoiu@intel.com>
|
||||||
* Copyright (c) 2015 Intel Corporation.
|
* 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.
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import upm_grove.IsrCallback;
|
||||||
|
|
||||||
//NOT TESTED!!!
|
//NOT TESTED!!!
|
||||||
public class GroveButton_intrSample {
|
public class GroveButton_intrSample {
|
||||||
|
|
||||||
@ -31,7 +31,7 @@ public class GroveButton_intrSample {
|
|||||||
|
|
||||||
static {
|
static {
|
||||||
try {
|
try {
|
||||||
System.loadLibrary("javaupm_grove");
|
System.loadLibrary("mraajava");
|
||||||
} catch (UnsatisfiedLinkError e) {
|
} catch (UnsatisfiedLinkError e) {
|
||||||
System.err.println("error in loading native library");
|
System.err.println("error in loading native library");
|
||||||
System.exit(-1);
|
System.exit(-1);
|
||||||
@ -43,7 +43,7 @@ public class GroveButton_intrSample {
|
|||||||
upm_grove.GroveButton b = new upm_grove.GroveButton(2);
|
upm_grove.GroveButton b = new upm_grove.GroveButton(2);
|
||||||
|
|
||||||
IsrCallback callback = new ButtonISR();
|
IsrCallback callback = new ButtonISR();
|
||||||
b.installISR(0, callback);
|
b.installISR(mraa.Edge.EDGE_RISING.swigValue(), callback);
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
System.out.println("Counter: " + counter);
|
System.out.println("Counter: " + counter);
|
||||||
@ -60,6 +60,6 @@ class ButtonISR extends IsrCallback {
|
|||||||
|
|
||||||
public void run() {
|
public void run() {
|
||||||
GroveButton_intrSample.counter++;
|
GroveButton_intrSample.counter++;
|
||||||
System.out.println("+++++++++");
|
System.out.println("Button pressed!");
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user