Skip to content

Commit 9a21096

Browse files
committed
Merge branch 'main' of https://github.com/adafruit/Adafruit_Blinka into vivid-unit2
2 parents c15604e + a1329a8 commit 9a21096

File tree

11 files changed

+133
-173
lines changed

11 files changed

+133
-173
lines changed

requirements.txt

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
Adafruit-PlatformDetect>=3.62.0
2-
Adafruit-PureIO>=1.1.7
3-
Jetson.GPIO; platform_machine=='aarch64'
4-
RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l' or platform_machine=='aarch64'
5-
rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l' or platform_machine=='aarch64'
6-
sysv_ipc>=1.1.0; sys_platform == 'linux' and platform_machine!='mips'
7-
pyftdi>=0.40.0
8-
binho-host-adapter>=0.1.6
9-
numpy>=1.21.5
10-
adafruit-circuitpython-typing
1+
# requirements.txt
2+
#
3+
# installs dependencies from ./setup.py, and the package itself,
4+
# in editable mode
5+
# -e .
6+
7+
# (the -e above is optional). you could also just install the package
8+
# normally with just the line below (after uncommenting)
9+
.

setup.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
import io
1212
import os
13+
import sys
14+
import platform
1315

1416
from setuptools import setup, find_packages
1517

@@ -21,6 +23,7 @@
2123
long_description = "\n" + f.read()
2224

2325
board_reqs = []
26+
platform_reqs = []
2427
if os.path.exists("/proc/device-tree/compatible"):
2528
with open("/proc/device-tree/compatible", "rb") as f:
2629
compat = f.read()
@@ -34,15 +37,18 @@
3437
or b"brcm,bcm2838" in compat
3538
or b"brcm,bcm2711" in compat
3639
):
37-
board_reqs = ["RPi.GPIO", "rpi_ws281x>=4.0.0", "sysv_ipc>=1.1.0"]
40+
board_reqs = ["RPi.GPIO", "rpi_ws281x>=4.0.0"]
3841
# Pi 5
3942
if b"brcm,bcm2712" in compat:
40-
board_reqs = ["rpi_ws281x>=4.0.0", "sysv_ipc>=1.1.0", "rpi-lgpio"]
43+
board_reqs = ["rpi_ws281x>=4.0.0", "rpi-lgpio"]
4144
if (
4245
b"ti,am335x" in compat
4346
): # BeagleBone Black, Green, PocketBeagle, BeagleBone AI, etc.
4447
board_reqs = ["Adafruit_BBIO"]
4548

49+
if sys.platform == "linux" and platform.machine != "mips":
50+
platform_reqs = ["sysv_ipc>=1.1.0"]
51+
4652
setup(
4753
name="Adafruit-Blinka",
4854
use_scm_version={
@@ -89,12 +95,15 @@
8995
},
9096
include_package_data=True,
9197
install_requires=[
92-
"Adafruit-PlatformDetect>=3.62.0",
98+
"Adafruit-PlatformDetect>=3.70.1",
9399
"Adafruit-PureIO>=1.1.7",
100+
"binho-host-adapter>=0.1.6",
94101
"pyftdi>=0.40.0",
102+
"numpy>=1.21.5",
95103
"adafruit-circuitpython-typing",
96104
]
97-
+ board_reqs,
105+
+ board_reqs
106+
+ platform_reqs,
98107
license="MIT",
99108
classifiers=[
100109
# Trove classifiers
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# SPDX-FileCopyrightText: 2024 mmontol
2+
#
3+
# SPDX-License-Identifier: MIT
4+
"""Pin definitions for the LubanCat-5."""
5+
6+
from adafruit_blinka.microcontroller.rockchip.rk3588 import pin
7+
from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin
8+
9+
# GPIO1 = +3.3V
10+
# GPIO2 = +5V
11+
GPIO3 = pin.GPIO1_C0
12+
# GPIO4 = +5V
13+
GPIO5 = pin.GPIO1_C1
14+
# GPIO6 = GND
15+
GPIO7 = Pin((6, 0))
16+
GPIO8 = pin.GPIO1_B6
17+
# GPIO9 = GND
18+
GPIO10 = pin.GPIO1_B7
19+
GPIO11 = Pin((6, 1))
20+
GPIO12 = Pin((6, 4))
21+
GPIO13 = Pin((6, 2))
22+
# GPIO14 = GND
23+
GPIO15 = Pin((6, 3))
24+
GPIO16 = Pin((6, 5))
25+
# GPIO17 = +3.3V
26+
GPIO18 = Pin((6, 6))
27+
GPIO19 = pin.GPIO4_A1
28+
# GPIO20 = GND
29+
GPIO21 = pin.GPIO4_A0
30+
GPIO22 = Pin((6, 7))
31+
GPIO23 = pin.GPIO4_A2
32+
GPIO24 = pin.GPIO4_B2
33+
# GPIO25 = GND
34+
GPIO26 = Pin((7, 5))
35+
GPIO27 = pin.GPIO1_A2
36+
GPIO28 = pin.GPIO1_A3
37+
GPIO29 = pin.GPIO2_C3
38+
# GPIO30 = GND
39+
GPIO31 = Pin((7, 0))
40+
GPIO32 = pin.GPIO4_B6
41+
GPIO33 = pin.GPIO1_D6
42+
# GPIO34 = GND
43+
GPIO35 = pin.GPIO1_D7
44+
GPIO36 = Pin((7, 4))
45+
GPIO37 = Pin((7, 1))
46+
GPIO38 = Pin((7, 3))
47+
# GPIO39 = GND
48+
GPIO40 = Pin((7, 2))
49+
50+
# I2C
51+
I2C3_SCL = pin.I2C3_SCL_M0
52+
I2C3_SDA = pin.I2C3_SDA_M0
53+
I2C4_SCL = pin.I2C4_SCL_M3
54+
I2C4_SDA = pin.I2C4_SDA_M3
55+
I2C8_SCL = pin.I2C8_SCL_M2
56+
I2C8_SDA = pin.I2C8_SDA_M2
57+
58+
# UART
59+
UART1_TX = pin.UART1_TX_M1
60+
UART1_RX = pin.UART1_RX_M1
61+
UART3_TX = pin.UART3_TX_M0
62+
UART3_RX = pin.UART3_RX_M0
63+
64+
# Default SPI
65+
MOSI = pin.SPI0_MOSI_M1
66+
MISO = pin.SPI0_MISO_M1
67+
SCLK = pin.SPI0_SCLK_M1
68+
CS0 = pin.SPI0_CS0_M1
69+
70+
# PWM
71+
PWM0 = pin.PWM0_M2
72+
PWM1 = pin.PWM1_M2
73+
PWM13_M1 = pin.PWM13_M1
74+
PWM13_M2 = pin.PWM13_M2
75+
PWM14_M1 = pin.PWM14_M1
76+
PWM14_M2 = pin.PWM14_M2
77+
PWM15 = pin.PWM15_IR_M3

src/adafruit_blinka/board/raspberrypi/raspi_5b.py

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/adafruit_blinka/microcontroller/bcm2712/__init__.py

Whitespace-only changes.

src/adafruit_blinka/microcontroller/bcm2712/pin.py

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)