Untangle code and remove pylint disables

[Adafruit_Blinka-hackapet.git] / src / adafruit_blinka / microcontroller / ftdi_mpsse / mpsse / i2c.py

diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py
index 762dd715a6006307238e3a36b6d14add6959cbb5..b98c59ba649d9fcc829fde27bc37e95238087235 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py
+++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py
@@ -1,5 +1,13 @@
+# SPDX-FileCopyrightText: 2021 Melissa LeBlanc-Williams for Adafruit Industries
+#
+# SPDX-License-Identifier: MIT
 """I2C Class for FTDI MPSSE"""
 from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.pin import Pin
+from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.url import (
+    get_ft232h_url,
+    get_ft2232h_url,
+)
+
 
 class I2C:
     """Custom I2C Class for FTDI MPSSE"""
@@ -9,7 +17,7 @@ class I2C:
     _mode = None
 
     # pylint: disable=unused-argument
-    def __init__(self, id=None, mode=MASTER, baudrate=None, frequency=400000):
+    def __init__(self, i2c_id=None, mode=MASTER, baudrate=None, frequency=400000):
         if mode != self.MASTER:
             raise NotImplementedError("Only I2C Master supported!")
         _mode = self.MASTER
@@ -21,10 +29,10 @@ class I2C:
         # pylint: enable=import-outside-toplevel
 
         self._i2c = I2cController()
-        if id is None:
-            self._i2c.configure("ftdi://ftdi:ft232h/1", frequency=frequency)
+        if i2c_id is None:
+            self._i2c.configure(get_ft232h_url(), frequency=frequency)
         else:
-            self._i2c.configure("ftdi://ftdi:ft2232h/{}".format(id+1), frequency=frequency)
+            self._i2c.configure(get_ft2232h_url(i2c_id), frequency=frequency)
         Pin.mpsse_gpio = self._i2c.get_gpio()
 
     def scan(self):
@@ -56,7 +64,7 @@ class I2C:
         out_end=None,
         in_start=0,
         in_end=None,
-        stop=False
+        stop=False,
     ):
         """Write data from buffer_out to an address and then
         read data from an address and into buffer_in