Merge pull request #395 from flyleaf91/master

Add support for LubanCat i.MX6ULL board

diff --git a/src/adafruit_blinka/board/orangepi/orangepizeroplus.py b/src/adafruit_blinka/board/orangepi/orangepizeroplus.py
new file mode 100644 (file)
index 0000000..36ed7f3
--- /dev/null
+++ b/src/adafruit_blinka/board/orangepi/orangepizeroplus.py
@@ -0,0 +1,38 @@
+"""Pin definitions for the Orange Pi Zero Plus."""
+
+from adafruit_blinka.microcontroller.allwinner.h5 import pin
+
+PA12 = pin.PA12
+SDA = pin.PA12
+PA11 = pin.PA11
+SCL = pin.PA11
+PA6 = pin.PA6
+PWM1 = pin.PA6
+PA1 = pin.PA1
+UART2_RX = pin.PA1
+PA0 = pin.PA0
+UART2_TX = pin.PA0
+PA3 = pin.PA3
+UART2_CTS = pin.PA3
+PA15 = pin.PA15
+PA16 = pin.PA16
+PA14 = pin.PA14
+SPI1_CLK = pin.PA14
+PG6 = pin.PG6
+UART1_TX = pin.PG6
+PG7 = pin.PG7
+UART1_RX = pin.PG7
+PA7 = pin.PA7
+PA19 = pin.PA19
+TWI1_SDA = pin.PA19
+PA18 = pin.PA18
+TWI1_SCK = pin.PA18
+PA2 = pin.PA2
+UART2_RTS = pin.PA2
+PA13 = pin.PA13
+SPI1_CS = pin.PA13
+PA10 = pin.PA10
+
+SCLK = pin.PA14
+MOSI = pin.PA15
+MISO = pin.PA16

diff --git a/src/adafruit_blinka/microcontroller/mcp2221/i2c.py b/src/adafruit_blinka/microcontroller/mcp2221/i2c.py
index cd8f60d04076bf6ddbb152fcfc8e15f4c369eba9..df2642f681456d60dd288919f0df9b0b3417c58d 100644 (file)
--- a/src/adafruit_blinka/microcontroller/mcp2221/i2c.py
+++ b/src/adafruit_blinka/microcontroller/mcp2221/i2c.py
@@ -7,7 +7,7 @@ class I2C:
 
     def __init__(self, *, frequency=100000):
         self._mcp2221 = mcp2221
-        self._mcp2221.i2c_configure(frequency)
+        self._mcp2221._i2c_configure(frequency)
 
     def scan(self):
         """Perform an I2C Device Scan"""

diff --git a/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py b/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py
index e01eb7b1e59f5222ebd4edf31eafb740688510fd..0e061e62380d888880ab2a79624c4ec903bfce08 100644 (file)
--- a/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py
+++ b/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py
@@ -296,7 +296,7 @@ class MCP2221:
 
     # pylint: enable=too-many-arguments
 
-    def i2c_configure(self, baudrate=100000):
+    def _i2c_configure(self, baudrate=100000):
         """Configure I2C"""
         self._hid_xfer(
             bytes(

diff --git a/src/board.py b/src/board.py
index f0aa88312f160f2e60d029bfd1ee4313354889e2..9f68792e33f17f24ee615e7ee3a6f33d896dccb3 100755 (executable)
--- a/src/board.py
+++ b/src/board.py
@@ -99,6 +99,9 @@ elif board_id == ap_board.ORANGE_PI_2:
 elif board_id == ap_board.ORANGE_PI_ZERO_PLUS_2H5:
     from adafruit_blinka.board.orangepi.orangepizeroplus2h5 import *
 
+elif board_id == ap_board.ORANGE_PI_ZERO_PLUS:
+    from adafruit_blinka.board.orangepi.orangepizeroplus import *
+
 elif board_id == ap_board.BANANA_PI_M2_ZERO:
     from adafruit_blinka.board.bananapi.bpim2zero import *
 

diff --git a/src/busio.py b/src/busio.py
index 9260ccc32f8ea61a30b697732ec30b801ca7f386..8e61dc2c11ad96fa14c21f70ec20de2cc61eac3e 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -27,7 +27,7 @@ class I2C(Lockable):
     for both MicroPython and Linux.
     """
 
-    def __init__(self, scl, sda, frequency=400000):
+    def __init__(self, scl, sda, frequency=100000):
         self.init(scl, sda, frequency)
 
     def init(self, scl, sda, frequency):

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 593745b195abb68b696e86090953d5650c9f838f..020b070d78fd6cec2d9017ea94fd5903dbeedc34 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -66,6 +66,8 @@ elif chip_id == ap_chip.A33:
     from adafruit_blinka.microcontroller.allwinner.a33.pin import *
 elif chip_id == ap_chip.RK3308:
     from adafruit_blinka.microcontroller.rockchip.rk3308.pin import *
+elif chip_id == ap_chip.H5:
+    from adafruit_blinka.microcontroller.allwinner.h5.pin import *
 elif chip_id == ap_chip.IMX8MX:
     from adafruit_blinka.microcontroller.nxp_imx8m import *
 elif chip_id == ap_chip.IMX6ULL: