Skip to content

Commit adc9969

Browse files
authored
Merge pull request #7 from adafruit/pylint-update
ran black, disabled bad-continuation, had build.yml install the latest pylint
2 parents 4e5a03f + 70c43fe commit adc9969

File tree

5 files changed

+131
-107
lines changed

5 files changed

+131
-107
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_displayio_ssd1305.py

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,28 +52,29 @@
5252
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_DisplayIO_SSD1305.git"
5353

5454
_INIT_SEQUENCE = (
55-
b"\xAE\x00" # DISPLAY_OFF
55+
b"\xAE\x00" # DISPLAY_OFF
5656
b"\xd5\x01\x80" # SET_DISP_CLK_DIV
57-
b"\xA1\x00" # Column 127 is segment 0
57+
b"\xA1\x00" # Column 127 is segment 0
5858
b"\xA8\x01\x3F" # Mux ratio is 1/64
5959
b"\xad\x01\x8e" # Set Master Configuration
6060
b"\xd8\x01\x05" # Set Area Color Mode On/Off & Low Power Display Mode
6161
b"\x20\x01\x00" # Set memory addressing to horizontal mode.
6262
b"\x40\x01\x2E" # SET_DISP_START_LINE ADD
63-
b"\xc8\x00" # Set COM Output Scan Direction 64 to 1
63+
b"\xc8\x00" # Set COM Output Scan Direction 64 to 1
6464
b"\xda\x01\x12" # Set com configuration
65-
b"\x91\x04\x3f\x3f\x3f\x3f" # Current drive pulse width of BANK0, Color A, Band C.
65+
b"\x91\x04\x3f\x3f\x3f\x3f" # Current drive pulse width of BANK0, Color A, Band C.
6666
b"\xd9\x01\xd2" # Set pre-charge period orig: 0xd9, 0x22 if self.external_vcc else 0xf1,
6767
b"\xdb\x01\x34" # Set vcom configuration 0xdb, 0x30, $ 0.83* Vcc
68-
b"\xA6\x00" # Normal display
69-
b"\xA4\x00" # output follows RAM contents SET_ENTIRE_ON
68+
b"\xA6\x00" # Normal display
69+
b"\xA4\x00" # output follows RAM contents SET_ENTIRE_ON
7070
b"\x8d\x01\x14" # Enable charge pump
7171
b"\xAF\x00\x00" # DISPLAY_ON
7272
)
7373

7474
# pylint: disable=too-few-public-methods
7575
class SSD1305(displayio.Display):
7676
"""SSD1305 driver"""
77+
7778
def __init__(self, bus, **kwargs):
7879
colstart = 0
7980
# Patch the init sequence for 32 pixel high displays.
@@ -82,12 +83,22 @@ def __init__(self, bus, **kwargs):
8283
height = kwargs["height"]
8384
if "rotation" in kwargs and kwargs["rotation"] % 180 != 0:
8485
height = kwargs["width"]
85-
init_sequence[9] = height - 1 # patch mux ratio
86+
init_sequence[9] = height - 1 # patch mux ratio
8687

8788
if kwargs["height"] == 32:
8889
colstart = 4
89-
super().__init__(bus, init_sequence, **kwargs, color_depth=1, grayscale=True,
90-
pixels_in_byte_share_row=False,
91-
set_column_command=0x21, set_row_command=0x22, data_as_commands=True,
92-
set_vertical_scroll=0xd3, brightness_command=0x81,
93-
single_byte_bounds=True, colstart=colstart)
90+
super().__init__(
91+
bus,
92+
init_sequence,
93+
**kwargs,
94+
color_depth=1,
95+
grayscale=True,
96+
pixels_in_byte_share_row=False,
97+
set_column_command=0x21,
98+
set_row_command=0x22,
99+
data_as_commands=True,
100+
set_vertical_scroll=0xD3,
101+
brightness_command=0x81,
102+
single_byte_bounds=True,
103+
colstart=colstart,
104+
)

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

examples/displayio_ssd1305_simpletest.py

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@
1818
spi = board.SPI()
1919
oled_cs = board.D5
2020
oled_dc = board.D6
21-
display_bus = displayio.FourWire(spi, command=oled_dc, chip_select=oled_cs,
22-
baudrate=1000000, reset=oled_reset)
21+
display_bus = displayio.FourWire(
22+
spi, command=oled_dc, chip_select=oled_cs, baudrate=1000000, reset=oled_reset
23+
)
2324

2425
# Use for I2C
2526
# i2c = board.I2C()
2627
# display_bus = displayio.I2CDisplay(i2c, device_address=0x3c, reset=oled_reset)
2728

2829
WIDTH = 128
29-
HEIGHT = 64 # Change to 32 if needed
30+
HEIGHT = 64 # Change to 32 if needed
3031
BORDER = 8
3132
FONTSCALE = 1
3233

@@ -38,29 +39,33 @@
3839

3940
color_bitmap = displayio.Bitmap(display.width, display.height, 1)
4041
color_palette = displayio.Palette(1)
41-
color_palette[0] = 0xFFFFFF # White
42+
color_palette[0] = 0xFFFFFF # White
4243

43-
bg_sprite = displayio.TileGrid(color_bitmap,
44-
pixel_shader=color_palette,
45-
x=0, y=0)
44+
bg_sprite = displayio.TileGrid(color_bitmap, pixel_shader=color_palette, x=0, y=0)
4645
splash.append(bg_sprite)
4746

4847
# Draw a smaller inner rectangle
49-
inner_bitmap = displayio.Bitmap(display.width - BORDER * 2, display.height - BORDER * 2, 1)
48+
inner_bitmap = displayio.Bitmap(
49+
display.width - BORDER * 2, display.height - BORDER * 2, 1
50+
)
5051
inner_palette = displayio.Palette(1)
51-
inner_palette[0] = 0x000000 # Black
52-
inner_sprite = displayio.TileGrid(inner_bitmap,
53-
pixel_shader=inner_palette,
54-
x=BORDER, y=BORDER)
52+
inner_palette[0] = 0x000000 # Black
53+
inner_sprite = displayio.TileGrid(
54+
inner_bitmap, pixel_shader=inner_palette, x=BORDER, y=BORDER
55+
)
5556
splash.append(inner_sprite)
5657

5758
# Draw a label
5859
text = "Hello World!"
5960
text_area = label.Label(terminalio.FONT, text=text, color=0xFFFFFF)
6061
text_width = text_area.bounding_box[2] * FONTSCALE
61-
text_group = displayio.Group(max_size=10, scale=FONTSCALE, x=display.width // 2 - text_width // 2,
62-
y=display.height // 2)
63-
text_group.append(text_area) # Subgroup for text scaling
62+
text_group = displayio.Group(
63+
max_size=10,
64+
scale=FONTSCALE,
65+
x=display.width // 2 - text_width // 2,
66+
y=display.height // 2,
67+
)
68+
text_group.append(text_area) # Subgroup for text scaling
6469
splash.append(text_group)
6570

6671
while True:

0 commit comments

Comments
 (0)