Merge pull request #111 from ladyada/master

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

diff --git a/src/busio.py b/src/busio.py
index 206635d46df557560aab437b123bb217bdd3987e..0928b870a98a930190633b1d0caf014790675c53 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -8,7 +8,8 @@ See `CircuitPython:busio` in CircuitPython for more details.
 """
 
 from adafruit_blinka import Enum, Lockable, agnostic
 """
 
 from adafruit_blinka import Enum, Lockable, agnostic

-from adafruit_blinka.agnostic import board_id
+from adafruit_blinka.agnostic import board_id, detector
+import adafruit_platformdetect.board as ap_board

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


@@ -16,10 +17,8 @@ class I2C(Lockable):
 
     def init(self, scl, sda, frequency):
         self.deinit()
 
     def init(self, scl, sda, frequency):
         self.deinit()

-        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
+        if detector.board.any_embedded_linux:
+            from adafruit_blinka.microcontroller.generic_linux.i2c import I2C as _I2C

         else:
             from machine import I2C as _I2C
         from microcontroller.pin import i2cPorts
         else:
             from machine import I2C as _I2C
         from microcontroller.pin import i2cPorts


@@ -28,8 +27,9 @@ class I2C(Lockable):
                 self._i2c = _I2C(portId, mode=_I2C.MASTER, baudrate=frequency)
                 break
         else:
                 self._i2c = _I2C(portId, mode=_I2C.MASTER, baudrate=frequency)
                 break
         else:

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

 
     def deinit(self):
         try:
 
     def deinit(self):
         try:


@@ -72,10 +72,8 @@ class I2C(Lockable):
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):
         self.deinit()
 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
-        elif board_id == "beaglebone_black":
-            from adafruit_blinka.microcontroller.beaglebone_black.spi import SPI as _SPI
+        if detector.board.any_embedded_linux:
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI

         else:
             from machine import SPI as _SPI
         from microcontroller.pin import spiPorts
         else:
             from machine import SPI as _SPI
         from microcontroller.pin import spiPorts


@@ -92,12 +90,21 @@ class SPI(Lockable):
                 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 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":
-            from adafruit_blinka.microcontroller.beaglebone_black.spi import SPI as _SPI
-            from adafruit_blinka.microcontroller.beaglebone_black.pin import Pin
+        if detector.board.any_raspberry_pi:
+            from adafruit_blinka.microcontroller.bcm283x.pin import Pin
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+        elif detector.board.any_beaglebone:
+            from adafruit_blinka.microcontroller.am335x.pin import Pin
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+        elif board_id == ap_board.ORANGE_PI_PC:
+            from adafruit_blinka.microcontroller.allwinner_h3.pin import Pin
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+        elif board_id == ap_board.GIANT_BOARD:
+            from adafruit_blinka.microcontroller.sama5.pin import Pin
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
+        elif board_id == ap_board.CORAL_EDGE_TPU_DEV:
+            from adafruit_blinka.microcontroller.nxp_imx8m.pin import Pin
+            from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI

         else:
             from machine import SPI as _SPI
             from machine import Pin
         else:
             from machine import SPI as _SPI
             from machine import Pin


@@ -125,7 +132,7 @@ class SPI(Lockable):
         return self._spi.write(buf, start, end)
 
     def readinto(self, buf, start=0, end=None, write_value=0):
         return self._spi.write(buf, start, end)
 
     def readinto(self, buf, start=0, end=None, write_value=0):

-        return self._spi.readinto(buf, start, end)
+        return self._spi.readinto(buf, start, end, write_value=write_value)

 
     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)
 
     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)


@@ -148,7 +155,10 @@ class UART(Lockable):
                  timeout=1000,
                  receiver_buffer_size=64,
                  flow=None):
                  timeout=1000,
                  receiver_buffer_size=64,
                  flow=None):

-        from machine import UART as _UART
+        if detector.board.any_embedded_linux:
+            raise RuntimeError('busio.UART not supported on this platform. Please use pyserial instead.')
+        else:
+            from machine import UART as _UART

         from microcontroller.pin import uartPorts
 
         self.baudrate = baudrate
         from microcontroller.pin import uartPorts
 
         self.baudrate = baudrate


@@ -156,7 +166,7 @@ class UART(Lockable):
         if flow is not None:  # default 0
             raise NotImplementedError(
                 "Parameter '{}' unsupported on {}".format(
         if flow is not None:  # default 0
             raise NotImplementedError(
                 "Parameter '{}' unsupported on {}".format(

-                    "flow", agnostic.board))
+                    "flow", agnostic.board_id))

 
         # translate parity flag for Micropython
         if parity is UART.Parity.ODD:
 
         # translate parity flag for Micropython
         if parity is UART.Parity.ODD:


@@ -183,8 +193,8 @@ class UART(Lockable):
                 break
         else:
             raise NotImplementedError(
                 break
         else:
             raise NotImplementedError(

-                "No Hardware UART on (tx,rx)={}\nValid UART ports".format(
-                    (tx, rx), uartPorts))
+                "No Hardware UART on (tx,rx)={}\nValid UART ports: {}".format((tx, rx), uartPorts)
+            )

 
     def deinit(self):
         self._uart = None
 
     def deinit(self):
         self._uart = None