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?ds=sidebyside

Merge branch 'adafruit:main' into main
---

d89450d952bd7538b72b4b01c59eb76c467593d0
diff --cc 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:
diff --cc 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:
diff --cc 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: