Merge pull request #13 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_vl6180x.py

@@ -51,45 +51,45 @@
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_VL6180X.git"
 
 
-#pylint: disable=bad-whitespace
+# pylint: disable=bad-whitespace
 # Internal constants:
-_VL6180X_DEFAULT_I2C_ADDR                  = const(0x29)
-_VL6180X_REG_IDENTIFICATION_MODEL_ID       = const(0x000)
-_VL6180X_REG_SYSTEM_INTERRUPT_CONFIG       = const(0x014)
-_VL6180X_REG_SYSTEM_INTERRUPT_CLEAR        = const(0x015)
-_VL6180X_REG_SYSTEM_FRESH_OUT_OF_RESET     = const(0x016)
-_VL6180X_REG_SYSRANGE_START                = const(0x018)
-_VL6180X_REG_SYSALS_START                  = const(0x038)
-_VL6180X_REG_SYSALS_ANALOGUE_GAIN          = const(0x03F)
-_VL6180X_REG_SYSALS_INTEGRATION_PERIOD_HI  = const(0x040)
-_VL6180X_REG_SYSALS_INTEGRATION_PERIOD_LO  = const(0x041)
-_VL6180X_REG_RESULT_ALS_VAL                = const(0x050)
-_VL6180X_REG_RESULT_RANGE_VAL              = const(0x062)
-_VL6180X_REG_RESULT_RANGE_STATUS           = const(0x04d)
-_VL6180X_REG_RESULT_INTERRUPT_STATUS_GPIO  = const(0x04f)
+_VL6180X_DEFAULT_I2C_ADDR = const(0x29)
+_VL6180X_REG_IDENTIFICATION_MODEL_ID = const(0x000)
+_VL6180X_REG_SYSTEM_INTERRUPT_CONFIG = const(0x014)
+_VL6180X_REG_SYSTEM_INTERRUPT_CLEAR = const(0x015)
+_VL6180X_REG_SYSTEM_FRESH_OUT_OF_RESET = const(0x016)
+_VL6180X_REG_SYSRANGE_START = const(0x018)
+_VL6180X_REG_SYSALS_START = const(0x038)
+_VL6180X_REG_SYSALS_ANALOGUE_GAIN = const(0x03F)
+_VL6180X_REG_SYSALS_INTEGRATION_PERIOD_HI = const(0x040)
+_VL6180X_REG_SYSALS_INTEGRATION_PERIOD_LO = const(0x041)
+_VL6180X_REG_RESULT_ALS_VAL = const(0x050)
+_VL6180X_REG_RESULT_RANGE_VAL = const(0x062)
+_VL6180X_REG_RESULT_RANGE_STATUS = const(0x04D)
+_VL6180X_REG_RESULT_INTERRUPT_STATUS_GPIO = const(0x04F)
 
 # User-facing constants:
-ALS_GAIN_1         = const(0x06)
-ALS_GAIN_1_25      = const(0x05)
-ALS_GAIN_1_67      = const(0x04)
-ALS_GAIN_2_5       = const(0x03)
-ALS_GAIN_5         = const(0x02)
-ALS_GAIN_10        = const(0x01)
-ALS_GAIN_20        = const(0x00)
-ALS_GAIN_40        = const(0x07)
+ALS_GAIN_1 = const(0x06)
+ALS_GAIN_1_25 = const(0x05)
+ALS_GAIN_1_67 = const(0x04)
+ALS_GAIN_2_5 = const(0x03)
+ALS_GAIN_5 = const(0x02)
+ALS_GAIN_10 = const(0x01)
+ALS_GAIN_20 = const(0x00)
+ALS_GAIN_40 = const(0x07)
 
-ERROR_NONE         = const(0)
-ERROR_SYSERR_1     = const(1)
-ERROR_SYSERR_5     = const(5)
-ERROR_ECEFAIL      = const(6)
-ERROR_NOCONVERGE   = const(7)
-ERROR_RANGEIGNORE  = const(8)
-ERROR_SNR          = const(11)
-ERROR_RAWUFLOW     = const(12)
-ERROR_RAWOFLOW     = const(13)
-ERROR_RANGEUFLOW   = const(14)
-ERROR_RANGEOFLOW   = const(15)
-#pylint: enable=bad-whitespace
+ERROR_NONE = const(0)
+ERROR_SYSERR_1 = const(1)
+ERROR_SYSERR_5 = const(5)
+ERROR_ECEFAIL = const(6)
+ERROR_NOCONVERGE = const(7)
+ERROR_RANGEIGNORE = const(8)
+ERROR_SNR = const(11)
+ERROR_RAWUFLOW = const(12)
+ERROR_RAWOFLOW = const(13)
+ERROR_RANGEUFLOW = const(14)
+ERROR_RANGEOFLOW = const(15)
+# pylint: enable=bad-whitespace
 
 
 class VL6180X:
@@ -107,7 +107,7 @@ class VL6180X:
     def __init__(self, i2c, address=_VL6180X_DEFAULT_I2C_ADDR):
         self._device = i2c_device.I2CDevice(i2c, address)
         if self._read_8(_VL6180X_REG_IDENTIFICATION_MODEL_ID) != 0xB4:
-            raise RuntimeError('Could not find VL6180X, is it connected and powered?')
+            raise RuntimeError("Could not find VL6180X, is it connected and powered?")
         self._load_settings()
         self._write_8(_VL6180X_REG_SYSTEM_FRESH_OUT_OF_RESET, 0x00)
 
@@ -142,7 +142,7 @@ def read_lux(self, gain):
         """
         reg = self._read_8(_VL6180X_REG_SYSTEM_INTERRUPT_CONFIG)
         reg &= ~0x38
-        reg |= (0x4 << 3) # IRQ on ALS ready
+        reg |= 0x4 << 3  # IRQ on ALS ready
         self._write_8(_VL6180X_REG_SYSTEM_INTERRUPT_CONFIG, reg)
         # 100 ms integration period
         self._write_8(_VL6180X_REG_SYSALS_INTEGRATION_PERIOD_HI, 0)
@@ -154,13 +154,15 @@ def read_lux(self, gain):
         # start ALS
         self._write_8(_VL6180X_REG_SYSALS_START, 0x1)
         # Poll until "New Sample Ready threshold event" is set
-        while ((self._read_8(_VL6180X_REG_RESULT_INTERRUPT_STATUS_GPIO) >> 3) & 0x7) != 4:
+        while (
+            (self._read_8(_VL6180X_REG_RESULT_INTERRUPT_STATUS_GPIO) >> 3) & 0x7
+        ) != 4:
             pass
         # read lux!
         lux = self._read_16(_VL6180X_REG_RESULT_ALS_VAL)
         # clear interrupt
         self._write_8(_VL6180X_REG_SYSTEM_INTERRUPT_CLEAR, 0x07)
-        lux *= 0.32 # calibrated count/lux
+        lux *= 0.32  # calibrated count/lux
         if gain == ALS_GAIN_1:
             pass
         elif gain == ALS_GAIN_1_25:
@@ -178,7 +180,7 @@ def read_lux(self, gain):
         elif gain == ALS_GAIN_40:
             lux /= 20
         lux *= 100
-        lux /= 100 # integration time in ms
+        lux /= 100  # integration time in ms
         return lux
 
     @property
@@ -205,72 +207,76 @@ def _load_settings(self):
         self._write_8(0x0207, 0x01)
         self._write_8(0x0208, 0x01)
         self._write_8(0x0096, 0x00)
-        self._write_8(0x0097, 0xfd)
-        self._write_8(0x00e3, 0x00)
-        self._write_8(0x00e4, 0x04)
-        self._write_8(0x00e5, 0x02)
-        self._write_8(0x00e6, 0x01)
-        self._write_8(0x00e7, 0x03)
-        self._write_8(0x00f5, 0x02)
-        self._write_8(0x00d9, 0x05)
-        self._write_8(0x00db, 0xce)
-        self._write_8(0x00dc, 0x03)
-        self._write_8(0x00dd, 0xf8)
-        self._write_8(0x009f, 0x00)
-        self._write_8(0x00a3, 0x3c)
-        self._write_8(0x00b7, 0x00)
-        self._write_8(0x00bb, 0x3c)
-        self._write_8(0x00b2, 0x09)
-        self._write_8(0x00ca, 0x09)
+        self._write_8(0x0097, 0xFD)
+        self._write_8(0x00E3, 0x00)
+        self._write_8(0x00E4, 0x04)
+        self._write_8(0x00E5, 0x02)
+        self._write_8(0x00E6, 0x01)
+        self._write_8(0x00E7, 0x03)
+        self._write_8(0x00F5, 0x02)
+        self._write_8(0x00D9, 0x05)
+        self._write_8(0x00DB, 0xCE)
+        self._write_8(0x00DC, 0x03)
+        self._write_8(0x00DD, 0xF8)
+        self._write_8(0x009F, 0x00)
+        self._write_8(0x00A3, 0x3C)
+        self._write_8(0x00B7, 0x00)
+        self._write_8(0x00BB, 0x3C)
+        self._write_8(0x00B2, 0x09)
+        self._write_8(0x00CA, 0x09)
         self._write_8(0x0198, 0x01)
-        self._write_8(0x01b0, 0x17)
-        self._write_8(0x01ad, 0x00)
-        self._write_8(0x00ff, 0x05)
+        self._write_8(0x01B0, 0x17)
+        self._write_8(0x01AD, 0x00)
+        self._write_8(0x00FF, 0x05)
         self._write_8(0x0100, 0x05)
         self._write_8(0x0199, 0x05)
-        self._write_8(0x01a6, 0x1b)
-        self._write_8(0x01ac, 0x3e)
-        self._write_8(0x01a7, 0x1f)
+        self._write_8(0x01A6, 0x1B)
+        self._write_8(0x01AC, 0x3E)
+        self._write_8(0x01A7, 0x1F)
         self._write_8(0x0030, 0x00)
         # Recommended : Public registers - See data sheet for more detail
-        self._write_8(0x0011, 0x10)   # Enables polling for 'New Sample ready'
-                                      # when measurement completes
-        self._write_8(0x010a, 0x30)   # Set the averaging sample period
-                                      # (compromise between lower noise and
-                                      # increased execution time)
-        self._write_8(0x003f, 0x46)   # Sets the light and dark gain (upper
-                                      # nibble). Dark gain should not be
-                                      # changed.
-        self._write_8(0x0031, 0xFF)   # sets the # of range measurements after
-                                      # which auto calibration of system is
-                                      # performed
-        self._write_8(0x0040, 0x63)   # Set ALS integration time to 100ms
-        self._write_8(0x002e, 0x01)   # perform a single temperature calibration
-                                      # of the ranging sensor
+        self._write_8(0x0011, 0x10)  # Enables polling for 'New Sample ready'
+        # when measurement completes
+        self._write_8(0x010A, 0x30)  # Set the averaging sample period
+        # (compromise between lower noise and
+        # increased execution time)
+        self._write_8(0x003F, 0x46)  # Sets the light and dark gain (upper
+        # nibble). Dark gain should not be
+        # changed.
+        self._write_8(0x0031, 0xFF)  # sets the # of range measurements after
+        # which auto calibration of system is
+        # performed
+        self._write_8(0x0040, 0x63)  # Set ALS integration time to 100ms
+        self._write_8(0x002E, 0x01)  # perform a single temperature calibration
+        # of the ranging sensor
 
         # Optional: Public registers - See data sheet for more detail
-        self._write_8(0x001b, 0x09)   # Set default ranging inter-measurement
-                                      # period to 100ms
-        self._write_8(0x003e, 0x31)   # Set default ALS inter-measurement period
-                                      # to 500ms
-        self._write_8(0x0014, 0x24)   # Configures interrupt on 'New Sample
-                                      # Ready threshold event'
+        self._write_8(0x001B, 0x09)  # Set default ranging inter-measurement
+        # period to 100ms
+        self._write_8(0x003E, 0x31)  # Set default ALS inter-measurement period
+        # to 500ms
+        self._write_8(0x0014, 0x24)  # Configures interrupt on 'New Sample
+        # Ready threshold event'
 
     def _write_8(self, address, data):
         # Write 1 byte of data from the specified 16-bit register address.
         with self._device:
-            self._device.write(bytes([(address >> 8) & 0xFF,
-                                      address & 0xFF,
-                                      data]))
+            self._device.write(bytes([(address >> 8) & 0xFF, address & 0xFF, data]))
 
     def _write_16(self, address, data):
         # Write a 16-bit big endian value to the specified 16-bit register
         # address.
         with self._device as i2c:
-            i2c.write(bytes([(address >> 8) & 0xFF,
-                             address & 0xFF,
-                             (data >> 8) & 0xFF,
-                             data & 0xFF]))
+            i2c.write(
+                bytes(
+                    [
+                        (address >> 8) & 0xFF,
+                        address & 0xFF,
+                        (data >> 8) & 0xFF,
+                        data & 0xFF,
+                    ]
+                )
+            )
 
     def _read_8(self, address):
         # Read and return a byte from the specified 16-bit register address.