Renamed keypad._EventQueue for parity with CircuitPython

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

diff --git a/src/analogio.py b/src/analogio.py
index 7d3f92af1ef75b5e02053d764ae566b99be8a411..e77e0f0528f8858972a597fb72f3a7326346dd0b 100644 (file)
--- a/src/analogio.py
+++ b/src/analogio.py
@@ -9,7 +9,6 @@ Not supported by all boards.
 
 * Author(s): Carter Nelson, Melissa LeBlanc-Williams
 """
 
 * Author(s): Carter Nelson, Melissa LeBlanc-Williams
 """

-import os

 import sys
 
 from adafruit_blinka.agnostic import detector
 import sys
 
 from adafruit_blinka.agnostic import detector


@@ -17,12 +16,8 @@ from adafruit_blinka.agnostic import detector
 # pylint: disable=ungrouped-imports,wrong-import-position,unused-import
 
 if detector.board.microchip_mcp2221:
 # 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
 elif detector.board.greatfet_one:
     from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogIn
     from adafruit_blinka.microcontroller.nxp_lpc4330.analogio import AnalogOut


@@ -41,6 +36,10 @@ elif detector.chip.RK3568:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.RK3566:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.RK3566:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn

+elif detector.chip.RV1103:
+    from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
+elif detector.chip.RV1106:
+    from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn

 elif detector.chip.IMX6ULL:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.STM32MP157:
 elif detector.chip.IMX6ULL:
     from adafruit_blinka.microcontroller.generic_linux.sysfs_analogin import AnalogIn
 elif detector.chip.STM32MP157:


@@ -67,5 +66,10 @@ elif detector.board.itsybitsy_u2if:
     from adafruit_blinka.microcontroller.rp2040_u2if.analogio import (
         AnalogIn_ItsyBitsy as AnalogIn,
     )
     from adafruit_blinka.microcontroller.rp2040_u2if.analogio import (
         AnalogIn_ItsyBitsy as AnalogIn,
     )

+elif detector.board.OS_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.")
 else:
     raise NotImplementedError("analogio not supported for this board.")