Skip to content

Commit 134aebf

Browse files
committed
Ran black, updated to pylint 2.x
1 parent 12883b8 commit 134aebf

File tree

6 files changed

+161
-130
lines changed

6 files changed

+161
-130
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
source actions-ci/install.sh
4141
- name: Pip install pylint, black, & Sphinx
4242
run: |
43-
pip install --force-reinstall pylint==1.9.2 black==19.10b0 Sphinx sphinx-rtd-theme
43+
pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
4444
- name: Library version
4545
run: git describe --dirty --always --tags
4646
- name: PyLint

adafruit_icm20649.py

+50-41
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,27 @@
5454
from adafruit_register.i2c_bit import RWBit
5555
from adafruit_register.i2c_bits import RWBits
5656

57-
#pylint: disable=bad-whitespace
58-
_ICM20649_DEFAULT_ADDRESS = 0x68 #icm20649 default i2c address
59-
_ICM20649_DEVICE_ID = 0xE1 # Correct context of WHO_AM_I register
57+
# pylint: disable=bad-whitespace
58+
_ICM20649_DEFAULT_ADDRESS = 0x68 # icm20649 default i2c address
59+
_ICM20649_DEVICE_ID = 0xE1 # Correct context of WHO_AM_I register
6060

6161
# Bank 0
6262
_ICM20649_WHO_AM_I = 0x00 # device_id register
63-
_ICM20649_REG_BANK_SEL = 0x7F # register bank selection register
64-
_ICM20649_PWR_MGMT_1 = 0x06 #primary power management register
65-
_ICM20649_ACCEL_XOUT_H = 0x2D # first byte of accel data
66-
_ICM20649_GYRO_XOUT_H = 0x33 # first byte of accel data
63+
_ICM20649_REG_BANK_SEL = 0x7F # register bank selection register
64+
_ICM20649_PWR_MGMT_1 = 0x06 # primary power management register
65+
_ICM20649_ACCEL_XOUT_H = 0x2D # first byte of accel data
66+
_ICM20649_GYRO_XOUT_H = 0x33 # first byte of accel data
6767

6868
# Bank 2
6969
_ICM20649_GYRO_SMPLRT_DIV = 0x00
70-
_ICM20649_GYRO_CONFIG_1 = 0x01
70+
_ICM20649_GYRO_CONFIG_1 = 0x01
7171
_ICM20649_ACCEL_SMPLRT_DIV_1 = 0x10
7272
_ICM20649_ACCEL_SMPLRT_DIV_2 = 0x11
73-
_ICM20649_ACCEL_CONFIG_1 = 0x14
73+
_ICM20649_ACCEL_CONFIG_1 = 0x14
7474

7575

76-
G_TO_ACCEL = 9.80665
77-
#pylint: enable=bad-whitespace
76+
G_TO_ACCEL = 9.80665
77+
# pylint: enable=bad-whitespace
7878
class CV:
7979
"""struct helper"""
8080

@@ -96,31 +96,39 @@ def is_valid(cls, value):
9696
return value in cls.string
9797

9898

99-
10099
class AccelRange(CV):
101100
"""Options for ``accelerometer_range``"""
102-
pass #pylint: disable=unnecessary-pass
103101

104-
AccelRange.add_values((
105-
('RANGE_4G', 0, 4, 8192),
106-
('RANGE_8G', 1, 8, 4096.0),
107-
('RANGE_16G', 2, 16, 2048),
108-
('RANGE_30G', 3, 30, 1024),
109-
))
102+
pass # pylint: disable=unnecessary-pass
103+
104+
105+
AccelRange.add_values(
106+
(
107+
("RANGE_4G", 0, 4, 8192),
108+
("RANGE_8G", 1, 8, 4096.0),
109+
("RANGE_16G", 2, 16, 2048),
110+
("RANGE_30G", 3, 30, 1024),
111+
)
112+
)
113+
110114

111115
class GyroRange(CV):
112116
"""Options for ``gyro_data_range``"""
113-
pass #pylint: disable=unnecessary-pass
114117

115-
GyroRange.add_values((
116-
('RANGE_500_DPS', 0, 500, 65.5),
117-
('RANGE_1000_DPS', 1, 1000, 32.8),
118-
('RANGE_2000_DPS', 2, 2000, 16.4),
119-
('RANGE_4000_DPS', 3, 4000, 8.2)
120-
))
118+
pass # pylint: disable=unnecessary-pass
121119

122120

123-
class ICM20649: #pylint:disable=too-many-instance-attributes
121+
GyroRange.add_values(
122+
(
123+
("RANGE_500_DPS", 0, 500, 65.5),
124+
("RANGE_1000_DPS", 1, 1000, 32.8),
125+
("RANGE_2000_DPS", 2, 2000, 16.4),
126+
("RANGE_4000_DPS", 3, 4000, 8.2),
127+
)
128+
)
129+
130+
131+
class ICM20649: # pylint:disable=too-many-instance-attributes
124132
"""Library for the ST ICM-20649 Wide-Range 6-DoF Accelerometer and Gyro.
125133
126134
:param ~busio.I2C i2c_bus: The I2C bus the ICM20649 is connected to.
@@ -159,19 +167,18 @@ def __init__(self, i2c_bus, address=_ICM20649_DEFAULT_ADDRESS):
159167
self._sleep = False
160168

161169
self._bank = 2
162-
self._accel_range = AccelRange.RANGE_8G #pylint: disable=no-member
170+
self._accel_range = AccelRange.RANGE_8G # pylint: disable=no-member
163171
self._cached_accel_range = self._accel_range
164172

165-
#TODO: CV-ify
173+
# TODO: CV-ify
166174
self._accel_dlpf_config = 3
167175

168-
169176
# 1.125 kHz/(1+ACCEL_SMPLRT_DIV[11:0]),
170177
# 1125Hz/(1+20) = 53.57Hz
171178
self._accel_rate_divisor = 20
172179

173180
# writeByte(ICM20649_ADDR,GYRO_CONFIG_1, gyroConfig);
174-
self._gyro_range = GyroRange.RANGE_500_DPS #pylint: disable=no-member
181+
self._gyro_range = GyroRange.RANGE_500_DPS # pylint: disable=no-member
175182
sleep(0.100)
176183
self._cached_gyro_range = self._gyro_range
177184

@@ -196,7 +203,7 @@ def acceleration(self):
196203
y = self._scale_xl_data(raw_accel_data[1])
197204
z = self._scale_xl_data(raw_accel_data[2])
198205

199-
return(x, y, z)
206+
return (x, y, z)
200207

201208
@property
202209
def gyro(self):
@@ -221,7 +228,7 @@ def accelerometer_range(self):
221228
return self._cached_accel_range
222229

223230
@accelerometer_range.setter
224-
def accelerometer_range(self, value): #pylint: disable=no-member
231+
def accelerometer_range(self, value): # pylint: disable=no-member
225232
if not AccelRange.is_valid(value):
226233
raise AttributeError("range must be an `AccelRange`")
227234
self._bank = 2
@@ -244,7 +251,7 @@ def gyro_range(self, value):
244251
self._gyro_range = value
245252
self._cached_gyro_range = value
246253
self._bank = 0
247-
sleep(.100) # needed to let new range settle
254+
sleep(0.100) # needed to let new range settle
248255

249256
@property
250257
def accelerometer_data_rate_divisor(self):
@@ -258,7 +265,7 @@ def accelerometer_data_rate_divisor(self):
258265
self._bank = 2
259266
raw_rate_divisor = self._accel_rate_divisor
260267
self._bank = 0
261-
#rate_hz = 1125/(1+raw_rate_divisor)
268+
# rate_hz = 1125/(1+raw_rate_divisor)
262269
return raw_rate_divisor
263270

264271
@accelerometer_data_rate_divisor.setter
@@ -291,11 +298,11 @@ def gyro_data_rate_divisor(self, value):
291298
self._gyro_rate_divisor = value
292299
self._bank = 0
293300

294-
def _accel_rate_calc(self, divisor):#pylint:disable=no-self-use
295-
return 1125/(1+divisor)
301+
def _accel_rate_calc(self, divisor): # pylint:disable=no-self-use
302+
return 1125 / (1 + divisor)
296303

297-
def _gyro_rate_calc(self, divisor):#pylint:disable=no-self-use
298-
return 1100/(1+divisor)
304+
def _gyro_rate_calc(self, divisor): # pylint:disable=no-self-use
305+
return 1100 / (1 + divisor)
299306

300307
@property
301308
def accelerometer_data_rate(self):
@@ -312,7 +319,9 @@ def accelerometer_data_rate(self):
312319
@accelerometer_data_rate.setter
313320
def accelerometer_data_rate(self, value):
314321
if value < self._accel_rate_calc(4095) or value > self._accel_rate_calc(0):
315-
raise AttributeError("Accelerometer data rate must be between 0.27 and 1125.0")
322+
raise AttributeError(
323+
"Accelerometer data rate must be between 0.27 and 1125.0"
324+
)
316325
self.accelerometer_data_rate_divisor = value
317326

318327
@property
@@ -332,5 +341,5 @@ def gyro_data_rate(self, value):
332341
if value < self._gyro_rate_calc(4095) or value > self._gyro_rate_calc(0):
333342
raise AttributeError("Gyro data rate must be between 4.30 and 1100.0")
334343

335-
divisor = round(((1125.0-value)/ value))
344+
divisor = round(((1125.0 - value) / value))
336345
self.gyro_data_rate_divisor = divisor

0 commit comments

Comments
 (0)