Merge branch 'main' into main

[Adafruit_Blinka-hackapet.git] / src / microcontroller / pin.py

diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 29153a87b2b7dcfc8d7e783f5c1dc74929cde1d6..fcaa155c0fe2080c29aad13b25f2c85e598c9014 100644 (file)
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: MIT
 """Pins named after their chip name."""
 #
 # SPDX-License-Identifier: MIT
 """Pins named after their chip name."""

-

 import sys
 from adafruit_platformdetect.constants import chips as ap_chip, boards as ap_boards
 from adafruit_blinka.agnostic import board_id, chip_id
 import sys
 from adafruit_platformdetect.constants import chips as ap_chip, boards as ap_boards
 from adafruit_blinka.agnostic import board_id, chip_id


@@ -96,6 +95,8 @@ elif chip_id == ap_chip.BINHO:
     from adafruit_blinka.microcontroller.nova.pin import *
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import *
     from adafruit_blinka.microcontroller.nova.pin import *
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import *

+elif chip_id == ap_chip.OS_AGNOSTIC:
+    from adafruit_blinka.microcontroller.generic_agnostic_board.pin import *

 elif chip_id == ap_chip.MCP2221:
     from adafruit_blinka.microcontroller.mcp2221.pin import *
 elif chip_id == ap_chip.A10:
 elif chip_id == ap_chip.MCP2221:
     from adafruit_blinka.microcontroller.mcp2221.pin import *
 elif chip_id == ap_chip.A10:


@@ -119,7 +120,7 @@ elif chip_id == ap_chip.RK3328:
 elif chip_id == ap_chip.RK3566:
     from adafruit_blinka.microcontroller.rockchip.rk3566.pin import *
 elif chip_id == ap_chip.RK3568:
 elif chip_id == ap_chip.RK3566:
     from adafruit_blinka.microcontroller.rockchip.rk3566.pin import *
 elif chip_id == ap_chip.RK3568:

-    if board_id in ("ODROID_M1"):
+    if board_id in (ap_boards.ODROID_M1,):

         from adafruit_blinka.microcontroller.rockchip.rk3568b2.pin import *
     else:
         from adafruit_blinka.microcontroller.rockchip.rk3568.pin import *
         from adafruit_blinka.microcontroller.rockchip.rk3568b2.pin import *
     else:
         from adafruit_blinka.microcontroller.rockchip.rk3568.pin import *


@@ -139,6 +140,10 @@ elif chip_id == ap_chip.RP2040_U2IF:
     from adafruit_blinka.microcontroller.rp2040_u2if.pin import *
 elif chip_id == ap_chip.D1_RISCV:
     from adafruit_blinka.microcontroller.allwinner.D1.pin import *
     from adafruit_blinka.microcontroller.rp2040_u2if.pin import *
 elif chip_id == ap_chip.D1_RISCV:
     from adafruit_blinka.microcontroller.allwinner.D1.pin import *

+elif chip_id == ap_chip.CV1800B:
+    from adafruit_blinka.microcontroller.cv1800b.pin import *
+elif chip_id == ap_chip.TH1520:
+    from adafruit_blinka.microcontroller.thead.th1520.pin import *

 elif "sphinx" in sys.modules:
     # pylint: disable=unused-import
     from adafruit_blinka.microcontroller.generic_micropython import Pin
 elif "sphinx" in sys.modules:
     # pylint: disable=unused-import
     from adafruit_blinka.microcontroller.generic_micropython import Pin