Merge pull request #14 from adafruit/pylint-update

Ran black, updated to pylint 2.x

Author: kattni

.github/workflows/build.yml

@@ -40,7 +40,7 @@ jobs:
         source actions-ci/install.sh
     - name: Pip install pylint, black, & Sphinx
       run: |
-        pip install --force-reinstall pylint==1.9.2 black==19.10b0 Sphinx sphinx-rtd-theme
+        pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
     - name: Library version
       run: git describe --dirty --always --tags
     - name: PyLint

adafruit_si4713.py

@@ -32,6 +32,7 @@
 import time
 
 from micropython import const
+
 try:
     import struct
 except ImportError:
@@ -44,62 +45,62 @@
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_SI4713.git"
 
 
-#pylint: disable=bad-whitespace
+# pylint: disable=bad-whitespace
 # Internal constants:
-_SI4710_ADDR0                           = const(0x11) # if SEN is = const(low)
-_SI4710_ADDR1                           = const(0x63) # if SEN is high, default
-_SI4710_STATUS_CTS                      = const(0x80)
-_SI4710_CMD_POWER_UP                    = const(0x01)
-_SI4710_CMD_GET_REV                     = const(0x10)
-_SI4710_CMD_POWER_DOWN                  = const(0x11)
-_SI4710_CMD_SET_PROPERTY                = const(0x12)
-_SI4710_CMD_GET_PROPERTY                = const(0x13)
-_SI4710_CMD_GET_INT_STATUS              = const(0x14)
-_SI4710_CMD_PATCH_ARGS                  = const(0x15)
-_SI4710_CMD_PATCH_DATA                  = const(0x16)
-_SI4710_CMD_TX_TUNE_FREQ                = const(0x30)
-_SI4710_CMD_TX_TUNE_POWER               = const(0x31)
-_SI4710_CMD_TX_TUNE_MEASURE             = const(0x32)
-_SI4710_CMD_TX_TUNE_STATUS              = const(0x33)
-_SI4710_CMD_TX_ASQ_STATUS               = const(0x34)
-_SI4710_CMD_TX_RDS_BUFF                 = const(0x35)
-_SI4710_CMD_TX_RDS_PS                   = const(0x36)
-_SI4710_CMD_TX_AGC_OVERRIDE             = const(0x48)
-_SI4710_CMD_GPO_CTL                     = const(0x80)
-_SI4710_CMD_GPO_SET                     = const(0x81)
-_SI4713_PROP_GPO_IEN                    = const(0x0001)
-_SI4713_PROP_DIGITAL_INPUT_FORMAT       = const(0x0101)
-_SI4713_PROP_DIGITAL_INPUT_SAMPLE_RATE  = const(0x0103)
-_SI4713_PROP_REFCLK_FREQ                = const(0x0201)
-_SI4713_PROP_REFCLK_PRESCALE            = const(0x0202)
-_SI4713_PROP_TX_COMPONENT_ENABLE        = const(0x2100)
-_SI4713_PROP_TX_AUDIO_DEVIATION         = const(0x2101)
-_SI4713_PROP_TX_PILOT_DEVIATION         = const(0x2102)
-_SI4713_PROP_TX_RDS_DEVIATION           = const(0x2103)
-_SI4713_PROP_TX_LINE_LEVEL_INPUT_LEVEL  = const(0x2104)
-_SI4713_PROP_TX_LINE_INPUT_MUTE         = const(0x2105)
-_SI4713_PROP_TX_PREEMPHASIS             = const(0x2106)
-_SI4713_PROP_TX_PILOT_FREQUENCY         = const(0x2107)
-_SI4713_PROP_TX_ACOMP_ENABLE            = const(0x2200)
-_SI4713_PROP_TX_ACOMP_THRESHOLD         = const(0x2201)
-_SI4713_PROP_TX_ATTACK_TIME             = const(0x2202)
-_SI4713_PROP_TX_RELEASE_TIME            = const(0x2203)
-_SI4713_PROP_TX_ACOMP_GAIN              = const(0x2204)
-_SI4713_PROP_TX_LIMITER_RELEASE_TIME    = const(0x2205)
-_SI4713_PROP_TX_ASQ_INTERRUPT_SOURCE    = const(0x2300)
-_SI4713_PROP_TX_ASQ_LEVEL_LOW           = const(0x2301)
-_SI4713_PROP_TX_ASQ_DURATION_LOW        = const(0x2302)
-_SI4713_PROP_TX_AQS_LEVEL_HIGH          = const(0x2303)
-_SI4713_PROP_TX_AQS_DURATION_HIGH       = const(0x2304)
-_SI4713_PROP_TX_RDS_INTERRUPT_SOURCE    = const(0x2C00)
-_SI4713_PROP_TX_RDS_PI                  = const(0x2C01)
-_SI4713_PROP_TX_RDS_PS_MIX              = const(0x2C02)
-_SI4713_PROP_TX_RDS_PS_MISC             = const(0x2C03)
-_SI4713_PROP_TX_RDS_PS_REPEAT_COUNT     = const(0x2C04)
-_SI4713_PROP_TX_RDS_MESSAGE_COUNT       = const(0x2C05)
-_SI4713_PROP_TX_RDS_PS_AF               = const(0x2C06)
-_SI4713_PROP_TX_RDS_FIFO_SIZE           = const(0x2C07)
-#pylint: enable=bad-whitespace
+_SI4710_ADDR0 = const(0x11)  # if SEN is = const(low)
+_SI4710_ADDR1 = const(0x63)  # if SEN is high, default
+_SI4710_STATUS_CTS = const(0x80)
+_SI4710_CMD_POWER_UP = const(0x01)
+_SI4710_CMD_GET_REV = const(0x10)
+_SI4710_CMD_POWER_DOWN = const(0x11)
+_SI4710_CMD_SET_PROPERTY = const(0x12)
+_SI4710_CMD_GET_PROPERTY = const(0x13)
+_SI4710_CMD_GET_INT_STATUS = const(0x14)
+_SI4710_CMD_PATCH_ARGS = const(0x15)
+_SI4710_CMD_PATCH_DATA = const(0x16)
+_SI4710_CMD_TX_TUNE_FREQ = const(0x30)
+_SI4710_CMD_TX_TUNE_POWER = const(0x31)
+_SI4710_CMD_TX_TUNE_MEASURE = const(0x32)
+_SI4710_CMD_TX_TUNE_STATUS = const(0x33)
+_SI4710_CMD_TX_ASQ_STATUS = const(0x34)
+_SI4710_CMD_TX_RDS_BUFF = const(0x35)
+_SI4710_CMD_TX_RDS_PS = const(0x36)
+_SI4710_CMD_TX_AGC_OVERRIDE = const(0x48)
+_SI4710_CMD_GPO_CTL = const(0x80)
+_SI4710_CMD_GPO_SET = const(0x81)
+_SI4713_PROP_GPO_IEN = const(0x0001)
+_SI4713_PROP_DIGITAL_INPUT_FORMAT = const(0x0101)
+_SI4713_PROP_DIGITAL_INPUT_SAMPLE_RATE = const(0x0103)
+_SI4713_PROP_REFCLK_FREQ = const(0x0201)
+_SI4713_PROP_REFCLK_PRESCALE = const(0x0202)
+_SI4713_PROP_TX_COMPONENT_ENABLE = const(0x2100)
+_SI4713_PROP_TX_AUDIO_DEVIATION = const(0x2101)
+_SI4713_PROP_TX_PILOT_DEVIATION = const(0x2102)
+_SI4713_PROP_TX_RDS_DEVIATION = const(0x2103)
+_SI4713_PROP_TX_LINE_LEVEL_INPUT_LEVEL = const(0x2104)
+_SI4713_PROP_TX_LINE_INPUT_MUTE = const(0x2105)
+_SI4713_PROP_TX_PREEMPHASIS = const(0x2106)
+_SI4713_PROP_TX_PILOT_FREQUENCY = const(0x2107)
+_SI4713_PROP_TX_ACOMP_ENABLE = const(0x2200)
+_SI4713_PROP_TX_ACOMP_THRESHOLD = const(0x2201)
+_SI4713_PROP_TX_ATTACK_TIME = const(0x2202)
+_SI4713_PROP_TX_RELEASE_TIME = const(0x2203)
+_SI4713_PROP_TX_ACOMP_GAIN = const(0x2204)
+_SI4713_PROP_TX_LIMITER_RELEASE_TIME = const(0x2205)
+_SI4713_PROP_TX_ASQ_INTERRUPT_SOURCE = const(0x2300)
+_SI4713_PROP_TX_ASQ_LEVEL_LOW = const(0x2301)
+_SI4713_PROP_TX_ASQ_DURATION_LOW = const(0x2302)
+_SI4713_PROP_TX_AQS_LEVEL_HIGH = const(0x2303)
+_SI4713_PROP_TX_AQS_DURATION_HIGH = const(0x2304)
+_SI4713_PROP_TX_RDS_INTERRUPT_SOURCE = const(0x2C00)
+_SI4713_PROP_TX_RDS_PI = const(0x2C01)
+_SI4713_PROP_TX_RDS_PS_MIX = const(0x2C02)
+_SI4713_PROP_TX_RDS_PS_MISC = const(0x2C03)
+_SI4713_PROP_TX_RDS_PS_REPEAT_COUNT = const(0x2C04)
+_SI4713_PROP_TX_RDS_MESSAGE_COUNT = const(0x2C05)
+_SI4713_PROP_TX_RDS_PS_AF = const(0x2C06)
+_SI4713_PROP_TX_RDS_FIFO_SIZE = const(0x2C07)
+# pylint: enable=bad-whitespace
 
 
 class SI4713:
@@ -141,7 +142,7 @@ def __init__(self, i2c, *, address=_SI4710_ADDR1, reset=None, timeout_s=0.1):
         self.reset()
         # Check product ID.
         if self._get_product_number() != 13:
-            raise RuntimeError('Failed to find SI4713, check wiring!')
+            raise RuntimeError("Failed to find SI4713, check wiring!")
 
     def _read_u8(self, address):
         # Read an 8-bit unsigned value from the specified 8-bit address.
@@ -182,7 +183,7 @@ def _write_from(self, buf, count=None):
             if self._BUFFER[0] & _SI4710_STATUS_CTS > 0:
                 return
             if time.monotonic() - start > self._timeout_s:
-                raise RuntimeError('Timeout waiting for SI4723 response, check wiring!')
+                raise RuntimeError("Timeout waiting for SI4723 response, check wiring!")
 
     def _set_property(self, prop, val):
         # Set a property of the SI4713 chip.  These are both 16-bit values.
@@ -205,10 +206,10 @@ def _get_product_number(self):
             i2c.readinto(self._BUFFER, end=9)
         return self._BUFFER[1]
         # Other potentially useful but unused data:
-        #fw = (self._BUFFER[2] << 8) | self._BUFFER[3]
-        #patch = (self._BUFFER[4] << 8) | self._BUFFER[5]
-        #cmp = (self._BUFFER[6] << 8) | self._BUFFER[7]
-        #rev = (self._BUFFER[8])
+        # fw = (self._BUFFER[2] << 8) | self._BUFFER[3]
+        # patch = (self._BUFFER[4] << 8) | self._BUFFER[5]
+        # cmp = (self._BUFFER[6] << 8) | self._BUFFER[7]
+        # rev = (self._BUFFER[8])
 
     def reset(self):
         """Perform a reset of the chip using the reset line.  Will also
@@ -258,7 +259,7 @@ def _poll_interrupt_status(self, expected):
         while self.interrupt_status != expected:
             time.sleep(0.01)  # Short delay for other processing.
             if time.monotonic() - start > self._timeout_s:
-                raise RuntimeError('Timeout waiting for SI4713 to respond!')
+                raise RuntimeError("Timeout waiting for SI4713 to respond!")
 
     def _tune_status(self):
         # Retrieve the tune status command values from the radio.  Will store
@@ -372,8 +373,7 @@ def received_noise_level(self, frequency_khz, antenna_capacitance=0):
         # Validate frequency and capacitance.
         assert 76000 <= frequency_khz <= 108000
         assert (frequency_khz % 50) == 0
-        assert antenna_capacitance == 0 or \
-               (0.25 <= antenna_capacitance <= 47.75)
+        assert antenna_capacitance == 0 or (0.25 <= antenna_capacitance <= 47.75)
         # Convert frequency and capacitance to units used by the chip.
         frequency_khz = (frequency_khz // 10) & 0xFFFF
         antenna_capacitance = int(antenna_capacitance / 0.25)
@@ -398,7 +398,8 @@ def input_level(self):
         """
         # Perform ASQ request, then parse out 8 bit _signed_ input level value.
         self._asq_status()
-        return struct.unpack('bbbbb', self._BUFFER[0:5])[4]
+        return struct.unpack("bbbbb", self._BUFFER[0:5])[4]
+
     @property
     def audio_signal_status(self):
         """Retrieve the ASQ or audio signal quality status value from the chip.
@@ -461,9 +462,9 @@ def _set_rds_station(self, station):
             self._BUFFER[0] = _SI4710_CMD_TX_RDS_PS
             self._BUFFER[1] = i // 4
             self._BUFFER[2] = station[i] if i < station_length else 0x00
-            self._BUFFER[3] = station[i+1] if i+1 < station_length else 0x00
-            self._BUFFER[4] = station[i+2] if i+2 < station_length else 0x00
-            self._BUFFER[5] = station[i+3] if i+3 < station_length else 0x00
+            self._BUFFER[3] = station[i + 1] if i + 1 < station_length else 0x00
+            self._BUFFER[4] = station[i + 2] if i + 2 < station_length else 0x00
+            self._BUFFER[5] = station[i + 3] if i + 3 < station_length else 0x00
             self._write_from(self._BUFFER, count=6)
 
     def _set_rds_buffer(self, rds_buffer):
@@ -478,22 +479,30 @@ def _set_rds_buffer(self, rds_buffer):
             self._BUFFER[2] = 0x20
             self._BUFFER[3] = i // 4
             self._BUFFER[4] = rds_buffer[i] if i < buf_length else 0x00
-            self._BUFFER[5] = rds_buffer[i+1] if i+1 < buf_length else 0x00
-            self._BUFFER[6] = rds_buffer[i+2] if i+2 < buf_length else 0x00
-            self._BUFFER[7] = rds_buffer[i+3] if i+3 < buf_length else 0x00
+            self._BUFFER[5] = rds_buffer[i + 1] if i + 1 < buf_length else 0x00
+            self._BUFFER[6] = rds_buffer[i + 2] if i + 2 < buf_length else 0x00
+            self._BUFFER[7] = rds_buffer[i + 3] if i + 3 < buf_length else 0x00
             self._write_from(self._BUFFER, count=8)
 
-    rds_station = property(None, _set_rds_station, None,
-                           """Set the RDS broadcast station to the specified
+    rds_station = property(
+        None,
+        _set_rds_station,
+        None,
+        """Set the RDS broadcast station to the specified
                            byte string.  Can be at most 96 bytes long and will
                            be padded with blank spaces if less.
-                           """)
-
-    rds_buffer = property(None, _set_rds_buffer, None,
-                          """Set the RDS broadcast buffer to the specified byte
+                           """,
+    )
+
+    rds_buffer = property(
+        None,
+        _set_rds_buffer,
+        None,
+        """Set the RDS broadcast buffer to the specified byte
                           string.  Can be at most 106 bytes long and will be
                           padded with blank spaces if less.
-                          """)
+                          """,
+    )
 
     def configure_rds(self, program_id, station=None, rds_buffer=None):
         """Configure and enable the RDS broadcast of the specified program ID.