Fix merge error in i2c busio and add frequency to Nova i2c init

diff --git a/src/adafruit_blinka/microcontroller/nova/i2c.py b/src/adafruit_blinka/microcontroller/nova/i2c.py
index 7f080627737b45676d99be39a5be7d1fcaface8c..19190704b841cb8b4ec22b541e29902468187a8f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nova/i2c.py
+++ b/src/adafruit_blinka/microcontroller/nova/i2c.py
@@ -1,12 +1,12 @@
 class I2C:
 
 class I2C:
 

-    def __init__(self):
+    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")
         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)
+        self._nova.setClockI2C(0, frequency)

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

diff --git a/src/busio.py b/src/busio.py
index e0118ac8c09314ec04f3b902d462e5d5018c07e9..f396b620e2038dbbfbd45d45400da747746a5117 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -25,6 +25,8 @@ class I2C(Lockable):
             return
         elif detector.board.binho_nova:
             from adafruit_blinka.microcontroller.nova.i2c import I2C
             return
         elif detector.board.binho_nova:
             from adafruit_blinka.microcontroller.nova.i2c import I2C

+            self._i2c = I2C(frequency=frequency)
+            return

         elif detector.board.microchip_mcp2221:
             from adafruit_blinka.microcontroller.mcp2221.i2c import I2C
             self._i2c = I2C(frequency=frequency)
         elif detector.board.microchip_mcp2221:
             from adafruit_blinka.microcontroller.mcp2221.i2c import I2C
             self._i2c = I2C(frequency=frequency)