fixes per review

Author: brentru

src/analogio.py

@@ -17,12 +17,12 @@
 # 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":
+    if "BLINKA_FORCECHIP" in os.environ and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221":
         from adafruit_blinka.microcontroller.fake_mcp2221.analogio import AnalogIn
         from adafruit_blinka.microcontroller.fake_mcp2221.analogio import AnalogOut
+    else:
+        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

src/board.py

@@ -224,10 +224,10 @@
     from adafruit_blinka.board.binho_nova import *
 
 elif board_id == ap_board.MICROCHIP_MCP2221:
-    if "BLINKA_FORCEBOARD" not in os.environ:
-        from adafruit_blinka.board.microchip_mcp2221 import *
-    elif os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221":
+    if "BLINKA_FORCECHIP" in os.environ and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221":
         from adafruit_blinka.board.fake_microchip_mcp2221 import *
+    else:
+        from adafruit_blinka.board.microchip_mcp2221 import *
 
 elif board_id == ap_board.GREATFET_ONE:
     from adafruit_blinka.board.greatfet_one import *

src/busio.py

@@ -51,10 +51,10 @@ def init(self, scl, sda, frequency):
             self._i2c = _I2C(frequency=frequency)
             return
         if detector.board.microchip_mcp2221:
-            if "BLINKA_FORCEBOARD" not in os.environ:
-                from adafruit_blinka.microcontroller.mcp2221.i2c import I2C as _I2C
-            elif os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221":
+            if "BLINKA_FORCECHIP" in os.environ and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221":
                 from adafruit_blinka.microcontroller.fake_mcp2221.i2c import I2C as _I2C
+            else:
+                from adafruit_blinka.microcontroller.mcp2221.i2c import I2C as _I2C
             self._i2c = _I2C(frequency=frequency)
             return
         if detector.board.greatfet_one:

src/digitalio.py

@@ -127,10 +127,10 @@
 elif detector.board.greatfet_one:
     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import Pin
 elif detector.board.microchip_mcp2221:
-    if "BLINKA_FORCEBOARD" not in os.environ:
-        from adafruit_blinka.microcontroller.mcp2221.pin import Pin
-    elif os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221":
+    if "BLINKA_FORCECHIP" in os.environ and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221":
         from adafruit_blinka.microcontroller.fake_mcp2221.pin import Pin
+    else:
+        from adafruit_blinka.microcontroller.mcp2221.pin import Pin
 elif detector.chip.RP2040_U2IF:
     from adafruit_blinka.microcontroller.rp2040_u2if.pin import Pin
 # MicroPython Chips

src/microcontroller/__init__.py

@@ -123,10 +123,10 @@ def delay_us(delay):
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330 import *
 elif chip_id == ap_chip.MCP2221:
-    if "BLINKA_FORCECHIP" not in os.environ:
-        from adafruit_blinka.microcontroller.mcp2221 import *
-    elif os.environ["BLINKA_FORCECHIP"] == "MCP2221":
+    if "BLINKA_FORCECHIP" in os.environ and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221":
         from adafruit_blinka.microcontroller.fake_mcp2221 import *
+    else:
+        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:

src/microcontroller/pin.py

@@ -97,11 +97,10 @@
 elif chip_id == ap_chip.LPC4330:
     from adafruit_blinka.microcontroller.nxp_lpc4330.pin import *
 elif chip_id == ap_chip.MCP2221:
-    if "BLINKA_FORCECHIP" not in os.environ:
-        from adafruit_blinka.microcontroller.mcp2221.pin import *
-    elif os.environ["BLINKA_FORCECHIP"] == "MCP2221":
+    if "BLINKA_FORCECHIP" in os.environ and os.environ["BLINKA_FORCEBOARD"] == "MICROCHIP_MCP2221":
         from adafruit_blinka.microcontroller.fake_mcp2221.pin import *
-
+    else:
+        from adafruit_blinka.microcontroller.mcp2221.pin import *
 elif chip_id == ap_chip.A10:
     from adafruit_blinka.microcontroller.allwinner.a20.pin import *
 elif chip_id == ap_chip.A20: