Skip to content

Commit 1cf2d83

Browse files
authored
Merge pull request #30 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents c51f558 + 48fb1a4 commit 1cf2d83

File tree

11 files changed

+388
-210
lines changed

11 files changed

+388
-210
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
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_pybadger/clue.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@
5555

5656
Buttons = namedtuple("Buttons", "a b")
5757

58+
5859
class Clue(PyBadgerBase):
5960
"""Class that represents a single CLUE."""
61+
6062
_audio_out = audiopwmio.PWMAudioOut
6163
_neopixel_count = 1
6264

@@ -68,8 +70,10 @@ def __init__(self):
6870
if i2c is not None:
6971
self._accelerometer = adafruit_lsm6ds.LSM6DS33(i2c)
7072

71-
self._buttons = GamePad(digitalio.DigitalInOut(board.BUTTON_A),
72-
digitalio.DigitalInOut(board.BUTTON_B))
73+
self._buttons = GamePad(
74+
digitalio.DigitalInOut(board.BUTTON_A),
75+
digitalio.DigitalInOut(board.BUTTON_B),
76+
)
7377

7478
@property
7579
def button(self):
@@ -88,9 +92,9 @@ def button(self):
8892
print("Button B")
8993
"""
9094
button_values = self._buttons.get_pressed()
91-
return Buttons(button_values & PyBadgerBase.BUTTON_B,
92-
button_values & PyBadgerBase.BUTTON_A)
93-
95+
return Buttons(
96+
button_values & PyBadgerBase.BUTTON_B, button_values & PyBadgerBase.BUTTON_A
97+
)
9498

9599
@property
96100
def _unsupported(self):
@@ -103,5 +107,6 @@ def _unsupported(self):
103107
play_file = _unsupported
104108
light = _unsupported
105109

110+
106111
clue = Clue() # pylint: disable=invalid-name
107112
"""Object that is automatically created on import."""

adafruit_pybadger/pybadge.py

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161

6262
Buttons = namedtuple("Buttons", "b a start select right down up left")
6363

64+
6465
class PyBadge(PyBadgerBase):
6566
"""Class that represents a single PyBadge, PyBadge LC, or EdgeBadge."""
6667

@@ -81,13 +82,17 @@ def __init__(self):
8182
if i2c is not None:
8283
int1 = digitalio.DigitalInOut(board.ACCELEROMETER_INTERRUPT)
8384
try:
84-
self._accelerometer = adafruit_lis3dh.LIS3DH_I2C(i2c, address=0x19, int1=int1)
85+
self._accelerometer = adafruit_lis3dh.LIS3DH_I2C(
86+
i2c, address=0x19, int1=int1
87+
)
8588
except ValueError:
8689
self._accelerometer = adafruit_lis3dh.LIS3DH_I2C(i2c, int1=int1)
8790

88-
self._buttons = GamePadShift(digitalio.DigitalInOut(board.BUTTON_CLOCK),
89-
digitalio.DigitalInOut(board.BUTTON_OUT),
90-
digitalio.DigitalInOut(board.BUTTON_LATCH))
91+
self._buttons = GamePadShift(
92+
digitalio.DigitalInOut(board.BUTTON_CLOCK),
93+
digitalio.DigitalInOut(board.BUTTON_OUT),
94+
digitalio.DigitalInOut(board.BUTTON_LATCH),
95+
)
9196

9297
self._light_sensor = analogio.AnalogIn(board.A7)
9398

@@ -113,11 +118,22 @@ def button(self):
113118
114119
"""
115120
button_values = self._buttons.get_pressed()
116-
return Buttons(*[button_values & button for button in
117-
(PyBadgerBase.BUTTON_B, PyBadgerBase.BUTTON_A,
118-
PyBadgerBase.BUTTON_START, PyBadgerBase.BUTTON_SELECT,
119-
PyBadgerBase.BUTTON_RIGHT, PyBadgerBase.BUTTON_DOWN,
120-
PyBadgerBase.BUTTON_UP, PyBadgerBase.BUTTON_LEFT)])
121+
return Buttons(
122+
*[
123+
button_values & button
124+
for button in (
125+
PyBadgerBase.BUTTON_B,
126+
PyBadgerBase.BUTTON_A,
127+
PyBadgerBase.BUTTON_START,
128+
PyBadgerBase.BUTTON_SELECT,
129+
PyBadgerBase.BUTTON_RIGHT,
130+
PyBadgerBase.BUTTON_DOWN,
131+
PyBadgerBase.BUTTON_UP,
132+
PyBadgerBase.BUTTON_LEFT,
133+
)
134+
]
135+
)
136+
121137

122138
pybadge = PyBadge() # pylint: disable=invalid-name
123139
"""Object that is automatically created on import."""

0 commit comments

Comments
 (0)