From: Franklin Harding Date: Mon, 29 Mar 2021 01:56:53 +0000 (-0700) Subject: Format with black, fix pylint errors X-Git-Tag: 6.9.2~2^2~5 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/416ffc462e0a64ad2e6202884a947d9d5fc8b0e7 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 e64805c..910d2d4 100644 --- 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() -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 762dd71..291a77c 100644 --- 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 + class I2C: """Custom I2C Class for FTDI MPSSE""" @@ -9,7 +10,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 +22,12 @@ class I2C: # 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: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): @@ -56,7 +59,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 diff --git a/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py b/src/adafruit_blinka/microcontroller/ftdi_mpsse/mpsse/pin.py index dc6282a..b5a7475 100644 --- 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 - 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 6304700..78dee58 100644 --- 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 - 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) - 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 diff --git a/src/adafruit_blinka/microcontroller/generic_linux/i2c.py b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py index 7be7514..bb912a5 100644 --- 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, - stop=False + stop=False, ): """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 df2642f..e320ac1 100644 --- 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, - stop=False + stop=False, ): """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 0e061e6..30f45f6 100644 --- 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, - 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 diff --git a/src/adafruit_blinka/microcontroller/nova/i2c.py b/src/adafruit_blinka/microcontroller/nova/i2c.py index 17731fb..e87c942 100644 --- 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, - stop=False + stop=False, ): """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 30a8762..4c63111 100644 --- 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, - stop=False + stop=False, ): """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 931b43e..1991900 100755 --- a/src/busio.py +++ b/src/busio.py @@ -127,7 +127,7 @@ class I2C(Lockable): 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 @@ -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 - 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) @@ -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.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.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