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

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

c0ed69170cfb86a1aca87bac22d449f30947dd60
diff --combined src/board.py
index 3a51e5c,f50fe03..0b8d1a3
--- a/src/board.py
+++ b/src/board.py
@@@ -121,9 -121,18 +121,18 @@@ 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_4:
+     from adafruit_blinka.board.orangepi.orangepi4 import *
+ 
+ elif board_id == ap_board.ORANGE_PI_4_LTS:
+     from adafruit_blinka.board.orangepi.orangepi4 import *
+ 
  elif board_id == ap_board.BANANA_PI_M2_ZERO:
      from adafruit_blinka.board.bananapi.bpim2zero import *
  
+ elif board_id == ap_board.BANANA_PI_M5:
+     from adafruit_blinka.board.bananapi.bpim5 import *
+ 
  elif board_id == ap_board.GIANT_BOARD:
      from adafruit_blinka.board.giantboard import *
  
@@@ -145,6 -154,9 +154,9 @@@ elif board_id == ap_board.JETSON_NANO
  elif board_id == ap_board.JETSON_NX:
      from adafruit_blinka.board.nvidia.jetson_nx import *
  
+ elif board_id == ap_board.JETSON_AGX_ORIN:
+     from adafruit_blinka.board.nvidia.jetson_orin import *
+ 
  elif board_id == ap_board.CLARA_AGX_XAVIER:
      from adafruit_blinka.board.nvidia.clara_agx_xavier import *
  
@@@ -196,9 -208,6 +208,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 *
  
@@@ -265,6 -274,9 +277,9 @@@ elif board_id == ap_board.MACROPAD_U2IF
  elif board_id == ap_board.QT2040_TRINKEY_U2IF:
      from adafruit_blinka.board.qt2040_trinkey_u2if import *
  
+ elif board_id == ap_board.LICHEE_RV:
+     from adafruit_blinka.board.lichee_rv import *
+ 
  elif "sphinx" in sys.modules:
      pass
  
diff --combined src/digitalio.py
index 6b89bf0,0969f35..b770b8a
--- 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:
@@@ -34,6 -32,8 +34,8 @@@ elif detector.chip.T186
      from adafruit_blinka.microcontroller.tegra.t186.pin import Pin
  elif detector.chip.T194:
      from adafruit_blinka.microcontroller.tegra.t194.pin import Pin
+ elif detector.chip.T234:
+     from adafruit_blinka.microcontroller.tegra.t234.pin import Pin
  elif detector.chip.S905:
      from adafruit_blinka.microcontroller.amlogic.s905.pin import Pin
  elif detector.chip.S905X3:
@@@ -54,8 -54,6 +56,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:
@@@ -98,6 -96,8 +100,8 @@@ elif detector.chip.H616
      from adafruit_blinka.microcontroller.allwinner.h616.pin import Pin
  elif detector.board.pico_u2if:
      from adafruit_blinka.microcontroller.rp2040_u2if.pin import Pin
+ elif detector.board.LICHEE_RV:
+     from adafruit_blinka.microcontroller.allwinner.D1.pin import Pin
  elif (
      detector.board.feather_u2if
      or detector.board.qtpy_u2if
diff --combined src/microcontroller/__init__.py
index 6865c4e,9bd7d09..6bc4587
--- 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:
@@@ -64,6 -62,8 +64,8 @@@ elif chip_id == ap_chip.T186
      from adafruit_blinka.microcontroller.tegra.t186 import *
  elif chip_id == ap_chip.T194:
      from adafruit_blinka.microcontroller.tegra.t194 import *
+ elif chip_id == ap_chip.T234:
+     from adafruit_blinka.microcontroller.tegra.t234 import *
  elif chip_id == ap_chip.S905:
      from adafruit_blinka.microcontroller.amlogic.s905 import *
  elif chip_id == ap_chip.S905X3:
@@@ -78,8 -78,6 +80,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,8 +124,8 @@@ elif chip_id == ap_chip.MT8167
      from adafruit_blinka.microcontroller.mt8167 import *
  elif chip_id == ap_chip.RP2040_U2IF:
      from adafruit_blinka.microcontroller.rp2040_u2if import *
+ elif chip_id == ap_chip.D1_RISCV:
+     from adafruit_blinka.microcontroller.allwinner.D1 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:
diff --combined src/microcontroller/pin.py
index 79627c0,196aa03..b4d595c
--- 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:
@@@ -51,6 -49,8 +51,8 @@@ elif chip_id == ap_chip.T186
      from adafruit_blinka.microcontroller.tegra.t186.pin import *
  elif chip_id == ap_chip.T194:
      from adafruit_blinka.microcontroller.tegra.t194.pin import *
+ elif chip_id == ap_chip.T234:
+     from adafruit_blinka.microcontroller.tegra.t234.pin import *
  elif chip_id == ap_chip.S905:
      from adafruit_blinka.microcontroller.amlogic.s905.pin import *
  elif chip_id == ap_chip.S905X3:
@@@ -81,8 -81,6 +83,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:
@@@ -105,6 -103,8 +107,8 @@@ elif chip_id == ap_chip.MT8167
      from adafruit_blinka.microcontroller.mt8167.pin import *
  elif chip_id == ap_chip.RP2040_U2IF:
      from adafruit_blinka.microcontroller.rp2040_u2if.pin import *
+ elif chip_id == ap_chip.D1_RISCV:
+     from adafruit_blinka.microcontroller.allwinner.D1.pin import *
  elif "sphinx" in sys.modules:
      # pylint: disable=unused-import
      from adafruit_blinka.microcontroller.generic_micropython import Pin