initial working MCP2221

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

diff --git a/src/busio.py b/src/busio.py
index be09cd08833c79e41a7e378bf2b02ca7578122cf..5ec726bc572ab0ea2500e20da927a141dde69e41 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -7,6 +7,8 @@ See `CircuitPython:busio` in CircuitPython for more details.
 * Author(s): cefn
 """
 
 * Author(s): cefn
 """
 

+import threading
+

 from adafruit_blinka import Enum, Lockable, agnostic
 from adafruit_blinka.agnostic import board_id, detector
 import adafruit_platformdetect.board as ap_board
 from adafruit_blinka import Enum, Lockable, agnostic
 from adafruit_blinka.agnostic import board_id, detector
 import adafruit_platformdetect.board as ap_board


@@ -23,6 +25,8 @@ class I2C(Lockable):
             return
         elif detector.board.binho_nova:
             from adafruit_blinka.microcontroller.nova.i2c import I2C
             return
         elif detector.board.binho_nova:
             from adafruit_blinka.microcontroller.nova.i2c import I2C

+        elif detector.board.microchip_mcp2221:
+            from adafruit_blinka.microcontroller.mcp2221.i2c import I2C

             self._i2c = I2C()
             return
         elif detector.board.any_embedded_linux:
             self._i2c = I2C()
             return
         elif detector.board.any_embedded_linux:


@@ -31,14 +35,19 @@ class I2C(Lockable):
             from machine import I2C as _I2C
         from microcontroller.pin import i2cPorts
         for portId, portScl, portSda in i2cPorts:
             from machine import I2C as _I2C
         from microcontroller.pin import i2cPorts
         for portId, portScl, portSda in i2cPorts:

-            if scl == portScl and sda == portSda:
-                self._i2c = _I2C(portId, mode=_I2C.MASTER, baudrate=frequency)
-                break
+            try:
+                if scl == portScl and sda == portSda:
+                    self._i2c = _I2C(portId, mode=_I2C.MASTER, baudrate=frequency)
+                    break
+            except RuntimeError:
+                pass

         else:
             raise ValueError(
                 "No Hardware I2C on (scl,sda)={}\nValid I2C ports: {}".format((scl, sda), i2cPorts)
             )
 
         else:
             raise ValueError(
                 "No Hardware I2C on (scl,sda)={}\nValid I2C ports: {}".format((scl, sda), i2cPorts)
             )
 

+        self._lock = threading.RLock()
+

     def deinit(self):
         try:
             del self._i2c
     def deinit(self):
         try:
             del self._i2c


@@ -46,9 +55,11 @@ class I2C(Lockable):
             pass
 
     def __enter__(self):
             pass
 
     def __enter__(self):

+        self._lock.acquire()

         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):

+        self._lock.release()

         self.deinit()
 
     def scan(self):
         self.deinit()
 
     def scan(self):