add more plumbing for SPI on BeagleBone

[Adafruit_Blinka-hackapet.git] / src / busio.py

diff --git a/src/busio.py b/src/busio.py
index 708039c686b33fb1caabdfe6d9299a9bc2af07d6..fb3ab1079a19fe3f461b6566ff8844644a61dc97 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -8,7 +8,7 @@ See `CircuitPython:busio` in CircuitPython for more details.
 """
 
 from adafruit_blinka import Enum, Lockable, agnostic
-from adafruit_blinka.agnostic import board as boardId
+from adafruit_blinka.agnostic import board_id
 
 class I2C(Lockable):
     def __init__(self, scl, sda, frequency=400000):
@@ -16,7 +16,9 @@ class I2C(Lockable):
 
     def init(self, scl, sda, frequency):
         self.deinit()
-        if boardId == "raspi_3" or boardId == "raspi_2":
+        if board_id == "raspi_3" or board_id == "raspi_2":
+            from adafruit_blinka.microcontroller.raspi_23.i2c import I2C as _I2C
+        if board_id == "beaglebone_black":
             from adafruit_blinka.microcontroller.raspi_23.i2c import I2C as _I2C
         else:
             from machine import I2C as _I2C
@@ -44,33 +46,51 @@ class I2C(Lockable):
     def scan(self):
         return self._i2c.scan()
 
-    def readfrom_into(self, address, buffer, start=0, end=None):
+    def readfrom_into(self, address, buffer, *, start=0, end=None):
         if start is not 0 or end is not None:
             if end is None:
                 end = len(buffer)
             buffer = memoryview(buffer)[start:end]
         stop = True  # remove for efficiency later
-        return self._i2c.readfrom_into(address, buffer, stop)
+        return self._i2c.readfrom_into(address, buffer, stop=stop)
 
-    def writeto(self, address, buffer, start=0, end=None, stop=True):
+    def writeto(self, address, buffer, *, start=0, end=None, stop=True):
+        if isinstance(buffer, str):
+            buffer = bytes([ord(x) for x in buffer])
         if start is not 0 or end is not None:
             if end is None:
-                return self._i2c.writeto(address, memoryview(buffer)[start:], stop)
+                return self._i2c.writeto(address, memoryview(buffer)[start:], stop=stop)
             else:
-                return self._i2c.writeto(address, memoryview(buffer)[start:end], stop)
-        return self._i2c.writeto(address, buffer, stop)
+                return self._i2c.writeto(address, memoryview(buffer)[start:end], stop=stop)
+        return self._i2c.writeto(address, buffer, stop=stop)
 
+    def writeto_then_readfrom(self, address, buffer_out, buffer_in, *, out_start=0, out_end=None, in_start=0, in_end=None, stop=False):
+        return self._i2c.writeto_then_readfrom(address, buffer_out, buffer_in,
+                                               out_start=out_start, out_end=out_end,
+                                               in_start=in_start, in_end=in_end, stop=stop)
 
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):
+        print("SPI(): __init()")
         self.deinit()
-        if boardId == "raspi_3" or boardId == "raspi_2":
+        if board_id == "raspi_3" or board_id == "raspi_2":
+            from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
+        elif board_id == "beaglebone_black":
+            print("SPI(): beaglebone_black: from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI")
             from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
         else:
             from machine import SPI as _SPI
         from microcontroller.pin import spiPorts
+        print("spiPorts: {0}".format(spiPorts))
+        print("for:")
         for portId, portSck, portMosi, portMiso in spiPorts:
-            if clock == portSck and MOSI == portMosi and MISO == portMiso:
+            print(portId, portSck, portMosi, portMiso)
+            if ((clock == portSck) and                   # Clock is required!
+                (MOSI == portMosi or MOSI == None) and   # But can do with just output
+                (MISO == portMiso or MISO == None)):      # Or just input
+                print("Line 91")
+                print(_SPI)
+                print(_SPI(portId))
                 self._spi = _SPI(portId)
                 self._pins = (portSck, portMosi, portMiso)
                 break
@@ -80,9 +100,13 @@ class SPI(Lockable):
                 format((clock, MOSI, MISO), spiPorts))
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
-        if boardId == "raspi_3" or boardId == "raspi_2":
+        if board_id == "raspi_3" or board_id == "raspi_2":
             from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.raspi_23.pin import Pin
+        elif board_id == "beaglebone_black":
+            # reuse the raspberry pi class as both boards use Linux spidev
+            from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
+            from adafruit_blinka.microcontroller.beaglebone_black.pin import Pin
         else:
             from machine import SPI as _SPI
             from machine import Pin
@@ -106,14 +130,14 @@ class SPI(Lockable):
         self._spi = None
         self._pinIds = None
 
-    def write(self, buf):
-        return self._spi.write(buf)
+    def write(self, buf, start=0, end=None):
+        return self._spi.write(buf, start, end)
 
-    def readinto(self, buf):
-        return self._spi.readinto(buf)
+    def readinto(self, buf, start=0, end=None, write_value=0):
+        return self._spi.readinto(buf, start, end)
 
-    def write_readinto(self, buffer_out, buffer_in):
-        return self._spi.write_readinto(buffer_out, buffer_in)
+    def write_readinto(self, buffer_out, buffer_in,  out_start=0, out_end=None, in_start=0, in_end=None):
+        return self._spi.write_readinto(buffer_out, buffer_in, out_start, out_end, in_start, in_end)
 
 
 class UART(Lockable):