Merge pull request #27 from adafruit/raspi_spi_class_vars

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

diff --git a/src/busio.py b/src/busio.py
old mode 100644 (file)
new mode 100755 (executable)
index a02eccf..72f3c7a
--- a/src/busio.py
+++ b/src/busio.py
@@ -1,4 +1,14 @@
+"""
+`busio` - Bus protocol support like I2C and SPI
+=================================================
+
+See `CircuitPython:busio` in CircuitPython for more details.
+
+* Author(s): cefn
+"""
+

 from adafruit_blinka import Enum, Lockable, agnostic
 from adafruit_blinka import Enum, Lockable, agnostic

+from adafruit_blinka.agnostic import board_id

 
 class I2C(Lockable):
     def __init__(self, scl, sda, frequency=400000):
 
 class I2C(Lockable):
     def __init__(self, scl, sda, frequency=400000):


@@ -6,11 +16,14 @@ class I2C(Lockable):
 
     def init(self, scl, sda, frequency):
         self.deinit()
 
     def init(self, scl, sda, frequency):
         self.deinit()

-        from machine import I2C as _I2C
+        if board_id == "raspi_3" or board_id == "raspi_2":
+            from adafruit_blinka.microcontroller.raspi_23.i2c import I2C as _I2C
+        else:
+            from machine import I2C as _I2C

         from microcontroller.pin import i2cPorts
         for portId, portScl, portSda in i2cPorts:
             if scl == portScl and sda == portSda:
         from microcontroller.pin import i2cPorts
         for portId, portScl, portSda in i2cPorts:
             if scl == portScl and sda == portSda:

-                self._i2c = I2C(portId, mode=_I2C.MASTER, baudrate=frequency)
+                self._i2c = _I2C(portId, mode=_I2C.MASTER, baudrate=frequency)

                 break
         else:
             raise NotImplementedError("No Hardware I2C on (scl,sda)={}\nValid UART ports".format(
                 break
         else:
             raise NotImplementedError("No Hardware I2C on (scl,sda)={}\nValid UART ports".format(


@@ -31,7 +44,7 @@ class I2C(Lockable):
     def scan(self):
         return self._i2c.scan()
 
     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)
         if start is not 0 or end is not None:
             if end is None:
                 end = len(buffer)


@@ -39,7 +52,9 @@ class I2C(Lockable):
         stop = True  # remove for efficiency later
         return self._i2c.readfrom_into(address, buffer, stop)
 
         stop = True  # remove for efficiency later
         return self._i2c.readfrom_into(address, buffer, 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)
         if start is not 0 or end is not None:
             if end is None:
                 return self._i2c.writeto(address, memoryview(buffer)[start:], stop)


@@ -47,30 +62,45 @@ class I2C(Lockable):
                 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)
         return self._i2c.writeto(address, buffer, 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_end, in_start, in_end, stop)

 
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):
 
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):

+        self.deinit()
+        if board_id == "raspi_3" or board_id == "raspi_2":
+            from adafruit_blinka.microcontroller.raspi_23.spi import SPI as _SPI
+        else:
+            from machine import SPI as _SPI

         from microcontroller.pin import spiPorts
         for portId, portSck, portMosi, portMiso in spiPorts:
         from microcontroller.pin import spiPorts
         for portId, portSck, portMosi, portMiso in spiPorts:

-            if clock == portSck and MOSI == portMosi and MISO == portMiso:
-                self._spi = SPI(portId)
+            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
+                self._spi = _SPI(portId)

                 self._pins = (portSck, portMosi, portMiso)
                 break
         else:
             raise NotImplementedError(
                 self._pins = (portSck, portMosi, portMiso)
                 break
         else:
             raise NotImplementedError(

-                "No Hardware SPI on (clock, MOSI, MISO)={}\nValid SPI ports:{}".
+                "No Hardware SPI on (SCLK, MOSI, MISO)={}\nValid SPI ports:{}".

                 format((clock, MOSI, MISO), spiPorts))
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
                 format((clock, MOSI, MISO), spiPorts))
 
     def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):

-        if self._locked:
+        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
+        else:
+            from machine import SPI as _SPI

             from machine import Pin
             from machine import Pin

+
+        if self._locked:

             # TODO check if #init ignores MOSI=None rather than unsetting, to save _pinIds attribute
             self._spi.init(
                 baudrate=baudrate,
                 polarity=polarity,
                 phase=phase,
                 bits=bits,
             # TODO check if #init ignores MOSI=None rather than unsetting, to save _pinIds attribute
             self._spi.init(
                 baudrate=baudrate,
                 polarity=polarity,
                 phase=phase,
                 bits=bits,

-                firstbit=SPI.MSB,
+                firstbit=_SPI.MSB,

                 sck=Pin(self._pins[0].id),
                 mosi=Pin(self._pins[1].id),
                 miso=Pin(self._pins[2].id)
                 sck=Pin(self._pins[0].id),
                 mosi=Pin(self._pins[1].id),
                 miso=Pin(self._pins[2].id)


@@ -82,14 +112,14 @@ class SPI(Lockable):
         self._spi = None
         self._pinIds = None
 
         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.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.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):
 
 
 class UART(Lockable):


@@ -99,7 +129,6 @@ class UART(Lockable):
     Parity.ODD = Parity()
     Parity.EVEN = Parity()
 
     Parity.ODD = Parity()
     Parity.EVEN = Parity()
 

-    # TODO investigate UART receiver_buffer_size as e.g. read_buf_len in https://github.com/micropython/micropython/blob/3eb0694b97c6a8f0e93b874549aac40d8b78b0e5/ports/stm32/uart.c

     def __init__(self,
                  tx,
                  rx,
     def __init__(self,
                  tx,
                  rx,