From 176b8172dce9f509cc2aa4219a225f4e8d650a12 Mon Sep 17 00:00:00 2001 From: Kattni Rembor Date: Thu, 9 Apr 2020 12:35:27 -0400 Subject: [PATCH 1/2] Black reformatting with Python 3 target. --- adafruit_lsm6ds.py | 150 +++++++++++++++++++++-------------- docs/conf.py | 120 +++++++++++++++++----------- examples/lsm6ds_full_test.py | 19 +++-- examples/lsm6ds_pedometer.py | 5 +- examples/lsm6ds_rate_test.py | 19 +++-- setup.py | 56 ++++++------- 6 files changed, 217 insertions(+), 152 deletions(-) diff --git a/adafruit_lsm6ds.py b/adafruit_lsm6ds.py index 832e6af..8254f59 100644 --- a/adafruit_lsm6ds.py +++ b/adafruit_lsm6ds.py @@ -54,11 +54,12 @@ from adafruit_register.i2c_struct import ROUnaryStruct, Struct from adafruit_register.i2c_bits import RWBits from adafruit_register.i2c_bit import RWBit + __version__ = "0.0.0-auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_LSM6DSOX.git" -_LSM6DS_DEFAULT_ADDRESS = const(0x6a) +_LSM6DS_DEFAULT_ADDRESS = const(0x6A) _LSM6DS_CHIP_ID = const(0x6C) _ISM330DHCT_CHIP_ID = const(0x6B) @@ -95,6 +96,7 @@ _MILLI_G_TO_ACCEL = 0.00980665 + class CV: """struct helper""" @@ -115,62 +117,82 @@ def is_valid(cls, value): "Returns true if the given value is a member of the CV" return value in cls.string + class AccelRange(CV): """Options for ``accelerometer_range``""" - pass #pylint: disable=unnecessary-pass -AccelRange.add_values(( - ('RANGE_2G', 0, 2, 0.061), - ('RANGE_16G', 1, 16, 0.488), - ('RANGE_4G', 2, 4, 0.122), - ('RANGE_8G', 3, 8, 0.244) -)) + pass # pylint: disable=unnecessary-pass + + +AccelRange.add_values( + ( + ("RANGE_2G", 0, 2, 0.061), + ("RANGE_16G", 1, 16, 0.488), + ("RANGE_4G", 2, 4, 0.122), + ("RANGE_8G", 3, 8, 0.244), + ) +) + class GyroRange(CV): """Options for ``gyro_data_range``""" - pass #pylint: disable=unnecessary-pass -GyroRange.add_values(( - ('RANGE_125_DPS', 125, 125, 4.375), - ('RANGE_250_DPS', 0, 250, 8.75), - ('RANGE_500_DPS', 1, 500, 17.50), - ('RANGE_1000_DPS', 2, 1000, 35.0), - ('RANGE_2000_DPS', 3, 2000, 70.0), - ('RANGE_4000_DPS', 4000, 4000, 140.0) -)) + pass # pylint: disable=unnecessary-pass + + +GyroRange.add_values( + ( + ("RANGE_125_DPS", 125, 125, 4.375), + ("RANGE_250_DPS", 0, 250, 8.75), + ("RANGE_500_DPS", 1, 500, 17.50), + ("RANGE_1000_DPS", 2, 1000, 35.0), + ("RANGE_2000_DPS", 3, 2000, 70.0), + ("RANGE_4000_DPS", 4000, 4000, 140.0), + ) +) + class Rate(CV): """Options for ``accelerometer_data_rate`` and ``gyro_data_rate``""" - pass #pylint: disable=unnecessary-pass - -Rate.add_values(( - ('RATE_SHUTDOWN', 0, 0, None), - ('RATE_12_5_HZ', 1, 12.5, None), - ('RATE_26_HZ', 2, 26.0, None), - ('RATE_52_HZ', 3, 52.0, None), - ('RATE_104_HZ', 4, 104.0, None), - ('RATE_208_HZ', 5, 208.0, None), - ('RATE_416_HZ', 6, 416.0, None), - ('RATE_833_HZ', 7, 833.0, None), - ('RATE_1_66K_HZ', 8, 1066.0, None), - ('RATE_3_33K_HZ', 9, 3033.0, None), - ('RATE_6_66K_HZ', 10, 6066.0, None), - ('RATE_1_6_HZ', 11, 1.6, None) -)) + + pass # pylint: disable=unnecessary-pass + + +Rate.add_values( + ( + ("RATE_SHUTDOWN", 0, 0, None), + ("RATE_12_5_HZ", 1, 12.5, None), + ("RATE_26_HZ", 2, 26.0, None), + ("RATE_52_HZ", 3, 52.0, None), + ("RATE_104_HZ", 4, 104.0, None), + ("RATE_208_HZ", 5, 208.0, None), + ("RATE_416_HZ", 6, 416.0, None), + ("RATE_833_HZ", 7, 833.0, None), + ("RATE_1_66K_HZ", 8, 1066.0, None), + ("RATE_3_33K_HZ", 9, 3033.0, None), + ("RATE_6_66K_HZ", 10, 6066.0, None), + ("RATE_1_6_HZ", 11, 1.6, None), + ) +) + class AccelHPF(CV): """Options for the accelerometer high pass filter""" - pass #pylint: disable=unnecessary-pass -AccelHPF.add_values(( - ('SLOPE', 0, 0, None), - ('HPF_DIV100', 1, 0, None), - ('HPF_DIV9', 2, 0, None), - ('HPF_DIV400', 3, 0, None), -)) + pass # pylint: disable=unnecessary-pass + + +AccelHPF.add_values( + ( + ("SLOPE", 0, 0, None), + ("HPF_DIV100", 1, 0, None), + ("HPF_DIV9", 2, 0, None), + ("HPF_DIV400", 3, 0, None), + ) +) -class LSM6DS: #pylint: disable=too-many-instance-attributes +class LSM6DS: # pylint: disable=too-many-instance-attributes """Driver for the LSM6DSOX 6-axis accelerometer and gyroscope. @@ -179,11 +201,11 @@ class LSM6DS: #pylint: disable=too-many-instance-attributes """ -#ROUnaryStructs: + # ROUnaryStructs: _chip_id = ROUnaryStruct(_LSM6DS_WHOAMI, " Date: Fri, 10 Apr 2020 10:59:32 -0400 Subject: [PATCH 2/2] Remove pass from empty classes. --- adafruit_lsm6ds.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/adafruit_lsm6ds.py b/adafruit_lsm6ds.py index 8254f59..436e670 100644 --- a/adafruit_lsm6ds.py +++ b/adafruit_lsm6ds.py @@ -121,8 +121,6 @@ def is_valid(cls, value): class AccelRange(CV): """Options for ``accelerometer_range``""" - pass # pylint: disable=unnecessary-pass - AccelRange.add_values( ( @@ -137,8 +135,6 @@ class AccelRange(CV): class GyroRange(CV): """Options for ``gyro_data_range``""" - pass # pylint: disable=unnecessary-pass - GyroRange.add_values( ( @@ -155,8 +151,6 @@ class GyroRange(CV): class Rate(CV): """Options for ``accelerometer_data_rate`` and ``gyro_data_rate``""" - pass # pylint: disable=unnecessary-pass - Rate.add_values( ( @@ -179,8 +173,6 @@ class Rate(CV): class AccelHPF(CV): """Options for the accelerometer high pass filter""" - pass # pylint: disable=unnecessary-pass - AccelHPF.add_values( (