]> Repositories - Adafruit_Blinka-hackapet.git/commitdiff
Merge branch 'adafruit:main' into main
authorRyzer58 <75142963+Ryzer58@users.noreply.github.com>
Sat, 24 Sep 2022 20:25:56 +0000 (21:25 +0100)
committerGitHub <noreply@github.com>
Sat, 24 Sep 2022 20:25:56 +0000 (21:25 +0100)
1  2 
src/analogio.py
src/board.py
src/digitalio.py
src/microcontroller/__init__.py
src/microcontroller/pin.py
src/pwmio.py

diff --cc src/analogio.py
Simple merge
diff --cc src/board.py
Simple merge
Simple merge
index 6bc4587ac2df6ed0077b444b3680768b9ffd5137,debf41c3423ea18a3743d2696eea2a83682887a2..f3ca3289da4c595d1f72c990c0f0fc34ad4465cf
@@@ -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:
index b4d595c2a31d8a03edefe0fda7557ee3ea0081d0,a46c6cd21fe9cdeeb4bf493dadd549d4dceb1615..95e9e9c95f05858637a005b0fa1f8b68c6131d2d
@@@ -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 ca6402883910bab612da649bdf6944391b33966f,ccf44209647be4c9e2987951a4fefc8d897cdc56..e2832975c7eca0136e994c527d56d315971177f1
@@@ -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: