fixes per review

diff --git a/src/analogio.py b/src/analogio.py
index 7d3f92af1ef75b5e02053d764ae566b99be8a411..645a5c460215ae2589bf930ff047cb44da7dbcd2 100644 (file)
--- 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:
 # 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
         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
 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 6165708023622971cb06098bbd92e538a121c172..e8eee04d8e834fba41111bd1d1a1a3492e7cbc99 100644 (file)
--- 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:
     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 *
         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 *
 
 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 cdce321172ce6f723ed6bfbb2a9e10027afe7599..ec9f6589350fdd690e087a04718a7ddcaf751f20 100644 (file)
--- 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:
             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
                 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:
             self._i2c = _I2C(frequency=frequency)
             return
         if detector.board.greatfet_one:

diff --git a/src/digitalio.py b/src/digitalio.py
index 2a5724a28a1b28e9225a3560b3e632f9e0f00fe5..07db7f1b9da23d0c40adb279207affff6b3e2062 100644 (file)
--- 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:
 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
         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
 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 b381b6f7c6fce58af3f0e36a46a0bcde0c83d746..f7d134f825c956b6edbfcffd72215d2ebe8d263e 100644 (file)
--- 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:
 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 *
         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:
 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 0a33ec6a0bd9ac4c7bb1c21afea684e74583f0f0..9138989af00b62da03c58c1b854c2a6eb0d41b75 100644 (file)
--- 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:
 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 *
         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:
 elif chip_id == ap_chip.A10:
     from adafruit_blinka.microcontroller.allwinner.a20.pin import *
 elif chip_id == ap_chip.A20: