From: Ryzer58 <75142963+Ryzer58@users.noreply.github.com> Date: Sat, 24 Sep 2022 20:25:56 +0000 (+0100) Subject: Merge branch 'adafruit:main' into main X-Git-Tag: 8.23.0~1^2~23^2 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/d89450d952bd7538b72b4b01c59eb76c467593d0?hp=-c Merge branch 'adafruit:main' into main --- d89450d952bd7538b72b4b01c59eb76c467593d0 diff --combined src/analogio.py index 54c5cec,4b7f9b0..87852de --- a/src/analogio.py +++ b/src/analogio.py @@@ -22,6 -22,9 +22,9 @@@ if detector.board.microchip_mcp2221 elif detector.board.greatfet_one: from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogIn from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogOut + elif detector.board.any_siemens_simatic_iot2000: + from adafruit_blinka.microcontroller.am65xx.analogio import AnalogIn + from adafruit_blinka.microcontroller.am65xx.analogio import AnalogOut elif detector.chip.RK3308: from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn elif detector.chip.RK3399: @@@ -30,8 -33,6 +33,8 @@@ 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 0b8d1a3,4b8ae56..7204a2e --- a/src/board.py +++ b/src/board.py @@@ -11,7 -11,7 +11,7 @@@ See `CircuitPython:board` in CircuitPyt """ - __version__ = "0.0.0-auto.0" + __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_Blinka.git" __blinka__ = True @@@ -208,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 * @@@ -280,6 -277,9 +280,9 @@@ elif board_id == ap_board.QT2040_TRINKE elif board_id == ap_board.LICHEE_RV: from adafruit_blinka.board.lichee_rv import * + elif board_id == ap_board.SIEMENS_SIMATIC_IOT2050_ADV: + from adafruit_blinka.board.siemens.siemens_iot2050 import * + elif "sphinx" in sys.modules: pass diff --combined src/digitalio.py index b770b8a,7f64fb1..deedebb --- a/src/digitalio.py +++ b/src/digitalio.py @@@ -18,12 -18,12 +18,14 @@@ if detector.chip.BCM2XXX from adafruit_blinka.microcontroller.bcm283x.pin import Pin 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: 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: @@@ -56,8 -56,6 +58,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: diff --combined src/microcontroller/__init__.py index 6bc4587,debf41c..f3ca328 --- a/src/microcontroller/__init__.py +++ b/src/microcontroller/__init__.py @@@ -44,10 -44,10 +44,12 @@@ elif chip_id == ap_chip.DRA74X from adafruit_blinka.microcontroller.dra74x import * 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: 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: @@@ -80,8 -80,6 +82,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: diff --combined src/microcontroller/pin.py index b4d595c,a46c6cd..95e9e9c --- a/src/microcontroller/pin.py +++ b/src/microcontroller/pin.py @@@ -29,10 -29,10 +29,12 @@@ elif chip_id == ap_chip.DRA74X from adafruit_blinka.microcontroller.dra74x.pin import * 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: 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: @@@ -83,8 -83,6 +85,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: diff --combined src/pwmio.py index ca64028,ccf4420..e283297 --- a/src/pwmio.py +++ b/src/pwmio.py @@@ -22,10 -22,10 +22,12 @@@ elif detector.board.any_coral_board from adafruit_blinka.microcontroller.generic_linux.sysfs_pwmout import PWMOut elif detector.board.any_giant_board: from adafruit_blinka.microcontroller.generic_linux.sysfs_pwmout import PWMOut +elif detector.board.any_pcduino_board: + from adafruit_blinka.microcontroller.generic_linux.sysfs_pwmout import PMWOut elif detector.board.any_beaglebone: from adafruit_blinka.microcontroller.am335x.sysfs_pwmout import PWMOut + elif detector.board.any_siemens_simatic_iot2000: + from adafruit_blinka.microcontroller.am65xx.pwmout import PWMOut elif detector.board.any_rock_pi_board: from adafruit_blinka.microcontroller.rockchip.PWMOut import PWMOut elif detector.board.binho_nova: