Merge pull request #914 from hajimef/develop

Added support for D-Robotics RDK-X3

diff --combined src/board.py
index f9b8760c5cded8ffabc978f7129bf7b366eb3d43,19356388a2451cfb9ebe298dbe0b8d0c85dca2a7..0726b7fe6fa0e9f6e8e76116bf72edd9e0a01e2b
--- 1/src/board.py
--- 2/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 c56f3497670b348d71d382aef162074e8cc54f70,66c0c108d8084ca9923c8bc85dfb607fac85cd35..50ecb97b88f7dd3d029d45ac0a2741d4dce11e30
--- 1/src/digitalio.py
--- 2/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 c461538d1497ea670412235c768cdc648715c3e4,da211e5b6d6ef2a05117955785223f30f11ee9a3..494efc842540b46b444ae51495b04940c15c98a2
--- 1/src/microcontroller/pin.py
--- 2/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 f6452f80529d3275272191053d2a39a729f13d5d,0e029a535ea523e70e4cfb1857666134d389b642..4b3f4c86d5fdabf1c8f1c1f4ffa00fbf452e5169
--- 1/src/pwmio.py
--- 2/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 (