From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Thu, 20 Jun 2024 17:18:22 +0000 (-0700)
Subject: Merge branch 'main' of https://github.com/adafruit/Adafruit_Blinka into vivid-unit2
X-Git-Tag: 8.46.0^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/9a2109697689b2b0926318e8fbb7e8662d4ee0c0?ds=inline;hp=-c

Merge branch 'main' of https://github.com/adafruit/Adafruit_Blinka into vivid-unit2
---

9a2109697689b2b0926318e8fbb7e8662d4ee0c0
diff --combined src/board.py
index 1a5ec92,667a234..8bc94e8
--- a/src/board.py
+++ b/src/board.py
@@@ -43,10 -43,9 +43,9 @@@ elif 
      or detector.board.RASPBERRY_PI_CM4
      or detector.board.RASPBERRY_PI_CM4S
      or detector.board.RASPBERRY_PI_400
+     or detector.board.RASPBERRY_PI_5
  ):
      from adafruit_blinka.board.raspberrypi.raspi_4b import *
- elif detector.board.RASPBERRY_PI_5:
-     from adafruit_blinka.board.raspberrypi.raspi_5b import *
  
  elif detector.board.any_raspberry_pi_40_pin:
      from adafruit_blinka.board.raspberrypi.raspi_40pin import *
@@@ -327,6 -326,9 +326,9 @@@ elif board_id == ap_board.LUBANCAT2
  elif board_id == ap_board.LUBANCAT4:
      from adafruit_blinka.board.lubancat.lubancat4 import *
  
+ elif board_id == ap_board.LUBANCAT5:
+     from adafruit_blinka.board.lubancat.lubancat5 import *
+ 
  elif board_id == ap_board.NANOPI_NEO_AIR:
      from adafruit_blinka.board.nanopi.neoair import *
  
@@@ -414,9 -416,6 +416,9 @@@ elif board_id == ap_board.LUCKFOX_PICO_
  elif board_id == ap_board.LUCKFOX_PICO_MAX:
      from adafruit_blinka.board.luckfox.luckfoxpico_max import *
  
 +elif board_id == ap_board.VIVID_UNIT:
 +    from adafruit_blinka.board.vivid_unit import *
 +
  elif "sphinx" in sys.modules:
      pass