Updated chip definitions

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

diff --git a/src/busio.py b/src/busio.py
index 1576ac9225607175e7034c74a568206cb32553ca..45e36e4d64e8bc45f7925954a46b91a5f2feb2bf 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,7 +17,7 @@ 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" or board_id == "beaglebone_black":
+        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 adafruit_blinka.microcontroller.generic_linux.i2c import I2C as _I2C
         else:
             from machine import I2C as _I2C


@@ -26,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:


@@ -69,23 +71,16 @@ class I2C(Lockable):
 
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):
 
 class SPI(Lockable):
     def __init__(self, clock, MOSI=None, MISO=None):

-        print("SPI(): __init()")

         self.deinit()
         self.deinit()

-        if board_id == "raspi_3" or board_id == "raspi_2" or board_id == "beaglebone_black":
+        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
             from adafruit_blinka.microcontroller.generic_linux.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:
         for portId, portSck, portMosi, portMiso in spiPorts:

-            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
             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
                 self._spi = _SPI(portId)
                 self._pins = (portSck, portMosi, portMiso)
                 break


@@ -95,12 +90,17 @@ 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.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 board_id == ap_board.BEAGLEBONE_BLACK:
+            from adafruit_blinka.microcontroller.am335x.pin import Pin

             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI

-        elif board_id == "beaglebone_black":
-            # reuse the raspberry pi class as both boards use Linux spidev
-            from adafruit_blinka.microcontroller.beaglebone_black.pin import Pin
+        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
         else:
             from machine import SPI as _SPI
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         else:
             from machine import SPI as _SPI


@@ -152,7 +152,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


@@ -160,7 +163,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:


@@ -187,8 +190,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