Some changes for testing Teensy4IoIoOtg

Author: chrisws

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

@@ -59,7 +59,7 @@ public void sync() {
     lock.invoke(IOIO::sync);
   }
 
-  public void waitForConnect(int latency) {
+  public void waitForConnect() {
     IOUtil.setError(null);
     IOService.getInstance().start();
     handleError();

ioio/ioio/src/main/java/ioio/smallbasic/pc/HexDump.java

@@ -0,0 +1,22 @@
+package ioio.smallbasic.pc;
+
+public class HexDump {
+  private int index;
+  private final String prefix;
+
+  HexDump(String prefix) {
+    this.index = 0;
+    this.prefix = prefix;
+  }
+
+  void print(int data) {
+    if (index % 16 == 0) {
+      if (index != 0) {
+        System.out.println();
+      }
+      System.out.printf("   %08x  ", index);
+    }
+    System.out.printf("%s:%02x ", prefix, data);
+    index++;
+  }
+}

ioio/ioio/src/main/java/ioio/smallbasic/pc/LoggingInputStream.java

@@ -0,0 +1,40 @@
+package ioio.smallbasic.pc;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class LoggingInputStream extends InputStream {
+  private static final int DEBUG_OUT = 0x24;
+  private final InputStream wrappedStream;
+  private final HexDump hexDump;
+
+  public LoggingInputStream(InputStream wrappedStream) {
+    this.wrappedStream = wrappedStream;
+    this.hexDump = new HexDump("RX");
+  }
+
+  @Override
+  public int read() throws IOException {
+    // see: IOIOLibCore/src/main/java/ioio/lib/impl/IOIOProtocol.java
+    int data = wrappedStream.read();
+    if (data == DEBUG_OUT) {
+      System.out.print("[FIRMWARE] ");
+      data = wrappedStream.read();
+      while (data != '\n') {
+        System.out.print(Character.valueOf((char) data));
+        data = wrappedStream.read();
+      }
+      System.out.println();
+      data = read();
+    } else {
+      hexDump.print(data);
+    }
+    return data;
+  }
+
+  @Override
+  public void close() throws IOException {
+    wrappedStream.close();
+  }
+}
+

ioio/ioio/src/main/java/ioio/smallbasic/pc/LoggingOutputStream.java

@@ -0,0 +1,30 @@
+package ioio.smallbasic.pc;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class LoggingOutputStream extends OutputStream {
+  private final OutputStream wrappedStream;
+  private final HexDump hexDump;
+
+  public LoggingOutputStream(OutputStream outputStream) {
+    this.wrappedStream = outputStream;
+    this.hexDump = new HexDump("TX");
+  }
+
+  @Override
+  public void write(int b) throws IOException {
+    wrappedStream.write(b);
+    hexDump.print(b);
+  }
+
+  @Override
+  public void flush() throws IOException {
+    wrappedStream.flush();
+  }
+
+  @Override
+  public void close() throws IOException {
+    wrappedStream.close();
+  }
+}

ioio/ioio/src/main/java/ioio/smallbasic/pc/SerialPortIOIOConnection.java

@@ -62,8 +62,8 @@ public OutputStream getOutputStream() throws ConnectionLostException {
   @Override
   public void waitForConnect() throws ConnectionLostException {
     if (!abort && serialPort.openPort()) {
-      inputStream = serialPort.getInputStream();
-      outputStream = serialPort.getOutputStream();
+      inputStream = new LoggingInputStream(serialPort.getInputStream());
+      outputStream = new LoggingOutputStream(serialPort.getOutputStream());
       serialPort.setDTR();
     } else {
       throw new ConnectionLostException();

ioio/main.cpp

@@ -244,7 +244,7 @@ FUNC_SIG lib_proc[] = {
   {0, 0, "HARDRESET", cmd_ioio_hardreset},
   {0, 0, "SOFTRESET", cmd_ioio_softreset},
   {0, 0, "SYNC", cmd_ioio_sync},
-  {1, 1, "WAITFORCONNECT", cmd_ioio_waitforconnect},
+  {0, 0, "WAITFORCONNECT", cmd_ioio_waitforconnect},
   {0, 0, "WAITFORDISCONNECT", cmd_ioio_waitfordisconnect},
 };
 
@@ -261,7 +261,7 @@ SBLIB_API int sblib_func_count() {
 //
 int sblib_init(const char *sourceFile) {
 #if defined(DESKTOP_MODULE)
-  int result = createJVM("-Djava.class.path=./ioio-1.0-jar-with-dependencies.jar", "-Dioio.SerialPorts=IOIO0", false);
+  int result = createJVM("-Djava.class.path=./ioio-1.0-jar-with-dependencies.jar", "-Dioio.SerialPorts=ttyACM0", false);
 #else
   int result = 1;
 #endif

ioio/samples/led.bas

@@ -1,22 +1,22 @@
 import ioio
 
-out = ioio.openDigitalOutput(0)
+out = ioio.openDigitalOutput(13)
 
-print "wait for connect"
-ioio.waitForConnect(10)
-print "ready!!!"
+'print "wait for connect"
+ioio.waitForConnect()
+'print "ready!!!"
 
 value = false
 for i = 0 to 5
   out.write(value)
   value = !value
-  delay 1000
+  delay 2000
 next  
 
 for i = 0 to 5
   out.write(value)
   value = !value
-  delay 100
+  delay 3000
 next
 
-print "done"
+'print "done"