From: Ryan L <ryestar101@gmail.com>
Date: Mon, 31 Jul 2023 18:30:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'adafruit/main'
X-Git-Tag: 8.23.0~1^2~9
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/2ac9e76bea9e29fcda185b73ff374d84b8439858?hp=-c

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

2ac9e76bea9e29fcda185b73ff374d84b8439858
diff --combined src/board.py
index bdb94ac,74aeb5c..9b80fb0
--- a/src/board.py
+++ b/src/board.py
@@@ -223,12 -223,6 +223,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 *
  
@@@ -328,6 -322,9 +328,9 @@@ elif board_id == ap_board.MACROPAD_U2IF
  elif board_id == ap_board.QT2040_TRINKEY_U2IF:
      from adafruit_blinka.board.qt2040_trinkey_u2if import *
  
+ elif board_id == ap_board.KB2040_U2IF:
+     from adafruit_blinka.board.kb2040_u2if import *
+ 
  elif board_id == ap_board.LICHEE_RV:
      from adafruit_blinka.board.lichee_rv import *
  
diff --combined src/pwmio.py
index d19a855,886241f..b4819da
--- a/src/pwmio.py
+++ b/src/pwmio.py
@@@ -22,8 -22,6 +22,8 @@@ 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 PWMOut
  elif detector.board.any_beaglebone:
      from adafruit_blinka.microcontroller.am335x.sysfs_pwmout import PWMOut
  elif detector.board.any_siemens_simatic_iot2000:
@@@ -47,6 -45,7 +47,7 @@@ elif 
      or detector.board.itsybitsy_u2if
      or detector.board.macropad_u2if
      or detector.board.qt2040_trinkey_u2if
+     or detector.board.kb2040_u2if
  ):
      from adafruit_blinka.microcontroller.rp2040_u2if.pwmio import PWMOut
  elif "sphinx" in sys.modules: