Merge pull request #216 from binhollc/master

[Adafruit_Blinka-hackapet.git] / src / adafruit_blinka / microcontroller / nova / i2c.py

diff --git a/src/adafruit_blinka/microcontroller/nova/i2c.py b/src/adafruit_blinka/microcontroller/nova/i2c.py
index 4e34a7dc1560f108432fa8277cd1d93ce1f5bf47..19190704b841cb8b4ec22b541e29902468187a8f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nova/i2c.py
+++ b/src/adafruit_blinka/microcontroller/nova/i2c.py
@@ -1,37 +1,75 @@
-from adafruit_blinka.microcontroller.nova.pin import Pin
-

 class I2C:
 
 class I2C:
 

-    def __init__(self):
-        # change GPIO controller to I2C
-        from pyftdi.i2c import I2cController
-        self._i2c = I2cController()
-        self._i2c.configure('ftdi:///1')
-        Pin.ft232h_gpio = self._i2c.get_gpio()
+    def __init__(self, *, frequency=400000):
+        from adafruit_blinka.microcontroller.nova import Connection
+        self._nova = Connection.getInstance()
+        self._nova.setNumericalBase(10)
+        self._nova.setOperationMode(0, "I2C")
+        self._nova.setPullUpStateI2C(0, "EN")
+        self._nova.setClockI2C(0, frequency)

 
     def scan(self):
 
     def scan(self):

-        return [addr for addr in range(0x79) if self._i2c.poll(addr)]
+
+        scanResults = []
+
+        for i in range(8, 121):
+            result = self._nova.scanAddrI2C(0, i<<1)
+
+            resp = result.split(" ")
+
+            if resp[3] == 'OK':
+                scanResults.append(i)
+
+        return scanResults

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

+

         end = end if end else len(buffer)
         end = end if end else len(buffer)

-        port = self._i2c.get_port(address)
-        port.write(buffer[start:end], relax=stop)
+
+        self._nova.startI2C(0, address<<1)
+
+        for i in range(start, end): 
+            self._nova.writeByteI2C(0, buffer[i])
+
+        if stop:
+            self._nova.endI2C(0)
+        else:
+            self._nova.endI2C(0, True)

 
     def readfrom_into(self, address, buffer, *, start=0, end=None, stop=True):
 
     def readfrom_into(self, address, buffer, *, start=0, end=None, stop=True):

+

         end = end if end else len(buffer)
         end = end if end else len(buffer)

-        port = self._i2c.get_port(address)
-        result = port.read(len(buffer[start:end]), relax=stop)
-        for i, b in enumerate(result):
-            buffer[start+i] = b
+
+        result = self._nova.readBytesI2C(0, address<<1, len(buffer[start:end]))
+
+        if result != "-NG":
+            resp = result.split(" ")
+
+            for i in range(len(buffer[start:end])):
+                buffer[start+i] = int(resp[2+i])
+        else:
+            raise RuntimeError("Received error response from Binho Nova, result = " + result)

 
     def writeto_then_readfrom(self, address, buffer_out, buffer_in, *,
                               out_start=0, out_end=None,
                               in_start=0, in_end=None, stop=False):
 
     def writeto_then_readfrom(self, address, buffer_out, buffer_in, *,
                               out_start=0, out_end=None,
                               in_start=0, in_end=None, stop=False):

+    

         out_end = out_end if out_end else len(buffer_out)
         in_end = in_end if in_end else len(buffer_in)
         out_end = out_end if out_end else len(buffer_out)
         in_end = in_end if in_end else len(buffer_in)

-        port = self._i2c.get_port(address)
-        result = port.exchange(buffer_out[out_start:out_end],
-                               in_end-in_start,
-                               relax=True).tobytes()
-        for i, b in enumerate(result):
-            buffer_in[in_start+i] = b
+
+        self._nova.startI2C(0, address<<1)
+
+        for i in range(out_start, out_end): 
+            self._nova.writeByteI2C(0, buffer_out[i])
+
+        self._nova.endI2C(0, True)
+
+        result = self._nova.readBytesI2C(0, address<<1, len(buffer_in[in_start:in_end]))
+
+        if result != "-NG":
+            resp = result.split(" ")
+
+            for i in range(len(buffer_in[in_start:in_end])):
+                buffer_in[in_start+i] = int(resp[2+i])
+        else:
+            raise RuntimeError("Received error response from Binho Nova, result = " + result)