IOIO: refactoring for SPIMaster

Author: chrisws

ioio/api.json

@@ -248,5 +248,10 @@
     "name": "TwiMaster":
     "comment": "An interface for controlling a TWI module, in TWI bus-master mode, enabling communication with multiple TWI-enabled slave modules.",
     "methods": []
+  },
+  {
+    "name": "SpiMaster":
+    "comment": "An interface for controlling an SPI module, in SPI bus-master mode, enabling communication with multiple SPI-enabled slave modules",
+    "methods": []
   }
 ]

ioio/main.cpp

@@ -30,6 +30,7 @@ int nextId = 1;
 #define CLASS_PWMOUTPUT "net/sourceforge/smallbasic/ioio/PwmOutputImpl"
 #define CLASS_CAPSENSE "net/sourceforge/smallbasic/ioio/CapsenseImpl"
 #define CLASS_TWIMASTER "net/sourceforge/smallbasic/ioio/TwiMasterImpl"
+#define CLASS_SPIMASTER "net/sourceforge/smallbasic/ioio/SpiMasterImpl"
 #define CLASS_IOIO "net/sourceforge/smallbasic/ioio/IOIOImpl"
 #define CLASS_IOTASK_ID 1
 
@@ -228,10 +229,25 @@ static int cmd_twimaster_writeread(var_s *self, int argc, slib_par_t *arg, var_s
   return result;
 }
 
+static int cmd_spimaster_write(var_s *self, int argc, slib_par_t *arg, var_s *retval) {
+  int result = 0;
+  if (argc != 2) {
+    error(retval, "writeRead", 0);
+  } else {
+    // TODO
+    //result = ioioTask->invokeVoidVoid("waitForDisconnect", retval);
+  }
+  return result;
+}
+
 static void create_twimaster(var_t *map) {
   v_create_callback(map, "writeRead", cmd_twimaster_writeread);
 }
 
+static void create_spimaster(var_t *map) {
+  v_create_callback(map, "write", cmd_spimaster_write);
+}
+
 #include "api.h"
 
 FUNC_SIG lib_func[] = {

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

@@ -28,11 +28,6 @@
  */
 package ioio.lib.pc;
 
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
 import ioio.PausedInputStream;
 import ioio.lib.api.IOIOConnection;
 import ioio.lib.api.exception.ConnectionLostException;
@@ -43,6 +38,11 @@
 import purejavacomm.NoSuchPortException;
 import purejavacomm.SerialPort;
 
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
 class SerialPortIOIOConnection implements IOIOConnection {
   private final String name_;
   // private static final String TAG = "SerialPortIOIOConnection";

ioio/src/main/java/ioio/lib/pc/SerialPortIOIOConnectionBootstrap.java

@@ -29,11 +29,6 @@
 
 package ioio.lib.pc;
 
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.LinkedList;
-import java.util.List;
-
 import ioio.lib.api.IOIOConnection;
 import ioio.lib.spi.IOIOConnectionBootstrap;
 import ioio.lib.spi.IOIOConnectionFactory;
@@ -42,6 +37,11 @@
 import purejavacomm.CommPortIdentifier;
 import purejavacomm.PortInUseException;
 
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.List;
+
 public class SerialPortIOIOConnectionBootstrap implements IOIOConnectionBootstrap {
   private static final String TAG = "SerialPortIOIOConnectionBootstrap";
 

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

@@ -83,13 +83,8 @@ public void setBuffer(int capacity) {
   }
 
   @Override
-  public void setup(IOIO ioio) {
+  public void setup(IOIO ioio) throws ConnectionLostException {
     Log.i(TAG, "setup entered");
-    try {
-      input = ioio.openAnalogInput(pin);
-    }
-    catch (ConnectionLostException e) {
-      throw new RuntimeException(e);
-    }
+    input = ioio.openAnalogInput(pin);
   }
 }

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

@@ -43,14 +43,9 @@ public void setFilterCoef(float t) {
   }
 
   @Override
-  public void setup(IOIO ioio) {
+  public void setup(IOIO ioio) throws ConnectionLostException {
     Log.i(TAG, "setup entered");
-    try {
-      capSense = ioio.openCapSense(pin);
-    }
-    catch (ConnectionLostException e) {
-      throw new RuntimeException(e);
-    }
+    capSense = ioio.openCapSense(pin);
   }
 
   @Override

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

@@ -5,10 +5,12 @@
 import ioio.lib.api.exception.ConnectionLostException;
 import ioio.lib.spi.Log;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 public class DigitalInputImpl extends IOTask implements DigitalInput {
   private static final String TAG = "DigitalInput";
+  private final AtomicBoolean value = new AtomicBoolean();
   private DigitalInput input;
-  private volatile boolean value;
 
   public DigitalInputImpl() {
     super();
@@ -24,23 +26,18 @@ public void close() {
 
   @Override
   public void loop() throws InterruptedException, ConnectionLostException {
-    value = input.read();
+    value.set(input.read());
   }
 
   @Override
   public boolean read() {
-    return value;
+    return value.get();
   }
 
   @Override
-  public void setup(IOIO ioio) {
+  public void setup(IOIO ioio) throws ConnectionLostException {
     Log.i(TAG, "setup entered");
-    try {
-      input = ioio.openDigitalInput(pin);
-    }
-    catch (ConnectionLostException e) {
-      throw new RuntimeException(e);
-    }
+    input = ioio.openDigitalInput(pin);
   }
 
   @Override

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

@@ -28,18 +28,13 @@ public void loop() throws ConnectionLostException {
   }
 
   @Override
-  public void setup(IOIO ioio) {
+  public void setup(IOIO ioio) throws ConnectionLostException {
     Log.i(TAG, "setup entered");
-    try {
-      output = ioio.openDigitalOutput(pin);
-    }
-    catch (ConnectionLostException e) {
-      throw new RuntimeException(e);
-    }
+    output = ioio.openDigitalOutput(pin);
   }
 
   @Override
-  public void write(final boolean value) {
+  public void write(boolean value) {
     handleError();
     lock.invoke((i) -> {
       i.write(value);

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

@@ -96,6 +96,7 @@ public void loop() throws ConnectionLostException, InterruptedException {
           next.loop();
         } catch (Throwable e) {
           next.setError(e.getLocalizedMessage());
+          break;
         }
       }
     }
@@ -105,7 +106,12 @@ public void setup(IOIO ioio) {
       this.ioio = ioio;
       this.lastAccessMillis = System.currentTimeMillis();
       for (IOTask next: ioTasks) {
-        next.setup(ioio);
+        try {
+          next.setup(ioio);
+        } catch (Throwable e) {
+          next.setError(e.getLocalizedMessage());
+          break;
+        }
       }
     }
   }

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

@@ -53,5 +53,5 @@ int getPin() {
    * Subclasses should override this method for performing operations to be
    * done once as soon as IOIO communication is established.
    */
-  abstract void setup(IOIO ioio);
+  abstract void setup(IOIO ioio) throws ConnectionLostException;
 }