Fix some SPI-related code to get BME280 example code working

[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 f62e73e95ba82fbd09c5c8171f0798dac26e57b1..f5ee718edaca00682ff64c25d08ae129189e88c0 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nova/i2c.py
+++ b/src/adafruit_blinka/microcontroller/nova/i2c.py
@@ -1,27 +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!')
-
-        # Pin.ft232h_gpio = self._i2c.get_gpio()
+        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, 400000)
 
     def scan(self):
 
@@ -55,10 +40,10 @@ class I2C:
 
         end = end if end else len(buffer)
 
-        result = self._nova.readBytesI2C(0, address, len(buffer(start:end)))
+        result = self._nova.readBytesI2C(0, address, len(buffer[start:end]))
         resp = result.split(" ")
 
-        for i in range(len(buffer(start:end))):
+        for i in range(len(buffer[start:end])):
             buffer[start+i] = resp[2+i]
 
     def writeto_then_readfrom(self, address, buffer_out, buffer_in, *,
@@ -75,8 +60,8 @@ class I2C:
 
         self._nova.endI2C(0, True)
 
-        result = self._nova.readBytesI2C(0, address, len(buffer_in(in_start:in_end)))
+        result = self._nova.readBytesI2C(0, address, len(buffer_in[in_start:in_end]))
         resp = result.split(" ")
 
-        for i in range(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]