From: Melissa LeBlanc-Williams Date: Mon, 5 May 2025 18:35:20 +0000 (-0700) Subject: Merge pull request #914 from hajimef/develop X-Git-Tag: 8.57.0~7 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/160378c619789ec4d574c4378c4f39f2ceb3184b?ds=inline;hp=-c Merge pull request #914 from hajimef/develop Added support for D-Robotics RDK-X3 --- 160378c619789ec4d574c4378c4f39f2ceb3184b diff --combined src/board.py index f9b8760,1935638..0726b7f --- a/src/board.py +++ b/src/board.py @@@ -41,10 -41,13 +41,10 @@@ elif board_id == ap_board.PYBOARD elif board_id == ap_board.RASPBERRY_PI_PICO: from adafruit_blinka.board.raspberrypi.pico import * -elif ( - detector.board.RASPBERRY_PI_4B - or detector.board.RASPBERRY_PI_CM4 - or detector.board.RASPBERRY_PI_CM4S - or detector.board.RASPBERRY_PI_400 - or detector.board.RASPBERRY_PI_5 -): +elif detector.board.any_raspberry_pi_5_board: + from adafruit_blinka.board.raspberrypi.raspi_5 import * + +elif detector.board.any_raspberry_pi_4_board: from adafruit_blinka.board.raspberrypi.raspi_4b import * elif detector.board.any_raspberry_pi_40_pin: @@@ -131,9 -134,6 +131,9 @@@ elif board_id == ap_board.ORANGE_PI_ZER elif board_id == ap_board.ORANGE_PI_3: from adafruit_blinka.board.orangepi.orangepi3 import * +elif board_id == ap_board.ORANGE_PI_3_LTS: + from adafruit_blinka.board.orangepi.orangepi3lts import * + elif board_id == ap_board.ORANGE_PI_3B: from adafruit_blinka.board.orangepi.orangepi3b import * @@@ -308,12 -308,6 +308,12 @@@ elif board_id == ap_board.ROCK_PI_5C elif board_id == ap_board.ROCK_PI_E: from adafruit_blinka.board.radxa.rockpie import * +elif board_id == ap_board.VAAMAN: + from adafruit_blinka.board.vicharak.vaaman import * + +elif board_id == ap_board.AXON: + from adafruit_blinka.board.vicharak.axon import * + elif board_id == ap_board.UDOO_X86: from adafruit_blinka.board.udoo_x86ultra import * @@@ -446,6 -440,9 +446,9 @@@ elif board_id == ap_board.VIVID_UNIT elif board_id == ap_board.INDIEDROID_NOVA: from adafruit_blinka.board.ameridroid.indiedroid_nova import * + elif board_id == ap_board.RDK_X3: + from adafruit_blinka.board.horizon.rdkx3 import * + elif "sphinx" in sys.modules: pass diff --combined src/digitalio.py index c56f349,66c0c10..50ecb97 --- a/src/digitalio.py +++ b/src/digitalio.py @@@ -15,10 -15,14 +15,10 @@@ from adafruit_blinka.agnostic import bo # By Chip Class if detector.chip.BCM2XXX: - if board_id in ( - "RASPBERRY_PI_4B", - "RASPBERRY_PI_400", - "RASPBERRY_PI_CM4", - "RASPBERRY_PI_CM4S", - "RASPBERRY_PI_5", - ): - from adafruit_blinka.microcontroller.bcm2711.pin import * + if detector.board.any_raspberry_pi_5_board: + from adafruit_blinka.microcontroller.bcm2712.pin import Pin + elif detector.board.any_raspberry_pi_4_board: + from adafruit_blinka.microcontroller.bcm2711.pin import Pin else: from adafruit_blinka.microcontroller.bcm283x.pin import Pin elif detector.chip.AM33XX: @@@ -117,6 -121,8 +117,8 @@@ elif detector.chip.TH1520 from adafruit_blinka.microcontroller.thead.th1520.pin import Pin elif detector.chip.K1: from adafruit_blinka.microcontroller.spacemit.k1.pin import Pin + elif detector.chip.SUNRISE_X3: + from adafruit_blinka.microcontroller.horizon.sunrise_x3.pin import Pin # Special Case Boards elif detector.board.ftdi_ft232h: from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin diff --combined src/microcontroller/pin.py index c461538,da211e5..494efc8 --- a/src/microcontroller/pin.py +++ b/src/microcontroller/pin.py @@@ -4,7 -4,7 +4,7 @@@ """Pins named after their chip name.""" import sys from adafruit_platformdetect.constants import chips as ap_chip, boards as ap_boards -from adafruit_blinka.agnostic import board_id, chip_id +from adafruit_blinka.agnostic import board_id, chip_id, detector # We intentionally are patching into this namespace so skip the wildcard check. # pylint: disable=unused-wildcard-import,wildcard-import,ungrouped-imports @@@ -16,9 -16,13 +16,9 @@@ elif chip_id == ap_chip.STM32F405 elif chip_id == ap_chip.RP2040: from adafruit_blinka.microcontroller.rp2040.pin import * elif chip_id == ap_chip.BCM2XXX: - if board_id in ( - "RASPBERRY_PI_4B", - "RASPBERRY_PI_400", - "RASPBERRY_PI_CM4", - "RASPBERRY_PI_CM4S", - "RASPBERRY_PI_5", - ): + if detector.board.any_raspberry_pi_5_board: + from adafruit_blinka.microcontroller.bcm2712.pin import * + elif detector.board.any_raspberry_pi_4_board: from adafruit_blinka.microcontroller.bcm2711.pin import * else: from adafruit_blinka.microcontroller.bcm283x.pin import * @@@ -149,6 -153,8 +149,8 @@@ elif chip_id == ap_chip.RV1103 from adafruit_blinka.microcontroller.rockchip.rv1103.pin import * elif chip_id == ap_chip.RV1106: from adafruit_blinka.microcontroller.rockchip.rv1106.pin import * + elif chip_id == ap_chip.SUNRISE_X3: + from adafruit_blinka.microcontroller.horizon.sunrise_x3.pin import * elif "sphinx" in sys.modules: # pylint: disable=unused-import from adafruit_blinka.microcontroller.generic_micropython import Pin diff --combined src/pwmio.py index f6452f8,0e029a5..4b3f4c8 --- a/src/pwmio.py +++ b/src/pwmio.py @@@ -16,11 -16,8 +16,11 @@@ from adafruit_blinka.agnostic import de # pylint: disable=unused-import -if detector.board.any_raspberry_pi: - from adafruit_blinka.microcontroller.bcm283x.pwmio.PWMOut import PWMOut +if detector.board.any_raspberry_pi_5_board: + from adafruit_blinka.microcontroller.generic_linux.lgpio_pwmout import PWMOut +elif detector.board.any_raspberry_pi: + # Pi 4 or lower + from adafruit_blinka.microcontroller.generic_linux.rpi_gpio_pwmout import PWMOut elif detector.board.any_bananapi: from adafruit_blinka.microcontroller.generic_linux.sysfs_pwmout import PWMOut elif detector.board.any_coral_board: @@@ -53,6 -50,8 +53,8 @@@ elif detector.board.any_luckfox_pico_bo from adafruit_blinka.microcontroller.generic_linux.sysfs_pwmout import PWMOut elif detector.board.any_starfive_id: from adafruit_blinka.microcontroller.starfive.JH7110.pwmio import PWMOut + elif detector.board.any_horizon_board: + from adafruit_blinka.microcontroller.horizon.pwmio.PWMOut import PWMOut elif detector.board.OS_AGNOSTIC_BOARD: from adafruit_blinka.microcontroller.generic_agnostic_board.PWMOut import PWMOut elif (