Skip to content

Commit 02a8c70

Browse files
chriswschrisws
committed
IOIO: implement jni methods
1 parent 8c24e81 commit 02a8c70

11 files changed

Lines changed: 88 additions & 82 deletions

File tree

‎ioio/Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Download the GNU Public License (GPL) from www.gnu.org
66
#
77
# export LD_LIBRARY_PATH=/usr/lib/jvm/java-1.8.0-openjdk-amd64/jre/lib/amd64/server:$LD_LIBRARY_PATH
8-
# javap -s -p -cp target/ioio-1.0.jar 'net.sourceforge.smallbasic.ioio.AnalogInput'
8+
# javap -s -p -cp target/ioio-1.0.jar 'net.sourceforge.smallbasic.ioio.AnalogInputImpl'
99
#
1010

1111
sbasic=sbasic

‎ioio/main.cpp‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ JNIEnv *env;
2020
JavaVM *jvm;
2121
int nextId = 1;
2222

23-
#define CLASS_ANALOGINPUT "net/sourceforge/smallbasic/ioio/AnalogInput"
24-
#define CLASS_DIGITALINPUT "net/sourceforge/smallbasic/ioio/DigitalInput"
25-
#define CLASS_DIGITALOUTPUT "net/sourceforge/smallbasic/ioio/DigitalOutput"
26-
#define CLASS_PULSEINPUT "net/sourceforge/smallbasic/ioio/PulseInput"
27-
#define CLASS_PWMOUTPUT "net/sourceforge/smallbasic/ioio/PwmOutput"
28-
#define CLASS_CAPSENSE "net/sourceforge/smallbasic/ioio/Capsense"
23+
#define CLASS_ANALOGINPUT "net/sourceforge/smallbasic/ioio/AnalogInputImpl"
24+
#define CLASS_DIGITALINPUT "net/sourceforge/smallbasic/ioio/DigitalInputImpl"
25+
#define CLASS_DIGITALOUTPUT "net/sourceforge/smallbasic/ioio/DigitalOutputImpl"
26+
#define CLASS_PULSEINPUT "net/sourceforge/smallbasic/ioio/PulseInputImpl"
27+
#define CLASS_PWMOUTPUT "net/sourceforge/smallbasic/ioio/PwmOutputImpl"
28+
#define CLASS_CAPSENSE "net/sourceforge/smallbasic/ioio/CapsenseImpl"
2929
#define CLASS_IOCLASS 1
3030

3131
struct IOClass {
@@ -58,11 +58,20 @@ struct IOClass {
5858
return result;
5959
}
6060

61-
bool checkException() {
61+
bool checkException(var_s *retval) {
6262
auto exc = env->ExceptionOccurred();
6363
if (exc) {
64-
env->ExceptionDescribe();
65-
env->ExceptionClear();
64+
if (retval) {
65+
jclass clazz = env->FindClass("java/lang/Object");
66+
jmethodID methodId = env->GetMethodID(clazz, "toString", "()Ljava/lang/String;");
67+
jstring jstr = (jstring) env->CallObjectMethod(exc, methodId);
68+
const char *message = env->GetStringUTFChars(jstr, JNI_FALSE);
69+
error(retval, message);
70+
env->ReleaseStringUTFChars(jstr, message);
71+
} else {
72+
env->ExceptionDescribe();
73+
env->ExceptionClear();
74+
}
6675
}
6776
return exc;
6877
}
@@ -76,7 +85,7 @@ struct IOClass {
7685
if (method != nullptr) {
7786
value = env->CallBooleanMethod(_instance, method);
7887
}
79-
if (!checkException()) {
88+
if (!checkException(retval)) {
8089
v_setint(retval, value);
8190
result = 1;
8291
}
@@ -93,7 +102,7 @@ struct IOClass {
93102
if (method != nullptr) {
94103
value = env->CallFloatMethod(_instance, method);
95104
}
96-
if (!checkException()) {
105+
if (!checkException(retval)) {
97106
v_setreal(retval, value);
98107
result = 1;
99108
}
@@ -110,7 +119,7 @@ struct IOClass {
110119
if (method != nullptr) {
111120
value = env->CallIntMethod(_instance, method);
112121
}
113-
if (!checkException()) {
122+
if (!checkException(retval)) {
114123
v_setint(retval, value);
115124
result = 1;
116125
}
@@ -126,7 +135,7 @@ struct IOClass {
126135
if (method != nullptr) {
127136
env->CallVoidMethod(_instance, method, value);
128137
}
129-
if (!checkException()) {
138+
if (!checkException(retval)) {
130139
result = 1;
131140
}
132141
}
@@ -141,7 +150,7 @@ struct IOClass {
141150
if (method != nullptr) {
142151
env->CallVoidMethod(_instance, method, value);
143152
}
144-
if (!checkException()) {
153+
if (!checkException(retval)) {
145154
result = 1;
146155
}
147156
}
@@ -156,7 +165,7 @@ struct IOClass {
156165
if (method != nullptr) {
157166
env->CallVoidMethod(_instance, method, value);
158167
}
159-
if (!checkException()) {
168+
if (!checkException(retval)) {
160169
result = 1;
161170
}
162171
}
@@ -171,7 +180,7 @@ struct IOClass {
171180
if (method != nullptr) {
172181
env->CallVoidMethod(_instance, method);
173182
}
174-
if (!checkException()) {
183+
if (!checkException(retval)) {
175184
result = 1;
176185
}
177186
}

‎ioio/samples/led.bas‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,17 @@ print "wait for connect"
66
out.waitForConnect()
77
print "ready"
88

9-
while !out.isReady()
10-
print "actually.. not ready"
11-
delay 1000
12-
wend
13-
149
value = false
1510
for i = 0 to 5
1611
out.write(value)
1712
value = !value
18-
delay 100
13+
delay 1000
1914
next
2015

2116
for i = 0 to 5
2217
out.write(value)
2318
value = !value
24-
delay 10
19+
delay 100
2520
next
2621

2722
print "done"

ioio/src/main/java/net/sourceforge/smallbasic/ioio/AnalogInput.java renamed to ioio/src/main/java/net/sourceforge/smallbasic/ioio/AnalogInputImpl.java

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@
55
import ioio.lib.api.exception.IncompatibilityException;
66
import ioio.lib.spi.Log;
77
import ioio.lib.util.IOIOLooper;
8+
import ioio.lib.api.AnalogInput;
89

910
import java.util.concurrent.BlockingQueue;
1011
import java.util.concurrent.CountDownLatch;
1112
import java.util.concurrent.LinkedBlockingQueue;
1213

13-
public class AnalogInput extends AbstractLooperProvider implements ioio.lib.api.AnalogInput {
14+
public class AnalogInputImpl extends AbstractLooperProvider implements AnalogInput {
1415
private static final String TAG = "AnalogInput";
1516
private AnalogInputLooper looper;
16-
static final protected BlockingQueue<FloatConsumer<ioio.lib.api.AnalogInput>> INPUT_QUEUE = new LinkedBlockingQueue<>();
17+
protected BlockingQueue<FloatConsumer<AnalogInput>> inputQueue;
1718

18-
public AnalogInput() {
19+
public AnalogInputImpl() {
1920
super();
21+
inputQueue = new LinkedBlockingQueue<>();
2022
Log.i(TAG, "created");
2123
}
2224

@@ -39,65 +41,65 @@ public IOIOLooper createIOIOLooper(String connectionType, Object extra) {
3941

4042
@Override
4143
public int getOverflowCount() {
42-
return (int) invokeFloat(ioio.lib.api.AnalogInput::getOverflowCount);
44+
return (int) invokeFloat(AnalogInput::getOverflowCount);
4345
}
4446

4547
@Override
4648
public float getReference() {
47-
return invokeFloat(ioio.lib.api.AnalogInput::getReference);
49+
return invokeFloat(AnalogInput::getReference);
4850
}
4951

5052
@Override
5153
public float getSampleRate() {
52-
return invokeFloat(ioio.lib.api.AnalogInput::getSampleRate);
54+
return invokeFloat(AnalogInput::getSampleRate);
5355
}
5456

5557
@Override
5658
public float getVoltage() {
57-
return invokeFloat(ioio.lib.api.AnalogInput::getVoltage);
59+
return invokeFloat(AnalogInput::getVoltage);
5860
}
5961

6062
@Override
6163
public float getVoltageBuffered() {
62-
return invokeFloat(ioio.lib.api.AnalogInput::getVoltageBuffered);
64+
return invokeFloat(AnalogInput::getVoltageBuffered);
6365
}
6466

6567
@Override
6668
public float getVoltageSync() {
67-
return invokeFloat(ioio.lib.api.AnalogInput::getVoltageSync);
69+
return invokeFloat(AnalogInput::getVoltageSync);
6870
}
6971

7072
public void open(int pin) {
7173
Log.i(TAG, "openInput");
72-
looper = new AnalogInputLooper(QUEUE, pin);
74+
looper = new AnalogInputLooper(QUEUE, inputQueue, pin);
7375
start();
7476
}
7577

7678
@Override
7779
public float read() throws InterruptedException, ConnectionLostException {
78-
return invokeFloat(ioio.lib.api.AnalogInput::read);
80+
return invokeFloat(AnalogInput::read);
7981
}
8082

8183
@Override
8284
public float readBuffered() {
83-
return invokeFloat(ioio.lib.api.AnalogInput::readBuffered);
85+
return invokeFloat(AnalogInput::readBuffered);
8486
}
8587

8688
@Override
8789
public float readSync() {
88-
return invokeFloat(ioio.lib.api.AnalogInput::readSync);
90+
return invokeFloat(AnalogInput::readSync);
8991
}
9092

9193
@Override
9294
public void setBuffer(int capacity) {
9395

9496
}
9597

96-
protected float invokeFloat(FloatConsumer<ioio.lib.api.AnalogInput> consumer) {
98+
protected float invokeFloat(FloatConsumer<AnalogInput> consumer) {
9799
final CountDownLatch latch = new CountDownLatch(1);
98100
final float[] result = new float[1];
99101
try {
100-
INPUT_QUEUE.put(e -> {
102+
inputQueue.put(e -> {
101103
result[0] = consumer.invoke(e);
102104
latch.countDown();
103105
return result[0];
@@ -111,10 +113,14 @@ protected float invokeFloat(FloatConsumer<ioio.lib.api.AnalogInput> consumer) {
111113
}
112114

113115
static class AnalogInputLooper extends AbstractLooper {
114-
private ioio.lib.api.AnalogInput analogInput;
116+
private AnalogInput analogInput;
117+
private final BlockingQueue<FloatConsumer<AnalogInput>> inputQueue;
115118

116-
public AnalogInputLooper(BlockingQueue<Consumer<IOIO>> queue, int pin) {
119+
public AnalogInputLooper(BlockingQueue<Consumer<IOIO>> queue,
120+
BlockingQueue<FloatConsumer<AnalogInput>> inputQueue,
121+
int pin) {
117122
super(queue, pin);
123+
this.inputQueue = inputQueue;
118124
Log.i(TAG, "creating AnalogInputLooper");
119125
}
120126

@@ -126,9 +132,9 @@ public void close() {
126132
@Override
127133
public void loop() throws InterruptedException, ConnectionLostException {
128134
super.loop();
129-
if (!INPUT_QUEUE.isEmpty()) {
135+
if (!inputQueue.isEmpty()) {
130136
try {
131-
INPUT_QUEUE.take().invoke(analogInput);
137+
inputQueue.take().invoke(analogInput);
132138
}
133139
catch (ConnectionLostException | IncompatibilityException e) {
134140
throw new RuntimeException(e);

ioio/src/main/java/net/sourceforge/smallbasic/ioio/CapSense.java renamed to ioio/src/main/java/net/sourceforge/smallbasic/ioio/CapSenseImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package net.sourceforge.smallbasic.ioio;
22

3+
import ioio.lib.api.CapSense;
34
import ioio.lib.api.IOIO;
45
import ioio.lib.api.exception.ConnectionLostException;
56
import ioio.lib.spi.Log;
67
import ioio.lib.util.IOIOLooper;
78

89
import java.util.concurrent.BlockingQueue;
910

10-
public class CapSense extends AbstractLooperProvider implements ioio.lib.api.CapSense {
11+
public class CapSenseImpl extends AbstractLooperProvider implements CapSense {
1112
private static final String TAG = "CapSense";
1213
private CapSenseLooper looper;
1314

14-
public CapSense() {
15+
public CapSenseImpl() {
1516
super();
1617
Log.i(TAG, "created");
1718
}
@@ -69,7 +70,7 @@ public void waitUnderSync(float threshold) throws ConnectionLostException, Inter
6970
}
7071

7172
static class CapSenseLooper extends AbstractLooper {
72-
private ioio.lib.api.CapSense capSense;
73+
private CapSense capSense;
7374

7475
public CapSenseLooper(BlockingQueue<Consumer<IOIO>> queue, int pin) {
7576
super(queue, pin);

ioio/src/main/java/net/sourceforge/smallbasic/ioio/DigitalInput.java renamed to ioio/src/main/java/net/sourceforge/smallbasic/ioio/DigitalInputImpl.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
package net.sourceforge.smallbasic.ioio;
22

3+
import ioio.lib.api.DigitalInput;
34
import ioio.lib.api.IOIO;
45
import ioio.lib.api.exception.ConnectionLostException;
56
import ioio.lib.spi.Log;
67
import ioio.lib.util.IOIOLooper;
78

89
import java.util.concurrent.BlockingQueue;
10+
import java.util.concurrent.CountDownLatch;
911

10-
public class DigitalInput extends AbstractLooperProvider implements ioio.lib.api.DigitalInput {
12+
public class DigitalInputImpl extends AbstractLooperProvider implements DigitalInput {
1113
private static final String TAG = "DigitalInput";
1214
private DigitalInputLooper looper;
15+
private CountDownLatch latch;
1316

14-
public DigitalInput() {
17+
public DigitalInputImpl() {
1518
super();
19+
looper = null;
20+
latch = null;
1621
Log.i(TAG, "created DigitalInput");
1722
}
1823

1924
@Override
2025
public void close() {
2126
super.close();
22-
this.looper.close();
2327
looper = null;
2428
}
2529

@@ -41,7 +45,6 @@ public boolean read() {
4145

4246
@Override
4347
public void waitForValue(boolean value) throws InterruptedException, ConnectionLostException {
44-
4548
}
4649

4750
static class DigitalInputLooper extends AbstractLooper {
@@ -63,7 +66,6 @@ public void close() {
6366
public void loop() throws InterruptedException, ConnectionLostException {
6467
super.loop();
6568
value = input.read();
66-
Thread.sleep(10);
6769
}
6870

6971
@Override

0 commit comments

Comments
 (0)