From: Ryan L <ryestar101@gmail.com>
Date: Sun, 12 Feb 2023 19:54:51 +0000 (+0000)
Subject: Merge remote-tracking branch 'adafruit/main'
X-Git-Tag: 8.23.0~1^2~15
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/5ff566c864a4ce65feda222ec35f4dea9a4089e1?hp=-c

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

5ff566c864a4ce65feda222ec35f4dea9a4089e1
diff --combined src/analogio.py
index 03b1620,58381b0..5721ef7
--- a/src/analogio.py
+++ b/src/analogio.py
@@@ -31,14 -31,14 +31,16 @@@ elif detector.chip.RK3399
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
  elif detector.chip.RK3588:
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
+ elif detector.chip.RK3568:
+     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
  elif detector.chip.RK3566:
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
  elif detector.chip.IMX6ULL:
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
  elif detector.chip.STM32MP157:
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 +elif detector.chip.A10:
 +    from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
  elif "sphinx" in sys.modules:
      pass
  elif detector.board.pico_u2if:
diff --combined src/board.py
index 36147ab,25283e9..c389fde
--- a/src/board.py
+++ b/src/board.py
@@@ -127,6 -127,9 +127,9 @@@ 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:
+     from adafruit_blinka.board.orangepi.orangepi5 import *
+ 
  elif board_id == ap_board.BANANA_PI_M2_ZERO:
      from adafruit_blinka.board.bananapi.bpim2zero import *
  
@@@ -214,12 -217,6 +217,12 @@@ 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.PCDUINO3:
 +    from adafruit_blinka.board.linksprite.pcduino3 import *
 +
  elif board_id == ap_board.SOPINE:
      from adafruit_blinka.board.soPine import *
  
@@@ -232,6 -229,9 +235,9 @@@ elif board_id == ap_board.ONION_OMEGA2
  elif board_id == ap_board.RADXA_CM3:
      from adafruit_blinka.board.radxa.radxacm3 import *
  
+ elif board_id == ap_board.ROCK_PI_3A:
+     from adafruit_blinka.board.radxa.rockpi3a import *
+ 
  elif board_id == ap_board.RADXA_ZERO:
      from adafruit_blinka.board.radxa.radxazero import *
  
@@@ -241,6 -241,9 +247,9 @@@ elif board_id == ap_board.ROCK_PI_S
  elif board_id == ap_board.ROCK_PI_4:
      from adafruit_blinka.board.radxa.rockpi4 import *
  
+ elif board_id == ap_board.ROCK_PI_4_C_PLUS:
+     from adafruit_blinka.board.radxa.rockpi4cplus import *
+ 
  elif board_id == ap_board.ROCK_PI_5:
      from adafruit_blinka.board.radxa.rock5 import *
  
@@@ -274,6 -277,9 +283,9 @@@ elif board_id == ap_board.LUBANCAT_ZERO
  elif board_id == ap_board.LUBANCAT1:
      from adafruit_blinka.board.lubancat.lubancat1 import *
  
+ elif board_id == ap_board.LUBANCAT2:
+     from adafruit_blinka.board.lubancat.lubancat2 import *
+ 
  elif board_id == ap_board.NANOPI_NEO_AIR:
      from adafruit_blinka.board.nanopi.neoair import *
  
@@@ -307,9 -313,15 +319,15 @@@ elif board_id == ap_board.LICHEE_RV
  elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_ADV:
      from adafruit_blinka.board.siemens.siemens_iot2050 import *
  
+ elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_BASIC:
+     from adafruit_blinka.board.siemens.siemens_iot2050 import *
+ 
  elif board_id == ap_board.AML_S905X_CC:
      from adafruit_blinka.board.librecomputer.aml_s905x_cc_v1 import *
  
+ elif board_id == ap_board.GENERIC_LINUX_PC:
+     from adafruit_blinka.board.generic_linux_pc import *
+ 
  elif "sphinx" in sys.modules:
      pass
  
diff --combined src/digitalio.py
index 60fbfe6,ed31d0a..46af5ea
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@@ -25,10 -25,6 +25,10 @@@ 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.SUN7I:
 +    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:
@@@ -63,10 -59,6 +63,10 @@@ 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.A30:
 +    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:
@@@ -77,12 -69,16 +77,16 @@@ elif detector.chip.RK3308
      from adafruit_blinka.microcontroller.rockchip.rk3308.pin import Pin
  elif detector.chip.RK3399:
      from adafruit_blinka.microcontroller.rockchip.rk3399.pin import Pin
+ elif detector.chip.RK3399_T:
+     from adafruit_blinka.microcontroller.rockchip.rk3399_t.pin import Pin
  elif detector.chip.RK3588:
      from adafruit_blinka.microcontroller.rockchip.rk3588.pin import Pin
  elif detector.chip.RK3328:
      from adafruit_blinka.microcontroller.rockchip.rk3328.pin import Pin
  elif detector.chip.RK3566:
      from adafruit_blinka.microcontroller.rockchip.rk3566.pin import Pin
+ elif detector.chip.RK3568:
+     from adafruit_blinka.microcontroller.rockchip.rk3568.pin import Pin
  elif detector.chip.PENTIUM_N3710:
      from adafruit_blinka.microcontroller.pentium.n3710.pin import Pin
  elif detector.chip.ATOM_J4105:
diff --combined src/microcontroller/__init__.py
index 8e7efe8,0951c0e..a73c4dd
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -48,10 -48,6 +48,10 @@@ elif chip_id == ap_chip.AM65XX
      from adafruit_blinka.microcontroller.am65xx 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.SUN7I:
 +    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:
@@@ -86,10 -82,6 +86,10 @@@ 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.A20:
 +    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:
@@@ -98,12 -90,16 +98,16 @@@ elif chip_id == ap_chip.RK3308
      from adafruit_blinka.microcontroller.rockchip.rk3308 import *
  elif chip_id == ap_chip.RK3399:
      from adafruit_blinka.microcontroller.rockchip.rk3399 import *
+ elif chip_id == ap_chip.RK3399_T:
+     from adafruit_blinka.microcontroller.rockchip.rk3399_t import *
  elif chip_id == ap_chip.RK3588:
      from adafruit_blinka.microcontroller.rockchip.rk3588 import *
  elif chip_id == ap_chip.RK3328:
      from adafruit_blinka.microcontroller.rockchip.rk3328 import *
  elif chip_id == ap_chip.RK3566:
      from adafruit_blinka.microcontroller.rockchip.rk3566 import *
+ elif chip_id == ap_chip.RK3568:
+     from adafruit_blinka.microcontroller.rockchip.rk3568 import *
  elif chip_id == ap_chip.H3:
      from adafruit_blinka.microcontroller.allwinner.h3 import *
  elif chip_id == ap_chip.H5:
diff --combined src/microcontroller/pin.py
index 44f5224,a5b7ede..bd6702b
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -33,10 -33,6 +33,10 @@@ elif chip_id == ap_chip.AM65XX
      from adafruit_blinka.microcontroller.am65xx.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.SUN7I:
 +    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:
@@@ -89,10 -85,6 +89,10 @@@ 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.A20:
 +    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:
@@@ -101,12 -93,16 +101,16 @@@ elif chip_id == ap_chip.RK3308
      from adafruit_blinka.microcontroller.rockchip.rk3308.pin import *
  elif chip_id == ap_chip.RK3399:
      from adafruit_blinka.microcontroller.rockchip.rk3399.pin import *
+ elif chip_id == ap_chip.RK3399_T:
+     from adafruit_blinka.microcontroller.rockchip.rk3399_t.pin import *
  elif chip_id == ap_chip.RK3588:
      from adafruit_blinka.microcontroller.rockchip.rk3588.pin import *
  elif chip_id == ap_chip.RK3328:
      from adafruit_blinka.microcontroller.rockchip.rk3328.pin import *
  elif chip_id == ap_chip.RK3566:
      from adafruit_blinka.microcontroller.rockchip.rk3566.pin import *
+ elif chip_id == ap_chip.RK3568:
+     from adafruit_blinka.microcontroller.rockchip.rk3568.pin import *
  elif chip_id == ap_chip.RK3568B2:
      from adafruit_blinka.microcontroller.rockchip.rk3568b2.pin import *
  elif chip_id == ap_chip.MIPS24KC: