Skip to content

Commit a63edd3

Browse files
authored
Merge pull request #15 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents 2a25de6 + 7443b9e commit a63edd3

File tree

6 files changed

+87
-69
lines changed

6 files changed

+87
-69
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_debouncer.py

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@
5252
_UNSTABLE_STATE = const(0x02)
5353
_CHANGED_STATE = const(0x04)
5454

55-
class Debouncer(object):
55+
56+
class Debouncer():
5657
"""Debounce an input pin or an arbitrary predicate"""
5758

5859
def __init__(self, io_or_predicate, interval=0.010):
@@ -61,7 +62,7 @@ def __init__(self, io_or_predicate, interval=0.010):
6162
:param int interval: bounce threshold in seconds (default is 0.010, i.e. 10 milliseconds)
6263
"""
6364
self.state = 0x00
64-
if hasattr(io_or_predicate, 'value'):
65+
if hasattr(io_or_predicate, "value"):
6566
self.function = lambda: io_or_predicate.value
6667
else:
6768
self.function = io_or_predicate
@@ -72,23 +73,18 @@ def __init__(self, io_or_predicate, interval=0.010):
7273
self._previous_state_duration = 0
7374
self._state_changed_time = 0
7475

75-
7676
def _set_state(self, bits):
7777
self.state |= bits
7878

79-
8079
def _unset_state(self, bits):
8180
self.state &= ~bits
8281

83-
8482
def _toggle_state(self, bits):
8583
self.state ^= bits
8684

87-
8885
def _get_state(self, bits):
8986
return (self.state & bits) != 0
9087

91-
9288
def update(self):
9389
"""Update the debouncer state. MUST be called frequently"""
9490
now = time.monotonic()
@@ -106,23 +102,22 @@ def update(self):
106102
self._previous_state_duration = now - self._state_changed_time
107103
self._state_changed_time = now
108104

109-
110105
@property
111106
def value(self):
112107
"""Return the current debounced value."""
113108
return self._get_state(_DEBOUNCED_STATE)
114109

115-
116110
@property
117111
def rose(self):
118112
"""Return whether the debounced value went from low to high at the most recent update."""
119113
return self._get_state(_DEBOUNCED_STATE) and self._get_state(_CHANGED_STATE)
120114

121-
122115
@property
123116
def fell(self):
124117
"""Return whether the debounced value went from high to low at the most recent update."""
125-
return (not self._get_state(_DEBOUNCED_STATE)) and self._get_state(_CHANGED_STATE)
118+
return (not self._get_state(_DEBOUNCED_STATE)) and self._get_state(
119+
_CHANGED_STATE
120+
)
126121

127122
@property
128123
def last_duration(self):

docs/conf.py

Lines changed: 65 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@
22

33
import os
44
import sys
5-
sys.path.insert(0, os.path.abspath('..'))
5+
6+
sys.path.insert(0, os.path.abspath(".."))
67

78
# -- General configuration ------------------------------------------------
89

910
# Add any Sphinx extension module names here, as strings. They can be
1011
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
1112
# ones.
1213
extensions = [
13-
'sphinx.ext.autodoc',
14-
'sphinx.ext.intersphinx',
15-
'sphinx.ext.napoleon',
16-
'sphinx.ext.todo',
14+
"sphinx.ext.autodoc",
15+
"sphinx.ext.intersphinx",
16+
"sphinx.ext.napoleon",
17+
"sphinx.ext.todo",
1718
]
1819

1920
# TODO: Please Read!
@@ -23,29 +24,32 @@
2324
autodoc_mock_imports = ["digitalio"]
2425

2526

26-
intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
27+
intersphinx_mapping = {
28+
"python": ("https://docs.python.org/3.4", None),
29+
"CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
30+
}
2731

2832
# Add any paths that contain templates here, relative to this directory.
29-
templates_path = ['_templates']
33+
templates_path = ["_templates"]
3034

31-
source_suffix = '.rst'
35+
source_suffix = ".rst"
3236

3337
# The master toctree document.
34-
master_doc = 'index'
38+
master_doc = "index"
3539

3640
# General information about the project.
37-
project = u'Adafruit Debouncer Library'
38-
copyright = u'2019 Dave Astels'
39-
author = u'Dave Astels'
41+
project = "Adafruit Debouncer Library"
42+
copyright = "2019 Dave Astels"
43+
author = "Dave Astels"
4044

4145
# The version info for the project you're documenting, acts as replacement for
4246
# |version| and |release|, also used in various other places throughout the
4347
# built documents.
4448
#
4549
# The short X.Y version.
46-
version = u'1.0'
50+
version = "1.0"
4751
# The full version, including alpha/beta/rc tags.
48-
release = u'1.0'
52+
release = "1.0"
4953

5054
# The language for content autogenerated by Sphinx. Refer to documentation
5155
# for a list of supported languages.
@@ -57,7 +61,7 @@
5761
# List of patterns, relative to source directory, that match files and
5862
# directories to ignore when looking for source files.
5963
# This patterns also effect to html_static_path and html_extra_path
60-
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.env', 'CODE_OF_CONDUCT.md']
64+
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", ".env", "CODE_OF_CONDUCT.md"]
6165

6266
# The reST default role (used for this markup: `text`) to use for all
6367
# documents.
@@ -69,7 +73,7 @@
6973
add_function_parentheses = True
7074

7175
# The name of the Pygments (syntax highlighting) style to use.
72-
pygments_style = 'sphinx'
76+
pygments_style = "sphinx"
7377

7478
# If true, `todo` and `todoList` produce output, else they produce nothing.
7579
todo_include_todos = False
@@ -84,68 +88,76 @@
8488
# The theme to use for HTML and HTML Help pages. See the documentation for
8589
# a list of builtin themes.
8690
#
87-
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
91+
on_rtd = os.environ.get("READTHEDOCS", None) == "True"
8892

8993
if not on_rtd: # only import and set the theme if we're building docs locally
9094
try:
9195
import sphinx_rtd_theme
92-
html_theme = 'sphinx_rtd_theme'
93-
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), '.']
96+
97+
html_theme = "sphinx_rtd_theme"
98+
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
9499
except:
95-
html_theme = 'default'
96-
html_theme_path = ['.']
100+
html_theme = "default"
101+
html_theme_path = ["."]
97102
else:
98-
html_theme_path = ['.']
103+
html_theme_path = ["."]
99104

100105
# Add any paths that contain custom static files (such as style sheets) here,
101106
# relative to this directory. They are copied after the builtin static files,
102107
# so a file named "default.css" will overwrite the builtin "default.css".
103-
html_static_path = ['_static']
108+
html_static_path = ["_static"]
104109

105110
# The name of an image file (relative to this directory) to use as a favicon of
106111
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
107112
# pixels large.
108113
#
109-
html_favicon = '_static/favicon.ico'
114+
html_favicon = "_static/favicon.ico"
110115

111116
# Output file base name for HTML help builder.
112-
htmlhelp_basename = 'AdafruitDebouncerLibrarydoc'
117+
htmlhelp_basename = "AdafruitDebouncerLibrarydoc"
113118

114119
# -- Options for LaTeX output ---------------------------------------------
115120

116121
latex_elements = {
117-
# The paper size ('letterpaper' or 'a4paper').
118-
#
119-
# 'papersize': 'letterpaper',
120-
121-
# The font size ('10pt', '11pt' or '12pt').
122-
#
123-
# 'pointsize': '10pt',
124-
125-
# Additional stuff for the LaTeX preamble.
126-
#
127-
# 'preamble': '',
128-
129-
# Latex figure (float) alignment
130-
#
131-
# 'figure_align': 'htbp',
122+
# The paper size ('letterpaper' or 'a4paper').
123+
#
124+
# 'papersize': 'letterpaper',
125+
# The font size ('10pt', '11pt' or '12pt').
126+
#
127+
# 'pointsize': '10pt',
128+
# Additional stuff for the LaTeX preamble.
129+
#
130+
# 'preamble': '',
131+
# Latex figure (float) alignment
132+
#
133+
# 'figure_align': 'htbp',
132134
}
133135

134136
# Grouping the document tree into LaTeX files. List of tuples
135137
# (source start file, target name, title,
136138
# author, documentclass [howto, manual, or own class]).
137139
latex_documents = [
138-
(master_doc, 'AdafruitdebouncerLibrary.tex', u'Adafruitdebouncer Library Documentation',
139-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitdebouncerLibrary.tex",
143+
"Adafruitdebouncer Library Documentation",
144+
author,
145+
"manual",
146+
),
140147
]
141148

142149
# -- Options for manual page output ---------------------------------------
143150

144151
# One entry per manual page. List of tuples
145152
# (source start file, name, description, authors, manual section).
146153
man_pages = [
147-
(master_doc, 'Adafruitdebouncerlibrary', u'Adafruit debouncer Library Documentation',
148-
[author], 1)
154+
(
155+
master_doc,
156+
"Adafruitdebouncerlibrary",
157+
"Adafruit debouncer Library Documentation",
158+
[author],
159+
1,
160+
)
149161
]
150162

151163
# -- Options for Texinfo output -------------------------------------------
@@ -154,7 +166,13 @@
154166
# (source start file, target name, title, author,
155167
# dir menu entry, description, category)
156168
texinfo_documents = [
157-
(master_doc, 'AdafruitdebouncerLibrary', u'Adafruit debouncer Library Documentation',
158-
author, 'AdafruitdebouncerLibrary', 'One line description of project.',
159-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitdebouncerLibrary",
172+
"Adafruit debouncer Library Documentation",
173+
author,
174+
"AdafruitdebouncerLibrary",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
160178
]

examples/debouncer_crickit_test.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@
3434

3535
ss = crickit.seesaw
3636

37+
3738
def make_crikit_signal_debouncer(pin):
3839
"""Return a lambda to read the specified pin"""
3940
ss.pin_mode(pin, ss.INPUT_PULLUP)
4041
return Debouncer(lambda: ss.digital_read(pin))
4142

43+
4244
# Two buttons are pullups, connect to ground to activate
4345
clock = make_crikit_signal_debouncer(crickit.SIGNAL1)
4446
signal_2 = make_crikit_signal_debouncer(crickit.SIGNAL2)
@@ -54,6 +56,9 @@ def make_crikit_signal_debouncer(pin):
5456
signal_5.update()
5557

5658
if clock.fell:
57-
print('%u %u %u %u' % (signal_2.value, signal_3.value, signal_4.value, signal_5.value))
59+
print(
60+
"%u %u %u %u"
61+
% (signal_2.value, signal_3.value, signal_4.value, signal_5.value)
62+
)
5863

5964
time.sleep(0.1)

examples/debouncer_simpletest.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
while True:
3737
switch.update()
3838
if switch.fell:
39-
print('Just pressed')
39+
print("Just pressed")
4040
if switch.rose:
41-
print('Just released')
41+
print("Just released")
4242
if switch.value:
43-
print('not pressed')
43+
print("not pressed")
4444
else:
45-
print('pressed')
45+
print("pressed")

examples/debouncer_timing_test.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
while True:
1212
switch.update()
1313
if switch.fell:
14-
print('pressed')
15-
print('was released for ', switch.last_duration)
14+
print("pressed")
15+
print("was released for ", switch.last_duration)
1616
elif switch.rose:
17-
print('released')
18-
print('was pressed for ', switch.last_duration)
17+
print("released")
18+
print("was pressed for ", switch.last_duration)
1919
else:
20-
print('Stable for ', switch.current_duration)
20+
print("Stable for ", switch.current_duration)
2121
time.sleep(0.1)

0 commit comments

Comments
 (0)