Merge remote-tracking branch 'adafruit/main'

diff --git a/src/adafruit_blinka/board/kb2040_u2if.py b/src/adafruit_blinka/board/kb2040_u2if.py
new file mode 100644 (file)
index 0000000..95b1473
--- /dev/null
+++ b/src/adafruit_blinka/board/kb2040_u2if.py
@@ -0,0 +1,57 @@
+# SPDX-FileCopyrightText: 2023 Carter Nelson for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
+"""
+Pin definitions for the KB2040 with u2if firmware.
+
+Adafruit CircuitPython 8.2.0 on 2023-07-05; Adafruit KB2040 with rp2040
+>>> import board
+>>> board.
+A0              A1              A2              A3
+BUTTON          CLK             D0              D1
+D10             D11             D12             D13
+D2              D3              D4              D5
+D6              D7              D8              D9
+I2C             MISO            MOSI            NEOPIXEL
+RX              SCK             SCL             SDA
+SPI             STEMMA_I2C      TX              UART
+board_id
+"""
+
+from adafruit_blinka.microcontroller.rp2040_u2if import pin
+
+D0 = TX = pin.GP0
+D1 = RX = pin.GP1
+D2 = pin.GP2
+D3 = pin.GP3
+D4 = pin.GP4
+D5 = pin.GP5
+D6 = pin.GP6
+D7 = pin.GP7
+D8 = pin.GP8
+D9 = pin.GP9
+D10 = pin.GP10
+D11 = pin.GP11
+D12 = pin.GP12
+D13 = pin.GP13
+
+A0 = pin.GP26
+A1 = pin.GP27
+A2 = pin.GP28
+A3 = pin.GP29
+
+BUTTON = pin.GP11
+
+NEOPIXEL = pin.GP17
+
+SDA = pin.GP12
+SCL = pin.GP13
+
+SCLK = pin.GP18
+MOSI = pin.GP19
+MISO = pin.GP20
+
+
+# access u2if via pin instance to open for specifc VID/PID
+# pylint:disable = protected-access
+pin.GP0._u2if_open_hid(0x239A, 0x0105)

diff --git a/src/adafruit_blinka/board/orangepi/orangepi5.py b/src/adafruit_blinka/board/orangepi/orangepi5.py
index 18893939caf4a082371dc5f77a5b3fa042d3e2f1..e86f2ea83a43a206bb5ca59e333567e667ab0493 100644 (file)
--- a/src/adafruit_blinka/board/orangepi/orangepi5.py
+++ b/src/adafruit_blinka/board/orangepi/orangepi5.py
@@ -51,16 +51,16 @@ TXD = UART1_TX
 RXD = UART1_RX
 
 # I2C
-I2C1_SCL = pin.GPIO1_D2
-I2C1_SDA = pin.GPIO1_D3
+I2C1_SCL = pin.GPIO1_B1
+I2C1_SDA = pin.GPIO1_B2
 I2C3_SCL = pin.GPIO1_C1
 I2C3_SDA = pin.GPIO1_C0
 I2C5_SCL = pin.GPIO1_B6
 I2C5_SDA = pin.GPIO1_B7
 
 # Default I2C
-SCL = I2C5_SCL
-SDA = I2C5_SDA
+SCL = I2C1_SCL
+SDA = I2C1_SDA
 
 # SPI
 SPI4_MISO = pin.GPIO1_C0

diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
index 8879cd12e4de610e5887172321796e5d93af2e91..cca9184fb7871b9a670ae98757ee03170cab7ae0 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
+++ b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py
@@ -204,6 +204,8 @@ I2C0_SCL_M1 = GPIO4_C5
 I2C0_SDA_M1 = GPIO4_C6
 I2C1_SCL_M0 = GPIO0_B5
 I2C1_SDA_M0 = GPIO0_B6
+I2C1_SCL_M4 = GPIO1_B1
+I2C1_SDA_M4 = GPIO1_B2
 I2C3_SCL_M1 = GPIO3_B7
 I2C3_SDA_M1 = GPIO3_C0
 I2C7_SCL_M3 = GPIO4_B2
@@ -217,6 +219,7 @@ I2C5_SCL_M3 = GPIO1_B6
 i2cPorts = (
     (0, I2C0_SCL_M1, I2C0_SDA_M1),
     (1, I2C1_SCL_M0, I2C1_SDA_M0),
+    (1, I2C1_SCL_M4, I2C1_SDA_M4),
     (3, I2C3_SCL_M1, I2C3_SDA_M1),
     (5, I2C5_SCL_M3, I2C5_SDA_M3),
     (7, I2C7_SCL_M3, I2C7_SDA_M3),

diff --git a/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py b/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py
index 1715b4a026a9443f19f12b3ee646881b188a2f28..f294e1e5839e5a9499be729fc2738413619741ef 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py
+++ b/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py
@@ -185,3 +185,17 @@ class I2C_QT2040_Trinkey(I2C):
         self._index = index
 
         super().__init__(index, frequency=frequency)
+
+
+class I2C_KB2040(I2C):
+    """I2C Class for KB2040 u2if"""
+
+    def __init__(self, scl, sda, *, frequency=100000):
+        index = None
+        if scl.id == 13 and sda.id == 12:
+            index = 0
+        if index is None:
+            raise ValueError("I2C not found on specified pins.")
+        self._index = index
+
+        super().__init__(index, frequency=frequency)

diff --git a/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py b/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py
index 7491c0343d03e63328b153d67d449c5c5c98950c..0acc5e62fcde6ad86b5f5fc70f5c607a3dc82a40 100644 (file)
--- a/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py
+++ b/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py
@@ -166,3 +166,15 @@ class SPI_MacroPad(SPI):
         if index is None:
             raise ValueError("No SPI port on specified pin.")
         super().__init__(index, baudrate=baudrate)
+
+
+class SPI_KB2040(SPI):
+    """SPI Class for KB2040 u2if"""
+
+    def __init__(self, clock, *, baudrate=100000):
+        index = None
+        if clock.id == 18:
+            index = 0
+        if index is None:
+            raise ValueError("No SPI port on specified pin.")
+        super().__init__(index, baudrate=baudrate)

diff --git a/src/board.py b/src/board.py
index bdb94ac0867d940804079a5e7f526fed18902b99..9b80fb0a6581f17d582f2419f521e13c6e820a5b 100644 (file)
--- a/src/board.py
+++ b/src/board.py
@@ -328,6 +328,9 @@ elif board_id == ap_board.MACROPAD_U2IF:
 elif board_id == ap_board.QT2040_TRINKEY_U2IF:
     from adafruit_blinka.board.qt2040_trinkey_u2if import *
 
+elif board_id == ap_board.KB2040_U2IF:
+    from adafruit_blinka.board.kb2040_u2if import *
+
 elif board_id == ap_board.LICHEE_RV:
     from adafruit_blinka.board.lichee_rv import *
 

diff --git a/src/busio.py b/src/busio.py
index ed5c88c2016e324ecd2805714ee23f400dada482..2de9e60a69137419a5c734f00d9e179cf27f14c5 100644 (file)
--- a/src/busio.py
+++ b/src/busio.py
@@ -114,6 +114,13 @@ class I2C(Lockable):
                 I2C_QT2040_Trinkey as _I2C,
             )
 
+            self._i2c = _I2C(scl, sda, frequency=frequency)
+            return
+        if detector.board.kb2040_u2if:
+            from adafruit_blinka.microcontroller.rp2040_u2if.i2c import (
+                I2C_KB2040 as _I2C,
+            )
+
             self._i2c = _I2C(scl, sda, frequency=frequency)
             return
         if detector.chip.id == ap_chip.RP2040:
@@ -312,6 +319,14 @@ class SPI(Lockable):
         if detector.board.qtpy_u2if:
             from adafruit_blinka.microcontroller.rp2040_u2if.spi import SPI_QTPY as _SPI
 
+            self._spi = _SPI(clock)  # this is really all that's needed
+            self._pins = (clock, clock, clock)  # will determine MOSI/MISO from clock
+            return
+        if detector.board.kb2040_u2if:
+            from adafruit_blinka.microcontroller.rp2040_u2if.spi import (
+                SPI_KB2040 as _SPI,
+            )
+
             self._spi = _SPI(clock)  # this is really all that's needed
             self._pins = (clock, clock, clock)  # will determine MOSI/MISO from clock
             return
@@ -397,6 +412,10 @@ class SPI(Lockable):
             from adafruit_blinka.microcontroller.rp2040_u2if.spi import (
                 SPI_MacroPad as _SPI,
             )
+        elif detector.board.kb2040_u2if:
+            from adafruit_blinka.microcontroller.rp2040_u2if.spi import (
+                SPI_KB2040 as _SPI,
+            )
         elif detector.board.qtpy_u2if:
             from adafruit_blinka.microcontroller.rp2040_u2if.spi import SPI_QTPY as _SPI
         elif detector.chip.id == ap_chip.RP2040:

diff --git a/src/neopixel_write.py b/src/neopixel_write.py
index 997dd0dec5e75dafbe7dec5cac56f77817274067..7c4f757a0fdb3d68481e5618f7d87055f5d707dd 100644 (file)
--- a/src/neopixel_write.py
+++ b/src/neopixel_write.py
@@ -28,6 +28,7 @@ elif (
     or detector.board.itsybitsy_u2if
     or detector.board.macropad_u2if
     or detector.board.qt2040_trinkey_u2if
+    or detector.board.kb2040_u2if
 ):
     from adafruit_blinka.microcontroller.rp2040_u2if import neopixel as _neopixel
 elif "sphinx" in sys.modules:

diff --git a/src/pwmio.py b/src/pwmio.py
index d19a855533bdc46bb4a8040f324c68fd1ff991ab..b4819daf07365108902b04dd8f7bb62a25e5ecfb 100644 (file)
--- a/src/pwmio.py
+++ b/src/pwmio.py
@@ -47,6 +47,7 @@ elif (
     or detector.board.itsybitsy_u2if
     or detector.board.macropad_u2if
     or detector.board.qt2040_trinkey_u2if
+    or detector.board.kb2040_u2if
 ):
     from adafruit_blinka.microcontroller.rp2040_u2if.pwmio import PWMOut
 elif "sphinx" in sys.modules: