IOIO: android integration

Author: chrisws

ioio/ioio/src/main/java/ioio/lib/android/AccessoryConnectionBootstrap.java

@@ -38,8 +38,6 @@
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
 
-import net.sourceforge.smallbasic.ioio.IOIOLoader;
-
 import java.io.BufferedOutputStream;
 import java.io.FileDescriptor;
 import java.io.FileInputStream;

…rceforge/smallbasic/ioio/IOIOLoader.java …in/java/ioio/lib/android/IOIOLoader.javaioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/IOIOLoader.java renamed to ioio/ioio/src/main/java/ioio/lib/android/IOIOLoader.java ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/IOIOLoader.java renamed to ioio/ioio/src/main/java/ioio/lib/android/IOIOLoader.java

@@ -1,4 +1,4 @@
-package net.sourceforge.smallbasic.ioio;
+package ioio.lib.android;
 
 import android.content.Context;
 

ioio/ioio/src/main/java/net/sourceforge/smallbasic/ioio/IOLock.java

@@ -11,7 +11,7 @@
 
 public class IOLock<I> {
   private final Object mutex = new Object();
-  private static final int TIMEOUT_SECS = 5;
+  private static final int TIMEOUT_SECS = 20;
   private Consumer<I> consumer;
 
   public void invoke(Consumer<I> consumer) {
@@ -90,7 +90,7 @@ private CountDownLatch beginLatch() {
   private void endLatch(CountDownLatch latch) {
     try {
       if (!latch.await(TIMEOUT_SECS, TimeUnit.SECONDS)) {
-        throw new RuntimeException("Timeout waiting for latch");
+        throw new RuntimeException("Timeout waiting for device");
       }
     } catch (InterruptedException e) {
       throw new RuntimeException(e);

ioio/main.cpp

@@ -76,7 +76,7 @@ jclass findClass(const char *path) {
   return g_env->FindClass(path);
 }
 
-jobject createInstance() {
+jobject createInstance(jclass clazz) {
   jmethodID constructor = g_env->GetMethodID(clazz, "<init>", "()V");
   jobject result;
   if (constructor != nullptr) {
@@ -496,7 +496,7 @@ int sblib_init(const char *sourceFile) {
 #if defined(DESKTOP_MODULE)
   JavaVMInitArgs vm_args;
   JavaVMOption options[3];
-  options[0].optionString = (char *)"-Djava.class.path=./android/target/ioio-1.0-jar-with-dependencies.jar";
+  options[0].optionString = (char *)"-Djava.class.path=./ioio-1.0-jar-with-dependencies.jar";
   options[1].optionString = (char *)"-Dioio.SerialPorts=IOIO0";
   options[2].optionString = (char *)"-Xrs";
   //options[2].optionString = "-Xdebug";