IOIO: android integration

Author: chrisws

ioio/Makefile.am

@@ -29,3 +29,7 @@ $(generated): api.json mkapi.bas mkdoc.bas
 	$(sbasic) mkapi.bas > $@
 	$(sbasic) mkdoc.bas > README.md
 	@touch main.cpp
+
+
+android:
+	./gradlew clean :ioio:assemble && ls -l ioio/build/outputs/aar/ && cp ioio/build/outputs/aar/ioio-* ~/src/SmallBASIC/src/platform/android/app/libs/

ioio/build.gradle

@@ -3,7 +3,6 @@ buildscript {
   repositories {
     google()
     mavenCentral()
-    maven { url 'https://jitpack.io' }
   }
   dependencies {
     classpath 'com.android.tools.build:gradle:8.3.0'
@@ -22,4 +21,3 @@ apply plugin: 'idea'
 tasks.register('clean', Delete) {
   delete rootProject.buildDir
 }
-

ioio/ioio/Android.mk

@@ -10,7 +10,7 @@ LOCAL_PATH := $(JNI_PATH)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE     := ioio
-LOCAL_CFLAGS     := -DHAVE_CONFIG_H=1 -Wno-unknown-pragmas -I../ -I../../ -I../include
+LOCAL_CFLAGS     := -DHAVE_CONFIG_H=1 -DANDROID_MODULE -Wno-unknown-pragmas -I../ -I../../ -I../include
 LOCAL_SRC_FILES  := ../../include/param.cpp \
                     ../../include/hashmap.cpp \
                     ../../include/apiexec.cpp \

ioio/ioio/build.gradle

@@ -11,6 +11,7 @@ android {
     }
   }
 
+
   namespace 'net.sourceforge.smallbasic.ioio'
   compileSdk 34
 
@@ -37,3 +38,21 @@ android {
 dependencies {
   implementation 'com.github.ytai.ioio:IOIOLibCore:5.07'
 }
+
+configurations.implementation.setCanBeResolved(true)
+
+tasks.register('jarWithDependencies', Jar) {
+  def libDir = file("${project.buildDir}/../lib")
+  configurations.implementation.files.each { dependencyJar ->
+    zipTree(dependencyJar).visit { details ->
+      if (!details.directory) {
+        copy {
+          from details.file
+          into "${libDir}/${details.path}"
+        }
+      }
+    }
+  }
+}
+
+assemble.dependsOn jarWithDependencies

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

@@ -19,6 +19,11 @@ public void beginBatch() {
     lock.invoke(IOIO::beginBatch);
   }
 
+  public void close() {
+    super.close();
+    IOService.getInstance().stop();
+  }
+
   public void disconnect() {
     lock.invoke(IOIO::disconnect);
   }

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

@@ -1,8 +1,23 @@
 package net.sourceforge.smallbasic.ioio;
 
+import ioio.lib.spi.Log;
+
 public class IOIOLoader {
-  public static native void init();
-  static {
-    init();
+  private static final String TAG = "IOIOLoader";
+  public static native void init(Class<?> clazz);
+
+  public IOIOLoader() {
+    super();
+    init(getClass());
+  }
+
+  public static Class<?> findClass(String className) {
+    try {
+      Log.i(TAG, "findClass " + className);
+      return Class.forName("net.sourceforge.smallbasic.ioio." + className);
+    }
+    catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
   }
 }

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

@@ -55,6 +55,11 @@ public void start() {
     connectionController.start();
   }
 
+  public void stop() {
+    looper.ioio.disconnect();
+    connectionController.stop();
+  }
+
   private void registerPin(int pin) throws IOException {
     if (pin != -1) {
       if (pin < 0 || pin > MAX_PINS) {

ioio/log.h

@@ -0,0 +1,31 @@
+// This file is part of SmallBASIC
+//
+// Copyright(C) 2024 Chris Warren-Smith.
+//
+// This program is distributed under the terms of the GPL v2.0 or later
+// Download the GNU Public License (GPL) from www.gnu.org
+//
+
+#pragma once
+
+#include "config.h"
+
+#if defined(ANDROID_MODULE)
+ #include <android/log.h>
+ #if defined(_DEBUG)
+   #define deviceLog(...) __android_log_print(ANDROID_LOG_ERROR, "smallbasic", __VA_ARGS__)
+ #else
+   #define deviceLog(...) __android_log_print(ANDROID_LOG_INFO, "smallbasic", __VA_ARGS__)
+ #endif
+#else
+ #define deviceLog(...) printf(__VA_ARGS__)
+#endif
+
+#if defined(_DEBUG)
+ #define trace(...) deviceLog(__VA_ARGS__)
+#else
+ #define trace(...)
+#endif
+
+#define logEntered() trace("%s entered (%s %d)", __FUNCTION__, __FILE__, __LINE__);
+#define logLeaving() trace("%s leaving (%s %d)", __FUNCTION__, __FILE__, __LINE__);

ioio/mkapi.bas

@@ -57,10 +57,10 @@ sub generate_command(objName, method)
 
   local getter, indent
   if (objName == "IOIO") then
-    getter = "ioioTask->"
+    getter = "g_ioioTask->"
     indent = "    "
   else 
-    getter = "_ioTaskMap.at(id)."
+    getter = "g_ioTaskMap.at(id)."
     indent = "      "
     print "    int id = get_io_class_id(self, retval);"
     print "    if (id != -1) {"
@@ -114,15 +114,15 @@ sub generate_open_function(byref obj)
       print "  int pin" + pin + " = get_param_int(argc, params, " + (pin - 1) + ", -1);"
     next 
   endif
-  print "  int id = ++nextId;"
-  print "  IOTask &instance = _ioTaskMap[id];"
+  print "  int id = ++g_nextId;"
+  print "  IOTask &instance = g_ioTaskMap[id];"
   print "  if (instance.create(CLASS_" + upper(obj.name) + ", retval) &&"
   print "      instance." + openFunc + "retval)) {"
   print "    map_init_id(retval, id, CLASS_IOTASK_ID);"
   print "    create_" + lower(obj.name) + "(retval);"
   print "    result = 1;"
   print "  } else {"
-  print "    _ioTaskMap.erase(id);"
+  print "    g_ioTaskMap.erase(id);"
   print "    result = 0;"
   print "  }"
   print "  return result;"