Skip to content

Commit fc08537

Browse files
authored
Merge pull request #10 from adafruit/pylint-update
Ran black, updated to pylint 2.x
2 parents f762244 + b5b815e commit fc08537

File tree

5 files changed

+92
-73
lines changed

5 files changed

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

adafruit_ssd1351.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
_INIT_SEQUENCE = (
5454
b"\xFD\x01\x12" # COMMAND_LOCK Unlock IC MCU
5555
b"\xFD\x01\xB1" # COMMAND_LOCK
56-
b"\xAE\x00" # DISPLAY_OFF
56+
b"\xAE\x00" # DISPLAY_OFF
5757
b"\xB2\x03\xA4\x00\x00" # DISPLAY_ENHANCEMENT
5858
b"\xB3\x01\xF0" # CLOCK_DIV
5959
b"\xCA\x01\x7F" # MUX_RATIO
@@ -62,7 +62,7 @@
6262
b"\xAB\x01\x01" # FUNCTION_SELECT
6363
b"\xB1\x01\x32" # PRECHARGE
6464
b"\xBE\x01\x05" # VCOMH
65-
b"\xA6\x00" # NORMAL_DISPLAY
65+
b"\xA6\x00" # NORMAL_DISPLAY
6666
b"\xC1\x03\xC8\x80\xC8" # CONTRAST_ABC (RGB)
6767
b"\xC7\x01\x0F" # CONTRAST_MASTER
6868
b"\xB4\x03\xA0\xB5\x55" # SET_VSL Set segment low volt
@@ -74,7 +74,14 @@
7474
# pylint: disable=too-few-public-methods
7575
class SSD1351(displayio.Display):
7676
"""SSD1351 driver"""
77+
7778
def __init__(self, bus, **kwargs):
78-
super().__init__(bus, _INIT_SEQUENCE, **kwargs, set_column_command=0x15,
79-
set_row_command=0x75, write_ram_command=0x5C,
80-
single_byte_bounds=True)
79+
super().__init__(
80+
bus,
81+
_INIT_SEQUENCE,
82+
**kwargs,
83+
set_column_command=0x15,
84+
set_row_command=0x75,
85+
write_ram_command=0x5C,
86+
single_byte_bounds=True,
87+
)

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", "busio"]
2425
autodoc_mock_imports = ["displayio"]
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 SSD1351 Library'
38-
copyright = u'2019 Melissa LeBlanc-Williams'
39-
author = u'Melissa LeBlanc-Williams'
41+
project = "Adafruit SSD1351 Library"
42+
copyright = "2019 Melissa LeBlanc-Williams"
43+
author = "Melissa LeBlanc-Williams"
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 = 'AdafruitSsd1351Librarydoc'
117+
htmlhelp_basename = "AdafruitSsd1351Librarydoc"
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, 'AdafruitSSD1351Library.tex', u'AdafruitSSD1351 Library Documentation',
139-
author, 'manual'),
140+
(
141+
master_doc,
142+
"AdafruitSSD1351Library.tex",
143+
"AdafruitSSD1351 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, 'AdafruitSSD1351library', u'Adafruit SSD1351 Library Documentation',
148-
[author], 1)
154+
(
155+
master_doc,
156+
"AdafruitSSD1351library",
157+
"Adafruit SSD1351 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, 'AdafruitSSD1351Library', u'Adafruit SSD1351 Library Documentation',
158-
author, 'AdafruitSSD1351Library', 'One line description of project.',
159-
'Miscellaneous'),
169+
(
170+
master_doc,
171+
"AdafruitSSD1351Library",
172+
"Adafruit SSD1351 Library Documentation",
173+
author,
174+
"AdafruitSSD1351Library",
175+
"One line description of project.",
176+
"Miscellaneous",
177+
),
160178
]

examples/ssd1351_128x96_simpletest.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
tft_cs = board.D5
1717
tft_dc = board.D6
1818

19-
display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs,
20-
reset=board.D9, baudrate=16000000)
19+
display_bus = displayio.FourWire(
20+
spi, command=tft_dc, chip_select=tft_cs, reset=board.D9, baudrate=16000000
21+
)
2122

2223
display = SSD1351(display_bus, width=128, height=96)
2324

@@ -27,20 +28,16 @@
2728

2829
color_bitmap = displayio.Bitmap(128, 96, 1)
2930
color_palette = displayio.Palette(1)
30-
color_palette[0] = 0x00FF00 # Bright Green
31+
color_palette[0] = 0x00FF00 # Bright Green
3132

32-
bg_sprite = displayio.TileGrid(color_bitmap,
33-
pixel_shader=color_palette,
34-
x=0, y=0)
33+
bg_sprite = displayio.TileGrid(color_bitmap, pixel_shader=color_palette, x=0, y=0)
3534
splash.append(bg_sprite)
3635

3736
# Draw a smaller inner rectangle
3837
inner_bitmap = displayio.Bitmap(108, 76, 1)
3938
inner_palette = displayio.Palette(1)
40-
inner_palette[0] = 0xAA0088 # Purple
41-
inner_sprite = displayio.TileGrid(inner_bitmap,
42-
pixel_shader=inner_palette,
43-
x=10, y=10)
39+
inner_palette[0] = 0xAA0088 # Purple
40+
inner_sprite = displayio.TileGrid(inner_bitmap, pixel_shader=inner_palette, x=10, y=10)
4441
splash.append(inner_sprite)
4542

4643
# Draw a label

examples/ssd1351_simpletest.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
tft_cs = board.D5
1717
tft_dc = board.D6
1818

19-
display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs,
20-
reset=board.D9, baudrate=16000000)
19+
display_bus = displayio.FourWire(
20+
spi, command=tft_dc, chip_select=tft_cs, reset=board.D9, baudrate=16000000
21+
)
2122

2223
display = SSD1351(display_bus, width=128, height=128)
2324

@@ -27,20 +28,16 @@
2728

2829
color_bitmap = displayio.Bitmap(128, 128, 1)
2930
color_palette = displayio.Palette(1)
30-
color_palette[0] = 0x00FF00 # Bright Green
31+
color_palette[0] = 0x00FF00 # Bright Green
3132

32-
bg_sprite = displayio.TileGrid(color_bitmap,
33-
pixel_shader=color_palette,
34-
x=0, y=0)
33+
bg_sprite = displayio.TileGrid(color_bitmap, pixel_shader=color_palette, x=0, y=0)
3534
splash.append(bg_sprite)
3635

3736
# Draw a smaller inner rectangle
3837
inner_bitmap = displayio.Bitmap(108, 108, 1)
3938
inner_palette = displayio.Palette(1)
40-
inner_palette[0] = 0xAA0088 # Purple
41-
inner_sprite = displayio.TileGrid(inner_bitmap,
42-
pixel_shader=inner_palette,
43-
x=10, y=10)
39+
inner_palette[0] = 0xAA0088 # Purple
40+
inner_sprite = displayio.TileGrid(inner_bitmap, pixel_shader=inner_palette, x=10, y=10)
4441
splash.append(inner_sprite)
4542

4643
# Draw a label

0 commit comments

Comments
 (0)