From: Ryan L <ryestar101@gmail.com>
Date: Sat, 15 Apr 2023 20:30:43 +0000 (+0100)
Subject: Merge remote-tracking branch 'adafruit/main'
X-Git-Tag: 8.23.0~1^2~11
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/7ed38d8a5d513ca1bc04cd491079069f45841744?hp=-c

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

7ed38d8a5d513ca1bc04cd491079069f45841744
diff --combined src/board.py
index fc3b754,89a2a73..bdb94ac
--- a/src/board.py
+++ b/src/board.py
@@@ -61,6 -61,9 +61,9 @@@ elif board_id == ap_board.BEAGLEBONE
  elif board_id == ap_board.BEAGLEBONE_BLACK:
      from adafruit_blinka.board.beagleboard.beaglebone_black import *
  
+ elif board_id == ap_board.BEAGLEBONE_BLUE:
+     from adafruit_blinka.board.beagleboard.beaglebone_blue import *
+ 
  elif board_id == ap_board.BEAGLEBONE_GREEN:
      from adafruit_blinka.board.beagleboard.beaglebone_black import *
  
@@@ -163,6 -166,9 +166,9 @@@ elif board_id == ap_board.JETSON_NX
  elif board_id == ap_board.JETSON_AGX_ORIN:
      from adafruit_blinka.board.nvidia.jetson_orin import *
  
+ elif board_id in (ap_board.JETSON_ORIN_NX, ap_board.JETSON_ORIN_NANO):
+     from adafruit_blinka.board.nvidia.jetson_orin_nx import *
+ 
  elif board_id == ap_board.CLARA_AGX_XAVIER:
      from adafruit_blinka.board.nvidia.clara_agx_xavier import *
  
@@@ -217,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 *
  
@@@ -301,6 -301,15 +307,15 @@@ elif board_id == ap_board.PICO_U2IF
  elif board_id == ap_board.FEATHER_U2IF:
      from adafruit_blinka.board.feather_u2if import *
  
+ elif board_id == ap_board.FEATHER_CAN_U2IF:
+     from adafruit_blinka.board.feather_can_u2if import *
+ 
+ elif board_id == ap_board.FEATHER_EPD_U2IF:
+     from adafruit_blinka.board.feather_epd_u2if import *
+ 
+ elif board_id == ap_board.FEATHER_RFM_U2IF:
+     from adafruit_blinka.board.feather_rfm_u2if import *
+ 
  elif board_id == ap_board.QTPY_U2IF:
      from adafruit_blinka.board.qtpy_u2if import *
  
@@@ -340,15 -349,16 +355,16 @@@ elif board_id is None
  
      package = str(pkg_resources.get_distribution("adafruit_platformdetect")).split()
      raise NotImplementedError(
-         "{1} version {2} was unable to identify the board and/or microcontroller running "
-         "the {0} platform. Please be sure you have the latest packages running: 'pip3 install "
-         "--upgrade adafruit-blinka adafruit-platformdetect'".format(
-             platform.system(), package[0], package[1]
-         )
+         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:
+         'pip3 install --upgrade adafruit-blinka adafruit-platformdetect'
+         """
      )
  
  else:
-     raise NotImplementedError("Board not supported {}".format(board_id))
+     raise NotImplementedError(f"Board not supported {board_id}.")
  
  if "SCL" in locals() and "SDA" in locals():
  
diff --combined src/pwmio.py
index 8584c19,57854df..d19a855
--- a/src/pwmio.py
+++ b/src/pwmio.py
@@@ -9,7 -9,7 +9,7 @@@ Not supported by all boards
  
  * Author(s): Melissa LeBlanc-Williams
  """
- 
+ # pylint: disable=too-many-boolean-expressions
  import sys
  
  from adafruit_blinka.agnostic import detector
@@@ -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:
@@@ -40,6 -38,9 +40,9 @@@ elif detector.board.pico_u2if
      from adafruit_blinka.microcontroller.rp2040_u2if.pwmio import PWMOut
  elif (
      detector.board.feather_u2if
+     or detector.board.feather_can_u2if
+     or detector.board.feather_epd_u2if
+     or detector.board.feather_rfm_u2if
      or detector.board.qtpy_u2if
      or detector.board.itsybitsy_u2if
      or detector.board.macropad_u2if