From: Ryan L <ryestar101@gmail.com>
Date: Wed, 22 Jun 2022 19:19:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'adafruit/main'
X-Git-Tag: 8.23.0~1^2~29
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/d50f67848c801bc48f5e98e7236a6869264b22ab?hp=-c

Merge remote-tracking branch 'adafruit/main'
---

d50f67848c801bc48f5e98e7236a6869264b22ab
diff --combined src/board.py
index 656216b,173c854..3a51e5c
--- a/src/board.py
+++ b/src/board.py
@@@ -196,9 -196,6 +196,9 @@@ elif board_id == ap_board.PINE64
  elif board_id == ap_board.PINEH64:
      from adafruit_blinka.board.pineH64 import *
  
 +elif board_id == ap_board.PCDUINO2:
 +    from adafruit_blinka.board.linksprite.pcduino2 import *
 +
  elif board_id == ap_board.SOPINE:
      from adafruit_blinka.board.soPine import *
  
@@@ -208,6 -205,9 +208,9 @@@ elif board_id == ap_board.CLOCKWORK_CPI
  elif board_id == ap_board.ONION_OMEGA2:
      from adafruit_blinka.board.onion.omega2 import *
  
+ elif board_id == ap_board.RADXA_ZERO:
+     from adafruit_blinka.board.radxa.radxazero import *
+ 
  elif board_id == ap_board.ROCK_PI_S:
      from adafruit_blinka.board.radxa.rockpis import *
  
diff --combined src/digitalio.py
index 509aece,24e65e9..6b89bf0
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@@ -22,8 -22,6 +22,8 @@@ elif detector.chip.JH71x0
      from adafruit_blinka.microcontroller.starfive.JH71x0.pin import Pin
  elif detector.chip.DRA74X:
      from adafruit_blinka.microcontroller.dra74x.pin import Pin
 +elif detector.chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
  elif detector.chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin
  elif detector.chip.SAMA5:
@@@ -38,6 -36,8 +38,8 @@@ elif detector.chip.S905
      from adafruit_blinka.microcontroller.amlogic.s905.pin import Pin
  elif detector.chip.S905X3:
      from adafruit_blinka.microcontroller.amlogic.s905x3.pin import Pin
+ elif detector.chip.S905Y2:
+     from adafruit_blinka.microcontroller.amlogic.s905y2.pin import Pin
  elif detector.chip.S922X:
      from adafruit_blinka.microcontroller.amlogic.s922x.pin import Pin
  elif detector.chip.A311D:
@@@ -52,8 -52,6 +54,8 @@@ elif detector.chip.IMX6ULL
      from adafruit_blinka.microcontroller.nxp_imx6ull.pin import Pin
  elif detector.chip.HFU540:
      from adafruit_blinka.microcontroller.hfu540.pin import Pin
 +elif detector.chip.A10:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import Pin
  elif detector.chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin
  elif detector.chip.A33:
diff --combined src/microcontroller/__init__.py
index a307a0d,c72fc83..6865c4e
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -46,8 -46,6 +46,8 @@@ elif chip_id == ap_chip.AM33XX
      from adafruit_blinka.microcontroller.am335x import *
  elif chip_id == ap_chip.JH71x0:
      from adafruit_blinka.microcontroller.starfive.JH71x0 import *
 +elif chip_id == ap_chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3 import *
  elif chip_id == ap_chip.H5:
@@@ -68,6 -66,8 +68,8 @@@ elif chip_id == ap_chip.S905
      from adafruit_blinka.microcontroller.amlogic.s905 import *
  elif chip_id == ap_chip.S905X3:
      from adafruit_blinka.microcontroller.amlogic.s905x3 import *
+ elif chip_id == ap_chip.S905Y2:
+     from adafruit_blinka.microcontroller.amlogic.s905y2 import *
  elif chip_id == ap_chip.S922X:
      from adafruit_blinka.microcontroller.amlogic.s922x import *
  elif chip_id == ap_chip.A311D:
@@@ -76,8 -76,6 +78,8 @@@ elif chip_id == ap_chip.EXYNOS5422
      from adafruit_blinka.microcontroller.samsung.exynos5422 import *
  elif chip_id == ap_chip.APQ8016:
      from adafruit_blinka.microcontroller.snapdragon.apq8016 import *
 +elif chip_id == ap_chip.A10:
 +    from adafruit_blinka.microcontroller.allwinner.a10 import *
  elif chip_id == ap_chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64 import *
  elif chip_id == ap_chip.A33:
@@@ -122,6 -120,10 +124,10 @@@ elif chip_id == ap_chip.RP2040_U2IF
      from adafruit_blinka.microcontroller.rp2040_u2if import *
  elif chip_id == ap_chip.GENERIC_X86:
      print("WARNING: GENERIC_X86 is not fully supported. Some features may not work.")
+ elif chip_id is None:
+     print(
+         "WARNING: chip_id == None is not fully supported. Some features may not work."
+     )
  elif "sphinx" in sys.modules:
      pass
  else:
diff --combined src/microcontroller/pin.py
index ab96c7b,f283b74..79627c0
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -31,8 -31,6 +31,8 @@@ elif chip_id == ap_chip.AM33XX
      from adafruit_blinka.microcontroller.am335x.pin import *
  elif chip_id == ap_chip.JH71x0:
      from adafruit_blinka.microcontroller.starfive.JH71x0.pin import *
 +elif chip_id == ap_chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3.pin import *
  elif chip_id == ap_chip.H3:
@@@ -55,6 -53,8 +55,8 @@@ elif chip_id == ap_chip.S905
      from adafruit_blinka.microcontroller.amlogic.s905.pin import *
  elif chip_id == ap_chip.S905X3:
      from adafruit_blinka.microcontroller.amlogic.s905x3.pin import *
+ elif chip_id == ap_chip.S905Y2:
+     from adafruit_blinka.microcontroller.amlogic.s905y2.pin import *
  elif chip_id == ap_chip.S922X:
      from adafruit_blinka.microcontroller.amlogic.s922x.pin import *
  elif chip_id == ap_chip.A311D:
@@@ -79,8 -79,6 +81,8 @@@ elif chip_id == ap_chip.LPC4330
      from adafruit_blinka.microcontroller.nxp_lpc4330.pin import *
  elif chip_id == ap_chip.MCP2221:
      from adafruit_blinka.microcontroller.mcp2221.pin import *
 +elif chip_id == ap_chip.A10:
 +    from adafruit_blinka.microcontroller.allwinner.a10.pin import *
  elif chip_id == ap_chip.A64:
      from adafruit_blinka.microcontroller.allwinner.a64.pin import *
  elif chip_id == ap_chip.A33:
@@@ -106,5 -104,13 +108,13 @@@ elif chip_id == ap_chip.RP2040_U2IF
  elif "sphinx" in sys.modules:
      # pylint: disable=unused-import
      from adafruit_blinka.microcontroller.generic_micropython import Pin
+ elif chip_id == ap_chip.GENERIC_X86:
+     print("WARNING: GENERIC_X86 is not fully supported. Some features may not work.")
+     from adafruit_blinka.microcontroller.generic_micropython import Pin
+ elif chip_id is None:
+     print(
+         "WARNING: chip_id == None is not fully supported. Some features may not work."
+     )
+     from adafruit_blinka.microcontroller.generic_micropython import Pin
  else:
      raise NotImplementedError("Microcontroller not supported: ", chip_id)