Skip to content

Commit 59bde46

Browse files
authored
Merge pull request #5 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents 3e4f705 + e393e9c commit 59bde46

File tree

4 files changed

+98
-70
lines changed

4 files changed

+98
-70
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 pylint black==19.10b0 Sphinx sphinx-rtd-theme
4444
- name: Library version
4545
run: git describe --dirty --always --tags
4646
- name: PyLint

adafruit_ssd1608.py

+25-18
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,40 @@
4848
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_SSD1608.git"
4949

5050
_START_SEQUENCE = (
51-
b"\x12\x00" # Software reset
52-
b"\x01\x03\x00\x00\x00" # driver output control
53-
b"\x3a\x01\x1b" # Set dummy line period
54-
b"\x3b\x01\x0b" # Set gate line width
55-
b"\x11\x01\x03" # Data entry sequence
56-
b"\x2c\x01\x70" # Vcom Voltage
51+
b"\x12\x00" # Software reset
52+
b"\x01\x03\x00\x00\x00" # driver output control
53+
b"\x3a\x01\x1b" # Set dummy line period
54+
b"\x3b\x01\x0b" # Set gate line width
55+
b"\x11\x01\x03" # Data entry sequence
56+
b"\x2c\x01\x70" # Vcom Voltage
5757
b"\x32\x1e\x02\x02\x01\x11\x12\x12\x22\x22\x66\x69\x69\x59\x58\x99\x99\x88\x00\x00\x00\x00\xf8"
58-
b"\xb4\x13\x51\x35\x51\x51\x19\x01\x00" # LUT
59-
b"\x22\x01\xc7" # Set DISP ctrl2
58+
b"\xb4\x13\x51\x35\x51\x51\x19\x01\x00" # LUT
59+
b"\x22\x01\xc7" # Set DISP ctrl2
6060
)
6161

62-
_STOP_SEQUENCE = (
63-
b"\x10\x01\x01" # Enter deep sleep
64-
)
62+
_STOP_SEQUENCE = b"\x10\x01\x01" # Enter deep sleep
6563

6664
# pylint: disable=too-few-public-methods
6765
class SSD1608(displayio.EPaperDisplay):
6866
"""SSD1608 driver"""
67+
6968
def __init__(self, bus, **kwargs):
7069
start_sequence = bytearray(_START_SEQUENCE)
7170
width = kwargs["width"]
72-
start_sequence[4] = (width - 1) & 0xff
71+
start_sequence[4] = (width - 1) & 0xFF
7372
start_sequence[5] = (width - 1) >> 8
7473

75-
super().__init__(bus, start_sequence, _STOP_SEQUENCE, **kwargs,
76-
ram_width=240, ram_height=320,
77-
set_column_window_command=0x44, set_row_window_command=0x45,
78-
set_current_column_command=0x4e, set_current_row_command=0x4f,
79-
write_black_ram_command=0x24,
80-
refresh_display_command=0x20)
74+
super().__init__(
75+
bus,
76+
start_sequence,
77+
_STOP_SEQUENCE,
78+
**kwargs,
79+
ram_width=240,
80+
ram_height=320,
81+
set_column_window_command=0x44,
82+
set_row_window_command=0x45,
83+
set_current_column_command=0x4E,
84+
set_current_row_command=0x4F,
85+
write_black_ram_command=0x24,
86+
refresh_display_command=0x20,
87+
)

docs/conf.py

+65-47
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 = ["displayio"]
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 SSD1608 Library'
38-
copyright = u'2019 Scott Shawcroft'
39-
author = u'Scott Shawcroft'
41+
project = "Adafruit SSD1608 Library"
42+
copyright = "2019 Scott Shawcroft"
43+
author = "Scott Shawcroft"
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 = 'AdafruitSsd1608Librarydoc'
117+
htmlhelp_basename = "AdafruitSsd1608Librarydoc"
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, 'AdafruitSSD1608Library.tex', u'AdafruitSSD1608 Library Documentation',
139-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitSSD1608Library.tex",
143+
"AdafruitSSD1608 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, 'AdafruitSSD1608library', u'Adafruit SSD1608 Library Documentation',
148-
[author], 1)
154+
(
155+
master_doc,
156+
"AdafruitSSD1608library",
157+
"Adafruit SSD1608 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, 'AdafruitSSD1608Library', u'Adafruit SSD1608 Library Documentation',
158-
author, 'AdafruitSSD1608Library', 'One line description of project.',
159-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitSSD1608Library",
172+
"Adafruit SSD1608 Library Documentation",
173+
author,
174+
"AdafruitSSD1608Library",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
160178
]

examples/ssd1608_simpletest.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,20 @@
1313
displayio.release_displays()
1414

1515
# This pinout works on a Feather M4 and may need to be altered for other boards.
16-
spi = board.SPI() # Uses SCK and MOSI
16+
spi = board.SPI() # Uses SCK and MOSI
1717
epd_cs = board.D9
1818
epd_dc = board.D10
1919
epd_reset = board.D5
2020
epd_busy = board.D6
2121

22-
display_bus = displayio.FourWire(spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset,
23-
baudrate=1000000)
22+
display_bus = displayio.FourWire(
23+
spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000
24+
)
2425
time.sleep(1)
2526

26-
display = adafruit_ssd1608.SSD1608(display_bus, width=200, height=200, busy_pin=epd_busy)
27+
display = adafruit_ssd1608.SSD1608(
28+
display_bus, width=200, height=200, busy_pin=epd_busy
29+
)
2730

2831
g = displayio.Group()
2932

0 commit comments

Comments
 (0)