fixed bugs and tested

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

diff --git a/src/busio.py b/src/busio.py
index 0a3f52991820fb23edf7188664ac73ade7610946..234bc4fd156aefb14459e3aefd91313d9f7cb8f8 100644 (file)
--- a/src/busio.py
+++ b/src/busio.py
@@ -9,8 +9,6 @@ See `CircuitPython:busio` in CircuitPython for more details.
 
 * Author(s): cefn
 """
 
 * Author(s): cefn
 """

-import os
-

 try:
     import threading
 except ImportError:
 try:
     import threading
 except ImportError:


@@ -51,15 +49,19 @@ 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_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
+            from adafruit_blinka.microcontroller.mcp2221.i2c import I2C as _I2C
+

             self._i2c = _I2C(frequency=frequency)
             return
             self._i2c = _I2C(frequency=frequency)
             return

+
+        if detector.board.OS_AGNOSTIC_BOARD:
+            from adafruit_blinka.microcontroller.generic_agnostic_board.i2c import (
+                I2C as _I2C,
+            )
+
+            self._i2c = _I2C(frequency=frequency)
+            return
+

         if detector.board.greatfet_one:
             from adafruit_blinka.microcontroller.nxp_lpc4330.i2c import I2C as _I2C
 
         if detector.board.greatfet_one:
             from adafruit_blinka.microcontroller.nxp_lpc4330.i2c import I2C as _I2C
 


@@ -356,6 +358,10 @@ class SPI(Lockable):
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         elif detector.board.ftdi_ft2232h:
             from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
         elif detector.board.ftdi_ft2232h:
             from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import SPI as _SPI

+        elif detector.board.OS_AGNOSTIC_BOARD:
+            from adafruit_blinka.microcontroller.generic_agnostic_board.spi import (
+                SPI as _SPI,
+            )

         else:
             from adafruit_blinka.microcontroller.generic_micropython.spi import (
                 SPI as _SPI,
         else:
             from adafruit_blinka.microcontroller.generic_micropython.spi import (
                 SPI as _SPI,


@@ -435,6 +441,10 @@ class SPI(Lockable):
             from adafruit_blinka.microcontroller.am65xx.pin import Pin
         elif detector.board.any_embedded_linux:
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.am65xx.pin import Pin
         elif detector.board.any_embedded_linux:
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI

+        elif detector.board.OS_AGNOSTIC_BOARD:
+            from adafruit_blinka.microcontroller.generic_agnostic_board.spi import (
+                SPI as _SPI,
+            )

         else:
             from adafruit_blinka.microcontroller.generic_micropython.spi import (
                 SPI as _SPI,
         else:
             from adafruit_blinka.microcontroller.generic_micropython.spi import (
                 SPI as _SPI,