From: Ryan L Date: Sun, 12 Feb 2023 19:54:51 +0000 (+0000) Subject: Merge remote-tracking branch 'adafruit/main' X-Git-Tag: 8.23.0~1^2~15 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/5ff566c864a4ce65feda222ec35f4dea9a4089e1?hp=c3bfd01efa31a426ec6eb258598b1871bb04a178 Merge remote-tracking branch 'adafruit/main' --- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5fe5064..ea5eab5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,20 +15,20 @@ jobs: run: echo "$GITHUB_CONTEXT" - name: Translate Repo Name For Build Tools filename_prefix id: repo-name - run: echo ::set-output name=repo-name::Adafruit-Blinka + run: echo "repo-name=Adafruit-Blinka" >> $GITHUB_OUTPUT - name: Set up Python 3.7 - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: 3.7 - name: Versions run: | python3 --version - name: Checkout Current Repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: submodules: true - name: Checkout tools repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: adafruit/actions-ci-circuitpython-libs path: actions-ci diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f8399b7..a0eb8f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,14 +11,14 @@ jobs: upload-pypi: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Check For setup.py id: need-pypi run: | - echo ::set-output name=setup-py::$( find . -wholename './setup.py' ) + echo "setup-py=$( find . -wholename './setup.py' )" >> $GITHUB_OUTPUT - name: Set up Python if: contains(steps.need-pypi.outputs.setup-py, 'setup.py') - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: '3.x' - name: Install dependencies diff --git a/src/adafruit_blinka/board/generic_linux_pc.py b/src/adafruit_blinka/board/generic_linux_pc.py new file mode 100644 index 0000000..bb3e737 --- /dev/null +++ b/src/adafruit_blinka/board/generic_linux_pc.py @@ -0,0 +1,4 @@ +# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries +# +# SPDX-License-Identifier: MIT +"""(Empty) definitions for the GENERIC_LINUX_PC.""" diff --git a/src/adafruit_blinka/board/lubancat/lubancat2.py b/src/adafruit_blinka/board/lubancat/lubancat2.py new file mode 100644 index 0000000..b82f502 --- /dev/null +++ b/src/adafruit_blinka/board/lubancat/lubancat2.py @@ -0,0 +1,73 @@ +# SPDX-FileCopyrightText: 2023 mmontol +# +# SPDX-License-Identifier: MIT +"""Pin definitions for the LubanCat2.""" + +from adafruit_blinka.microcontroller.rockchip.rk3568 import pin + +# lbancat2 board 40-pin J5: +# -------------------------- +# 3V3 | (1) (2) | 5V +# GPIO3 | (3) (4) | 5V +# GPIO5 | (5) (6) | GND +# GPIO7 | (7) (8) | GPIO8 +# GND | (9) (10) | GPIO10 +# ....................... # +# ....................... # +# GPIO33| (33) (34) | GND +# GPIO35| (35) (36) | GPIO36 +# GPIO37| (37) (38) | GPIO38 +# GND | (39) (40) | GPIO40 +# -------------------------- + +GPIO3 = pin.GPIO1_A0 +GPIO5 = pin.GPIO1_A1 +GPIO7 = pin.GPIO0_B0 +GPIO8 = pin.GPIO3_B7 +GPIO10 = pin.GPIO3_C0 +GPIO11 = pin.GPIO3_A5 +GPIO12 = pin.GPIO3_B1 +GPIO13 = pin.GPIO3_A6 +GPIO15 = pin.GPIO3_A7 +GPIO16 = pin.GPIO2_D7 +GPIO18 = pin.GPIO3_A0 +GPIO19 = pin.GPIO4_C3 +GPIO21 = pin.GPIO4_C5 +GPIO22 = pin.GPIO0_C2 +GPIO23 = pin.GPIO4_C2 +GPIO24 = pin.GPIO4_C6 +GPIO26 = pin.GPIO4_C4 +GPIO27 = pin.GPIO3_B4 +GPIO28 = pin.GPIO3_B3 +GPIO29 = pin.GPIO4_D2 +GPIO31 = pin.GPIO3_B6 +GPIO32 = pin.GPIO3_B2 +GPIO33 = pin.GPIO3_B5 +GPIO35 = pin.GPIO3_C4 +GPIO36 = pin.GPIO1_B0 +GPIO37 = pin.GPIO3_C5 +GPIO38 = pin.GPIO1_B1 +GPIO40 = pin.GPIO1_B2 + +# I2C +I2C3_SDA = pin.I2C3_SDA_M0 +I2C3_SCL = pin.I2C3_SCL_M0 +I2C5_SCL = pin.I2C5_SCL_M0 +I2C5_SDA = pin.I2C5_SDA_M0 + +# UART +UART3_TX = pin.UART3_TX_M1 +UART3_RX = pin.UART3_RX_M1 + +# SPI +MOSI = pin.SPI3_MOSI_M1 +MISO = pin.SPI3_MISO_M1 +SCLK = pin.SPI3_CLK_M1 +CS0 = pin.GPIO4_C6 +CS1 = pin.GPIO4_C4 + +# PWM +PWM8 = pin.PWM8_M0 +PWM9 = pin.PWM9_M0 +PWM10 = pin.PWM10_M0 +PWM14 = pin.PWM14_M0 diff --git a/src/adafruit_blinka/board/orangepi/orangepi5.py b/src/adafruit_blinka/board/orangepi/orangepi5.py new file mode 100644 index 0000000..1889393 --- /dev/null +++ b/src/adafruit_blinka/board/orangepi/orangepi5.py @@ -0,0 +1,75 @@ +# SPDX-FileCopyrightText: 2022 Corebb +# +# SPDX-License-Identifier: MIT +"""Pin definitions for the Orange Pi 5""" + +from adafruit_blinka.microcontroller.rockchip.rk3588 import pin + +# D pin number is ordered by physical pin sequence + +# D1 = +3.3V +# D2 = +5V +D3 = pin.GPIO1_B7 +# D4 = +5V +D5 = pin.GPIO1_B6 +# D6 = GND +D7 = pin.GPIO1_C6 +D8 = pin.GPIO4_A3 +# D9 = GND +D10 = pin.GPIO4_A4 +D11 = pin.GPIO4_B2 +D12 = pin.GPIO0_D5 +D13 = pin.GPIO4_B3 +# D14 = GND +D15 = pin.GPIO0_D4 +D16 = pin.GPIO1_D3 +# D17 = +3.3V +D18 = pin.GPIO1_D2 +D19 = pin.GPIO1_C1 +# D20 = GND +D21 = pin.GPIO1_C0 +D22 = pin.GPIO2_D4 +D23 = pin.GPIO1_C2 +D24 = pin.GPIO1_C4 +# D25 = GND +D26 = pin.GPIO1_A3 + +# UART +UART0_TX = pin.GPIO4_A3 +UART0_RX = pin.GPIO4_A4 +UART1_TX = pin.GPIO1_B6 +UART1_RX = pin.GPIO1_B7 +UART3_TX = pin.GPIO1_C1 +UART3_RX = pin.GPIO1_C0 +UART4_TX = pin.GPIO1_D2 +UART4_RX = pin.GPIO1_D3 + +# Default UART +TX = UART1_TX +RX = UART1_RX +TXD = UART1_TX +RXD = UART1_RX + +# I2C +I2C1_SCL = pin.GPIO1_D2 +I2C1_SDA = pin.GPIO1_D3 +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 + +# SPI +SPI4_MISO = pin.GPIO1_C0 +SPI4_MOSI = pin.GPIO1_C1 +SPI4_CLK = pin.GPIO1_C2 +SPI4_CS1 = pin.GPIO1_C4 + +# Default SPI +MOSI = SPI4_MOSI +MISO = SPI4_MISO +SCLK = SPI4_CLK +CS = SPI4_CS1 diff --git a/src/adafruit_blinka/board/radxa/rockpi3a.py b/src/adafruit_blinka/board/radxa/rockpi3a.py new file mode 100644 index 0000000..ee6bbba --- /dev/null +++ b/src/adafruit_blinka/board/radxa/rockpi3a.py @@ -0,0 +1,54 @@ +# SPDX-FileCopyrightText: 2023 Enrico Trevisanello +# +# SPDX-License-Identifier: MIT +"""Pin definitions for the Radxa Rock Pi 3A.""" + +from adafruit_blinka.microcontroller.rockchip.rk3568 import pin + +# 3A IO pins + +D1_A0 = pin.GPIO1_A0 # /I2C3_SDA_M0/PIN 32 +D1_A1 = pin.GPIO1_A1 # /I2C3_SCL_M0/PIN 33 +D0_B5 = pin.GPIO0_B5 # /I2C2_SCL_M0/PIN 13 +D0_D1 = pin.GPIO0_D1 # /UART2_TX_M0/PIN 25 +D0_D0 = pin.GPIO0_D0 # /UART2_RX_M0/PIN 24 +D3_C4 = pin.GPIO3_C4 # /PWM14_M0/PIN 116 +D3_A3 = pin.GPIO3_A3 # /PIN 99 +D3_C5 = pin.GPIO3_C5 # /PWM14_M0/PIN 117 +D3_C0 = pin.GPIO3_C0 # /PWM14_M0/PIN 16 +D0_B2 = pin.GPIO0_B2 # /UART4_TX_M1/PIN 106 +D4_C3 = pin.GPIO4_C3 # /PWM15_IR_M1/PIN 147 +D4_C5 = pin.GPIO4_C5 # /PWM12_M1/PIN 149 +D0_C1 = pin.GPIO0_C1 # /PWM2_M0/ PIN 17 +D4_C2 = pin.GPIO4_C2 # /PWM14_M1/PIN 146 +D4_C6 = pin.GPIO4_C6 # /PWM13_M1/PIN 150 +D4_D1 = pin.GPIO4_D1 # /SPI3_CS1_M1/PIN 153 +D0_B6 = pin.GPIO0_B6 # /I2C2_SDA_M0/PIN 14 +D0_B5 = pin.GPIO0_B5 # /I2C2_SCL_M0/PIN 13 +D2_D7 = pin.GPIO2_D7 # /UART8_TX_M1/PIN 95 +D3_A0 = pin.GPIO3_A0 # /SPI2_CLK_M1/PIN 96 +D3_C2 = pin.GPIO3_C2 # /UART5_TX_M1/PIN 114 +D3_C3 = pin.GPIO3_C3 # /UART5_RX_M1/PIN 115 +D3_A4 = pin.GPIO3_A4 # /PIN 100 +D3_A2 = pin.GPIO3_A2 # /PIN 98 +D3_C0 = pin.GPIO3_C0 # /PWM13_M0/PIN 112 +D3_A6 = pin.GPIO3_A6 # /PIN 102 +D3_A5 = pin.GPIO3_A5 # /PIN 101 + +# I2C +SDA = D1_A0 +SCL = D1_A1 + +# SPI +CE0 = D4_C6 +SCLK = D4_C2 +MOSI = D4_C3 +MISO = D4_C5 + +# UART aliases +UART_TX = D0_D1 +UART_RX = D0_D0 +TXD = D0_D1 +RXD = D0_D0 +TX = D0_D1 +RX = D0_D0 diff --git a/src/adafruit_blinka/board/radxa/rockpi4.py b/src/adafruit_blinka/board/radxa/rockpi4.py index 9c04670..bd3e449 100644 --- a/src/adafruit_blinka/board/radxa/rockpi4.py +++ b/src/adafruit_blinka/board/radxa/rockpi4.py @@ -11,10 +11,11 @@ D7 = pin.GPIO2_B3 # /SPI2_CLK/PIN 75/ D8 = pin.GPIO4_C4 # /UART2_TXD/PIN 148/ D10 = pin.GPIO4_C3 # /UART2_RXD/PIN 147/ D11 = pin.GPIO4_C2 # /PWM0/PIN 146/ +D12 = pin.GPIO4_A3 D13 = pin.GPIO4_C6 # /PWM1/PIN 150/ D15 = pin.GPIO4_C5 # /SPDIF_TX/PIN 149/ D16 = pin.GPIO4_D2 # /PIN 154/ -D17 = pin.GPIO4_D4 # /PIN 156/ +D18 = pin.GPIO4_D4 # /PIN 156/ D19 = pin.GPIO1_B0 # /UART4_TXD/SPI1_TXD/PIN 40/ D21 = pin.GPIO1_A7 # /UART4_RXD/SPI1_RXD/PIN 39/ D22 = pin.GPIO4_D5 # /PIN 157/ diff --git a/src/adafruit_blinka/board/radxa/rockpi4cplus.py b/src/adafruit_blinka/board/radxa/rockpi4cplus.py new file mode 100644 index 0000000..fd1d4ad --- /dev/null +++ b/src/adafruit_blinka/board/radxa/rockpi4cplus.py @@ -0,0 +1,66 @@ +# SPDX-FileCopyrightText: 2023 Wouter Groeneveld +# See https://wiki.radxa.com/Rock4/hardware/gpio for pinout +# +# SPDX-License-Identifier: MIT +"""Pin definitions for the Rock Pi 4 C+.""" + +from adafruit_blinka.microcontroller.rockchip.rk3399_t import pin + +D3 = pin.GPIO2_A7 +D5 = pin.GPIO2_B0 +D7 = pin.GPIO2_B3 +D8 = pin.GPIO4_C4 +D10 = pin.GPIO4_C3 +D11 = pin.GPIO4_C2 +D12 = pin.GPIO2_D3 +D13 = pin.GPIO1_A1 +D15 = pin.GPIO4_C5 +D16 = pin.GPIO4_D2 +D18 = pin.GPIO4_D4 +D19 = pin.GPIO1_B0 +D21 = pin.GPIO1_A7 +D22 = pin.GPIO4_D5 +D23 = pin.GPIO1_B1 +D24 = pin.GPIO1_B2 +D27 = pin.GPIO2_A0 +D28 = pin.GPIO2_A1 +D29 = pin.GPIO2_B2 +D31 = pin.GPIO2_B1 +D32 = pin.GPIO3_C0 +D33 = pin.GPIO2_B4 +D35 = pin.GPIO4_A5 +D36 = pin.GPIO2_D4 +D37 = pin.GPIO4_D6 +D38 = pin.GPIO1_A4 +D40 = pin.GPIO1_C4 + +SDA2 = D27 +SCL2 = D28 + +SDA6 = D31 +SCL6 = D29 + +SDA7 = D3 +SCL7 = D5 + +SDA = SDA2 +SCL = SCL2 + +SCLK = D7 +MOSI = D29 +MISO = D31 +CS = D33 +SCK = SCLK + +UART2_TX = D8 +UART2_RX = D10 + +UART4_TX = D19 +UART4_RX = D21 + +UART_TX = UART2_TX +UART_RX = UART2_RX + +PWM0 = pin.PWM0 + +ADC_IN0 = pin.ADC_IN0 diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py index 3dd75e7..e7d994d 100644 --- a/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py +++ b/src/adafruit_blinka/microcontroller/rockchip/rk3399/pin.py @@ -63,7 +63,7 @@ SPI1_SCLK = GPIO1_B1 SPI1_MISO = GPIO1_B0 SPI1_MOSI = GPIO1_A7 SPI2_CS = GPIO2_B4 -SPI2_SCLK = GPIO2_A1 +SPI2_SCLK = GPIO2_B3 SPI2_MISO = GPIO2_B1 SPI2_MOSI = GPIO2_B2 diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3399_t/__init__.py b/src/adafruit_blinka/microcontroller/rockchip/rk3399_t/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3399_t/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3399_t/pin.py new file mode 100644 index 0000000..e72e45b --- /dev/null +++ b/src/adafruit_blinka/microcontroller/rockchip/rk3399_t/pin.py @@ -0,0 +1,78 @@ +# SPDX-FileCopyrightText: 2023 Wouter Groeneveld +# See https://wiki.radxa.com/Rock4/hardware/gpio (click EXPAND for the Pi 4C, chip RK3399_T) +# +# SPDX-License-Identifier: MIT +"""A Pin class for use with Rockchip RK3399_T.""" + +from adafruit_blinka.microcontroller.generic_linux.sysfs_pin import Pin + +GPIO1_A1 = Pin(33) +GPIO1_A4 = Pin(36) +GPIO1_A7 = Pin(39) +GPIO1_B0 = Pin(40) +GPIO1_B1 = Pin(41) +GPIO1_B2 = Pin(42) +GPIO1_C4 = Pin(52) +GPIO2_A0 = Pin(64) +GPIO2_A1 = Pin(65) +GPIO2_A7 = Pin(71) +GPIO2_B0 = Pin(72) +GPIO2_B1 = Pin(73) +GPIO2_B2 = Pin(74) +GPIO2_B3 = Pin(75) +GPIO2_B4 = Pin(76) +GPIO2_D3 = Pin(91) +GPIO2_D4 = Pin(92) +GPIO3_C0 = Pin(112) +GPIO4_A5 = Pin(133) +GPIO4_C2 = Pin(146) +GPIO4_C3 = Pin(147) +GPIO4_C4 = Pin(148) +GPIO4_C5 = Pin(149) +GPIO4_C6 = Pin(150) +GPIO4_D2 = Pin(154) +GPIO4_D4 = Pin(156) +GPIO4_D5 = Pin(157) +GPIO4_D6 = Pin(158) +ADC_IN0 = 1 + +# I2C +I2C2_SDA = GPIO2_A0 +I2C2_SCL = GPIO2_A1 +I2C6_SDA = GPIO2_B1 +I2C6_SCL = GPIO2_B2 +I2C7_SDA = GPIO2_A7 +I2C7_SCL = GPIO2_B0 + +# SPI +SPI1_CS = GPIO1_B2 +SPI1_SCLK = GPIO1_B1 +SPI1_MISO = GPIO1_B0 +SPI1_MOSI = GPIO1_A7 +SPI2_CS = GPIO2_B4 +SPI2_SCLK = GPIO2_B3 +SPI2_MISO = GPIO2_B1 +SPI2_MOSI = GPIO2_B2 + +# UART +UART0_TX = GPIO4_C4 +UART0_RX = GPIO4_C3 + +# PWM +PWM0 = GPIO4_C2 + +# ordered as i2cId, SCL, SDA +i2cPorts = ( + (0, I2C2_SCL, I2C2_SDA), + (1, I2C6_SCL, I2C6_SDA), + (7, I2C7_SCL, I2C7_SDA), +) + +# ordered as spiId, sckId, mosiId, misoId +spiPorts = ((1, SPI1_SCLK, SPI1_MOSI, SPI1_MISO),) + +# SysFS pwm outputs, pwm channel and pin in first tuple +pwmOuts = (((0, 0), PWM0),) + +# SysFS analog inputs, Ordered as analog analogInId, device, and channel +analogIns = ((ADC_IN0, 0, 0),) diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3568/__init__.py b/src/adafruit_blinka/microcontroller/rockchip/rk3568/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3568/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3568/pin.py new file mode 100644 index 0000000..0aa3a55 --- /dev/null +++ b/src/adafruit_blinka/microcontroller/rockchip/rk3568/pin.py @@ -0,0 +1,249 @@ +# SPDX-FileCopyrightText: 2023 mmontol, etrevis +# +# SPDX-License-Identifier: MIT + +"""A Pin class for use with Rockchip RK3568.""" + +from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin + + +# GPIOx_yz = x * 32 + y * 8 + z +# y: A -> 0, B -> 1, C -> 2, D -> 3 + +# GPIO0 +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_A7 = 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 +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_A7 = 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 +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_A7 = 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 +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_A7 = 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)) + +# GPIO4 +GPIO4_A0 = Pin((4, 0)) +GPIO4_A1 = Pin((4, 1)) +GPIO4_A2 = Pin((4, 2)) +GPIO4_A3 = Pin((4, 3)) +GPIO4_A4 = Pin((4, 4)) +GPIO4_A5 = Pin((4, 5)) +GPIO4_A6 = Pin((4, 6)) +GPIO4_A7 = Pin((4, 7)) +GPIO4_B0 = Pin((4, 8)) +GPIO4_B1 = Pin((4, 9)) +GPIO4_B2 = Pin((4, 10)) +GPIO4_B3 = Pin((4, 11)) +GPIO4_B4 = Pin((4, 12)) +GPIO4_B5 = Pin((4, 13)) +GPIO4_B6 = Pin((4, 14)) +GPIO4_B7 = Pin((4, 15)) +GPIO4_C0 = Pin((4, 16)) +GPIO4_C1 = Pin((4, 17)) +GPIO4_C2 = Pin((4, 18)) +GPIO4_C3 = Pin((4, 19)) +GPIO4_C4 = Pin((4, 20)) +GPIO4_C5 = Pin((4, 21)) +GPIO4_C6 = Pin((4, 22)) +GPIO4_C7 = Pin((4, 23)) +GPIO4_D0 = Pin((4, 24)) +GPIO4_D1 = Pin((4, 25)) +GPIO4_D2 = Pin((4, 26)) +GPIO4_D3 = Pin((4, 27)) +GPIO4_D4 = Pin((4, 28)) +GPIO4_D5 = Pin((4, 29)) +GPIO4_D6 = Pin((4, 30)) +GPIO4_D7 = Pin((4, 31)) + +# I2C +I2C3_SCL_M0 = GPIO1_A1 +I2C3_SDA_M0 = GPIO1_A0 +I2C5_SCL_M0 = GPIO3_B3 +I2C5_SDA_M0 = GPIO3_B4 +I2C2_SCL_M0 = GPIO0_B5 +I2C2_SDA_M0 = GPIO0_B6 +I2C1_SCL = GPIO0_B3 +I2C1_SDA = GPIO0_B4 + +# SPI +SPI3_CS0_M1 = GPIO4_C6 +SPI3_CS1_M1 = GPIO4_D1 +SPI3_CLK_M1 = GPIO4_C2 +SPI3_MISO_M1 = GPIO4_C5 +SPI3_MOSI_M1 = GPIO4_C3 + +# UART +UART0_RX = GPIO0_C0 +UART0_TX = GPIO0_C1 +UART2_TX_M0 = GPIO0_D1 +UART2_RX_M0 = GPIO0_D0 +UART3_TX_M0 = GPIO1_A1 +UART3_RX_M0 = GPIO1_A0 +UART3_TX_M1 = GPIO3_B7 +UART3_RX_M1 = GPIO3_C0 +UART7_TX_M1 = GPIO3_C4 +UART7_RX_M1 = GPIO3_C5 + +# PWM +PWM1_M0 = GPIO0_C0 +PWM1_M1 = GPIO0_B5 +PWM2_M0 = GPIO0_C1 +PWM2_M1 = GPIO0_B6 +PWM8_M0 = GPIO3_B1 +PWM9_M0 = GPIO3_B2 +PWM12_M1 = GPIO4_C5 +PWM13_M1 = GPIO4_C6 +PWM10_M0 = GPIO3_B5 +PWM14_M0 = GPIO3_C4 +PWM14_M1 = GPIO4_C2 +PWM15_IR_M1 = GPIO3_C5 + +# ordered as i2cId, SCL, SDA +i2cPorts = ( + (3, I2C3_SCL_M0, I2C3_SDA_M0), + (5, I2C5_SCL_M0, I2C5_SDA_M0), + (2, I2C2_SCL_M0, I2C2_SDA_M0), + (1, I2C1_SCL, I2C1_SDA), +) + +# ordered as spiId, sckId, mosiId, misoId +spiPorts = ((3, SPI3_CLK_M1, SPI3_MOSI_M1, SPI3_MISO_M1),) + +# SysFS pwm outputs, pwm channel and pin in first tuple +pwmOuts = ( + ((1, 0), PWM1_M0), + ((1, 0), PWM2_M0), + ((1, 0), PWM8_M0), + ((1, 0), PWM9_M0), + ((1, 0), PWM10_M0), + ((1, 0), PWM12_M1), + ((1, 0), PWM13_M1), + ((1, 0), PWM14_M0), +) + +# SysFS analog inputs, Ordered as analog analogInId, device, and channel diff --git a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py index 50fd905..8879cd1 100644 --- a/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py +++ b/src/adafruit_blinka/microcontroller/rockchip/rk3588/pin.py @@ -210,12 +210,15 @@ I2C7_SCL_M3 = GPIO4_B2 I2C7_SDA_M3 = GPIO4_B3 I2C8_SCL_M4 = GPIO3_C2 I2C8_SDA_M4 = GPIO3_C3 +I2C5_SDA_M3 = GPIO1_B7 +I2C5_SCL_M3 = GPIO1_B6 # ordered as i2cId, sclId, sdaId i2cPorts = ( (0, I2C0_SCL_M1, I2C0_SDA_M1), (1, I2C1_SCL_M0, I2C1_SDA_M0), (3, I2C3_SCL_M1, I2C3_SDA_M1), + (5, I2C5_SCL_M3, I2C5_SDA_M3), (7, I2C7_SCL_M3, I2C7_SDA_M3), (8, I2C8_SCL_M4, I2C8_SDA_M4), ) @@ -240,11 +243,17 @@ SPI3_MOSI_M0 = GPIO4_C5 SPI3_SCK_M0 = GPIO4_C6 SPI3_SCLK_M0 = SPI3_SCK_M0 +SPI4_MISO_M0 = GPIO1_C0 +SPI4_MOSI_M0 = GPIO1_C1 +SPI4_SCK_M0 = GPIO1_C2 +SPI4_SCLK_M0 = SPI4_SCK_M0 + # ordered as spiId, sckId, mosiId, misoId spiPorts = ( (0, SPI0_SCLK_M2, SPI0_MOSI_M2, SPI0_MISO_M2), (1, SPI1_SCLK_M1, SPI1_MOSI_M1, SPI1_MISO_M1), (3, SPI3_SCLK_M0, SPI3_MOSI_M0, SPI3_MISO_M0), + (4, SPI4_SCLK_M0, SPI4_MOSI_M0, SPI4_MISO_M0), ) # PWM diff --git a/src/analogio.py b/src/analogio.py index 03b1620..5721ef7 100644 --- a/src/analogio.py +++ b/src/analogio.py @@ -31,6 +31,8 @@ elif detector.chip.RK3399: from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn elif detector.chip.RK3588: from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn +elif detector.chip.RK3568: + from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn elif detector.chip.RK3566: from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn elif detector.chip.IMX6ULL: diff --git a/src/board.py b/src/board.py index 36147ab..c389fde 100644 --- a/src/board.py +++ b/src/board.py @@ -127,6 +127,9 @@ elif board_id == ap_board.ORANGE_PI_4: elif board_id == ap_board.ORANGE_PI_4_LTS: from adafruit_blinka.board.orangepi.orangepi4 import * +elif board_id == ap_board.ORANGE_PI_5: + from adafruit_blinka.board.orangepi.orangepi5 import * + elif board_id == ap_board.BANANA_PI_M2_ZERO: from adafruit_blinka.board.bananapi.bpim2zero import * @@ -232,6 +235,9 @@ elif board_id == ap_board.ONION_OMEGA2: elif board_id == ap_board.RADXA_CM3: from adafruit_blinka.board.radxa.radxacm3 import * +elif board_id == ap_board.ROCK_PI_3A: + from adafruit_blinka.board.radxa.rockpi3a import * + elif board_id == ap_board.RADXA_ZERO: from adafruit_blinka.board.radxa.radxazero import * @@ -241,6 +247,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_4_C_PLUS: + from adafruit_blinka.board.radxa.rockpi4cplus import * + elif board_id == ap_board.ROCK_PI_5: from adafruit_blinka.board.radxa.rock5 import * @@ -274,6 +283,9 @@ elif board_id == ap_board.LUBANCAT_ZERO: elif board_id == ap_board.LUBANCAT1: from adafruit_blinka.board.lubancat.lubancat1 import * +elif board_id == ap_board.LUBANCAT2: + from adafruit_blinka.board.lubancat.lubancat2 import * + elif board_id == ap_board.NANOPI_NEO_AIR: from adafruit_blinka.board.nanopi.neoair import * @@ -307,9 +319,15 @@ elif board_id == ap_board.LICHEE_RV: elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_ADV: from adafruit_blinka.board.siemens.siemens_iot2050 import * +elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_BASIC: + from adafruit_blinka.board.siemens.siemens_iot2050 import * + elif board_id == ap_board.AML_S905X_CC: from adafruit_blinka.board.librecomputer.aml_s905x_cc_v1 import * +elif board_id == ap_board.GENERIC_LINUX_PC: + from adafruit_blinka.board.generic_linux_pc import * + elif "sphinx" in sys.modules: pass diff --git a/src/digitalio.py b/src/digitalio.py index 60fbfe6..46af5ea 100644 --- a/src/digitalio.py +++ b/src/digitalio.py @@ -77,12 +77,16 @@ 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.RK3399_T: + from adafruit_blinka.microcontroller.rockchip.rk3399_t.pin import Pin elif detector.chip.RK3588: from adafruit_blinka.microcontroller.rockchip.rk3588.pin import Pin elif detector.chip.RK3328: from adafruit_blinka.microcontroller.rockchip.rk3328.pin import Pin elif detector.chip.RK3566: from adafruit_blinka.microcontroller.rockchip.rk3566.pin import Pin +elif detector.chip.RK3568: + from adafruit_blinka.microcontroller.rockchip.rk3568.pin import Pin elif detector.chip.PENTIUM_N3710: from adafruit_blinka.microcontroller.pentium.n3710.pin import Pin elif detector.chip.ATOM_J4105: diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py index 8e7efe8..a73c4dd 100644 --- a/src/microcontroller/__init__.py +++ b/src/microcontroller/__init__.py @@ -98,12 +98,16 @@ elif chip_id == ap_chip.RK3308: from adafruit_blinka.microcontroller.rockchip.rk3308 import * elif chip_id == ap_chip.RK3399: from adafruit_blinka.microcontroller.rockchip.rk3399 import * +elif chip_id == ap_chip.RK3399_T: + from adafruit_blinka.microcontroller.rockchip.rk3399_t import * elif chip_id == ap_chip.RK3588: from adafruit_blinka.microcontroller.rockchip.rk3588 import * elif chip_id == ap_chip.RK3328: from adafruit_blinka.microcontroller.rockchip.rk3328 import * elif chip_id == ap_chip.RK3566: from adafruit_blinka.microcontroller.rockchip.rk3566 import * +elif chip_id == ap_chip.RK3568: + from adafruit_blinka.microcontroller.rockchip.rk3568 import * elif chip_id == ap_chip.H3: from adafruit_blinka.microcontroller.allwinner.h3 import * elif chip_id == ap_chip.H5: diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py index 44f5224..bd6702b 100644 --- a/src/microcontroller/pin.py +++ b/src/microcontroller/pin.py @@ -101,12 +101,16 @@ 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.RK3399_T: + from adafruit_blinka.microcontroller.rockchip.rk3399_t.pin import * elif chip_id == ap_chip.RK3588: from adafruit_blinka.microcontroller.rockchip.rk3588.pin import * elif chip_id == ap_chip.RK3328: from adafruit_blinka.microcontroller.rockchip.rk3328.pin import * elif chip_id == ap_chip.RK3566: from adafruit_blinka.microcontroller.rockchip.rk3566.pin import * +elif chip_id == ap_chip.RK3568: + from adafruit_blinka.microcontroller.rockchip.rk3568.pin import * elif chip_id == ap_chip.RK3568B2: from adafruit_blinka.microcontroller.rockchip.rk3568b2.pin import * elif chip_id == ap_chip.MIPS24KC: