From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Thu, 9 Jan 2020 23:29:36 +0000 (-0800)
Subject: Merge branch 'AllWinner_refactor' of https://github.com/yeyeto2788/Adafruit_Blinka... 
X-Git-Tag: 3.4.0^2^2~1
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/104bf0c9e9985b7c12329d9fa74a90a8671290b1?hp=0247ac4c6e81fec209f215e58fb0ddb3304a97b1

Merge branch 'AllWinner_refactor' of https://github.com/yeyeto2788/Adafruit_Blinka into pine64
---

diff --git a/requirements.txt b/requirements.txt
index e007ce4..a2cfda9 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,5 @@ RPi.GPIO; platform_machine=='armv7l' or platform_machine=='armv6l'
 rpi_ws281x>=4.0.0; platform_machine=='armv7l' or platform_machine=='armv6l'
 spidev>=3.4; sys_platform == 'linux' and platform_machine!='mips'
 sysv_ipc; sys_platform == 'linux' and platform_machine!='mips'
-pyftdi>=0.30.0
+pyftdi>=0.40.0
 binho-host-adapter>=0.1.4
diff --git a/setup.py b/setup.py
index 29c7bdc..0bd1560 100755
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,7 @@ setup(
         "Adafruit-PureIO",
         "spidev>=3.4; sys_platform=='linux' and platform_machine!='mips'",
         "sysv_ipc; platform_system != 'Windows' and platform_machine != 'mips'",
-        "pyftdi>=0.30.0"
+        "pyftdi>=0.40.0"
     ] + board_reqs,
     license='MIT',
     classifiers=[
diff --git a/src/adafruit_blinka/microcontroller/ft232h/i2c.py b/src/adafruit_blinka/microcontroller/ft232h/i2c.py
index 411121d..7f733c1 100644
--- a/src/adafruit_blinka/microcontroller/ft232h/i2c.py
+++ b/src/adafruit_blinka/microcontroller/ft232h/i2c.py
@@ -32,6 +32,6 @@ class I2C:
         port = self._i2c.get_port(address)
         result = port.exchange(buffer_out[out_start:out_end],
                                in_end-in_start,
-                               relax=True).tobytes()
+                               relax=True)
         for i, b in enumerate(result):
             buffer_in[in_start+i] = b
diff --git a/src/adafruit_blinka/microcontroller/nova/i2c.py b/src/adafruit_blinka/microcontroller/nova/i2c.py
index 7f08062..1919070 100644
--- a/src/adafruit_blinka/microcontroller/nova/i2c.py
+++ b/src/adafruit_blinka/microcontroller/nova/i2c.py
@@ -1,12 +1,12 @@
 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")
-        self._nova.setClockI2C(0, 400000)
+        self._nova.setClockI2C(0, frequency)
 
     def scan(self):
 
diff --git a/src/busio.py b/src/busio.py
index e3dacad..5439745 100755
--- 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
+            self._i2c = I2C(frequency=frequency)
+            return
         elif detector.board.microchip_mcp2221:
             from adafruit_blinka.microcontroller.mcp2221.i2c import I2C
             self._i2c = I2C(frequency=frequency)