Skip to content

Commit f4b7d25

Browse files
committed
fix spi-master regression
1 parent 2117d01 commit f4b7d25

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

include/javaproxy.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ JNIEnv *g_env;
1616
JavaVM *g_jvm;
1717
jobject g_activity;
1818

19-
#define ARRAY_SIZE 1024
19+
// TWI limit is 255, SPI limit is 64
20+
#define ARRAY_SIZE 255
2021

2122
#if defined(ANDROID_MODULE)
2223
#define attachCurrentThread() g_jvm->AttachCurrentThread(&g_env, nullptr)

ioio/ioio/src/main/java/ioio/smallbasic/SpiMasterImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public long readWrite(int readLen, final byte[] write, int writeLen) {
5656
public void write(final byte[] write, int writeLen) {
5757
handleError();
5858
lock.invoke((i) -> {
59-
spiMaster.writeRead(write, write.length, write.length, null, 0);
59+
spiMaster.writeRead(write, writeLen, writeLen, null, 0);
6060
});
6161
}
6262

@@ -90,7 +90,7 @@ private void validatePins() {
9090
mosi == clk ||
9191
mosi == slaveSelect ||
9292
clk == slaveSelect) {
93-
IOUtil.setError("One or pins have duplicate values");
93+
IOUtil.setError("One or more pins have duplicate values");
9494
}
9595
}
9696
}

ioio/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ SBLIB_API int sblib_func_count() {
254254
//
255255
int sblib_init(const char *sourceFile) {
256256
#if defined(DESKTOP_MODULE)
257-
int result = createJVM("-Djava.class.path=./ioio-1.0-jar-with-dependencies.jar", "-Dioio.SerialPorts=IOIO0", true);
257+
int result = createJVM("-Djava.class.path=./ioio-1.0-jar-with-dependencies.jar", "-Dioio.SerialPorts=IOIO0", false);
258258
#else
259259
int result = 1;
260260
#endif

0 commit comments

Comments
 (0)