Moved testing out of top level python path

[hackapet/Adafruit_Blinka.git] / python / bitbangio / __init__.py

diff --git a/python/bitbangio/__init__.py b/python/bitbangio/__init__.py
index 3634f44bf250efd82d42ee42e09f78f1ae344c5c..8276d61d57d2072fe60dc70f0fd8bf3d2c9decd6 100644 (file)
--- a/python/bitbangio/__init__.py
+++ b/python/bitbangio/__init__.py
@@ -1,13 +1,17 @@
-from machine import Pin, I2C as _I2C
+from mcp import Lockable
+from machine import I2C as _I2C
+from machine import Pin
+import agnostic

 
 

-class I2C:
+class I2C(Lockable):

     def __init__(self, scl, sda, frequency=400000):
     def __init__(self, scl, sda, frequency=400000):

+        super().__init()

         self.init(scl, sda, frequency)
 
     def init(self, scl, sda, frequency):
         self.deinit()
         id = -1 # force bitbanging implementation - in future introspect platform if SDA/SCL matches hardware I2C
         self.init(scl, sda, frequency)
 
     def init(self, scl, sda, frequency):
         self.deinit()
         id = -1 # force bitbanging implementation - in future introspect platform if SDA/SCL matches hardware I2C

-        self._i2c = _I2C(id, Pin(scl.id), Pin(sda.id), frequency)
+        self._i2c = _I2C(id, Pin(scl.id), Pin(sda.id), freq=frequency)

 
     def deinit(self):
         try:
 
     def deinit(self):
         try:


@@ -24,29 +28,40 @@ class I2C:
     def scan(self):
         return self._i2c.scan()
 
     def scan(self):
         return self._i2c.scan()
 

-    def try_lock(self):
-        if self._locked:
-            return False
-        else:
-            self._locked=True
-            return True
-
-    def unlock(self):
-        if self._locked:
-            self._locked = False
-        else:
-            raise ValueError("Not locked")
-

     def readfrom_into(self, address, buffer, start=0, end=None):
         if start is not 0 or end is not None:
             if end is None:
                 end = len(buffer)
             buffer = memoryview(buffer)[start:end]
     def readfrom_into(self, address, buffer, start=0, end=None):
         if start is not 0 or end is not None:
             if end is None:
                 end = len(buffer)
             buffer = memoryview(buffer)[start:end]

-        return self._i2c.readfrom_into(address, buffer, stop=False)
+        stop = True # remove for efficiency later
+        return self._i2c.readfrom_into(address, buffer, stop)

 
 

-    def writeto(self, address, buffer, start=0, end=None, stop=True):
+    def writeto(self, address, buffer, start=0, end=None, stop=True, *a, **k):

         if start is not 0 or end is not None:
             if end is None:
                 end = len(buffer)
             buffer = memoryview(buffer)[start:end]
         return self._i2c.writeto(address, buffer, stop)
         if start is not 0 or end is not None:
             if end is None:
                 end = len(buffer)
             buffer = memoryview(buffer)[start:end]
         return self._i2c.writeto(address, buffer, stop)

+
+# TODO untested, as actually busio.SPI was on tasklist https://github.com/adafruit/Adafruit_Micropython_Blinka/issues/2 :(
+class SPI(Lockable):
+    def __init__(self, clock, MOSI=None, MISO=None):
+        self._spi = SPI(-1)
+        self._pins = (clock.id, MOSI.id, MISO.id)
+
+    def configure(self, baudrate=100000, polarity=0, phase=0, bits=8):
+        if self._locked:
+            # TODO verify if _spi obj 'caches' sck, mosi, miso to avoid storing in _attributeIds (duplicated in busio)
+            # i.e. #init ignores MOSI=None rather than unsetting
+            self._spi.init(baudrate=baudrate, polarity=polarity, phase=phase, bits = bits, firstbit = SPI.MSB, sck = Pin(self._pins[0]), mosi=Pin(self._pins[1]), miso=Pin(self._pins[2]))
+        else:
+            raise RuntimeError("First call try_lock()")
+
+    def write(self, buf):
+        return self._spi.write(buf)
+
+    def readinto(self, buf):
+        return self.readinto(buf)
+
+    def write_readinto(self, buffer_out, buffer_in)
+        return self.write_readinto(buffer_out, buffer_in)