From: Franklin Harding Date: Tue, 11 May 2021 07:01:42 +0000 (-0700) Subject: Merge branch 'master' of https://github.com/adafruit/Adafruit_Blinka X-Git-Tag: 6.9.2~2^2~3 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/6db6ef855f798996075d2919ca924ec31983f7f1?hp=71dd8473c46e4b07044859af2ef60fef66cf0455 Merge branch 'master' of https://github.com/adafruit/Adafruit_Blinka --- diff --git a/README.rst b/README.rst index 40df1a9..d802c16 100755 --- a/README.rst +++ b/README.rst @@ -17,16 +17,19 @@ Introduction :target: https://github.com/psf/black :alt: Code Style: Black -This repository contains a selection of packages mirroring the CircuitPython API -on hosts running micropython. Working code exists to emulate the CircuitPython packages; +This repository contains a selection of packages emulating the CircuitPython API +for devices or hosts running CPython or MicroPython. Working code exists to emulate these CircuitPython packages: -* **board** - breakout-specific pin identities -* **microcontroller** - chip-specific pin identities * **analogio** - analog input/output pins, using pin identities from board+microcontroller packages -* **digitalio** - digital input/output pins, using pin identities from board+microcontroller packages * **bitbangio** - software-driven interfaces for I2C, SPI +* **board** - breakout-specific pin identities * **busio** - hardware-driven interfaces for I2C, SPI, UART +* **digitalio** - digital input/output pins, using pin identities from board+microcontroller packages +* **microcontroller** - chip-specific pin identities +* **micropython** - MicroPython-specific module +* **neopixel_write** - low-level interface to NeoPixels * **pulseio** - contains classes that provide access to basic pulse IO (PWM) +* **pwmio** - contains classes that provide access to basic pulse IO (PWM) For details, see the `Blinka API reference `_. @@ -34,12 +37,14 @@ For details, see the `Blinka API reference Dependencies ============= -The Micropython compatibility layers described above are intended to provide a CircuitPython-like API for devices which -are running CPython or Micropython. Since corresponding packages should be built-in to any standard -CircuitPython image, they have no value on a device already running CircuitPython and would likely conflict in unhappy ways. +The emulation described above is intended to provide a +CircuitPython-like API for devices which are running CPython or +Micropython. Since corresponding packages should be built-in to any +standard CircuitPython image, they have no value on a device already +running CircuitPython and would likely conflict in unhappy ways. The test suites in the test/src folder under **testing.universal** are by design -intended to run on *either* CircuitPython *or* Micropython+compatibility layer to prove conformance. +intended to run on *either* CircuitPython *or* CPython/Micropython+compatibility layer to prove conformance. Installing from PyPI ===================== diff --git a/requirements.txt b/requirements.txt index 59a7ee9..013f2dc 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Adafruit-PlatformDetect>=3.1.0 +Adafruit-PlatformDetect>=3.13.0 Adafruit-PureIO>=1.1.7 Jetson.GPIO; platform_machine=='aarch64' RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l' diff --git a/setup.py b/setup.py index 7e92596..5d6ea95 100755 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ setup( "adafruit_blinka.microcontroller.bcm283x.pulseio": ["libgpiod_pulsein"] }, install_requires=[ - "Adafruit-PlatformDetect>=3.1.0", + "Adafruit-PlatformDetect>=3.13.0", "Adafruit-PureIO>=1.1.7", "pyftdi>=0.40.0", ] diff --git a/src/adafruit_blinka/board/lubancat/lubancat_stm32mp157.py b/src/adafruit_blinka/board/lubancat/lubancat_stm32mp157.py new file mode 100644 index 0000000..33dfdcd --- /dev/null +++ b/src/adafruit_blinka/board/lubancat/lubancat_stm32mp157.py @@ -0,0 +1,49 @@ +"""Pin definitions for the LubanCat STM32MP157.""" + +from adafruit_blinka.microcontroller.stm32.stm32mp157 import pin + +# Pro board pin header J1 named GPIO_PAx, pin header J2 named GPIO_PBx + +# Board pin name [= alias] = RPI name [= alias] = pin name + +# connector J1 +GPIO_PA3 = USART1_CTS = PZ3 = pin.PZ3 +GPIO_PA4 = USART1_RTS = PZ5 = pin.PZ5 +GPIO_PA5 = USART1_TX = PZ7 = pin.PZ7 +GPIO_PA6 = USART1_RX = PZ6 = pin.PZ6 +GPIO_PA7 = USART3_TX = PB10 = pin.PB10 +GPIO_PA8 = USART3_RX = PB12 = pin.PB12 +GPIO_PA11 = FDCAN1_TX = PA12 = pin.PA12 +GPIO_PA12 = FDCAN1_RX = PA11 = pin.PA11 +# connector J2 +GPIO_PB7 = UART4_TX = PG11 = pin.PG11 +GPIO_PB8 = UART4_RX = PB2 = pin.PB2 +GPIO_PB11 = QSPI_IO0 = PF8 = pin.PF8 +GPIO_PB12 = QSPI_IO1 = PF9 = pin.PF9 +GPIO_PB13 = QSPI_IO2 = PF7 = pin.PF7 +GPIO_PB14 = QSPI_IO3 = PF6 = pin.PF6 +GPIO_PB15 = QSPI_CLK = PF10 = pin.PF10 +GPIO_PB16 = QSPI_NCS = PB6 = pin.PB6 + +# general gpio as LED、KEY function +# LED +LED_RED = PA13 = pin.PA13 +LED_GREEN = PB5 = pin.PG2 +LED_BLUE = PB5 = pin.PB5 +# KEY +KEY1 = PB13 = pin.PB13 +KEY2 = PH7 = pin.PH7 +# BEEP +BEEP = PC13 = pin.PC13 + +# general gpio as I2C function +# I2C1 +GPIO_PA13 = I2C1_SCL = SCL1 = SCL = pin.PF14 +GPIO_PA14 = I2C1_SDA = SDA1 = SDA = pin.PF15 +# I2C2 +GPIO_PA15 = I2C2_SCL = SCL2 = pin.PZ0 +GPIO_PA16 = I2C2_SDA = SDA2 = pin.PZ1 + +# general gpio as analog input function +GPIO_PB3 = ADC_IN0 = ANA0 = A0 = pin.PAN0 +GPIO_PB4 = ADC_IN1 = ANA1 = A1 = pin.PAN1 diff --git a/src/adafruit_blinka/board/pico_u2if.py b/src/adafruit_blinka/board/pico_u2if.py new file mode 100644 index 0000000..bcdfe47 --- /dev/null +++ b/src/adafruit_blinka/board/pico_u2if.py @@ -0,0 +1,46 @@ +"""Pin definitions for the MicroChip MCP2221""" +from adafruit_blinka.microcontroller.pico_u2if import pin + +GP0 = pin.GP0 +GP1 = pin.GP1 +GP2 = pin.GP2 +GP3 = pin.GP3 +GP4 = pin.GP4 +GP5 = pin.GP5 +GP6 = pin.GP6 +GP7 = pin.GP7 +GP8 = pin.GP8 +GP9 = pin.GP9 +GP10 = pin.GP10 +GP11 = pin.GP11 +GP12 = pin.GP12 +GP13 = pin.GP13 +GP14 = pin.GP14 +GP15 = pin.GP15 +GP16 = pin.GP16 +GP17 = pin.GP17 +GP18 = pin.GP18 +GP19 = pin.GP19 +GP20 = pin.GP20 +GP21 = pin.GP21 +GP22 = pin.GP22 +GP26 = pin.GP26 +GP27 = pin.GP27 +GP28 = pin.GP28 + +ADC0 = GP26 +ADC1 = GP27 + +SCL = SCL0 = GP5 +SDA = SDA0 = GP4 + +SCL1 = GP15 +SDA1 = GP14 + +SCLK = SCK = SCLK0 = SCK0 = GP18 +MOSI = MOSI0 = GP19 +MISO = MISO0 = GP12 + +SCLK1 = SCK1 = GP10 +MOSI1 = GP11 +MISO1 = GP12 diff --git a/src/adafruit_blinka/board/radxa/rockpie.py b/src/adafruit_blinka/board/radxa/rockpie.py new file mode 100644 index 0000000..edb79ed --- /dev/null +++ b/src/adafruit_blinka/board/radxa/rockpie.py @@ -0,0 +1,54 @@ +"""Pin definitions for the Rock Pi E.""" + +from adafruit_blinka.microcontroller.rockchip.rk3328 import pin + +D3 = pin.GPIO3_A4 # /UART1_TX/PIN 100/ +D5 = pin.GPIO3_A6 # /UART1_RX/PIN 102/ +D7 = pin.GPIO1_D4 # /PIN 60/ +D8 = pin.GPIO2_A0 # /UART2_TX/PIN 64/ +D10 = pin.GPIO2_A1 # /UART2_RX/PIN 65/ +D11 = pin.GPIO2_A2 # /PWM_IR/PIN 66/ +D12 = pin.GPIO2_C2 # /PDM_CLK/I2S1_SCLK/PIN 82/ +D13 = pin.GPIO2_A3 # /PIN 67/ +D15 = pin.GPIO0_D3 # /PIN 27/ +D19 = pin.GPIO3_A1 # /SPI0_TXD/PIN 97/ +D21 = pin.GPIO3_A2 # /SPI0_RXD/PIN 98/ +D23 = pin.GPIO3_A0 # /SPI0_CLK/PIN 96/ +D24 = pin.GPIO3_B0 # /SPI0_CSN0/PIN 104/ +D26 = pin.GPIO2_B4 # /PIN 76/ +D27 = pin.GPIO2_A4 # /I2C1_SDAPIN 68/ +D28 = pin.GPIO2_A5 # /I2C1_SCL/PIN 69/ +D29 = pin.GPIO2_C4 # /I2S1_SDIO1/PDM_SDI1/PIN 84/ +D31 = pin.GPIO2_C5 # /I2S1_SDIO2/PDM_SDI2/PIN 85/ +D32 = pin.GPIO2_C0 # /I2S1_LRCK_RX/PIN 80/ +D33 = pin.GPIO2_A6 # /PWM2/PIN 70/ +D35 = pin.GPIO2_C1 # /I2S1_LRCK_TX/PIN 81/ +D36 = pin.GPIO2_B7 # /I2S1_MCLK/PIN 79/ +D37 = pin.GPIO2_C6 # /PDM_SDI3/PIN 86/ +D38 = pin.GPIO2_C3 # /PDM_SDI0/I2S1_SDI/PIN 83/ +D40 = pin.GPIO2_C7 # /PDM_FSYNC/I2S1_SDO/PIN 87/ + +SDA2 = D27 +SCL2 = D28 + +SDA = SDA2 +SCL = SCL2 + +SCLK = D23 +MOSI = D19 +MISO = D21 +CS = D24 +SCK = SCLK + +UART1_TX = D3 +UART2_RX = D5 +UART2_TX = D8 +UART2_RX = D10 + +UART4_TX = D19 +UART4_RX = D21 + +UART_TX = UART2_TX +UART_RX = UART2_RX + +PWM2 = pin.PWM2 diff --git a/src/adafruit_blinka/board/raspberrypi/pico.py b/src/adafruit_blinka/board/raspberrypi/pico.py new file mode 100755 index 0000000..e554ad1 --- /dev/null +++ b/src/adafruit_blinka/board/raspberrypi/pico.py @@ -0,0 +1,41 @@ +"""Raspberry Pi Pico pin names""" + +from adafruit_blinka.microcontroller.rp2040 import pin + +GP0 = pin.GP0 +GP1 = pin.GP1 +GP2 = pin.GP2 +GP3 = pin.GP3 +GP4 = pin.GP4 +GP5 = pin.GP5 +GP6 = pin.GP6 +GP7 = pin.GP7 +GP8 = pin.GP8 +GP9 = pin.GP9 +GP10 = pin.GP10 +GP11 = pin.GP11 +GP12 = pin.GP12 +GP13 = pin.GP13 +GP14 = pin.GP14 +GP15 = pin.GP15 +GP16 = pin.GP16 +GP17 = pin.GP17 +GP18 = pin.GP18 +GP19 = pin.GP19 +GP20 = pin.GP20 +GP21 = pin.GP21 +GP22 = pin.GP22 +GP23 = pin.GP23 +GP24 = pin.GP24 +GP25 = pin.GP25 +GP26 = pin.GP26 +GP27 = pin.GP27 +GP28 = pin.GP28 +LED = GP25 +SMPS_MODE = GP23 +VBUS_SENSE = GP24 +A0 = GP26 +A1 = GP27 +A2 = GP28 +A3 = pin.GP29 +VOLTAGE_MONITOR = pin.GP29 diff --git a/src/adafruit_blinka/microcontroller/allwinner/h6/pin.py b/src/adafruit_blinka/microcontroller/allwinner/h6/pin.py index af944e3..53c469f 100644 --- a/src/adafruit_blinka/microcontroller/allwinner/h6/pin.py +++ b/src/adafruit_blinka/microcontroller/allwinner/h6/pin.py @@ -39,9 +39,9 @@ SPI1_MISO = PH6 PH8 = Pin((1, 230)) PH9 = Pin((1, 231)) -PL8 = Pin((1, 360)) -PL9 = Pin((1, 361)) +PL8 = Pin((0, 8)) +PL9 = Pin((0, 9)) i2cPorts = ((0, TWI0_SCL, TWI0_SDA),) -spiPorts = ((0, SPI1_SCLK, SPI1_MOSI, SPI1_MISO),) +spiPorts = ((1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO),) uartPorts = ((2, UART2_TX, UART2_RX),) diff --git a/src/adafruit_blinka/microcontroller/allwinner/h616/pin.py b/src/adafruit_blinka/microcontroller/allwinner/h616/pin.py index 160aee2..5c046d1 100644 --- a/src/adafruit_blinka/microcontroller/allwinner/h616/pin.py +++ b/src/adafruit_blinka/microcontroller/allwinner/h616/pin.py @@ -2,7 +2,7 @@ from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin PC0 = Pin((1, 64)) -SPI0_CLK = PC0 +SPI0_SCLK = PC0 PC1 = Pin((1, 65)) PC2 = Pin((1, 66)) SPI0_MOSI = PC2 @@ -65,7 +65,7 @@ TWI3_SDA = PH5 SPI1_CS0 = PH5 PH6 = Pin((1, 230)) UART2_RX = PH6 -SPI1_CLK = PH6 +SPI1_SCLK = PH6 PH7 = Pin((1, 231)) SPI1_MOSI = PH7 PH8 = Pin((1, 232)) @@ -95,8 +95,8 @@ PI16 = Pin((1, 272)) i2cPorts = ((3, TWI3_SCL, TWI3_SDA),) # ordered as spiId, sckId, mosiId, misoId spiPorts = ( - (0, SPI0_CLK, SPI0_MOSI, SPI0_MISO), - (1, SPI1_CLK, SPI1_MOSI, SPI1_MISO), + (0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO), + (1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO), ) # ordered as uartId, txId, rxId uartPorts = ( diff --git a/src/adafruit_blinka/microcontroller/bcm283x/pin.py b/src/adafruit_blinka/microcontroller/bcm283x/pin.py index 5022366..82b8b26 100644 --- a/src/adafruit_blinka/microcontroller/bcm283x/pin.py +++ b/src/adafruit_blinka/microcontroller/bcm283x/pin.py @@ -142,6 +142,9 @@ spiPorts = ( (0, SCLK, MOSI, MISO), (1, SCLK_1, MOSI_1, MISO_1), (2, SCLK_2, MOSI_2, MISO_2), + (3, D3, D2, D1), # SPI3 on Pi4/CM4 + (4, D7, D6, D5), # SPI4 on Pi4/CM4 + (5, D15, D14, D13), # SPI5 on Pi4/CM4 ) # ordered as uartId, txId, rxId @@ -153,4 +156,5 @@ uartPorts = ((1, TXD, RXD),) i2cPorts = ( (1, SCL, SDA), (0, D1, D0), # both pi 1 and pi 2 i2c ports! + (10, D45, D44), # internal i2c bus for the CM4 ) diff --git a/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py index 19dc98f..fd9febe 100644 --- a/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py +++ b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py @@ -25,7 +25,7 @@ def final(): atexit.register(final) -# pylint: disable=c-extension-no-member +# pylint: disable=c-extension-no-member, consider-using-with class PulseIn: """PulseIn Class to read PWM signals""" diff --git a/src/adafruit_blinka/microcontroller/esp8266/pin.py b/src/adafruit_blinka/microcontroller/esp8266/pin.py index 9dc856f..5ba9884 100755 --- a/src/adafruit_blinka/microcontroller/esp8266/pin.py +++ b/src/adafruit_blinka/microcontroller/esp8266/pin.py @@ -16,14 +16,14 @@ GPIO16 = Pin(16) TOUT = Pin("TOUT") # ordered as spiId, sckId, mosiId, misoId -SPI_PORTS = (1, GPIO14, GPIO13, GPIO12) +spiPorts = (1, GPIO14, GPIO13, GPIO12) # ordered as uartId, txId, rxId -UART_PORTS = ( +uartPorts = ( (0, GPIO1, GPIO3), # TODO secondary pins for UART0 configurable from Micropython? How to flag? # (0, GPIO15, GPIO13) (1, GPIO2, None), ) -I2C_PORTS = () +i2cPorts = () diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft2232h/pin.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft2232h/pin.py index 814a3a9..4fa8440 100644 --- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft2232h/pin.py +++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft2232h/pin.py @@ -5,44 +5,44 @@ from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.pin import Pin # See https://eblot.github.io/pyftdi/pinout.html for detailed FTDI device pinout information # MPSSE Port A -AD4 = Pin(4, url="ftdi://ftdi:ft2232h/1") -AD5 = Pin(5, url="ftdi://ftdi:ft2232h/1") -AD6 = Pin(6, url="ftdi://ftdi:ft2232h/1") -AD7 = Pin(7, url="ftdi://ftdi:ft2232h/1") -AC0 = Pin(8, url="ftdi://ftdi:ft2232h/1") -AC1 = Pin(9, url="ftdi://ftdi:ft2232h/1") -AC2 = Pin(10, url="ftdi://ftdi:ft2232h/1") -AC3 = Pin(11, url="ftdi://ftdi:ft2232h/1") -AC4 = Pin(12, url="ftdi://ftdi:ft2232h/1") -AC5 = Pin(13, url="ftdi://ftdi:ft2232h/1") -AC6 = Pin(14, url="ftdi://ftdi:ft2232h/1") -AC7 = Pin(15, url="ftdi://ftdi:ft2232h/1") - -SCL0 = Pin(url="ftdi://ftdi:ft2232h/1") -SDA0 = Pin(url="ftdi://ftdi:ft2232h/1") -SCK0 = SCLK0 = Pin(url="ftdi://ftdi:ft2232h/1") -MOSI0 = Pin(url="ftdi://ftdi:ft2232h/1") -MISO0 = Pin(url="ftdi://ftdi:ft2232h/1") +AD4 = Pin(4, interface_id=0) +AD5 = Pin(5, interface_id=0) +AD6 = Pin(6, interface_id=0) +AD7 = Pin(7, interface_id=0) +AC0 = Pin(8, interface_id=0) +AC1 = Pin(9, interface_id=0) +AC2 = Pin(10, interface_id=0) +AC3 = Pin(11, interface_id=0) +AC4 = Pin(12, interface_id=0) +AC5 = Pin(13, interface_id=0) +AC6 = Pin(14, interface_id=0) +AC7 = Pin(15, interface_id=0) + +SCL0 = Pin(interface_id=0) +SDA0 = Pin(interface_id=0) +SCK0 = SCLK0 = Pin(interface_id=0) +MOSI0 = Pin(interface_id=0) +MISO0 = Pin(interface_id=0) # MPSSE Port B -BD4 = Pin(4, url="ftdi://ftdi:ft2232h/2") -BD5 = Pin(5, url="ftdi://ftdi:ft2232h/2") -BD6 = Pin(6, url="ftdi://ftdi:ft2232h/2") -BD7 = Pin(7, url="ftdi://ftdi:ft2232h/2") -BC0 = Pin(8, url="ftdi://ftdi:ft2232h/2") -BC1 = Pin(9, url="ftdi://ftdi:ft2232h/2") -BC2 = Pin(10, url="ftdi://ftdi:ft2232h/2") -BC3 = Pin(11, url="ftdi://ftdi:ft2232h/2") -BC4 = Pin(12, url="ftdi://ftdi:ft2232h/2") -BC5 = Pin(13, url="ftdi://ftdi:ft2232h/2") -BC6 = Pin(14, url="ftdi://ftdi:ft2232h/2") -BC7 = Pin(15, url="ftdi://ftdi:ft2232h/2") - -SCL1 = Pin(url="ftdi://ftdi:ft2232h/2") -SDA1 = Pin(url="ftdi://ftdi:ft2232h/2") -SCK1 = SCLK1 = Pin(url="ftdi://ftdi:ft2232h/2") -MOSI1 = Pin(url="ftdi://ftdi:ft2232h/2") -MISO1 = Pin(url="ftdi://ftdi:ft2232h/2") +BD4 = Pin(4, interface_id=1) +BD5 = Pin(5, interface_id=1) +BD6 = Pin(6, interface_id=1) +BD7 = Pin(7, interface_id=1) +BC0 = Pin(8, interface_id=1) +BC1 = Pin(9, interface_id=1) +BC2 = Pin(10, interface_id=1) +BC3 = Pin(11, interface_id=1) +BC4 = Pin(12, interface_id=1) +BC5 = Pin(13, interface_id=1) +BC6 = Pin(14, interface_id=1) +BC7 = Pin(15, interface_id=1) + +SCL1 = Pin(interface_id=1) +SDA1 = Pin(interface_id=1) +SCK1 = SCLK1 = Pin(interface_id=1) +MOSI1 = Pin(interface_id=1) +MISO1 = Pin(interface_id=1) i2cPorts = ( (0, SCL0, SDA0), diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py index 291a77c..f9539fb 100644 --- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py +++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py @@ -1,5 +1,9 @@ """I2C Class for FTDI MPSSE""" from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.pin import Pin +from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.url import ( + get_ft232h_url, + get_ft2232h_url, +) class I2C: @@ -23,11 +27,9 @@ class I2C: self._i2c = I2cController() if i2c_id is None: - self._i2c.configure("ftdi://ftdi:ft232h/1", frequency=frequency) + self._i2c.configure(get_ft232h_url(), frequency=frequency) else: - self._i2c.configure( - "ftdi://ftdi:ft2232h/{}".format(i2c_id + 1), frequency=frequency - ) + self._i2c.configure(get_ft2232h_url(i2c_id), frequency=frequency) Pin.mpsse_gpio = self._i2c.get_gpio() def scan(self): diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py index b5a7475..5dc171e 100644 --- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py +++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py @@ -1,5 +1,7 @@ """MPSSE pin names""" +from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.url import get_ft232h_url, get_ft2232h_url + class Pin: """A basic Pin class for use with FTDI MPSSEs.""" @@ -14,7 +16,7 @@ class Pin: mpsse_gpio = None - def __init__(self, pin_id=None, url="ftdi://ftdi:ft232h/1"): + def __init__(self, pin_id=None, interface_id=None): # setup GPIO controller if not done yet # use one provided by I2C as default if not Pin.mpsse_gpio: @@ -24,7 +26,10 @@ class Pin: # pylint: enable=import-outside-toplevel i2c = I2cController() - i2c.configure(url) + if interface_id is None: + i2c.configure(get_ft232h_url()) + else: + i2c.configure(get_ft2232h_url(interface_id)) Pin.mpsse_gpio = i2c.get_gpio() # check if pin is valid if pin_id: diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py index 78dee58..0b76c08 100644 --- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py +++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py @@ -1,5 +1,9 @@ """SPI Class for FTDI MPSSE""" from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.pin import Pin +from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.url import ( + get_ft232h_url, + get_ft2232h_url, +) # pylint: disable=protected-access class SPI: @@ -15,9 +19,9 @@ class SPI: self._spi = SpiController(cs_count=1) if spi_id is None: - self._spi.configure("ftdi://ftdi:ft232h/1") + self._spi.configure(get_ft232h_url()) else: - self._spi.configure("ftdi://ftdi:ft2232h/{}".format(spi_id + 1)) + self._spi.configure(get_ft2232h_url(spi_id + 1)) self._port = self._spi.get_port(0) self._port.set_frequency(100000) self._port._cpol = 0 diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/url.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/url.py new file mode 100644 index 0000000..c2f2eaf --- /dev/null +++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/url.py @@ -0,0 +1,31 @@ +"""Support for getting the URL from the BLINKA_FT232H variable.""" + +import os + + +def get_ft232h_url(): + """ + Return the FTDI url to use. If BLINKA_FT232H starts with ftdi:, returns + that. Otherwise, returns a default value. + """ + + url = os.environ.get("BLINKA_FT232H", "1") + + if url.startswith("ftdi:"): + return url + + return "ftdi://ftdi:ft232h/1" + + +def get_ft2232h_url(interface_id): + """ + Return the FTDI url to use. If BLINKA_FT2232H_{} starts with ftdi:, returns + that. Otherwise, returns a default value. + """ + + url = os.environ.get("BLINKA_FT2232H_{}".format(interface_id), "1") + + if url.startswith("ftdi:"): + return url + + return "ftdi://ftdi:ft2232h/{}".format(interface_id + 1) diff --git a/src/adafruit_blinka/microcontroller/generic_micropython/i2c.py b/src/adafruit_blinka/microcontroller/generic_micropython/i2c.py new file mode 100755 index 0000000..3ace77a --- /dev/null +++ b/src/adafruit_blinka/microcontroller/generic_micropython/i2c.py @@ -0,0 +1,51 @@ +"""I2C Class for Generic MicroPython""" +from machine import I2C as _I2C + + +class I2C: + """I2C Class for Generic MicroPython""" + + MASTER = 0 + + # pylint: disable=unused-argument + def __init__(self, portId, *, mode=MASTER, baudrate=100000): + self._i2c = _I2C(portId, freq=baudrate) + + def scan(self): + """Perform an I2C Device Scan""" + return self._i2c.scan() + + def writeto(self, address, buffer, *, stop=True): + """Write the data from the buffer to the address""" + return self._i2c.writeto(address, buffer) + + def readfrom_into(self, address, buffer, *, stop=True): + """Read data from an address and into the buffer""" + return self._i2c.readfrom_into(address, buffer) + + def writeto_then_readfrom( + self, + address, + buffer_out, + buffer_in, + *, + out_start=0, + out_end=None, + in_start=0, + in_end=None, + stop=False + ): + """Write data from buffer_out to an address and then + read data from an address and into buffer_in + """ + self._i2c.writeto_then_readfrom( + address, + buffer_out, + buffer_in, + out_start=out_start, + out_end=out_end, + in_start=in_start, + in_end=in_end, + ) + + # pylint: enable=unused-argument diff --git a/src/adafruit_blinka/microcontroller/generic_micropython/spi.py b/src/adafruit_blinka/microcontroller/generic_micropython/spi.py new file mode 100755 index 0000000..7842a19 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/generic_micropython/spi.py @@ -0,0 +1,66 @@ +"""SPI Class for Generic MicroPython""" +from machine import SPI as _SPI + +# pylint: disable=protected-access, no-self-use +class SPI: + """SPI Class for Generic MicroPython""" + + MSB = _SPI.MSB + LSB = _SPI.LSB + + def __init__(self, portId, baudrate=100000): + self._frequency = baudrate + self._spi = _SPI(portId) + + # pylint: disable=too-many-arguments,unused-argument + def init( + self, + baudrate=1000000, + polarity=0, + phase=0, + bits=8, + firstbit=_SPI.MSB, + ): + """Initialize the Port""" + self._frequency = baudrate + self._spi.init( + baudrate=baudrate, + polarity=polarity, + phase=phase, + bits=bits, + firstbit=firstbit, + mode=_SPI.MASTER, + ) + + # pylint: enable=too-many-arguments + + @property + def frequency(self): + """Return the current frequency""" + return self._frequency + + def write(self, buf, start=0, end=None): + """Write data from the buffer to SPI""" + self._spi.write(buf) + + def readinto(self, buf, start=0, end=None, write_value=0): + """Read data from SPI and into the buffer""" + self._spi.readinto(buf) + + # pylint: disable=too-many-arguments + def write_readinto( + self, buffer_out, buffer_in, out_start=0, out_end=None, in_start=0, in_end=None + ): + """Perform a half-duplex write from buffer_out and then + read data into buffer_in + """ + self._spi.write_readinto( + buffer_out, + buffer_in, + out_start=out_start, + out_end=out_end, + in_start=in_start, + in_end=in_end, + ) + + # pylint: enable=too-many-arguments diff --git a/src/adafruit_blinka/microcontroller/nova/__init__.py b/src/adafruit_blinka/microcontroller/nova/__init__.py index 8ab7ce0..d9b7f75 100644 --- a/src/adafruit_blinka/microcontroller/nova/__init__.py +++ b/src/adafruit_blinka/microcontroller/nova/__init__.py @@ -8,13 +8,13 @@ class Connection: @staticmethod def getInstance(): - """ Static access method. """ + """Static access method.""" if Connection.__instance is None: Connection() return Connection.__instance def __init__(self): - """ Virtually private constructor. """ + """Virtually private constructor.""" if Connection.__instance is not None: raise Exception("This class is a singleton!") diff --git a/src/adafruit_blinka/microcontroller/pico_u2if/__init__.py b/src/adafruit_blinka/microcontroller/pico_u2if/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/adafruit_blinka/microcontroller/pico_u2if/analogio.py b/src/adafruit_blinka/microcontroller/pico_u2if/analogio.py new file mode 100644 index 0000000..2ae480f --- /dev/null +++ b/src/adafruit_blinka/microcontroller/pico_u2if/analogio.py @@ -0,0 +1,35 @@ +""" +`analogio` - Analog input and output control +================================================= +See `CircuitPython:analogio` in CircuitPython for more details. +* Author(s): Carter Nelson +""" +from adafruit_blinka import ContextManaged +from .pico_u2if import pico_u2if + + +class AnalogIn(ContextManaged): + """Analog Input Class""" + + def __init__(self, pin): + # per their pinout, why only two? + if pin.id not in (26, 27): + raise ValueError("Pin does not support ADC.") + self.pin_id = pin.id + pico_u2if.adc_init_pin(self.pin_id) + + @property + def value(self): + """Read the ADC and return the value""" + return pico_u2if.adc_get_value(self.pin_id) << 4 + + # pylint: disable=no-self-use + @value.setter + def value(self, value): + # emulate what CircuitPython does + raise AttributeError("'AnalogIn' object has no attribute 'value'") + + # pylint: enable=no-self-use + + def deinit(self): + pass diff --git a/src/adafruit_blinka/microcontroller/pico_u2if/i2c.py b/src/adafruit_blinka/microcontroller/pico_u2if/i2c.py new file mode 100644 index 0000000..ee393bb --- /dev/null +++ b/src/adafruit_blinka/microcontroller/pico_u2if/i2c.py @@ -0,0 +1,62 @@ +"""I2C Class for Pico u2if""" +from .pico_u2if import pico_u2if + + +class I2C: + """Custom I2C Class for Pico u2if""" + + def __init__(self, scl, sda, *, frequency=100000): + index = None + if scl.id == 5 and sda.id == 4: + index = 0 + if scl.id == 15 and sda.id == 14: + index = 1 + if index is None: + raise ValueError("I2C not found on specified pins.") + self._index = index + pico_u2if.i2c_set_port(self._index) + pico_u2if.i2c_configure(frequency) + + def scan(self): + """Perform an I2C Device Scan""" + pico_u2if.i2c_set_port(self._index) + return pico_u2if.i2c_scan() + + # pylint: disable=unused-argument + def writeto(self, address, buffer, *, start=0, end=None, stop=True): + """Write data from the buffer to an address""" + pico_u2if.i2c_set_port(self._index) + pico_u2if.i2c_writeto(address, buffer, start=start, end=end) + + def readfrom_into(self, address, buffer, *, start=0, end=None, stop=True): + """Read data from an address and into the buffer""" + pico_u2if.i2c_set_port(self._index) + pico_u2if.i2c_readfrom_into(address, buffer, start=start, end=end) + + def writeto_then_readfrom( + self, + address, + buffer_out, + buffer_in, + *, + out_start=0, + out_end=None, + in_start=0, + in_end=None, + stop=False + ): + """Write data from buffer_out to an address and then + read data from an address and into buffer_in + """ + pico_u2if.i2c_set_port(self._index) + pico_u2if.i2c_writeto_then_readfrom( + address, + buffer_out, + buffer_in, + out_start=out_start, + out_end=out_end, + in_start=in_start, + in_end=in_end, + ) + + # pylint: enable=unused-argument diff --git a/src/adafruit_blinka/microcontroller/pico_u2if/neopixel.py b/src/adafruit_blinka/microcontroller/pico_u2if/neopixel.py new file mode 100644 index 0000000..4953c2d --- /dev/null +++ b/src/adafruit_blinka/microcontroller/pico_u2if/neopixel.py @@ -0,0 +1,17 @@ +"""NeoPixel write for Pico u2if.""" + +from .pico_u2if import pico_u2if + + +def neopixel_write(gpio, buf): + """NeoPixel Writing Function""" + + # pad output buffer from 3 bpp to 4 bpp + buffer = [] + for i in range(0, len(buf), 3): + buffer.append(0) + buffer.append(buf[i + 2]) + buffer.append(buf[i + 1]) + buffer.append(buf[i]) + + pico_u2if.neopixel_write(gpio, buffer) diff --git a/src/adafruit_blinka/microcontroller/pico_u2if/pico_u2if.py b/src/adafruit_blinka/microcontroller/pico_u2if/pico_u2if.py new file mode 100644 index 0000000..687bfc0 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/pico_u2if/pico_u2if.py @@ -0,0 +1,492 @@ +"""Chip Definition for Pico with u2if firmware""" +# https://github.com/execuc/u2if + +import os +import time +import hid + +# Use to set delay between reset and device reopen. if negative, don't reset at all +PICO_U2IF_RESET_DELAY = float(os.environ.get("PICO_U2IF_RESET_DELAY", 1)) + +# pylint: disable=import-outside-toplevel,too-many-branches,too-many-statements +# pylint: disable=too-many-arguments,too-many-function-args, too-many-public-methods + + +class Pico_u2if: + """MCP2221 Device Class Definition""" + + VID = 0xCAFE + PID = 0x4005 + + # MISC + RESP_OK = 0x01 + SYS_RESET = 0x10 + + # GPIO + GPIO_INIT_PIN = 0x20 + GPIO_SET_VALUE = 0x21 + GPIO_GET_VALUE = 0x22 + + # ADC + ADC_INIT_PIN = 0x40 + ADC_GET_VALUE = 0x41 + + # I2C + I2C0_INIT = 0x80 + I2C0_DEINIT = 0x81 + I2C0_WRITE = 0x82 + I2C0_READ = 0x83 + I2C0_WRITE_FROM_UART = 0x84 + I2C1_INIT = I2C0_INIT + 0x10 + I2C1_DEINIT = I2C0_DEINIT + 0x10 + I2C1_WRITE = I2C0_WRITE + 0x10 + I2C1_READ = I2C0_READ + 0x10 + I2C1_WRITE_FROM_UART = I2C0_WRITE_FROM_UART + 0x10 + + # SPI + SPI0_INIT = 0x60 + SPI0_DEINIT = 0x61 + SPI0_WRITE = 0x62 + SPI0_READ = 0x63 + SPI0_WRITE_FROM_UART = 0x64 + SPI1_INIT = SPI0_INIT + 0x10 + SPI1_DEINIT = SPI0_DEINIT + 0x10 + SPI1_WRITE = SPI0_WRITE + 0x10 + SPI1_READ = SPI0_READ + 0x10 + SPI1_WRITE_FROM_UART = SPI0_WRITE_FROM_UART + 0x10 + + # WS2812B (LED) + WS2812B_INIT = 0xA0 + WS2812B_DEINIT = 0xA1 + WS2812B_WRITE = 0xA2 + + # PWM + PWM_INIT_PIN = 0x30 + PWM_DEINIT_PIN = 0x31 + PWM_SET_FREQ = 0x32 + PWM_GET_FREQ = 0x33 + PWM_SET_DUTY_U16 = 0x34 + PWM_GET_DUTY_U16 = 0x35 + PWM_SET_DUTY_NS = 0x36 + PWM_GET_DUTY_NS = 0x37 + + def __init__(self): + self._hid = hid.device() + self._hid.open(Pico_u2if.VID, Pico_u2if.PID) + if PICO_U2IF_RESET_DELAY >= 0: + self._reset() + self._i2c_index = None + self._spi_index = None + self._serial = None + self._neopixel_initialized = False + self._uart_rx_buffer = None + + def _hid_xfer(self, report, response=True): + """Perform HID Transfer""" + # first byte is report ID, which =0 + # remaing bytes = 64 byte report data + # https://github.com/libusb/hidapi/blob/083223e77952e1ef57e6b77796536a3359c1b2a3/hidapi/hidapi.h#L185 + self._hid.write(b"\0" + report + b"\0" * (64 - len(report))) + if response: + # return is 64 byte response report + return self._hid.read(64) + return None + + def _reset(self): + self._hid_xfer(bytes([self.SYS_RESET]), False) + time.sleep(PICO_U2IF_RESET_DELAY) + start = time.monotonic() + while time.monotonic() - start < 5: + try: + self._hid.open(Pico_u2if.VID, Pico_u2if.PID) + except OSError: + time.sleep(0.1) + continue + return + raise OSError("Pico open error.") + + # ---------------------------------------------------------------- + # GPIO + # ---------------------------------------------------------------- + def gpio_init_pin(self, pin_id, direction, pull): + """Configure GPIO Pin.""" + self._hid_xfer( + bytes( + [ + self.GPIO_INIT_PIN, + pin_id, + direction, + pull, + ] + ) + ) + + def gpio_set_pin(self, pin_id, value): + """Set Current GPIO Pin Value""" + self._hid_xfer( + bytes( + [ + self.GPIO_SET_VALUE, + pin_id, + int(value), + ] + ) + ) + + def gpio_get_pin(self, pin_id): + """Get Current GPIO Pin Value""" + resp = self._hid_xfer( + bytes( + [ + self.GPIO_GET_VALUE, + pin_id, + ] + ), + True, + ) + return resp[3] != 0x00 + + # ---------------------------------------------------------------- + # ADC + # ---------------------------------------------------------------- + def adc_init_pin(self, pin_id): + """Configure ADC Pin.""" + self._hid_xfer( + bytes( + [ + self.ADC_INIT_PIN, + pin_id, + ] + ) + ) + + def adc_get_value(self, pin_id): + """Get ADC value for pin.""" + resp = self._hid_xfer( + bytes( + [ + self.ADC_GET_VALUE, + pin_id, + ] + ), + True, + ) + return int.from_bytes(resp[3 : 3 + 2], byteorder="little") + + # ---------------------------------------------------------------- + # I2C + # ---------------------------------------------------------------- + def i2c_configure(self, baudrate, pullup=False): + """Configure I2C.""" + if self._i2c_index is None: + raise RuntimeError("I2C bus not initialized.") + + resp = self._hid_xfer( + bytes( + [ + self.I2C0_INIT if self._i2c_index == 0 else self.I2C1_INIT, + 0x00 if not pullup else 0x01, + ] + ) + + baudrate.to_bytes(4, byteorder="little"), + True, + ) + if resp[1] != self.RESP_OK: + raise RuntimeError("I2C init error.") + + def i2c_set_port(self, index): + """Set I2C port.""" + if index not in (0, 1): + raise ValueError("I2C index must be 0 or 1.") + self._i2c_index = index + + def _i2c_write(self, address, buffer, start=0, end=None, stop=True): + """Write data from the buffer to an address""" + if self._i2c_index is None: + raise RuntimeError("I2C bus not initialized.") + + end = end if end else len(buffer) + + write_cmd = self.I2C0_WRITE if self._i2c_index == 0 else self.I2C1_WRITE + stop_flag = 0x01 if stop else 0x00 + + while (end - start) > 0: + remain_bytes = end - start + chunk = min(remain_bytes, 64 - 7) + resp = self._hid_xfer( + bytes([write_cmd, address, stop_flag]) + + remain_bytes.to_bytes(4, byteorder="little") + + buffer[start : (start + chunk)], + True, + ) + if resp[1] != self.RESP_OK: + raise RuntimeError("I2C write error") + start += chunk + + def _i2c_read(self, address, buffer, start=0, end=None): + """Read data from an address and into the buffer""" + # TODO: support chunkified reads + if self._i2c_index is None: + raise RuntimeError("I2C bus not initialized.") + + end = end if end else len(buffer) + + read_cmd = self.I2C0_READ if self._i2c_index == 0 else self.I2C1_READ + stop_flag = 0x01 # always stop + read_size = end - start + + resp = self._hid_xfer(bytes([read_cmd, address, stop_flag, read_size]), True) + if resp[1] != self.RESP_OK: + raise RuntimeError("I2C write error") + # move into buffer + for i in range(read_size): + buffer[start + i] = resp[i + 2] + + def i2c_writeto(self, address, buffer, *, start=0, end=None): + """Write data from the buffer to an address""" + self._i2c_write(address, buffer, start, end) + + def i2c_readfrom_into(self, address, buffer, *, start=0, end=None): + """Read data from an address and into the buffer""" + self._i2c_read(address, buffer, start, end) + + def i2c_writeto_then_readfrom( + self, + address, + out_buffer, + in_buffer, + *, + out_start=0, + out_end=None, + in_start=0, + in_end=None + ): + """Write data from buffer_out to an address and then + read data from an address and into buffer_in + """ + self._i2c_write(address, out_buffer, out_start, out_end, False) + self._i2c_read(address, in_buffer, in_start, in_end) + + def i2c_scan(self, *, start=0, end=0x79): + """Perform an I2C Device Scan""" + if self._i2c_index is None: + raise RuntimeError("I2C bus not initialized.") + found = [] + for addr in range(start, end + 1): + # try a write + try: + self.i2c_writeto(addr, b"\x00\x00\x00") + except RuntimeError: # no reply! + continue + # store if success + found.append(addr) + return found + + # ---------------------------------------------------------------- + # SPI + # ---------------------------------------------------------------- + def spi_configure(self, baudrate): + """Configure SPI.""" + if self._spi_index is None: + raise RuntimeError("SPI bus not initialized.") + + resp = self._hid_xfer( + bytes( + [ + self.SPI0_INIT if self._spi_index == 0 else self.SPI1_INIT, + 0x00, # mode, not yet implemented + ] + ) + + baudrate.to_bytes(4, byteorder="little"), + True, + ) + if resp[1] != self.RESP_OK: + raise RuntimeError("SPI init error.") + + def spi_set_port(self, index): + """Set SPI port.""" + if index not in (0, 1): + raise ValueError("SPI index must be 0 or 1.") + self._spi_index = index + + def spi_write(self, buffer, *, start=0, end=None): + """SPI write.""" + if self._spi_index is None: + raise RuntimeError("SPI bus not initialized.") + + end = end if end else len(buffer) + + write_cmd = self.SPI0_WRITE if self._spi_index == 0 else self.SPI1_WRITE + + while (end - start) > 0: + remain_bytes = end - start + chunk = min(remain_bytes, 64 - 3) + resp = self._hid_xfer( + bytes([write_cmd, chunk]) + buffer[start : (start + chunk)], True + ) + if resp[1] != self.RESP_OK: + raise RuntimeError("SPI write error") + start += chunk + + def spi_readinto(self, buffer, *, start=0, end=None, write_value=0): + """SPI readinto.""" + if self._spi_index is None: + raise RuntimeError("SPI bus not initialized.") + + end = end if end else len(buffer) + read_cmd = self.SPI0_READ if self._spi_index == 0 else self.SPI1_READ + read_size = end - start + + resp = self._hid_xfer(bytes([read_cmd, write_value, read_size]), True) + if resp[1] != self.RESP_OK: + raise RuntimeError("SPI write error") + # move into buffer + for i in range(read_size): + buffer[start + i] = resp[i + 2] + + def spi_write_readinto( + self, + buffer_out, + buffer_in, + *, + out_start=0, + out_end=None, + in_start=0, + in_end=None + ): + """SPI write and readinto.""" + raise NotImplementedError("SPI write_readinto Not implemented") + + # ---------------------------------------------------------------- + # NEOPIXEL + # ---------------------------------------------------------------- + def neopixel_write(self, gpio, buf): + """NeoPixel write.""" + # open serial (data is sent over this) + if self._serial is None: + import serial + import serial.tools.list_ports + + ports = serial.tools.list_ports.comports() + for port in ports: + if port.vid == self.VID and port.pid == self.PID: + self._serial = serial.Serial(port.device) + break + if self._serial is None: + raise RuntimeError("Could not find Pico com port.") + + # init + if not self._neopixel_initialized: + # deinit any current setup + # pylint: disable=protected-access + self._hid_xfer(bytes([self.WS2812B_DEINIT])) + resp = self._hid_xfer( + bytes( + [ + self.WS2812B_INIT, + gpio._pin.id, + ] + ), + True, + ) + if resp[1] != self.RESP_OK: + raise RuntimeError("Neopixel init error") + self._neopixel_initialized = True + + self._serial.reset_output_buffer() + + # write + # command is done over HID + remain_bytes = len(buf) + resp = self._hid_xfer( + bytes([self.WS2812B_WRITE]) + remain_bytes.to_bytes(4, byteorder="little"), + True, + ) + if resp[1] != self.RESP_OK: + # pylint: disable=no-else-raise + if resp[2] == 0x01: + raise RuntimeError( + "Neopixel write error : too many pixel for the firmware." + ) + elif resp[2] == 0x02: + print(resp[0:10]) + raise RuntimeError( + "Neopixel write error : transfer already in progress." + ) + else: + raise RuntimeError("Neopixel write error.") + # buffer is sent over serial + self._serial.write(buf) + # hack (see u2if) + if len(buf) % 64 == 0: + self._serial.write([0]) + self._serial.flush() + # polling loop to wait for write complete? + resp = self._hid.read(64) + while resp[0] != self.WS2812B_WRITE: + resp = self._hid.read(64) + if resp[1] != self.RESP_OK: + raise RuntimeError("Neopixel write (flush) error.") + + # ---------------------------------------------------------------- + # PWM + # ---------------------------------------------------------------- + # pylint: disable=unused-argument + def pwm_configure(self, pin, frequency=500, duty_cycle=0, variable_frequency=False): + """Configure PWM.""" + self.pwm_deinit(pin) + resp = self._hid_xfer(bytes([self.PWM_INIT_PIN, pin.id]), True) + if resp[1] != self.RESP_OK: + raise RuntimeError("PWM init error.") + + self.pwm_set_frequency(pin, frequency) + self.pwm_set_duty_cycle(pin, duty_cycle) + + def pwm_deinit(self, pin): + """Deinit PWM.""" + self._hid_xfer(bytes([self.PWM_DEINIT_PIN, pin.id])) + + def pwm_get_frequency(self, pin): + """PWM get freq.""" + resp = self._hid_xfer(bytes([self.PWM_GET_FREQ, pin.id]), True) + if resp[1] != self.RESP_OK: + raise RuntimeError("PWM get frequency error.") + return int.from_bytes(resp[3 : 3 + 4], byteorder="little") + + def pwm_set_frequency(self, pin, frequency): + """PWM set freq.""" + resp = self._hid_xfer( + bytes([self.PWM_SET_FREQ, pin.id]) + + frequency.to_bytes(4, byteorder="little"), + True, + ) + if resp[1] != self.RESP_OK: + # pylint: disable=no-else-raise + if resp[3] == 0x01: + raise RuntimeError("PWM different frequency on same slice.") + elif resp[3] == 0x02: + raise RuntimeError("PWM frequency too low.") + elif resp[3] == 0x03: + raise RuntimeError("PWM frequency too high.") + else: + raise RuntimeError("PWM frequency error.") + + def pwm_get_duty_cycle(self, pin): + """PWM get duty cycle.""" + resp = self._hid_xfer(bytes([self.PWM_GET_DUTY_U16, pin.id]), True) + if resp[1] != self.RESP_OK: + raise RuntimeError("PWM get duty cycle error.") + return int.from_bytes(resp[3 : 3 + 4], byteorder="little") + + def pwm_set_duty_cycle(self, pin, duty_cycle): + """PWM set duty cycle.""" + resp = self._hid_xfer( + bytes([self.PWM_SET_DUTY_U16, pin.id]) + + duty_cycle.to_bytes(2, byteorder="little"), + True, + ) + if resp[1] != self.RESP_OK: + raise RuntimeError("PWM set duty cycle error.") + + +pico_u2if = Pico_u2if() diff --git a/src/adafruit_blinka/microcontroller/pico_u2if/pin.py b/src/adafruit_blinka/microcontroller/pico_u2if/pin.py new file mode 100644 index 0000000..ef22587 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/pico_u2if/pin.py @@ -0,0 +1,84 @@ +"""PICO pin names""" +from .pico_u2if import pico_u2if + + +class Pin: + """A basic Pin class for use with MCP2221.""" + + # pin modes + IN = 0 + OUT = 1 + # pin values + LOW = 0 + HIGH = 1 + # pin pulls + PULL_NONE = 0 + PULL_UP = 1 + PULL_DOWN = 2 + + def __init__(self, pin_id=None): + self.id = pin_id + self._mode = None + self._pull = None + + def init(self, mode=IN, pull=PULL_NONE): + """Initialize the Pin""" + pull = Pin.PULL_NONE if pull is None else pull + if self.id is None: + raise RuntimeError("Can not init a None type pin.") + if mode not in (Pin.IN, Pin.OUT): + raise ValueError("Incorrect mode value.") + if pull not in (Pin.PULL_NONE, Pin.PULL_UP, Pin.PULL_DOWN): + raise ValueError("Incorrect pull value.") + + pico_u2if.gpio_init_pin(self.id, mode, pull) + + self._mode = mode + self._pull = pull + + def value(self, val=None): + """Set or return the Pin Value""" + # Digital In / Out + if self._mode in (Pin.IN, Pin.OUT): + # digital read + if val is None: + return pico_u2if.gpio_get_pin(self.id) + # digital write + if val in (Pin.LOW, Pin.HIGH): + pico_u2if.gpio_set_pin(self.id, val) + return None + # nope + raise ValueError("Invalid value for pin.") + + raise RuntimeError( + "No action for mode {} with value {}".format(self._mode, val) + ) + + +# create pin instances for each pin +GP0 = Pin(0) +GP1 = Pin(1) +GP2 = Pin(2) +GP3 = Pin(3) +GP4 = Pin(4) +GP5 = Pin(5) +GP6 = Pin(6) +GP7 = Pin(7) +GP8 = Pin(8) +GP9 = Pin(9) +GP10 = Pin(10) +GP11 = Pin(11) +GP12 = Pin(12) +GP13 = Pin(13) +GP14 = Pin(14) +GP15 = Pin(15) +GP16 = Pin(16) +GP17 = Pin(17) +GP18 = Pin(18) +GP19 = Pin(19) +GP20 = Pin(20) +GP21 = Pin(21) +GP22 = Pin(22) +GP26 = Pin(26) +GP27 = Pin(27) +GP28 = Pin(28) diff --git a/src/adafruit_blinka/microcontroller/pico_u2if/pwmio.py b/src/adafruit_blinka/microcontroller/pico_u2if/pwmio.py new file mode 100644 index 0000000..f69d28e --- /dev/null +++ b/src/adafruit_blinka/microcontroller/pico_u2if/pwmio.py @@ -0,0 +1,47 @@ +"""PWMOut Class for Pico u2if""" +from .pico_u2if import pico_u2if + + +class PWMOut: + """Pulse Width Modulation Output Class""" + + def __init__(self, pin, *, frequency=500, duty_cycle=0, variable_frequency=False): + pico_u2if.pwm_configure( + pin, + frequency=frequency, + duty_cycle=duty_cycle, + variable_frequency=variable_frequency, + ) + + self._pin = pin + + def __del__(self): + self.deinit() + + def __enter__(self): + return self + + def __exit__(self, t, value, traceback): + self.deinit() + + def deinit(self): + """Deinit PWM.""" + pico_u2if.pwm_deinit(self._pin) + + @property + def duty_cycle(self): + """The PWM's output duty cycle, 16-bit.""" + return pico_u2if.pwm_get_duty_cycle(self._pin) + + @duty_cycle.setter + def duty_cycle(self, duty_cycle): + pico_u2if.pwm_set_duty_cycle(self._pin, duty_cycle) + + @property + def frequency(self): + """The PWM's output frequency in Hertz.""" + return pico_u2if.pwm_get_frequency(self._pin) + + @frequency.setter + def frequency(self, frequency): + pico_u2if.pwm_set_frequency(self._pin, frequency) diff --git a/src/adafruit_blinka/microcontroller/pico_u2if/spi.py b/src/adafruit_blinka/microcontroller/pico_u2if/spi.py new file mode 100644 index 0000000..e4d7202 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/pico_u2if/spi.py @@ -0,0 +1,71 @@ +"""SPI Class for Pico u2if""" +from .pico_u2if import pico_u2if + +# pylint: disable=protected-access, no-self-use +class SPI: + """Custom SPI Class for Pico u2if""" + + MSB = 0 + + def __init__(self, clock, *, baudrate=100000): + index = None + if clock.id == 18: + index = 0 + if clock.id == 10: + index = 1 + if index is None: + raise ValueError("No SPI port on specified pin.") + self._index = index + self._frequency = baudrate + pico_u2if.spi_set_port(self._index) + pico_u2if.spi_configure(self._frequency) + + # pylint: disable=too-many-arguments,unused-argument + def init( + self, + baudrate=1000000, + polarity=0, + phase=0, + bits=8, + firstbit=MSB, + sck=None, + mosi=None, + miso=None, + ): + """Initialize the Port""" + self._frequency = baudrate + pico_u2if.spi_set_port(self._index) + pico_u2if.spi_configure(self._frequency) + + # pylint: enable=too-many-arguments + + @property + def frequency(self): + """Return the current frequency""" + return self._frequency + + def write(self, buf, start=0, end=None): + """Write data from the buffer to SPI""" + pico_u2if.spi_write(buf, start=start, end=end) + + def readinto(self, buf, start=0, end=None, write_value=0): + """Read data from SPI and into the buffer""" + pico_u2if.spi_readinto(buf, start=start, end=end, write_value=write_value) + + # pylint: disable=too-many-arguments + def write_readinto( + self, buffer_out, buffer_in, out_start=0, out_end=None, in_start=0, in_end=None + ): + """Perform a half-duplex write from buffer_out and then + read data into buffer_in + """ + pico_u2if.spi_write_readinto( + buffer_out, + buffer_in, + out_start=out_start, + out_end=out_end, + in_start=in_start, + in_end=in_end, + ) + + # pylint: enable=too-many-arguments diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3328/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3328/pin.py new file mode 100644 index 0000000..a0c8426 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/rockchip/rk3328/pin.py @@ -0,0 +1,163 @@ +"""A Pin class for use with Rockchip RK3328.""" + +from adafruit_blinka.microcontroller.generic_linux.sysfs_pin import Pin + +GPIO0_A0 = Pin((0, 0)) +GPIO0_A1 = Pin((0, 1)) +GPIO0_A2 = Pin((0, 2)) +GPIO0_A3 = Pin((0, 3)) +GPIO0_A4 = Pin((0, 4)) +GPIO0_A5 = Pin((0, 5)) +GPIO0_A6 = Pin((0, 6)) +GPIO0_B7 = Pin((0, 7)) +GPIO0_B0 = Pin((0, 8)) +GPIO0_B1 = Pin((0, 9)) +GPIO0_B2 = Pin((0, 10)) +GPIO0_B3 = Pin((0, 11)) +GPIO0_B4 = Pin((0, 12)) +GPIO0_B5 = Pin((0, 13)) +GPIO0_B6 = Pin((0, 14)) +GPIO0_B7 = Pin((0, 15)) +GPIO0_C0 = Pin((0, 16)) +GPIO0_C1 = Pin((0, 17)) +GPIO0_C2 = Pin((0, 18)) +GPIO0_C3 = Pin((0, 19)) +GPIO0_C4 = Pin((0, 20)) +GPIO0_C5 = Pin((0, 21)) +GPIO0_C6 = Pin((0, 22)) +GPIO0_C7 = Pin((0, 23)) +GPIO0_D0 = Pin((0, 24)) +GPIO0_D1 = Pin((0, 25)) +GPIO0_D2 = Pin((0, 26)) +GPIO0_D3 = Pin((0, 27)) +GPIO0_D4 = Pin((0, 28)) +GPIO0_D5 = Pin((0, 29)) +GPIO0_D6 = Pin((0, 30)) +GPIO0_D7 = Pin((0, 31)) + +GPIO1_A0 = Pin((1, 0)) +GPIO1_A1 = Pin((1, 1)) +GPIO1_A2 = Pin((1, 2)) +GPIO1_A3 = Pin((1, 3)) +GPIO1_A4 = Pin((1, 4)) +GPIO1_A5 = Pin((1, 5)) +GPIO1_A6 = Pin((1, 6)) +GPIO1_B7 = Pin((1, 7)) +GPIO1_B0 = Pin((1, 8)) +GPIO1_B1 = Pin((1, 9)) +GPIO1_B2 = Pin((1, 10)) +GPIO1_B3 = Pin((1, 11)) +GPIO1_B4 = Pin((1, 12)) +GPIO1_B5 = Pin((1, 13)) +GPIO1_B6 = Pin((1, 14)) +GPIO1_B7 = Pin((1, 15)) +GPIO1_C0 = Pin((1, 16)) +GPIO1_C1 = Pin((1, 17)) +GPIO1_C2 = Pin((1, 18)) +GPIO1_C3 = Pin((1, 19)) +GPIO1_C4 = Pin((1, 20)) +GPIO1_C5 = Pin((1, 21)) +GPIO1_C6 = Pin((1, 22)) +GPIO1_C7 = Pin((1, 23)) +GPIO1_D0 = Pin((1, 24)) +GPIO1_D1 = Pin((1, 25)) +GPIO1_D2 = Pin((1, 26)) +GPIO1_D3 = Pin((1, 27)) +GPIO1_D4 = Pin((1, 28)) +GPIO1_D5 = Pin((1, 29)) +GPIO1_D6 = Pin((1, 30)) +GPIO1_D7 = Pin((1, 31)) + +GPIO2_A0 = Pin((2, 0)) +GPIO2_A1 = Pin((2, 1)) +GPIO2_A2 = Pin((2, 2)) +GPIO2_A3 = Pin((2, 3)) +GPIO2_A4 = Pin((2, 4)) +GPIO2_A5 = Pin((2, 5)) +GPIO2_A6 = Pin((2, 6)) +GPIO2_B7 = Pin((2, 7)) +GPIO2_B0 = Pin((2, 8)) +GPIO2_B1 = Pin((2, 9)) +GPIO2_B2 = Pin((2, 10)) +GPIO2_B3 = Pin((2, 11)) +GPIO2_B4 = Pin((2, 12)) +GPIO2_B5 = Pin((2, 13)) +GPIO2_B6 = Pin((2, 14)) +GPIO2_B7 = Pin((2, 15)) +GPIO2_C0 = Pin((2, 16)) +GPIO2_C1 = Pin((2, 17)) +GPIO2_C2 = Pin((2, 18)) +GPIO2_C3 = Pin((2, 19)) +GPIO2_C4 = Pin((2, 20)) +GPIO2_C5 = Pin((2, 21)) +GPIO2_C6 = Pin((2, 22)) +GPIO2_C7 = Pin((2, 23)) +GPIO2_D0 = Pin((2, 24)) +GPIO2_D1 = Pin((2, 25)) +GPIO2_D2 = Pin((2, 26)) +GPIO2_D3 = Pin((2, 27)) +GPIO2_D4 = Pin((2, 28)) +GPIO2_D5 = Pin((2, 29)) +GPIO2_D6 = Pin((2, 30)) +GPIO2_D7 = Pin((2, 31)) + +GPIO3_A0 = Pin((3, 0)) +GPIO3_A1 = Pin((3, 1)) +GPIO3_A2 = Pin((3, 2)) +GPIO3_A3 = Pin((3, 3)) +GPIO3_A4 = Pin((3, 4)) +GPIO3_A5 = Pin((3, 5)) +GPIO3_A6 = Pin((3, 6)) +GPIO3_B7 = Pin((3, 7)) +GPIO3_B0 = Pin((3, 8)) +GPIO3_B1 = Pin((3, 9)) +GPIO3_B2 = Pin((3, 10)) +GPIO3_B3 = Pin((3, 11)) +GPIO3_B4 = Pin((3, 12)) +GPIO3_B5 = Pin((3, 13)) +GPIO3_B6 = Pin((3, 14)) +GPIO3_B7 = Pin((3, 15)) +GPIO3_C0 = Pin((3, 16)) +GPIO3_C1 = Pin((3, 17)) +GPIO3_C2 = Pin((3, 18)) +GPIO3_C3 = Pin((3, 19)) +GPIO3_C4 = Pin((3, 20)) +GPIO3_C5 = Pin((3, 21)) +GPIO3_C6 = Pin((3, 22)) +GPIO3_C7 = Pin((3, 23)) +GPIO3_D0 = Pin((3, 24)) +GPIO3_D1 = Pin((3, 25)) +GPIO3_D2 = Pin((3, 26)) +GPIO3_D3 = Pin((3, 27)) +GPIO3_D4 = Pin((3, 28)) +GPIO3_D5 = Pin((3, 29)) +GPIO3_D6 = Pin((3, 30)) +GPIO3_D7 = Pin((3, 31)) + +# I2C +I2C1_SDA = GPIO2_A4 +I2C1_SCL = GPIO2_A5 + +# SPI +SPI0_CS = GPIO3_B0 +SPI0_SCLK = GPIO3_A0 +SPI0_MISO = GPIO3_A2 +SPI0_MOSI = GPIO3_A1 + +# UART +UART1_TX = GPIO3_A4 +UART1_RX = GPIO3_A6 +UART2_TX = GPIO2_A0 +UART2_RX = GPIO2_A1 + +# PWM +PWM2 = GPIO2_A6 + +# ordered as i2cId, SCL, SDA +i2cPorts = ((0, I2C1_SCL, I2C1_SDA),) + +# ordered as spiId, sckId, mosiId, misoId +spiPorts = ((0, SPI0_SCLK, SPI0_MOSI, SPI0_MISO),) + +# SysFS pwm outputs, pwm channel and pin in first tuple +pwmOuts = (((2, 0), PWM2),) diff --git a/src/adafruit_blinka/microcontroller/rp2040/__init__.py b/src/adafruit_blinka/microcontroller/rp2040/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/adafruit_blinka/microcontroller/rp2040/i2c.py b/src/adafruit_blinka/microcontroller/rp2040/i2c.py new file mode 100644 index 0000000..16ff2e3 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/rp2040/i2c.py @@ -0,0 +1,65 @@ +"""I2C Class for RP2040""" +from machine import I2C as _I2C +from machine import Pin +from microcontroller.pin import i2cPorts + + +class I2C: + """Custom I2C Class for RP2040""" + + def __init__(self, scl, sda, *, frequency=100000): + for portId, portScl, portSda in i2cPorts: + try: + if scl == portScl and sda == portSda: + self._i2c = _I2C( + portId, sda=Pin(sda.id), scl=Pin(scl.id), freq=frequency + ) + break + except RuntimeError: + pass + else: + raise ValueError( + "No Hardware I2C on (scl,sda)={}\nValid I2C ports: {}".format( + (scl, sda), i2cPorts + ) + ) + + def scan(self): + """Perform an I2C Device Scan""" + return self._i2c.scan() + + # pylint: disable=unused-argument + def writeto(self, address, buffer, *, stop=True): + "Write data to the address from the buffer" + return self._i2c.writeto(address, buffer) + + def readfrom_into(self, address, buffer, *, stop=True): + """Read data from an address and into the buffer""" + return self._i2c.readfrom_into(address, buffer) + + def writeto_then_readfrom( + self, + address, + buffer_out, + buffer_in, + *, + out_start=0, + out_end=None, + in_start=0, + in_end=None, + stop=False + ): + """Write data from buffer_out to an address and then + read data from an address and into buffer_in + """ + self._i2c.writeto_then_readfrom( + address, + buffer_out, + buffer_in, + out_start=out_start, + out_end=out_end, + in_start=in_start, + in_end=in_end, + ) + + # pylint: enable=unused-argument diff --git a/src/adafruit_blinka/microcontroller/rp2040/pin.py b/src/adafruit_blinka/microcontroller/rp2040/pin.py new file mode 100755 index 0000000..e16890f --- /dev/null +++ b/src/adafruit_blinka/microcontroller/rp2040/pin.py @@ -0,0 +1,102 @@ +"""RP2040 pins""" + +from microcontroller import Pin + +GP0 = Pin(0) +GP1 = Pin(1) +GP2 = Pin(2) +GP3 = Pin(3) +GP4 = Pin(4) +GP5 = Pin(5) +GP6 = Pin(6) +GP7 = Pin(7) +GP8 = Pin(8) +GP9 = Pin(9) +GP10 = Pin(10) +GP11 = Pin(11) +GP12 = Pin(12) +GP13 = Pin(13) +GP14 = Pin(14) +GP15 = Pin(15) +GP16 = Pin(16) +GP17 = Pin(17) +GP18 = Pin(18) +GP19 = Pin(19) +GP20 = Pin(20) +GP21 = Pin(21) +GP22 = Pin(22) +GP23 = Pin(23) +GP24 = Pin(24) +GP25 = Pin(25) +GP26 = Pin(26) +GP27 = Pin(27) +GP28 = Pin(28) +GP29 = Pin(29) + +# ordered as spiId, sckId, mosiId (tx), misoId (rx) +spiPorts = ( + (0, GP2, GP3, GP0), + (0, GP2, GP3, GP4), + (0, GP2, GP7, GP0), + (0, GP2, GP7, GP4), + (0, GP6, GP3, GP0), + (0, GP6, GP3, GP4), + (0, GP6, GP7, GP0), + (0, GP6, GP7, GP4), + (1, GP10, GP11, GP8), + (1, GP10, GP11, GP12), + (1, GP10, GP15, GP8), + (1, GP10, GP15, GP12), + (1, GP14, GP11, GP8), + (1, GP14, GP11, GP12), + (1, GP14, GP15, GP8), + (1, GP14, GP15, GP12), +) + +# ordered as uartId, txId, rxId +uartPorts = ( + (0, GP0, GP1), + (0, GP0, GP13), + (0, GP12, GP1), + (0, GP12, GP13), + (1, GP4, GP5), + (1, GP4, GP9), + (1, GP8, GP5), + (1, GP8, GP9), +) + +# ordered as scl, sda +i2cPorts = ( + (0, GP1, GP0), + (0, GP1, GP4), + (0, GP1, GP8), + (0, GP1, GP12), + (0, GP5, GP0), + (0, GP5, GP4), + (0, GP5, GP8), + (0, GP5, GP12), + (0, GP9, GP0), + (0, GP9, GP4), + (0, GP9, GP8), + (0, GP9, GP12), + (0, GP13, GP0), + (0, GP13, GP4), + (0, GP13, GP8), + (0, GP13, GP12), + (1, GP3, GP2), + (1, GP3, GP6), + (1, GP3, GP10), + (1, GP3, GP14), + (1, GP7, GP2), + (1, GP7, GP6), + (1, GP7, GP10), + (1, GP7, GP14), + (1, GP11, GP2), + (1, GP11, GP6), + (1, GP11, GP10), + (1, GP11, GP14), + (1, GP15, GP2), + (1, GP15, GP6), + (1, GP15, GP10), + (1, GP15, GP14), +) diff --git a/src/adafruit_blinka/microcontroller/rp2040/spi.py b/src/adafruit_blinka/microcontroller/rp2040/spi.py new file mode 100644 index 0000000..e876a38 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/rp2040/spi.py @@ -0,0 +1,88 @@ +"""SPI Class for RP2040""" +from machine import SPI as _SPI +from machine import Pin +from microcontroller.pin import spiPorts + +# pylint: disable=protected-access, no-self-use +class SPI: + """Custom SPI Class for RP2040""" + + def __init__(self, clock, MOSI=None, MISO=None, *, baudrate=1000000): + self._frequency = baudrate + for portId, portSck, portMosi, portMiso in spiPorts: + if ( + (clock == portSck) + and MOSI in (portMosi, None) # Clock is required! + and MISO in (portMiso, None) # But can do with just output + ): # Or just input + mosiPin = Pin(portMosi.id) if MOSI else None + misoPin = Pin(portMiso.id) if MISO else None + self._spi = _SPI( + portId, + sck=Pin(portSck.id), + mosi=mosiPin, + miso=misoPin, + baudrate=baudrate, + ) + break + else: + raise ValueError( + "No Hardware SPI on (SCLK, MOSI, MISO)={}\nValid SPI ports:{}".format( + (clock, MOSI, MISO), spiPorts + ) + ) + + # pylint: disable=too-many-arguments,unused-argument + def init( + self, + baudrate=1000000, + polarity=0, + phase=0, + bits=8, + firstbit=_SPI.MSB, + sck=None, + mosi=None, + miso=None, + ): + """Initialize the Port""" + self._frequency = baudrate + self._spi.init( + baudrate=baudrate, + polarity=polarity, + phase=phase, + bits=bits, + firstbit=firstbit, + ) + + # pylint: enable=too-many-arguments + + @property + def frequency(self): + """Return the current frequency""" + return self._frequency + + def write(self, buf, start=0, end=None): + """Write data from the buffer to SPI""" + self._spi.write(buf) + + def readinto(self, buf, start=0, end=None, write_value=0): + """Read data from SPI and into the buffer""" + self._spi.readinto(buf) + + # pylint: disable=too-many-arguments + def write_readinto( + self, buffer_out, buffer_in, out_start=0, out_end=None, in_start=0, in_end=None + ): + """Perform a half-duplex write from buffer_out and then + read data into buffer_in + """ + self._spi.write_readinto( + buffer_out, + buffer_in, + out_start=out_start, + out_end=out_end, + in_start=in_start, + in_end=in_end, + ) + + # pylint: enable=too-many-arguments diff --git a/src/adafruit_blinka/microcontroller/rp2040/uart.py b/src/adafruit_blinka/microcontroller/rp2040/uart.py new file mode 100644 index 0000000..a233b8e --- /dev/null +++ b/src/adafruit_blinka/microcontroller/rp2040/uart.py @@ -0,0 +1,48 @@ +"""UART Class for RP2040""" +from machine import UART as _UART +from machine import Pin +from microcontroller.pin import uartPorts + +# pylint: disable=protected-access, no-self-use +class UART: + """Custom UART Class for RP2040""" + + # pylint: disable=too-many-arguments + def __init__(self, tx, rx, baudrate=9600, bits=8, parity=None, stop=1): + # check tx and rx have hardware support + for portId, txPin, rxPin in uartPorts: + if txPin == tx and rxPin == rx: + self._uart = _UART( + portId, + baudrate, + bits=bits, + parity=parity, + stop=stop, + tx=Pin(txPin.id), + rx=Pin(rxPin.id), + ) + break + else: + raise ValueError( + "No Hardware UART on (tx,rx)={}\nValid UART ports: {}".format( + (tx.id, rx.id), uartPorts + ) + ) + + # pylint: enable=too-many-arguments + + def read(self, nbytes=None): + """Read from the UART""" + return self._uart.read(nbytes) + + def readinto(self, buf, nbytes=None): + """Read from the UART into a buffer""" + return self._uart.readinto(buf, nbytes) + + def readline(self): + """Read a line of characters up to a newline charater from the UART""" + return self._uart.readline() + + def write(self, buf): + """Write to the UART from a buffer""" + return self._uart.write(buf) diff --git a/src/adafruit_blinka/microcontroller/stm32/stm32f405/pin.py b/src/adafruit_blinka/microcontroller/stm32/stm32f405/pin.py index 52ec1c0..605015d 100755 --- a/src/adafruit_blinka/microcontroller/stm32/stm32f405/pin.py +++ b/src/adafruit_blinka/microcontroller/stm32/stm32f405/pin.py @@ -51,10 +51,10 @@ C13 = Pin("C13") D2 = Pin("D2") # ordered as spiId, sckId, mosiId, misoId -SPI_PORTS = ((1, B13, B15, B14), (2, A5, A6, A7)) +spiPorts = ((1, B13, B15, B14), (2, A5, A7, A6)) # ordered as uartId, txId, rxId -UART_PORTS = ( +uartPorts = ( (1, B6, B7), (2, A2, A3), (3, B10, B11), @@ -62,7 +62,7 @@ UART_PORTS = ( (6, C6, C7), ) -I2C_PORTS = ( +i2cPorts = ( (1, B6, B7), (2, B10, B11), ) diff --git a/src/adafruit_blinka/microcontroller/stm32/stm32mp157/pin.py b/src/adafruit_blinka/microcontroller/stm32/stm32mp157/pin.py index 0196982..6aa6426 100755 --- a/src/adafruit_blinka/microcontroller/stm32/stm32mp157/pin.py +++ b/src/adafruit_blinka/microcontroller/stm32/stm32mp157/pin.py @@ -152,3 +152,18 @@ I2C_PORTS = ( (1, PD12, PF15), (5, PA11, PA12), ) + +# support busio port check +# 0 - linux system -> i2c-0 +# 1 - linux system -> i2c-1 +i2cPorts = ( + (0, PF14, PF15), + (1, PZ0, PZ1), +) + +# SysFS analog inputs, Ordered as analog analogInId, device, and channel +# Because stm32mp157 analog io used special port name,it doesn't like gpiod named form +# so support analog io in this way +PAN0 = 0 +PAN1 = 0 +analogIns = ((PAN0, 0, 0),) diff --git a/src/analogio.py b/src/analogio.py index 1db939a..04d3afc 100644 --- a/src/analogio.py +++ b/src/analogio.py @@ -25,7 +25,11 @@ elif detector.chip.RK3399: from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn elif detector.chip.IMX6ULL: from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn +elif detector.chip.STM32MP157: + from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn elif "sphinx" in sys.modules: pass +elif detector.board.pico_u2if: + from adafruit_blinka.microcontroller.pico_u2if.analogio import AnalogIn else: raise NotImplementedError("analogio not supported for this board.") diff --git a/src/board.py b/src/board.py index a89d70d..4390b28 100755 --- a/src/board.py +++ b/src/board.py @@ -44,6 +44,9 @@ elif board_id == ap_board.NODEMCU: elif board_id == ap_board.PYBOARD: from adafruit_blinka.board.pyboard import * +elif board_id == ap_board.RASPBERRY_PI_PICO: + from adafruit_blinka.board.raspberrypi.pico import * + elif detector.board.any_raspberry_pi_40_pin: from adafruit_blinka.board.raspberrypi.raspi_40pin import * @@ -56,6 +59,9 @@ elif detector.board.RASPBERRY_PI_B_REV1: elif detector.board.RASPBERRY_PI_A or detector.board.RASPBERRY_PI_B_REV2: from adafruit_blinka.board.raspberrypi.raspi_1b_rev2 import * +elif board_id == ap_board.BEAGLEBONE: + from adafruit_blinka.board.beagleboard.beaglebone_black import * + elif board_id == ap_board.BEAGLEBONE_BLACK: from adafruit_blinka.board.beagleboard.beaglebone_black import * @@ -197,6 +203,9 @@ elif board_id == ap_board.ROCK_PI_S: elif board_id == ap_board.ROCK_PI_4: from adafruit_blinka.board.radxa.rockpi4 import * +elif board_id == ap_board.ROCK_PI_E: + from adafruit_blinka.board.radxa.rockpie import * + elif board_id == ap_board.UDOO_X86: from adafruit_blinka.board.udoo_x86ultra import * @@ -206,28 +215,37 @@ elif board_id == ap_board.STM32MP157C_DK2: elif board_id == ap_board.LUBANCAT_IMX6ULL: from adafruit_blinka.board.lubancat.lubancat_imx6ull import * +elif board_id == ap_board.LUBANCAT_STM32MP157: + from adafruit_blinka.board.lubancat.lubancat_stm32mp157 import * + elif board_id == ap_board.NANOPI_NEO_AIR: from adafruit_blinka.board.nanopi.neoair import * elif board_id == ap_board.NANOPI_DUO2: from adafruit_blinka.board.nanopi.duo2 import * +elif board_id == ap_board.PICO_U2IF: + from adafruit_blinka.board.pico_u2if import * + elif "sphinx" in sys.modules: pass else: raise NotImplementedError("Board not supported {}".format(board_id)) +if "SCL" in locals() and "SDA" in locals(): + + def I2C(): + """The singleton I2C interface""" + import busio -def I2C(): - """The singleton I2C interface""" - import busio + return busio.I2C(SCL, SDA) - return busio.I2C(SCL, SDA) +if "SCLK" in locals() and "MOSI" in locals() and "MISO" in locals(): -def SPI(): - """The singleton SPI interface""" - import busio + def SPI(): + """The singleton SPI interface""" + import busio - return busio.SPI(SCLK, MOSI, MISO) + return busio.SPI(SCLK, MOSI, MISO) diff --git a/src/busio.py b/src/busio.py index 1991900..11c6341 100755 --- a/src/busio.py +++ b/src/busio.py @@ -18,7 +18,7 @@ from adafruit_blinka import Enum, Lockable, agnostic from adafruit_blinka.agnostic import board_id, detector # pylint: disable=import-outside-toplevel,too-many-branches,too-many-statements -# pylint: disable=too-many-arguments,too-many-function-args +# pylint: disable=too-many-arguments,too-many-function-args,consider-using-with class I2C(Lockable): @@ -53,19 +53,33 @@ class I2C(Lockable): self._i2c = _I2C(frequency=frequency) return + if detector.board.pico_u2if: + from adafruit_blinka.microcontroller.pico_u2if.i2c import I2C as _I2C + + self._i2c = _I2C(scl, sda, frequency=frequency) + return + if detector.chip.id == ap_chip.RP2040: + from adafruit_blinka.microcontroller.rp2040.i2c import I2C as _I2C + + self._i2c = _I2C(scl, sda, frequency=frequency) + return if detector.board.any_embedded_linux: from adafruit_blinka.microcontroller.generic_linux.i2c import I2C as _I2C elif detector.board.ftdi_ft2232h: from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.i2c import I2C as _I2C else: - from machine import I2C as _I2C + from adafruit_blinka.microcontroller.generic_micropython.i2c import ( + I2C as _I2C, + ) from microcontroller.pin import i2cPorts for portId, portScl, portSda in i2cPorts: try: + # pylint: disable=unexpected-keyword-arg if scl == portScl and sda == portSda: self._i2c = _I2C(portId, mode=_I2C.MASTER, baudrate=frequency) break + # pylint: enable=unexpected-keyword-arg except RuntimeError: pass else: @@ -177,12 +191,26 @@ class SPI(Lockable): self._spi = _SPI() self._pins = (SCK, MOSI, MISO) return + if detector.board.pico_u2if: + from adafruit_blinka.microcontroller.pico_u2if.spi import SPI 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.chip.id == ap_chip.RP2040: + from adafruit_blinka.microcontroller.rp2040.spi import SPI as _SPI + + self._spi = _SPI(clock, MOSI, MISO) # Pins configured on instantiation + self._pins = (clock, clock, clock) # These don't matter, they're discarded + return if detector.board.any_embedded_linux: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif detector.board.ftdi_ft2232h: from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import SPI as _SPI else: - from machine import SPI as _SPI + from adafruit_blinka.microcontroller.generic_micropython.spi import ( + SPI as _SPI, + ) from microcontroller.pin import spiPorts for portId, portSck, portMosi, portMiso in spiPorts: @@ -204,106 +232,82 @@ class SPI(Lockable): def configure(self, baudrate=100000, polarity=0, phase=0, bits=8): """Update the configuration""" if detector.board.any_raspberry_pi or detector.board.any_raspberry_pi_40_pin: - from adafruit_blinka.microcontroller.bcm283x.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif detector.board.BEAGLEBONE_AI: - from adafruit_blinka.microcontroller.dra74x.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 detector.board.any_orange_pi: - if detector.chip.id == ap_chip.SUN8I: - from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin - elif detector.chip.id == ap_chip.H5: - from adafruit_blinka.microcontroller.allwinner.h5.pin import Pin - elif detector.chip.id == ap_chip.H616: - from adafruit_blinka.microcontroller.allwinner.h616.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif detector.board.any_nanopi and detector.chip.id == ap_chip.SUN8I: - 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 elif board_id == ap_board.CORAL_EDGE_TPU_DEV_MINI: - from adafruit_blinka.microcontroller.mt8167.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif board_id == ap_board.ODROID_C2: - from adafruit_blinka.microcontroller.amlogic.s905.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif board_id == ap_board.ODROID_C4: - from adafruit_blinka.microcontroller.amlogic.s905x3.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif board_id == ap_board.ODROID_XU4: - from adafruit_blinka.microcontroller.samsung.exynos5422.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif board_id == ap_board.DRAGONBOARD_410C: - from adafruit_blinka.microcontroller.snapdragon.apq8016.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif board_id == ap_board.JETSON_NANO: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI - from adafruit_blinka.microcontroller.tegra.t210.pin import Pin elif board_id == ap_board.JETSON_TX1: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI - from adafruit_blinka.microcontroller.tegra.t210.pin import Pin elif board_id == ap_board.JETSON_TX2: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI - from adafruit_blinka.microcontroller.tegra.t186.pin import Pin elif board_id == ap_board.JETSON_XAVIER: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI - from adafruit_blinka.microcontroller.tegra.t194.pin import Pin elif board_id == ap_board.JETSON_NX: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI - from adafruit_blinka.microcontroller.tegra.t194.pin import Pin elif detector.board.ROCK_PI_S: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI - from adafruit_blinka.microcontroller.rockchip.rk3308.pin import Pin elif detector.board.ROCK_PI_4: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI - from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin + elif detector.board.ROCK_PI_E: + from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif detector.board.SIFIVE_UNLEASHED: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI - from adafruit_blinka.microcontroller.hfu540.pin import Pin elif detector.board.ftdi_ft232h: from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import ( SPI as _SPI, ) - from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin elif detector.board.ftdi_ft2232h: from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import ( SPI as _SPI, ) - from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.pin import Pin elif detector.board.binho_nova: from adafruit_blinka.microcontroller.nova.spi import SPI as _SPI - from adafruit_blinka.microcontroller.nova.pin import Pin elif detector.board.greatfet_one: from adafruit_blinka.microcontroller.nxp_lpc4330.spi import SPI as _SPI - from adafruit_blinka.microcontroller.nxp_lpc4330.pin import Pin elif board_id in ( ap_board.PINE64, ap_board.PINEBOOK, ap_board.PINEPHONE, ap_board.SOPINE, ): - from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin + from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI + elif board_id == ap_board.PINEH64: from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif board_id == ap_board.CLOCKWORK_CPI3: - from adafruit_blinka.microcontroller.allwinner.a33.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif board_id == ap_board.ONION_OMEGA2: - from adafruit_blinka.microcontroller.mips24kec.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI elif detector.board.any_lubancat and detector.chip.id == ap_chip.IMX6ULL: - from adafruit_blinka.microcontroller.nxp_imx6ull.pin import Pin from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI + elif detector.board.pico_u2if: + from adafruit_blinka.microcontroller.pico_u2if.spi import SPI as _SPI + elif detector.chip.id == ap_chip.RP2040: + from adafruit_blinka.microcontroller.rp2040.spi import SPI as _SPI else: - from machine import SPI as _SPI - from machine import Pin + from adafruit_blinka.microcontroller.generic_micropython.spi import ( + SPI as _SPI, + ) if self._locked: # TODO check if #init ignores MOSI=None rather than unsetting, to save _pinIds attribute @@ -313,9 +317,6 @@ class SPI(Lockable): phase=phase, bits=bits, firstbit=_SPI.MSB, - sck=Pin(self._pins[0].id), - mosi=Pin(self._pins[1].id), - miso=Pin(self._pins[2].id), ) else: raise RuntimeError("First call try_lock()") @@ -386,13 +387,12 @@ class UART(Lockable): from adafruit_blinka.microcontroller.nova.uart import UART as _UART elif detector.board.greatfet_one: from adafruit_blinka.microcontroller.nxp_lpc4330.uart import UART as _UART + elif detector.chip.id == ap_chip.RP2040: + from adafruit_blinka.microcontroller.rp2040.uart import UART as _UART else: from machine import UART as _UART - if detector.board.binho_nova: - from adafruit_blinka.microcontroller.nova.pin import uartPorts - else: - from microcontroller.pin import uartPorts + from microcontroller.pin import uartPorts self.baudrate = baudrate @@ -411,25 +411,35 @@ class UART(Lockable): else: raise ValueError("Invalid parity") - # check tx and rx have hardware support - for portId, portTx, portRx in uartPorts: # - if portTx == tx and portRx == rx: - self._uart = _UART( - portId, - baudrate, - bits=bits, - parity=parity, - stop=stop, - timeout=timeout, - read_buf_len=receiver_buffer_size, - ) - break + if detector.chip.id == ap_chip.RP2040: + self._uart = _UART( + tx, + rx, + baudrate=baudrate, + bits=bits, + parity=parity, + stop=stop, + ) else: - raise ValueError( - "No Hardware UART on (tx,rx)={}\nValid UART ports: {}".format( - (tx, rx), uartPorts + # check tx and rx have hardware support + for portId, portTx, portRx in uartPorts: # + if portTx == tx and portRx == rx: + self._uart = _UART( + portId, + baudrate, + bits=bits, + parity=parity, + stop=stop, + timeout=timeout, + read_buf_len=receiver_buffer_size, + ) + break + else: + raise ValueError( + "No Hardware UART on (tx,rx)={}\nValid UART ports: {}".format( + (tx, rx), uartPorts + ) ) - ) def deinit(self): """Deinitialization""" diff --git a/src/digitalio.py b/src/digitalio.py index 8db8399..eef0015 100755 --- a/src/digitalio.py +++ b/src/digitalio.py @@ -53,6 +53,8 @@ elif detector.chip.RK3308: from adafruit_blinka.microcontroller.rockchip.rk3308.pin import Pin elif detector.chip.RK3399: from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin +elif detector.chip.RK3328: + from adafruit_blinka.microcontroller.rockchip.rk3328.pin import Pin elif detector.board.ftdi_ft232h: from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin elif detector.board.ftdi_ft2232h: @@ -63,6 +65,8 @@ elif detector.board.greatfet_one: from adafruit_blinka.microcontroller.nxp_lpc4330.pin import Pin elif detector.chip.STM32F405: from machine import Pin +elif detector.chip.RP2040: + from machine import Pin elif detector.board.microchip_mcp2221: from adafruit_blinka.microcontroller.mcp2221.pin import Pin elif detector.chip.PENTIUM_N3710: @@ -73,8 +77,12 @@ elif detector.chip.MT8167: from adafruit_blinka.microcontroller.mt8167.pin import Pin elif detector.chip.H5: from adafruit_blinka.microcontroller.allwinner.h5.pin import Pin +elif detector.chip.H6: + from adafruit_blinka.microcontroller.allwinner.h6.pin import Pin elif detector.chip.H616: from adafruit_blinka.microcontroller.allwinner.h616.pin import Pin +elif detector.board.pico_u2if: + from adafruit_blinka.microcontroller.pico_u2if.pin import Pin from adafruit_blinka import Enum, ContextManaged diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py index 56396a0..255e2b7 100755 --- a/src/microcontroller/__init__.py +++ b/src/microcontroller/__init__.py @@ -17,7 +17,7 @@ class Pin(Enum): def __init__(self, pin_id): """Identifier for pin, referencing platform-specific pin id""" - self._id = pin_id + self.id = pin_id def __repr__(self): # pylint: disable=import-outside-toplevel, cyclic-import @@ -43,6 +43,8 @@ if chip_id == ap_chip.ESP8266: from adafruit_blinka.microcontroller.esp8266 import * elif chip_id == ap_chip.STM32F405: from adafruit_blinka.microcontroller.stm32.stm32f405 import * +elif chip_id == ap_chip.RP2040: + from adafruit_blinka.microcontroller.rp2040 import * elif chip_id == ap_chip.BCM2XXX: from adafruit_blinka.microcontroller.bcm283x import * elif chip_id == ap_chip.DRA74X: @@ -53,6 +55,8 @@ elif chip_id == ap_chip.SUN8I: from adafruit_blinka.microcontroller.allwinner.h3 import * elif chip_id == ap_chip.H5: from adafruit_blinka.microcontroller.allwinner.h5.pin import * +elif chip_id == ap_chip.H6: + from adafruit_blinka.microcontroller.allwinner.h6.pin import * elif chip_id == ap_chip.H616: from adafruit_blinka.microcontroller.allwinner.h616.pin import * elif chip_id == ap_chip.SAMA5: @@ -81,6 +85,8 @@ elif chip_id == ap_chip.RK3308: from adafruit_blinka.microcontroller.rockchip.rk3308.pin import * elif chip_id == ap_chip.RK3399: from adafruit_blinka.microcontroller.rockchip.rk3399.pin import * +elif chip_id == ap_chip.RK3328: + from adafruit_blinka.microcontroller.rockchip.rk3328.pin import * elif chip_id == ap_chip.H5: from adafruit_blinka.microcontroller.allwinner.h5.pin import * elif chip_id == ap_chip.IMX8MX: diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py index 8cdf89b..34f7b4a 100755 --- a/src/microcontroller/pin.py +++ b/src/microcontroller/pin.py @@ -10,6 +10,8 @@ if chip_id == ap_chip.ESP8266: from adafruit_blinka.microcontroller.esp8266.pin import * elif chip_id == ap_chip.STM32F405: from adafruit_blinka.microcontroller.stm32.stm32f405.pin import * +elif chip_id == ap_chip.RP2040: + from adafruit_blinka.microcontroller.rp2040.pin import * elif chip_id == ap_chip.BCM2XXX: from adafruit_blinka.microcontroller.bcm283x.pin import * elif chip_id == ap_chip.DRA74X: @@ -20,6 +22,8 @@ elif chip_id == ap_chip.SUN8I: from adafruit_blinka.microcontroller.allwinner.h3.pin import * elif chip_id == ap_chip.H5: from adafruit_blinka.microcontroller.allwinner.h5.pin import * +elif chip_id == ap_chip.H6: + from adafruit_blinka.microcontroller.allwinner.h6.pin import * elif chip_id == ap_chip.H616: from adafruit_blinka.microcontroller.allwinner.h616.pin import * elif chip_id == ap_chip.SAMA5: @@ -64,6 +68,8 @@ elif chip_id == ap_chip.RK3308: from adafruit_blinka.microcontroller.rockchip.rk3308.pin import * elif chip_id == ap_chip.RK3399: from adafruit_blinka.microcontroller.rockchip.rk3399.pin import * +elif chip_id == ap_chip.RK3328: + from adafruit_blinka.microcontroller.rockchip.rk3328.pin import * elif chip_id == ap_chip.MIPS24KC: from adafruit_blinka.microcontroller.atheros.ar9331.pin import * elif chip_id == ap_chip.MIPS24KEC: @@ -74,5 +80,7 @@ elif chip_id == ap_chip.STM32MP157: from adafruit_blinka.microcontroller.stm32.stm32mp157.pin import * elif chip_id == ap_chip.MT8167: from adafruit_blinka.microcontroller.mt8167.pin import * +elif chip_id == ap_chip.PICO_U2IF: + from adafruit_blinka.microcontroller.pico_u2if.pin import * else: raise NotImplementedError("Microcontroller not supported: ", chip_id) diff --git a/src/neopixel_write.py b/src/neopixel_write.py index 2c85f01..00ffa0b 100644 --- a/src/neopixel_write.py +++ b/src/neopixel_write.py @@ -14,6 +14,8 @@ from adafruit_blinka.agnostic import detector if detector.board.any_raspberry_pi: from adafruit_blinka.microcontroller.bcm283x import neopixel as _neopixel +elif detector.board.pico_u2if: + from adafruit_blinka.microcontroller.pico_u2if import neopixel as _neopixel elif "sphinx" in sys.modules: pass else: diff --git a/src/pwmio.py b/src/pwmio.py index 3a6b5bd..dbb8bb7 100644 --- a/src/pwmio.py +++ b/src/pwmio.py @@ -29,6 +29,8 @@ elif detector.board.greatfet_one: from adafruit_blinka.microcontroller.nxp_lpc4330.pwmout import PWMOut elif detector.board.any_lubancat: from adafruit_blinka.microcontroller.generic_linux.sysfs_pwmout import PWMOut +elif detector.board.pico_u2if: + from adafruit_blinka.microcontroller.pico_u2if.pwmio import PWMOut elif "sphinx" in sys.modules: pass else: