From: brentru <brent@adafruit.com>
Date: Thu, 4 Apr 2024 20:10:11 +0000 (-0400)
Subject: fixes per review
X-Git-Tag: 8.39.0^2~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/a2213644fcf96fa91d09ecb443eaed997468752e?ds=inline

fixes per review
---

diff --git a/src/analogio.py b/src/analogio.py
index 7d3f92a..645a5c4 100644
--- a/src/analogio.py
+++ b/src/analogio.py
@@ -17,12 +17,12 @@ 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":
+    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
diff --git a/src/board.py b/src/board.py
index 6165708..e8eee04 100644
--- a/src/board.py
+++ b/src/board.py
@@ -224,10 +224,10 @@ elif board_id == ap_board.BINHO_NOVA:
     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 *
diff --git a/src/busio.py b/src/busio.py
index cdce321..ec9f658 100644
--- a/src/busio.py
+++ b/src/busio.py
@@ -51,10 +51,10 @@ class I2C(Lockable):
             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:
diff --git a/src/digitalio.py b/src/digitalio.py
index 2a5724a..07db7f1 100644
--- a/src/digitalio.py
+++ b/src/digitalio.py
@@ -127,10 +127,10 @@ elif detector.board.binho_nova:
 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
diff --git a/src/microcontroller/__init__.py b/src/microcontroller/__init__.py
index b381b6f..f7d134f 100644
--- a/src/microcontroller/__init__.py
+++ b/src/microcontroller/__init__.py
@@ -123,10 +123,10 @@ elif chip_id == ap_chip.BINHO:
 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:
diff --git a/src/microcontroller/pin.py b/src/microcontroller/pin.py
index 0a33ec6..9138989 100644
--- a/src/microcontroller/pin.py
+++ b/src/microcontroller/pin.py
@@ -97,11 +97,10 @@ elif chip_id == ap_chip.BINHO:
 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: