Merge pull request #461 from makermelissa/master

Fix MicroPython and busio

diff --git a/src/adafruit_blinka/microcontroller/ft232h/i2c.py b/src/adafruit_blinka/microcontroller/ft232h/i2c.py
index 2d21f15408a9512d86ff5207543434fe5790cbeb..28d2644cd90c3ec2d438b475c4389f36a279ef5f 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ft232h/i2c.py
+++ b/src/adafruit_blinka/microcontroller/ft232h/i2c.py
@@ -1,5 +1,6 @@
 """I2C Class for FT232H"""
 from adafruit_blinka.microcontroller.ft232h.pin import Pin
+from adafruit_blinka.microcontroller.ft232h.url import get_ftdi_url
 
 
 class I2C:
@@ -13,7 +14,7 @@ class I2C:
         # pylint: enable=import-outside-toplevel
 
         self._i2c = I2cController()
-        self._i2c.configure("ftdi://ftdi:ft232h/1", frequency=frequency)
+        self._i2c.configure(get_ftdi_url(), frequency=frequency)
         Pin.ft232h_gpio = self._i2c.get_gpio()
 
     def scan(self):

diff --git a/src/adafruit_blinka/microcontroller/ft232h/pin.py b/src/adafruit_blinka/microcontroller/ft232h/pin.py
index 42ae5abd70e1176e7f6faaf23c3e53a4d5fd98ad..a138ee735a9dcf63dce22624fe3d24bf51b0f52a 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ft232h/pin.py
+++ b/src/adafruit_blinka/microcontroller/ft232h/pin.py
@@ -1,5 +1,7 @@
 """FT232H pin names"""
 
+from adafruit_blinka.microcontroller.ft232h.url import get_ftdi_url
+
 
 class Pin:
     """A basic Pin class for use with FT232H."""
@@ -24,7 +26,7 @@ class Pin:
             # pylint: enable=import-outside-toplevel
 
             i2c = I2cController()
-            i2c.configure("ftdi://ftdi:ft232h/1")
+            i2c.configure(get_ftdi_url())
             Pin.ft232h_gpio = i2c.get_gpio()
         # check if pin is valid
         if pin_id:

diff --git a/src/adafruit_blinka/microcontroller/ft232h/spi.py b/src/adafruit_blinka/microcontroller/ft232h/spi.py
index c768eaf8b87d960990feff26a308890a2a4520c5..fd16b39348f71f5c23c063ea3434bcfebe194ef2 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ft232h/spi.py
+++ b/src/adafruit_blinka/microcontroller/ft232h/spi.py
@@ -1,5 +1,6 @@
 """SPI Class for FT232H"""
 from adafruit_blinka.microcontroller.ft232h.pin import Pin
+from adafruit_blinka.microcontroller.ft232h.url import get_ftdi_url
 
 # pylint: disable=protected-access
 class SPI:
@@ -14,7 +15,7 @@ class SPI:
         # pylint: enable=import-outside-toplevel
 
         self._spi = SpiController(cs_count=1)
-        self._spi.configure("ftdi://ftdi:ft232h/1")
+        self._spi.configure(get_ftdi_url())
         self._port = self._spi.get_port(0)
         self._port.set_frequency(100000)
         self._port._cpol = 0

diff --git a/src/adafruit_blinka/microcontroller/ft232h/url.py b/src/adafruit_blinka/microcontroller/ft232h/url.py
new file mode 100644 (file)
index 0000000..afc69ae
--- /dev/null
+++ b/src/adafruit_blinka/microcontroller/ft232h/url.py
@@ -0,0 +1,17 @@
+"""Support for getting the URL from the BLINKA_FT232H variable."""
+
+import os
+
+
+def get_ftdi_url():
+    """
+    Return the FTDI url to use. If BLINKA_FT232H starts with ftdi:, returns
+    that. Otherwise, returns a default value.
+    """
+
+    url = os.environ.get("BLINKA_FT232H", "1")
+
+    if url.startswith("ftdi:"):
+        return url
+
+    return "ftdi://ftdi:ft232h/1"