SpiMaster.write now takes an array argument #11

Author: chrisws

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

@@ -1,6 +1,7 @@
 package ioio.smallbasic;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 import ioio.lib.api.IOIO;
 import ioio.lib.api.SpiMaster;
@@ -39,10 +40,12 @@ public void open(int miso, int mosi, int clk, int slaveSelect) throws IOExceptio
     validatePins();
   }
 
-  public void write(int address, int data) {
+  public void write(int address, final byte[] write, int writeLen) {
     handleError();
     lock.invoke((i) -> {
-      byte[] buffer = {(byte) address, (byte) data};
+      byte[] buffer = new byte[writeLen + 1];
+      buffer[0] = (byte)address;
+      System.arraycopy(write, 0, buffer, 1, writeLen);
       spiMaster.writeRead(buffer, buffer.length, buffer.length, null, 0);
     });
   }
@@ -54,7 +57,7 @@ void loop() throws ConnectionLostException, InterruptedException {
 
   @Override
   void setup(IOIO ioio) throws ConnectionLostException {
-    Log.i(TAG, "setup entered: " + miso + " " + mosi + " " + clk + " " + slaveSelect);
+    Log.i(TAG, "setup entered: miso:" + miso + " mosi:" + mosi + " clk:" + clk + " cs:" + slaveSelect);
     spiMaster = ioio.openSpiMaster(miso, mosi, clk, slaveSelect, SpiMaster.Rate.RATE_1M);
   }
 

ioio/ioio/src/main/java/ioio/smallbasic/TwiMasterImpl.java

@@ -48,10 +48,10 @@ public long readWrite(int address, int readLen, final byte[] write, int writeLen
     });
   }
 
-  public void write(int address, final byte[] write, int len) {
+  public void write(int address, final byte[] write, int writeLen) {
     handleError();
     lock.invoke((i) -> {
-      twiMaster.writeRead(address, false, write, len, null, 0);
+      twiMaster.writeRead(address, false, write, writeLen, null, 0);
     });
   }
 

ioio/main.cpp

@@ -93,13 +93,11 @@ static int cmd_twimaster_write(var_s *self, int argc, slib_par_t *arg, var_s *re
 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, "SpiMaster.write", 2);
+    error(retval, "SpiMaster.write", ARRAY_SIZE);
   } else {
     int id = get_io_class_id(self, retval);
     if (id != -1) {
-      auto address = get_param_int(argc, arg, 0, 0);
-      auto data = get_param_int(argc, arg, 1, 0);
-      result = g_ioTaskMap.at(id).invokeVoidInt2("write", address, data, retval);
+      result = g_ioTaskMap.at(id).invokeWrite(argc, arg, retval);
     }
   }
   return result;

ioio/samples/duino-1088AS.bas

@@ -10,14 +10,52 @@ spi = ioio.openSpiMaster(misoPin, mosiPin, clkPin, csPin)
 ioio.waitForConnect(10)
 
 spi.write(0x09, 0x00)  ' Decode mode: no decode for digits 0-7
-spi.write(0x0A, 0x01)  ' Intensity: maximum intensity 0x0 -> 0x0F
+spi.write(0x0A, 0x00)  ' Intensity: maximum intensity 0x0 -> 0x0F
 spi.write(0x0B, 0x07)  ' Scan limit: all digits
 spi.write(0x0C, 0x01)  ' Shutdown: normal operation
 
+for i = 1 to 8
+  spi.write(i, 0)
+next
+
+const glyph_a = [
+  [0,0,0,0,1,0,0,0],
+  [0,0,0,1,0,1,0,0],
+  [0,0,1,0,0,0,1,0],
+  [0,0,1,0,0,0,1,0],
+  [0,0,1,1,1,1,1,0],
+  [0,1,0,0,0,0,0,1],
+  [0,1,0,0,0,0,0,1],
+  [0,0,0,0,0,0,0,0],
+]
+
+const glyph_b = [
+  [0,1,0,0,0,0,0,0],
+  [0,1,0,0,0,0,0,0],
+  [0,1,0,0,0,0,0,0],
+  [0,1,1,1,0,0,0,0],
+  [0,1,0,0,1,0,0,0],
+  [0,1,0,0,0,1,0,0],
+  [0,1,0,0,0,1,0,0],
+  [0,0,1,1,1,0,0,0],
+]
+
+sub print_glyph(byref f)
+  local i, k, n
+  for i = 0 to 7
+    n = 0
+    for k = 0 to 7
+      if (f[i][k] == 1) then
+        n += pow(2, 7 - k)
+      endif
+    next k
+    spi.write(i + 1, n)
+  next i
+end
+
 while 1
-  for i = 1 to 8
-    spi.write(i, 0x35)
-  next
+  print_glyph(glyph_a)
+  delay 1000
+  print_glyph(glyph_b)
   delay 1000
-wend
-'
+wend  

ioio/samples/veml6030.bas

@@ -34,7 +34,7 @@ p3 = ioio.openTwiMaster(1, 0)
 ioio.waitForConnect(10)
 
 rem configure default settings
-p3.write(address, [alsConfReg, alsConf])
+p3.write(address, alsConfReg, alsConf)
 
 for i = 0 to 5
   print p3.readWrite(address, 2, [alsDataReg])