From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Mon, 5 May 2025 19:39:50 +0000 (-0700)
Subject: Merge branch 'main' of https://github.com/fb0u/Adafruit_Blinka into fb0u
X-Git-Tag: 8.57.0~3^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/074378ed284105b5099de2eeb7e62bd0a76628f6?hp=-c

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

074378ed284105b5099de2eeb7e62bd0a76628f6
diff --combined src/board.py
index 011170f,cde9726..cf32fd6
--- a/src/board.py
+++ b/src/board.py
@@@ -41,10 -41,7 +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.any_raspberry_pi_4_board or detector.board.any_raspberry_pi_5_board:
 +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 -128,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 *
  
@@@ -143,7 -137,7 +143,7 @@@ 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:
 +elif board_id in (ap_board.ORANGE_PI_5, ap_board.ORANGE_PI_5_MAX):
      from adafruit_blinka.board.orangepi.orangepi5 import *
  
  elif board_id == ap_board.ORANGE_PI_5_PLUS:
@@@ -167,9 -161,6 +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 *
  
@@@ -281,6 -272,9 +281,9 @@@ elif board_id == ap_board.RADXA_CM3
  elif board_id == ap_board.ROCK_PI_3A:
      from adafruit_blinka.board.radxa.rockpi3a import *
  
+ elif board_id == ap_board.ROCK_3B:
+     from adafruit_blinka.board.radxa.rock3b import *
+ 
  elif board_id == ap_board.ROCK_PI_3C:
      from adafruit_blinka.board.radxa.rockpi3c import *
  
@@@ -311,12 -305,6 +314,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 *
  
@@@ -449,9 -437,6 +452,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