From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Mon, 3 Jun 2024 19:34:58 +0000 (-0700)
Subject: Merge branch 'main' into main
X-Git-Tag: 8.40.0^2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/578fb1f2ccee3b9fd30f1b9d818586aaafa8a1be?hp=-c

Merge branch 'main' into main
---

578fb1f2ccee3b9fd30f1b9d818586aaafa8a1be
diff --combined src/board.py
index 16f5017,8915316..62af763
--- a/src/board.py
+++ b/src/board.py
@@@ -17,7 -17,6 +17,6 @@@ __blinka__ = Tru
  
  
  import sys
- import os
  import adafruit_platformdetect.constants.boards as ap_board
  from adafruit_blinka.agnostic import board_id, detector
  
@@@ -268,6 -267,9 +267,9 @@@ elif board_id == ap_board.ROCK_PI_3C
  elif board_id == ap_board.RADXA_ZERO:
      from adafruit_blinka.board.radxa.radxazero import *
  
+ elif board_id == ap_board.RADXA_ZERO3:
+     from adafruit_blinka.board.radxa.radxazero3 import *
+ 
  elif board_id == ap_board.ROCK_PI_S:
      from adafruit_blinka.board.radxa.rockpis import *
  
@@@ -388,13 -390,7 +390,10 @@@ elif board_id == ap_board.LICHEEPI_4A
  elif board_id == ap_board.MILKV_DUO:
      from adafruit_blinka.board.milkv_duo import *
  
 +elif board_id == ap_board.WALNUT_PI_1B:
 +    from adafruit_blinka.board.walnutpi.walnutpi1b import *
 +
- elif (
-     "BLINKA_FORCECHIP" in os.environ
-     and os.environ["BLINKA_FORCEBOARD"] == "GENERIC_AGNOSTIC_BOARD"
- ):
+ elif board_id == ap_board.OS_AGNOSTIC_BOARD:
      from adafruit_blinka.board.generic_agnostic_board import *
  
  elif "sphinx" in sys.modules: