Fixed microcontroller.pin import mappings

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

diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index 886064ed6bec6f47588492ff9a6ceef99afb0d49..a4d842569ff86b1bfdb351cb73994fc026368b75 100755 (executable)
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -11,7 +11,7 @@ import time
 from adafruit_platformdetect.constants import chips as ap_chip
 from adafruit_blinka import Enum
 from adafruit_blinka.agnostic import board_id, chip_id
 from adafruit_platformdetect.constants import chips as ap_chip
 from adafruit_blinka import Enum
 from adafruit_blinka.agnostic import board_id, chip_id

-
+import microcontroller.pin

 
 def delay_us(delay):
     """Sleep for delay usecs."""
 
 def delay_us(delay):
     """Sleep for delay usecs."""


@@ -37,12 +37,10 @@ class Pin(Enum):
         for key in dir(board):
             if getattr(board, key) is self:
                 return "board.{}".format(key)
         for key in dir(board):
             if getattr(board, key) is self:
                 return "board.{}".format(key)

-        import microcontroller.pin as pin
-

         # pylint: enable=import-outside-toplevel, cyclic-import
 
         # pylint: enable=import-outside-toplevel, cyclic-import
 

-        for key in dir(pin):
-            if getattr(pin, key) is self:
+        for key in dir(microcontroller.pin):
+            if getattr(microcontroller.pin, key) is self:

                 return "microcontroller.pin.{}".format(key)
         return repr(self)
 
                 return "microcontroller.pin.{}".format(key)
         return repr(self)
 


@@ -62,11 +60,11 @@ elif chip_id == ap_chip.BCM2XXX:
         "RASPBERRY_PI_400",
         "RASPBERRY_PI_CM4",
     ]:
         "RASPBERRY_PI_400",
         "RASPBERRY_PI_CM4",
     ]:

-        from adafruit_blinka.microcontroller.bcm2711.pin import *
+        from adafruit_blinka.microcontroller.bcm2711 import *

     else:
     else:

-        from adafruit_blinka.microcontroller.bcm283x.pin import *
+        from adafruit_blinka.microcontroller.bcm283x import *

 elif chip_id == ap_chip.DRA74X:
 elif chip_id == ap_chip.DRA74X:

-    from adafruit_blinka.microcontroller.dra74x.pin import *
+    from adafruit_blinka.microcontroller.dra74x import *

 elif chip_id == ap_chip.AM33XX:
     from adafruit_blinka.microcontroller.am335x import *
 elif chip_id == ap_chip.JH71x0:
 elif chip_id == ap_chip.AM33XX:
     from adafruit_blinka.microcontroller.am335x import *
 elif chip_id == ap_chip.JH71x0:


@@ -74,11 +72,11 @@ elif chip_id == ap_chip.JH71x0:
 elif chip_id == ap_chip.SUN8I:
     from adafruit_blinka.microcontroller.allwinner.h3 import *
 elif chip_id == ap_chip.H5:
 elif chip_id == ap_chip.SUN8I:
     from adafruit_blinka.microcontroller.allwinner.h3 import *
 elif chip_id == ap_chip.H5:

-    from adafruit_blinka.microcontroller.allwinner.h5.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h5 import *

 elif chip_id == ap_chip.H6:
 elif chip_id == ap_chip.H6:

-    from adafruit_blinka.microcontroller.allwinner.h6.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h6 import *

 elif chip_id == ap_chip.H616:
 elif chip_id == ap_chip.H616:

-    from adafruit_blinka.microcontroller.allwinner.h616.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h616 import *

 elif chip_id == ap_chip.SAMA5:
     from adafruit_blinka.microcontroller.sama5 import *
 elif chip_id == ap_chip.T210:
 elif chip_id == ap_chip.SAMA5:
     from adafruit_blinka.microcontroller.sama5 import *
 elif chip_id == ap_chip.T210:


@@ -88,55 +86,59 @@ elif chip_id == ap_chip.T186:
 elif chip_id == ap_chip.T194:
     from adafruit_blinka.microcontroller.tegra.t194 import *
 elif chip_id == ap_chip.S905:
 elif chip_id == ap_chip.T194:
     from adafruit_blinka.microcontroller.tegra.t194 import *
 elif chip_id == ap_chip.S905:

-    from adafruit_blinka.microcontroller.amlogic.s905.pin import *
+    from adafruit_blinka.microcontroller.amlogic.s905 import *

 elif chip_id == ap_chip.S905X3:
 elif chip_id == ap_chip.S905X3:

-    from adafruit_blinka.microcontroller.amlogic.s905x3.pin import *
+    from adafruit_blinka.microcontroller.amlogic.s905x3 import *

 elif chip_id == ap_chip.S922X:
 elif chip_id == ap_chip.S922X:

-    from adafruit_blinka.microcontroller.amlogic.s922x.pin import *
+    from adafruit_blinka.microcontroller.amlogic.s922x import *

 elif chip_id == ap_chip.EXYNOS5422:
 elif chip_id == ap_chip.EXYNOS5422:

-    from adafruit_blinka.microcontroller.samsung.exynos5422.pin import *
+    from adafruit_blinka.microcontroller.samsung.exynos5422 import *

 elif chip_id == ap_chip.APQ8016:
 elif chip_id == ap_chip.APQ8016:

-    from adafruit_blinka.microcontroller.snapdragon.apq8016.pin import *
+    from adafruit_blinka.microcontroller.snapdragon.apq8016 import *

 elif chip_id == ap_chip.A64:
 elif chip_id == ap_chip.A64:

-    from adafruit_blinka.microcontroller.allwinner.a64.pin import *
+    from adafruit_blinka.microcontroller.allwinner.a64 import *

 elif chip_id == ap_chip.A33:
 elif chip_id == ap_chip.A33:

-    from adafruit_blinka.microcontroller.allwinner.a33.pin import *
+    from adafruit_blinka.microcontroller.allwinner.a33 import *

 elif chip_id == ap_chip.RK3308:
 elif chip_id == ap_chip.RK3308:

-    from adafruit_blinka.microcontroller.rockchip.rk3308.pin import *
+    from adafruit_blinka.microcontroller.rockchip.rk3308 import *

 elif chip_id == ap_chip.RK3399:
 elif chip_id == ap_chip.RK3399:

-    from adafruit_blinka.microcontroller.rockchip.rk3399.pin import *
+    from adafruit_blinka.microcontroller.rockchip.rk3399 import *

 elif chip_id == ap_chip.RK3328:
 elif chip_id == ap_chip.RK3328:

-    from adafruit_blinka.microcontroller.rockchip.rk3328.pin import *
+    from adafruit_blinka.microcontroller.rockchip.rk3328 import *

 elif chip_id == ap_chip.H3:
 elif chip_id == ap_chip.H3:

-    from adafruit_blinka.microcontroller.allwinner.h3.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h3 import *

 elif chip_id == ap_chip.H5:
 elif chip_id == ap_chip.H5:

-    from adafruit_blinka.microcontroller.allwinner.h5.pin import *
+    from adafruit_blinka.microcontroller.allwinner.h5 import *

 elif chip_id == ap_chip.IMX8MX:
     from adafruit_blinka.microcontroller.nxp_imx8m import *
 elif chip_id == ap_chip.IMX6ULL:
     from adafruit_blinka.microcontroller.nxp_imx6ull import *
 elif chip_id == ap_chip.HFU540:
 elif chip_id == ap_chip.IMX8MX:
     from adafruit_blinka.microcontroller.nxp_imx8m import *
 elif chip_id == ap_chip.IMX6ULL:
     from adafruit_blinka.microcontroller.nxp_imx6ull import *
 elif chip_id == ap_chip.HFU540:

-    from adafruit_blinka.microcontroller.hfu540.pin import *
+    from adafruit_blinka.microcontroller.hfu540 import *

 elif chip_id == ap_chip.BINHO:
     from adafruit_blinka.microcontroller.nova import *
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330 import *
 elif chip_id == ap_chip.BINHO:
     from adafruit_blinka.microcontroller.nova import *
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330 import *

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

 elif chip_id == ap_chip.MIPS24KC:
     from adafruit_blinka.microcontroller.atheros.ar9331 import *
 elif chip_id == ap_chip.MIPS24KEC:
     from adafruit_blinka.microcontroller.mips24kec import *
 elif chip_id == ap_chip.FT232H:
 elif chip_id == ap_chip.MIPS24KC:
     from adafruit_blinka.microcontroller.atheros.ar9331 import *
 elif chip_id == ap_chip.MIPS24KEC:
     from adafruit_blinka.microcontroller.mips24kec import *
 elif chip_id == ap_chip.FT232H:

-    from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import *
+    from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h import *

 elif chip_id == ap_chip.FT2232H:
 elif chip_id == ap_chip.FT2232H:

-    from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.pin import *
+    from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h import *

 elif chip_id == ap_chip.PENTIUM_N3710:
 elif chip_id == ap_chip.PENTIUM_N3710:

-    from adafruit_blinka.microcontroller.pentium.n3710.pin import *
+    from adafruit_blinka.microcontroller.pentium.n3710 import *

 elif chip_id == ap_chip.STM32MP157:
 elif chip_id == ap_chip.STM32MP157:

-    from adafruit_blinka.microcontroller.stm32.stm32mp157.pin import *
+    from adafruit_blinka.microcontroller.stm32.stm32mp157 import *

 elif chip_id == ap_chip.MT8167:
 elif chip_id == ap_chip.MT8167:

-    from adafruit_blinka.microcontroller.mt8167.pin import *
+    from adafruit_blinka.microcontroller.mt8167 import *

 elif chip_id == ap_chip.RP2040_U2IF:
 elif chip_id == ap_chip.RP2040_U2IF:

-    from adafruit_blinka.microcontroller.rp2040_u2if.pin import *
+    from adafruit_blinka.microcontroller.rp2040_u2if import *
+elif chip_id == ap_chip.GENERIC_X86:
+    print("WARNING: GENERIC_X86 is not fully supported. Some features may not work.")

 elif "sphinx" in sys.modules:
     pass
 else:
 elif "sphinx" in sys.modules:
     pass
 else: