From: Ryan L <ryestar101@gmail.com>
Date: Tue, 3 Jan 2023 20:39:21 +0000 (+0000)
Subject: Merge remote-tracking branch 'adafruit/main'
X-Git-Tag: 8.23.0~1^2~16
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/c3bfd01efa31a426ec6eb258598b1871bb04a178?hp=-c

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

c3bfd01efa31a426ec6eb258598b1871bb04a178
diff --combined src/analogio.py
index 87852de,c553564..03b1620
--- a/src/analogio.py
+++ b/src/analogio.py
@@@ -29,12 -29,14 +29,16 @@@ elif detector.chip.RK3308
      from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
  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.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 70e6348,8654cd8..36147ab
--- a/src/board.py
+++ b/src/board.py
@@@ -178,6 -178,9 +178,9 @@@ elif board_id == ap_board.ODROID_C4
  elif board_id == ap_board.ODROID_N2:
      from adafruit_blinka.board.hardkernel.odroidn2 import *
  
+ elif board_id == ap_board.ODROID_M1:
+     from adafruit_blinka.board.hardkernel.odroidm1 import *
+ 
  elif board_id == ap_board.KHADAS_VIM3:
      from adafruit_blinka.board.khadas.khadasvim3 import *
  
@@@ -211,12 -214,6 +214,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 *
  
@@@ -226,6 -223,9 +229,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_CM3:
+     from adafruit_blinka.board.radxa.radxacm3 import *
+ 
  elif board_id == ap_board.RADXA_ZERO:
      from adafruit_blinka.board.radxa.radxazero import *
  
@@@ -235,12 -235,18 +241,18 @@@ 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_5:
+     from adafruit_blinka.board.radxa.rock5 import *
+ 
  elif board_id == ap_board.ROCK_PI_E:
      from adafruit_blinka.board.radxa.rockpie import *
  
  elif board_id == ap_board.UDOO_X86:
      from adafruit_blinka.board.udoo_x86ultra import *
  
+ elif board_id == ap_board.ODYSSEY_X86J41X5:
+     from adafruit_blinka.board.x86j41x5 import *
+ 
  elif board_id == ap_board.STM32MP157C_DK2:
      from adafruit_blinka.board.stm32.stm32mp157c_dk2 import *
  
@@@ -256,6 -262,12 +268,12 @@@ elif board_id == ap_board.LUBANCAT_IMX6
  elif board_id == ap_board.LUBANCAT_STM32MP157:
      from adafruit_blinka.board.lubancat.lubancat_stm32mp157 import *
  
+ elif board_id == ap_board.LUBANCAT_ZERO:
+     from adafruit_blinka.board.lubancat.lubancat_zero import *
+ 
+ elif board_id == ap_board.LUBANCAT1:
+     from adafruit_blinka.board.lubancat.lubancat1 import *
+ 
  elif board_id == ap_board.NANOPI_NEO_AIR:
      from adafruit_blinka.board.nanopi.neoair import *
  
diff --combined src/digitalio.py
index 2c6566a,a5c7b44..60fbfe6
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@@ -14,6 -14,7 +14,7 @@@ from adafruit_blinka.agnostic import bo
  
  # pylint: disable=ungrouped-imports,wrong-import-position
  
+ # By Chip Class
  if detector.chip.BCM2XXX:
      from adafruit_blinka.microcontroller.bcm283x.pin import Pin
  elif detector.chip.AM33XX:
@@@ -24,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:
@@@ -42,7 -39,7 +43,7 @@@ 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.board.aml_s905x_cc:
+ elif detector.chip.S905X:
      from adafruit_blinka.microcontroller.amlogic.s905x.pin import Pin
  elif detector.chip.S905X3:
      from adafruit_blinka.microcontroller.amlogic.s905x3.pin import Pin
@@@ -62,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:
@@@ -76,24 -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.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.board.ftdi_ft232h:
-     from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin
- elif detector.board.ftdi_ft2232h:
-     from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.pin import Pin
- elif detector.board.binho_nova:
-     from adafruit_blinka.microcontroller.nova.pin import Pin
- elif detector.board.greatfet_one:
-     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import Pin
- elif detector.chip.STM32F405:
-     from machine import Pin
- elif detector.chip.RP2040:
-     from machine import Pin
- elif detector.board.microchip_mcp2221:
-     from adafruit_blinka.microcontroller.mcp2221.pin import Pin
+ elif detector.chip.RK3566:
+     from adafruit_blinka.microcontroller.rockchip.rk3566.pin import Pin
  elif detector.chip.PENTIUM_N3710:
      from adafruit_blinka.microcontroller.pentium.n3710.pin import Pin
+ elif detector.chip.ATOM_J4105:
+     from adafruit_blinka.microcontroller.pentium.j4105.pin import Pin
  elif detector.chip.STM32MP157:
      from adafruit_blinka.microcontroller.stm32.stm32mp157.pin import Pin
  elif detector.chip.MT8167:
@@@ -106,18 -91,26 +99,26 @@@ elif detector.chip.H6
      from adafruit_blinka.microcontroller.allwinner.h6.pin import Pin
  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:
+ elif detector.chip.D1_RISCV:
      from adafruit_blinka.microcontroller.allwinner.D1.pin import Pin
- elif (
-     detector.board.feather_u2if
-     or detector.board.qtpy_u2if
-     or detector.board.itsybitsy_u2if
-     or detector.board.macropad_u2if
-     or detector.board.qt2040_trinkey_u2if
- ):
+ # Special Case Boards
+ elif detector.board.ftdi_ft232h:
+     from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin
+ elif detector.board.ftdi_ft2232h:
+     from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.pin import Pin
+ elif detector.board.binho_nova:
+     from adafruit_blinka.microcontroller.nova.pin import Pin
+ elif detector.board.greatfet_one:
+     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import Pin
+ elif detector.board.microchip_mcp2221:
+     from adafruit_blinka.microcontroller.mcp2221.pin import Pin
+ elif detector.chip.RP2040_U2IF:
      from adafruit_blinka.microcontroller.rp2040_u2if.pin import Pin
+ # MicroPython Chips
+ elif detector.chip.STM32F405:
+     from machine import Pin
+ elif detector.chip.RP2040:
+     from machine import Pin
  
  from adafruit_blinka import Enum, ContextManaged
  
diff --combined src/microcontroller/__init__.py
index d4dc4c4,e9c9d02..8e7efe8
--- 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,8 -90,12 +98,12 @@@ 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.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.H3:
      from adafruit_blinka.microcontroller.allwinner.h3 import *
  elif chip_id == ap_chip.H5:
@@@ -126,6 -122,8 +130,8 @@@ elif chip_id == ap_chip.FT2232H
      from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h import *
  elif chip_id == ap_chip.PENTIUM_N3710:
      from adafruit_blinka.microcontroller.pentium.n3710 import *
+ elif chip_id == ap_chip.ATOM_J4105:
+     from adafruit_blinka.microcontroller.pentium.j4105 import *
  elif chip_id == ap_chip.STM32MP157:
      from adafruit_blinka.microcontroller.stm32.stm32mp157 import *
  elif chip_id == ap_chip.MT8167:
diff --combined src/microcontroller/pin.py
index 7d57700,9ab4aca..44f5224
--- 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,14 -93,22 +101,22 @@@ 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.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.RK3568B2:
+     from adafruit_blinka.microcontroller.rockchip.rk3568b2.pin import *
  elif chip_id == ap_chip.MIPS24KC:
      from adafruit_blinka.microcontroller.atheros.ar9331.pin import *
  elif chip_id == ap_chip.MIPS24KEC:
      from adafruit_blinka.microcontroller.mips24kec.pin import *
  elif chip_id == ap_chip.PENTIUM_N3710:
      from adafruit_blinka.microcontroller.pentium.n3710.pin import *
+ elif chip_id == ap_chip.ATOM_J4105:
+     from adafruit_blinka.microcontroller.pentium.j4105.pin import *
  elif chip_id == ap_chip.STM32MP157:
      from adafruit_blinka.microcontroller.stm32.stm32mp157.pin import *
  elif chip_id == ap_chip.MT8167: