X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/blobdiff_plain/6f36409bfa014ce0a6040442c2856f3ef817680c..94b8f61cb28cb7cab038744ebc60d0dcbbb9e4e5:/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 bf36e2a..1919070 100644
--- a/src/adafruit_blinka/microcontroller/nova/i2c.py
+++ b/src/adafruit_blinka/microcontroller/nova/i2c.py
@@ -1,25 +1,12 @@
-#from adafruit_blinka.microcontroller.nova.pin import Pin
-
 class I2C:
 
-    def __init__(self):
-        # change GPIO controller to I2C
-        from binhoHostAdapter import binhoHostAdapter
-        from binhoHostAdapter import binhoUtilities
-
-        utilities = binhoUtilities.binhoUtilities()
-        devices = utilities.listAvailableDevices()
-
-        if len(devices) > 0:
-
-            self._nova = binhoHostAdapter.binhoHostAdapter(devices[0])
-            self._nova.setNumericalBase(10)
-            self._nova.setOperationMode(0, "I2C")
-            self._nova.setPullUpStateI2C(0, "EN")
-            self._nova.setClockI2C(0, 400000)
-
-        else:
-            raise RuntimeError('No Binho host adapter found!')
+    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):
 
@@ -39,7 +26,7 @@ class I2C:
 
         end = end if end else len(buffer)
 
-        self._nova.startI2C(0, address)
+        self._nova.startI2C(0, address<<1)
 
         for i in range(start, end): 
             self._nova.writeByteI2C(0, buffer[i])
@@ -53,11 +40,15 @@ class I2C:
 
         end = end if end else len(buffer)
 
-        result = self._nova.readBytesI2C(0, address, len(buffer[start:end]))
-        resp = result.split(" ")
+        result = self._nova.readBytesI2C(0, address<<1, len(buffer[start:end]))
 
-        for i in range(len(buffer[start:end])):
-            buffer[start+i] = resp[2+i]
+        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,
@@ -66,15 +57,19 @@ class I2C:
         out_end = out_end if out_end else len(buffer_out)
         in_end = in_end if in_end else len(buffer_in)
 
-        self._nova.startI2C(0, address)
+        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, len(buffer_in[in_start:in_end]))
-        resp = result.split(" ")
+        result = self._nova.readBytesI2C(0, address<<1, len(buffer_in[in_start:in_end]))
 
-        for i in range(len(buffer_in[in_start:in_end])):
-            buffer_in[in_start+i] = resp[2+i]
+        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)