Merge branch 'master' of https://github.com/binhollc/Adafruit_Blinka

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

diff --git a/src/busio.py b/src/busio.py
index 230db56f343a6341d92f0785be44ac6f9cfb9dc9..b478ec06c6a37cdef99720b71712607e1f0d0253 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
 """
 
+import threading
+
 from adafruit_blinka import Enum, Lockable, agnostic
 from adafruit_blinka.agnostic import board_id, detector
 import adafruit_platformdetect.board as ap_board
@@ -39,6 +41,8 @@ class I2C(Lockable):
                 "No Hardware I2C on (scl,sda)={}\nValid I2C ports: {}".format((scl, sda), i2cPorts)
             )
 
+        self._lock = threading.RLock()
+
     def deinit(self):
         try:
             del self._i2c
@@ -46,9 +50,11 @@ class I2C(Lockable):
             pass
 
     def __enter__(self):
+        self._lock.acquire()
         return self
 
     def __exit__(self, exc_type, exc_value, traceback):
+        self._lock.release()
         self.deinit()
 
     def scan(self):
@@ -88,9 +94,9 @@ class SPI(Lockable):
             return
         elif detector.board.binho_nova:
             from adafruit_blinka.microcontroller.nova.spi import SPI as _SPI
-            #from adafruit_blinka.microcontroller.nova.pin import SCK, MOSI, MISO
+            from adafruit_blinka.microcontroller.nova.pin import SCK, MOSI, MISO
             self._spi = _SPI(clock)
-            #self._pins = (SCK, MOSI, MISO)
+            self._pins = (SCK, MOSI, MISO)
             return
         elif detector.board.any_embedded_linux:
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
@@ -148,7 +154,7 @@ class SPI(Lockable):
             from adafruit_blinka.microcontroller.ft232h.pin import Pin
         elif detector.board.binho_nova:
             from adafruit_blinka.microcontroller.nova.spi import SPI as _SPI
-            #from adafruit_blinka.microcontroller.nova.pin import Pin
+            from adafruit_blinka.microcontroller.nova.pin import Pin
         else:
             from machine import SPI as _SPI
             from machine import Pin