From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Mon, 5 May 2025 18:55:27 +0000 (-0700)
Subject: Merge branch 'main' of https://github.com/Dangku/Adafruit_Blinka into dangku
X-Git-Tag: 8.57.0~6^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/d76755f8e5b923de0656fb222e092b80e94ebd9e?hp=-c

Merge branch 'main' of https://github.com/Dangku/Adafruit_Blinka into dangku
---

d76755f8e5b923de0656fb222e092b80e94ebd9e
diff --combined src/board.py
index 0726b7f,61402c4..3a91850
--- 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 *
  
@@@ -167,6 -167,9 +167,9 @@@ elif board_id == ap_board.BANANA_PI_M5
  elif board_id == ap_board.BANANA_PI_F3:
      from adafruit_blinka.board.bananapi.bpif3 import *
  
+ elif board_id == ap_board.BANANA_PI_F5:
+     from adafruit_blinka.board.bananapi.bpif5 import *
+ 
  elif board_id == ap_board.LEMAKER_BANANA_PRO:
      from adafruit_blinka.board.lemaker.bananapro import *
  
@@@ -308,12 -311,6 +311,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,9 -443,6 +449,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 50ecb97,545fdfc..a35f377
--- 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:
@@@ -111,14 -115,14 +111,16 @@@ elif detector.chip.H618
      from adafruit_blinka.microcontroller.allwinner.h618.pin import Pin
  elif detector.chip.H616:
      from adafruit_blinka.microcontroller.allwinner.h616.pin import Pin
+ elif detector.chip.T527:
+     from adafruit_blinka.microcontroller.allwinner.t527.pin import Pin
  elif detector.chip.D1_RISCV:
      from adafruit_blinka.microcontroller.allwinner.D1.pin import Pin
  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/__init__.py
index e56d487,88cf9cd..9f5e0fa
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -65,6 -65,8 +65,8 @@@ elif chip_id == ap_chip.H618
      from adafruit_blinka.microcontroller.allwinner.h618 import *
  elif chip_id == ap_chip.H616:
      from adafruit_blinka.microcontroller.allwinner.h616 import *
+ elif chip_id == ap_chip.T527:
+     from adafruit_blinka.microcontroller.allwinner.t527 import *
  elif chip_id == ap_chip.SAMA5:
      from adafruit_blinka.microcontroller.sama5 import *
  elif chip_id == ap_chip.T210:
@@@ -159,8 -161,6 +161,8 @@@ elif chip_id == ap_chip.TH1520
      from adafruit_blinka.microcontroller.thead.th1520 import *
  elif chip_id == ap_chip.K1:
      from adafruit_blinka.microcontroller.spacemit.k1 import *
 +elif chip_id == ap_chip.SUNRISE_X3:
 +    from adafruit_blinka.microcontroller.horizon.sunrise_x3 import *
  elif chip_id == ap_chip.GENERIC_X86:
      print("WARNING: GENERIC_X86 is not fully supported. Some features may not work.")
  elif chip_id == ap_chip.OS_AGNOSTIC:
diff --combined src/microcontroller/pin.py
index 494efc8,473d89d..1241672
--- 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 *
@@@ -54,6 -58,8 +54,8 @@@ elif chip_id == ap_chip.H616
          from adafruit_blinka.board.repkapi.repka_pi_4 import *
      else:
          from adafruit_blinka.microcontroller.allwinner.h616.pin import *
+ elif chip_id == ap_chip.T527:
+     from adafruit_blinka.microcontroller.allwinner.t527.pin import *
  elif chip_id == ap_chip.SAMA5:
      from adafruit_blinka.microcontroller.sama5.pin import *
  elif chip_id == ap_chip.T210:
@@@ -149,8 -155,6 +151,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