From a052cf3c615a2aedb6598a1c4fa93f72ea6b6ab0 Mon Sep 17 00:00:00 2001 From: caternuson Date: Fri, 7 Jul 2023 10:31:44 -0700 Subject: [PATCH 1/2] add KB2040 --- src/adafruit_blinka/board/kb2040_u2if.py | 57 +++++++++++++++++++ .../microcontroller/rp2040_u2if/i2c.py | 14 +++++ .../microcontroller/rp2040_u2if/spi.py | 12 ++++ src/board.py | 3 + src/busio.py | 17 ++++++ src/neopixel_write.py | 1 + src/pwmio.py | 1 + 7 files changed, 105 insertions(+) create mode 100644 src/adafruit_blinka/board/kb2040_u2if.py diff --git a/src/adafruit_blinka/board/kb2040_u2if.py b/src/adafruit_blinka/board/kb2040_u2if.py new file mode 100644 index 00000000..df8c7325 --- /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) \ No newline at end of file diff --git a/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py b/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py index 1715b4a0..c7f2d2f5 100644 --- a/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py +++ b/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py @@ -185,3 +185,17 @@ def __init__(self, scl, sda, *, frequency=100000): 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) \ No newline at end of file diff --git a/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py b/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py index 7491c034..33df281a 100644 --- a/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py +++ b/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py @@ -166,3 +166,15 @@ def __init__(self, clock, *, baudrate=100000): 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) \ No newline at end of file diff --git a/src/board.py b/src/board.py index 89a2a736..74aeb5cc 100644 --- a/src/board.py +++ b/src/board.py @@ -322,6 +322,9 @@ 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 ed5c88c2..458f5745 100644 --- a/src/busio.py +++ b/src/busio.py @@ -114,6 +114,13 @@ def init(self, scl, sda, frequency): 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,12 @@ def __init__(self, clock, MOSI=None, MISO=None): 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 +410,10 @@ def configure(self, baudrate=100000, polarity=0, phase=0, bits=8): 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 997dd0de..7c4f757a 100644 --- a/src/neopixel_write.py +++ b/src/neopixel_write.py @@ -28,6 +28,7 @@ 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 57854df4..886241fb 100644 --- a/src/pwmio.py +++ b/src/pwmio.py @@ -45,6 +45,7 @@ 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: From ae345a440ae40608c8f4ccec887e1bcaaa9fa15e Mon Sep 17 00:00:00 2001 From: caternuson Date: Fri, 7 Jul 2023 10:39:34 -0700 Subject: [PATCH 2/2] black --- src/adafruit_blinka/board/kb2040_u2if.py | 2 +- src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py | 2 +- src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py | 2 +- src/busio.py | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/adafruit_blinka/board/kb2040_u2if.py b/src/adafruit_blinka/board/kb2040_u2if.py index df8c7325..95b1473d 100644 --- a/src/adafruit_blinka/board/kb2040_u2if.py +++ b/src/adafruit_blinka/board/kb2040_u2if.py @@ -54,4 +54,4 @@ # access u2if via pin instance to open for specifc VID/PID # pylint:disable = protected-access -pin.GP0._u2if_open_hid(0x239A, 0x0105) \ No newline at end of file +pin.GP0._u2if_open_hid(0x239A, 0x0105) diff --git a/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py b/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py index c7f2d2f5..f294e1e5 100644 --- a/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py +++ b/src/adafruit_blinka/microcontroller/rp2040_u2if/i2c.py @@ -198,4 +198,4 @@ def __init__(self, scl, sda, *, frequency=100000): raise ValueError("I2C not found on specified pins.") self._index = index - super().__init__(index, frequency=frequency) \ No newline at end of file + 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 33df281a..0acc5e62 100644 --- a/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py +++ b/src/adafruit_blinka/microcontroller/rp2040_u2if/spi.py @@ -177,4 +177,4 @@ def __init__(self, clock, *, baudrate=100000): index = 0 if index is None: raise ValueError("No SPI port on specified pin.") - super().__init__(index, baudrate=baudrate) \ No newline at end of file + super().__init__(index, baudrate=baudrate) diff --git a/src/busio.py b/src/busio.py index 458f5745..2de9e60a 100644 --- a/src/busio.py +++ b/src/busio.py @@ -323,7 +323,9 @@ def __init__(self, clock, MOSI=None, MISO=None): 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 + 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