Merge branch 'adafruit:main' into raxda-zero3

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

diff --git a/src/analogio.py b/src/analogio.py
index 7d3f92af1ef75b5e02053d764ae566b99be8a411..f1b9a55986fe9370e144230abd11ee4430fa360e 100644 (file)
--- a/src/analogio.py
+++ b/src/analogio.py
@@ -17,12 +17,8 @@ from adafruit_blinka.agnostic import detector
 # pylint: disable=ungrouped-imports,wrong-import-position,unused-import
 
 if detector.board.microchip_mcp2221:
-    if "BLINKA_FORCECHIP" not in os.environ:
-        from adafruit_blinka.microcontroller.mcp2221.analogio import AnalogIn
-        from adafruit_blinka.microcontroller.mcp2221.analogio import AnalogOut
-    elif os.environ["BLINKA_FORCECHIP"] == "MCP2221":
-        from adafruit_blinka.microcontroller.fake_mcp2221.analogio import AnalogIn
-        from adafruit_blinka.microcontroller.fake_mcp2221.analogio import AnalogOut
+    from adafruit_blinka.microcontroller.mcp2221.analogio import AnalogIn
+    from adafruit_blinka.microcontroller.mcp2221.analogio import AnalogOut
 elif detector.board.greatfet_one:
     from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogIn
     from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogOut
@@ -67,5 +63,13 @@ elif detector.board.itsybitsy_u2if:
     from adafruit_blinka.microcontroller.rp2040_u2if.analogio import (
         AnalogIn_ItsyBitsy as AnalogIn,
     )
+elif (
+    "BLINKA_FORCECHIP" in os.environ
+    and os.environ["BLINKA_FORCEBOARD"] == "GENERIC_AGNOSTIC_BOARD"
+):
+    from adafruit_blinka.microcontroller.generic_agnostic_board.analogio import AnalogIn
+    from adafruit_blinka.microcontroller.generic_agnostic_board.analogio import (
+        AnalogOut,
+    )
 else:
     raise NotImplementedError("analogio not supported for this board.")