From: Ryan L 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?hp=-c Merge remote-tracking branch 'adafruit/main' --- 8f9a43ce8fb327a7e4dcabcf8df296a25236e495 diff --combined src/board.py index cfaad6c,0c68fe3..8d68aac --- a/src/board.py +++ b/src/board.py @@@ -226,12 -226,6 +226,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 * @@@ -364,8 -358,12 +364,12 @@@ elif board_id is None f""" {package[0]} version {package[1]} was unable to identify the board and/or microcontroller running the {platform.system()} platform. Please be sure you - have the latest packages running: + have the latest packages by running: 'pip3 install --upgrade adafruit-blinka adafruit-platformdetect' + + If you are running the latest package, your board may not yet be supported. Please + open a New Issue on GitHub at https://github.com/adafruit/Adafruit_Blinka/issues and + select New Board Request. """ ) diff --combined src/digitalio.py index 657e7da,b987c20..5dfadf6 --- a/src/digitalio.py +++ b/src/digitalio.py @@@ -21,14 -21,10 +21,14 @@@ elif detector.chip.AM33XX from adafruit_blinka.microcontroller.am335x.pin import Pin elif detector.chip.AM65XX: from adafruit_blinka.microcontroller.am65xx.pin import Pin - elif detector.chip.JH71x0: + 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.a20.pin import Pin +elif detector.chip.SUN7I: + from adafruit_blinka.microcontroller.allwinner.a20.pin import Pin elif detector.chip.SUN8I: from adafruit_blinka.microcontroller.allwinner.h3.pin import Pin elif detector.chip.SAMA5: @@@ -63,14 -59,12 +63,14 @@@ 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.a20.pin import Pin +elif detector.chip.A20: + from adafruit_blinka.microcontroller.allwinner.a20.pin import Pin elif detector.chip.A64: from adafruit_blinka.microcontroller.allwinner.a64.pin import Pin elif detector.chip.A33: from adafruit_blinka.microcontroller.allwinner.a33.pin import Pin -elif detector.chip.A20: - from adafruit_blinka.microcontroller.allwinner.a20.pin import Pin elif detector.chip.MIPS24KEC: from adafruit_blinka.microcontroller.mips24kec.pin import Pin elif detector.chip.RK3308: diff --combined 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: @@@ -86,14 -82,12 +86,14 @@@ 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.a20 import * +elif chip_id == ap_chip.A20: + from adafruit_blinka.microcontroller.allwinner.a20 import * elif chip_id == ap_chip.A64: from adafruit_blinka.microcontroller.allwinner.a64 import * elif chip_id == ap_chip.A33: from adafruit_blinka.microcontroller.allwinner.a33 import * -elif chip_id == ap_chip.A20: - from adafruit_blinka.microcontroller.allwinner.a20 import * elif chip_id == ap_chip.RK3308: from adafruit_blinka.microcontroller.rockchip.rk3308 import * elif chip_id == ap_chip.RK3399: diff --combined 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: @@@ -89,14 -85,12 +89,14 @@@ 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.a20.pin import * +elif chip_id == ap_chip.A20: + from adafruit_blinka.microcontroller.allwinner.a20.pin import * elif chip_id == ap_chip.A64: from adafruit_blinka.microcontroller.allwinner.a64.pin import * elif chip_id == ap_chip.A33: from adafruit_blinka.microcontroller.allwinner.a33.pin import * -elif chip_id == ap_chip.A20: - from adafruit_blinka.microcontroller.allwinner.a20.pin import * elif chip_id == ap_chip.RK3308: from adafruit_blinka.microcontroller.rockchip.rk3308.pin import * elif chip_id == ap_chip.RK3399: