Remove return_toml param

[Adafruit_Blinka-hackapet.git] / src / digitalio.py

diff --git a/src/digitalio.py b/src/digitalio.py
index aef48910b7ea607787e4d1abc5b2f6a6e6b62742..6f04984c0f7861b79f70bf4ea308efc3bbbea58a 100644 (file)
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -9,7 +9,6 @@ See `CircuitPython:digitalio` in CircuitPython for more details.
 
 * Author(s): cefn
 """
 
 * Author(s): cefn
 """

-import os

 from adafruit_blinka.agnostic import board_id, detector
 
 # pylint: disable=ungrouped-imports,wrong-import-position,unused-wildcard-import,wildcard-import
 from adafruit_blinka.agnostic import board_id, detector
 
 # pylint: disable=ungrouped-imports,wrong-import-position,unused-wildcard-import,wildcard-import


@@ -21,16 +20,17 @@ if detector.chip.BCM2XXX:
         "RASPBERRY_PI_400",
         "RASPBERRY_PI_CM4",
         "RASPBERRY_PI_CM4S",
         "RASPBERRY_PI_400",
         "RASPBERRY_PI_CM4",
         "RASPBERRY_PI_CM4S",

+        "RASPBERRY_PI_5",

     ):
         from adafruit_blinka.microcontroller.bcm2711.pin import *
     ):
         from adafruit_blinka.microcontroller.bcm2711.pin import *

-    elif board_id in ("RASPBERRY_PI_5",):
-        from adafruit_blinka.microcontroller.bcm2712.pin import *

     else:
         from adafruit_blinka.microcontroller.bcm283x.pin import Pin
 elif detector.chip.AM33XX:
     from adafruit_blinka.microcontroller.am335x.pin import Pin
 elif detector.chip.AM65XX:
     from adafruit_blinka.microcontroller.am65xx.pin import Pin
     else:
         from adafruit_blinka.microcontroller.bcm283x.pin import Pin
 elif detector.chip.AM33XX:
     from adafruit_blinka.microcontroller.am335x.pin import Pin
 elif detector.chip.AM65XX:
     from adafruit_blinka.microcontroller.am65xx.pin import Pin

+elif detector.chip.JH7110:
+    from adafruit_blinka.microcontroller.starfive.JH7110.pin import Pin

 elif detector.chip.JH71X0:
     from adafruit_blinka.microcontroller.starfive.JH71x0.pin import Pin
 elif detector.chip.DRA74X:
 elif detector.chip.JH71X0:
     from adafruit_blinka.microcontroller.starfive.JH71x0.pin import Pin
 elif detector.chip.DRA74X:


@@ -111,12 +111,16 @@ elif detector.chip.H5:
     from adafruit_blinka.microcontroller.allwinner.h5.pin import Pin
 elif detector.chip.H6:
     from adafruit_blinka.microcontroller.allwinner.h6.pin import Pin
     from adafruit_blinka.microcontroller.allwinner.h5.pin import Pin
 elif detector.chip.H6:
     from adafruit_blinka.microcontroller.allwinner.h6.pin import Pin

+elif detector.chip.H618:
+    from adafruit_blinka.microcontroller.allwinner.h618.pin import Pin

 elif detector.chip.H616:
     from adafruit_blinka.microcontroller.allwinner.h616.pin import Pin
 elif detector.chip.D1_RISCV:
     from adafruit_blinka.microcontroller.allwinner.D1.pin import Pin
 elif detector.chip.TH1520:
     from adafruit_blinka.microcontroller.thead.th1520.pin import Pin
 elif detector.chip.H616:
     from adafruit_blinka.microcontroller.allwinner.h616.pin import Pin
 elif detector.chip.D1_RISCV:
     from adafruit_blinka.microcontroller.allwinner.D1.pin import Pin
 elif detector.chip.TH1520:
     from adafruit_blinka.microcontroller.thead.th1520.pin import Pin

+elif detector.chip.K1:
+    from adafruit_blinka.microcontroller.spacemit.k1.pin import Pin

 # Special Case Boards
 elif detector.board.ftdi_ft232h:
     from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin
 # Special Case Boards
 elif detector.board.ftdi_ft232h:
     from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin


@@ -137,8 +141,12 @@ elif detector.chip.RP2040:
     from machine import Pin
 elif detector.chip.CV1800B:
     from adafruit_blinka.microcontroller.cv1800b.pin import Pin
     from machine import Pin
 elif detector.chip.CV1800B:
     from adafruit_blinka.microcontroller.cv1800b.pin import Pin

-elif "BLINKA_FORCECHIP" in os.environ and os.environ["BLINKA_FORCEBOARD"] == "GENERIC_AGNOSTIC_BOARD":
-    from adafruit_blinka.microcontroller.generic_agnostic.pin import Pin
+elif detector.chip.RV1103:
+    from adafruit_blinka.microcontroller.rockchip.rv1103.pin import Pin
+elif detector.chip.RV1106:
+    from adafruit_blinka.microcontroller.rockchip.rv1106.pin import Pin
+elif detector.chip.OS_AGNOSTIC:
+    from adafruit_blinka.microcontroller.generic_agnostic_board.pin import Pin

 
 from adafruit_blinka import Enum, ContextManaged
 
 
 from adafruit_blinka import Enum, ContextManaged