Format with black, fix pylint errors

diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft232h/pin.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft232h/pin.py
index e64805c72b79eeb92058f0e8e9f6f48703f41584..910d2d42f2c502de1160bf318e4848df297524c8 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft232h/pin.py
+++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/ft232h/pin.py
@@ -20,4 +20,4 @@ SCL = Pin()
 SDA = Pin()
 SCK = SCLK = Pin()
 MOSI = Pin()
 SDA = Pin()
 SCK = SCLK = Pin()
 MOSI = Pin()

-MISO = Pin()
\ No newline at end of file
+MISO = Pin()

diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py
index 762dd715a6006307238e3a36b6d14add6959cbb5..291a77ce5e85e1b842eea35eae0a015939c459bf 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py
+++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/i2c.py
@@ -1,6 +1,7 @@
 """I2C Class for FTDI MPSSE"""
 from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.pin import Pin
 
 """I2C Class for FTDI MPSSE"""
 from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.pin import Pin
 

+

 class I2C:
     """Custom I2C Class for FTDI MPSSE"""
 
 class I2C:
     """Custom I2C Class for FTDI MPSSE"""
 


@@ -9,7 +10,7 @@ class I2C:
     _mode = None
 
     # pylint: disable=unused-argument
     _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
         if mode != self.MASTER:
             raise NotImplementedError("Only I2C Master supported!")
         _mode = self.MASTER


@@ -21,10 +22,12 @@ class I2C:
         # pylint: enable=import-outside-toplevel
 
         self._i2c = I2cController()
         # pylint: enable=import-outside-toplevel
 
         self._i2c = I2cController()

-        if id is None:
+        if i2c_id is None:

             self._i2c.configure("ftdi://ftdi:ft232h/1", frequency=frequency)
         else:
             self._i2c.configure("ftdi://ftdi:ft232h/1", frequency=frequency)
         else:

-            self._i2c.configure("ftdi://ftdi:ft2232h/{}".format(id+1), frequency=frequency)
+            self._i2c.configure(
+                "ftdi://ftdi:ft2232h/{}".format(i2c_id + 1), frequency=frequency
+            )

         Pin.mpsse_gpio = self._i2c.get_gpio()
 
     def scan(self):
         Pin.mpsse_gpio = self._i2c.get_gpio()
 
     def scan(self):


@@ -56,7 +59,7 @@ class I2C:
         out_end=None,
         in_start=0,
         in_end=None,
         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
     ):
         """Write data from buffer_out to an address and then
         read data from an address and into buffer_in

diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py
index dc6282abfa82ab17b9e38c796e37c0a1daeeddf9..b5a7475c044a66abff80c62ec0bce84e542d82f2 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py
+++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py
@@ -66,4 +66,4 @@ class Pin:
             Pin.mpsse_gpio.write(current & Pin.mpsse_gpio.direction)
             return None
         # release the kraken
             Pin.mpsse_gpio.write(current & Pin.mpsse_gpio.direction)
             return None
         # release the kraken

-        raise RuntimeError("Invalid value for pin")
\ No newline at end of file
+        raise RuntimeError("Invalid value for pin")

diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py
index 63047003a3cbf8ed318d1c8f9ab937c37f64455e..78dee58b1098a97e6ad154ce22cbae304a9bda1e 100644 (file)
--- a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py
+++ b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/spi.py
@@ -7,17 +7,17 @@ class SPI:
 
     MSB = 0
 
 
     MSB = 0
 

-    def __init__(self, id=None):
+    def __init__(self, spi_id=None):

         # pylint: disable=import-outside-toplevel
         from pyftdi.spi import SpiController
 
         # pylint: enable=import-outside-toplevel
 
         self._spi = SpiController(cs_count=1)
         # pylint: disable=import-outside-toplevel
         from pyftdi.spi import SpiController
 
         # pylint: enable=import-outside-toplevel
 
         self._spi = SpiController(cs_count=1)

-        if id is None:
-            self._spi.configure("ftdi://ftdi:ft232h/1", frequency=frequency)
-        else
-            self._spi.configure("ftdi://ftdi:ft2232h/{}".format(id+1), frequency=frequency)
+        if spi_id is None:
+            self._spi.configure("ftdi://ftdi:ft232h/1")
+        else:
+            self._spi.configure("ftdi://ftdi:ft2232h/{}".format(spi_id + 1))

         self._port = self._spi.get_port(0)
         self._port.set_frequency(100000)
         self._port._cpol = 0
         self._port = self._spi.get_port(0)
         self._port.set_frequency(100000)
         self._port._cpol = 0

diff --git a/src/adafruit_blinka/microcontroller/generic_linux/i2c.py b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py
index 7be7514a9426af43188158b0da31bfa423501405..bb912a5b80210b72dc626663ff124dc24832d74b 100644 (file)
--- a/src/adafruit_blinka/microcontroller/generic_linux/i2c.py
+++ b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py
@@ -69,7 +69,7 @@ class I2C:
         out_end=None,
         in_start=0,
         in_end=None,
         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
     ):
         """Write data from buffer_out to an address and then
         read data from an address and into buffer_in

diff --git a/src/adafruit_blinka/microcontroller/mcp2221/i2c.py b/src/adafruit_blinka/microcontroller/mcp2221/i2c.py
index df2642f681456d60dd288919f0df9b0b3417c58d..e320ac1f448a52e708914841979d0fd286d028b6 100644 (file)
--- a/src/adafruit_blinka/microcontroller/mcp2221/i2c.py
+++ b/src/adafruit_blinka/microcontroller/mcp2221/i2c.py
@@ -32,7 +32,7 @@ class I2C:
         out_end=None,
         in_start=0,
         in_end=None,
         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
     ):
         """Write data from buffer_out to an address and then
         read data from an address and into buffer_in

diff --git a/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py b/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py
index 0e061e62380d888880ab2a79624c4ec903bfce08..30f45f6e8bc7e0b1d7dbb6e50bc537515c8fdefb 100644 (file)
--- a/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py
+++ b/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py
@@ -327,7 +327,7 @@ class MCP2221:
         out_start=0,
         out_end=None,
         in_start=0,
         out_start=0,
         out_end=None,
         in_start=0,

-        in_end=None
+        in_end=None,

     ):
         """Write data from buffer_out to an address and then
         read data from an address and into buffer_in
     ):
         """Write data from buffer_out to an address and then
         read data from an address and into buffer_in

diff --git a/src/adafruit_blinka/microcontroller/nova/i2c.py b/src/adafruit_blinka/microcontroller/nova/i2c.py
index 17731fb837e4bb371eb3afa9231498e75fc5b45c..e87c9429ab62cd184d024da8569b0be22fbbde3d 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nova/i2c.py
+++ b/src/adafruit_blinka/microcontroller/nova/i2c.py
@@ -98,7 +98,7 @@ class I2C:
         out_end=None,
         in_start=0,
         in_end=None,
         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
     ):
         """Write data from buffer_out to an address and then
         read data from an address and into buffer_in

diff --git a/src/adafruit_blinka/microcontroller/nxp_lpc4330/i2c.py b/src/adafruit_blinka/microcontroller/nxp_lpc4330/i2c.py
index 30a876295754f2f54bfd356f58cfb8a35806833d..4c6311145c0e6a0bfbc263cb36b8c5b2efc1ecdc 100644 (file)
--- a/src/adafruit_blinka/microcontroller/nxp_lpc4330/i2c.py
+++ b/src/adafruit_blinka/microcontroller/nxp_lpc4330/i2c.py
@@ -39,7 +39,7 @@ class I2C:
         out_end=None,
         in_start=0,
         in_end=None,
         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
     ):
         """Write data from buffer_out to an address and then
         read data from an address and into buffer_in

diff --git a/src/busio.py b/src/busio.py
index 931b43e15e19d9a9edb1926dd9144c715cdd9e78..199190083891adf01faaab5fd06387ac85dde9b8 100755 (executable)
--- a/src/busio.py
+++ b/src/busio.py
@@ -127,7 +127,7 @@ class I2C(Lockable):
         out_end=None,
         in_start=0,
         in_end=None,
         out_end=None,
         in_start=0,
         in_end=None,

-        stop=False
+        stop=False,

     ):
         """ "Write to a device at specified address from a buffer then read
         from a device at specified address into a buffer
     ):
         """ "Write to a device at specified address from a buffer then read
         from a device at specified address into a buffer


@@ -154,7 +154,11 @@ class SPI(Lockable):
         self.deinit()
         if detector.board.ftdi_ft232h:
             from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import SPI as _SPI
         self.deinit()
         if detector.board.ftdi_ft232h:
             from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import SPI as _SPI

-            from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import SCK, MOSI, MISO
+            from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import (
+                SCK,
+                MOSI,
+                MISO,
+            )

 
             self._spi = _SPI()
             self._pins = (SCK, MOSI, MISO)
 
             self._spi = _SPI()
             self._pins = (SCK, MOSI, MISO)


@@ -265,10 +269,14 @@ class SPI(Lockable):
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.hfu540.pin import Pin
         elif detector.board.ftdi_ft232h:
             from adafruit_blinka.microcontroller.generic_linux.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.hfu540.pin import Pin
         elif detector.board.ftdi_ft232h:

-            from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.spi import SPI as _SPI
+            from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import (
+                SPI as _SPI,
+            )

             from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin
         elif detector.board.ftdi_ft2232h:
             from adafruit_blinka.microcontroller.ftdi_mpsse.ft232h.pin import Pin
         elif detector.board.ftdi_ft2232h:

-            from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.spi import SPI as _SPI
+            from adafruit_blinka.microcontroller.ftdi_mpsse.mpsse.spi import (
+                SPI as _SPI,
+            )

             from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.pin import Pin
         elif detector.board.binho_nova:
             from adafruit_blinka.microcontroller.nova.spi import SPI as _SPI
             from adafruit_blinka.microcontroller.ftdi_mpsse.ft2232h.pin import Pin
         elif detector.board.binho_nova:
             from adafruit_blinka.microcontroller.nova.spi import SPI as _SPI