From: Ryan L <ryestar101@gmail.com>
Date: Tue, 12 Sep 2023 21:15:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'adafruit/main'
X-Git-Tag: 8.23.0~1^2~2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/8f9a43ce8fb327a7e4dcabcf8df296a25236e495

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

8f9a43ce8fb327a7e4dcabcf8df296a25236e495
diff --cc src/microcontroller/__init__.py
index d04d2ee,baf06cd..2bc4736
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@@ -46,12 -46,8 +46,12 @@@ elif chip_id == ap_chip.AM33XX
      from adafruit_blinka.microcontroller.am335x import *
  elif chip_id == ap_chip.AM65XX:
      from adafruit_blinka.microcontroller.am65xx import *
- elif chip_id == ap_chip.JH71x0:
+ elif chip_id == ap_chip.JH71X0:
      from adafruit_blinka.microcontroller.starfive.JH71x0 import *
 +elif chip_id == ap_chip.SUN4I:
 +    from adafruit_blinka.microcontroller.allwinner.a20 import *
 +elif chip_id == ap_chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a20 import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3 import *
  elif chip_id == ap_chip.H5:
diff --cc src/microcontroller/pin.py
index fdd77dd,fdbced4..362fe43
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@@ -31,12 -31,8 +31,12 @@@ elif chip_id == ap_chip.AM33XX
      from adafruit_blinka.microcontroller.am335x.pin import *
  elif chip_id == ap_chip.AM65XX:
      from adafruit_blinka.microcontroller.am65xx.pin import *
- elif chip_id == ap_chip.JH71x0:
+ 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.a20.pin import *
 +elif chip_id == ap_chip.SUN7I:
 +    from adafruit_blinka.microcontroller.allwinner.a20.pin import *
  elif chip_id == ap_chip.SUN8I:
      from adafruit_blinka.microcontroller.allwinner.h3.pin import *
  elif chip_id == ap_chip.H3: