Skip to content

Commit

Permalink
Merge pull request #8 from adafruit/pylint-update
Browse files Browse the repository at this point in the history
Ran black, updated to pylint 2.x
  • Loading branch information
kattni authored Mar 9, 2020
2 parents aa02354 + 03c79fc commit 78cf68c
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 74 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
source actions-ci/install.sh
- name: Pip install pylint, black, & Sphinx
run: |
pip install --force-reinstall pylint==1.9.2 black==19.10b0 Sphinx sphinx-rtd-theme
pip install pylint black==19.10b0 Sphinx sphinx-rtd-theme
- name: Library version
run: git describe --dirty --always --tags
- name: PyLint
Expand Down
35 changes: 18 additions & 17 deletions adafruit_hx8357.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,29 @@
__repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_HX8357.git"

_INIT_SEQUENCE = (
b"\x01\x80\x64" # _SWRESET and Delay 100ms
b"\xB9\x83\xFF\x83\x57\xFF" # _SETC and delay 500ms
b"\xB3\x04\x80\x00\x06\x06" # _SETRGB 0x80 enables SDO pin (0x00 disables)
b"\xB6\x01\x25" # _SETCOM -1.52V
b"\xB0\x01\x68" # _SETOSC Normal mode 70Hz, Idle mode 55 Hz
b"\xCC\x01\x05" # _SETPANEL BGR, Gate direction swapped
b"\xB1\x06\x00\x15\x1C\x1C\x83\xAA" # _SETPWR1 Not deep standby BT VSPR VSNR AP
b"\xC0\x06\x50\x50\x01\x3C\x1E\x08" # _SETSTBA OPON normal OPON idle STBA GEN
b"\xB4\x07\x02\x40\x00\x2A\x2A\x0D\x78" # _SETCYC NW 0x02 RTN DIV DUM DUM GDON GDOFF
b"\xE0\x22\x02\x0A\x11\x1d\x23\x35\x41\x4b\x4b\x42\x3A\x27\x1B\x08\x09\x03\x02\x0A" \
b"\x11\x1d\x23\x35\x41\x4b\x4b\x42\x3A\x27\x1B\x08\x09\x03\x00\x01" # _SETGAMMA
b"\x3A\x01\x55" # _COLMOD 16 bit
b"\x36\x01\xC0" # _MADCTL
b"\x35\x01\x00" # _TEON TW off
b"\x44\x02\x00\x02" # _TEARLINE
b"\x11\x80\x96" # _SLPOUT and delay 150 ms
b"\x01\x80\x64" # _SWRESET and Delay 100ms
b"\xB9\x83\xFF\x83\x57\xFF" # _SETC and delay 500ms
b"\xB3\x04\x80\x00\x06\x06" # _SETRGB 0x80 enables SDO pin (0x00 disables)
b"\xB6\x01\x25" # _SETCOM -1.52V
b"\xB0\x01\x68" # _SETOSC Normal mode 70Hz, Idle mode 55 Hz
b"\xCC\x01\x05" # _SETPANEL BGR, Gate direction swapped
b"\xB1\x06\x00\x15\x1C\x1C\x83\xAA" # _SETPWR1 Not deep standby BT VSPR VSNR AP
b"\xC0\x06\x50\x50\x01\x3C\x1E\x08" # _SETSTBA OPON normal OPON idle STBA GEN
b"\xB4\x07\x02\x40\x00\x2A\x2A\x0D\x78" # _SETCYC NW 0x02 RTN DIV DUM DUM GDON GDOFF
b"\xE0\x22\x02\x0A\x11\x1d\x23\x35\x41\x4b\x4b\x42\x3A\x27\x1B\x08\x09\x03\x02\x0A"
b"\x11\x1d\x23\x35\x41\x4b\x4b\x42\x3A\x27\x1B\x08\x09\x03\x00\x01" # _SETGAMMA
b"\x3A\x01\x55" # _COLMOD 16 bit
b"\x36\x01\xC0" # _MADCTL
b"\x35\x01\x00" # _TEON TW off
b"\x44\x02\x00\x02" # _TEARLINE
b"\x11\x80\x96" # _SLPOUT and delay 150 ms
b"\x36\x01\xA0"
b"\x29\x80\x32" # _DISPON and delay 50 ms
b"\x29\x80\x32" # _DISPON and delay 50 ms
)

# pylint: disable=too-few-public-methods
class HX8357(displayio.Display):
"""HX8357D driver"""

def __init__(self, bus, **kwargs):
super().__init__(bus, _INIT_SEQUENCE, **kwargs)
112 changes: 65 additions & 47 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@

import os
import sys
sys.path.insert(0, os.path.abspath('..'))

sys.path.insert(0, os.path.abspath(".."))

# -- General configuration ------------------------------------------------

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
'sphinx.ext.intersphinx',
'sphinx.ext.napoleon',
'sphinx.ext.todo',
"sphinx.ext.autodoc",
"sphinx.ext.intersphinx",
"sphinx.ext.napoleon",
"sphinx.ext.todo",
]

# TODO: Please Read!
Expand All @@ -24,29 +25,32 @@
autodoc_mock_imports = ["displayio"]


intersphinx_mapping = {'python': ('https://docs.python.org/3.4', None),'CircuitPython': ('https://circuitpython.readthedocs.io/en/latest/', None)}
intersphinx_mapping = {
"python": ("https://docs.python.org/3.4", None),
"CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
}

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]

source_suffix = '.rst'
source_suffix = ".rst"

# The master toctree document.
master_doc = 'index'
master_doc = "index"

# General information about the project.
project = u'Adafruit HX8357 Library'
copyright = u'2019 Melissa LeBlanc-Williams'
author = u'Melissa LeBlanc-Williams'
project = "Adafruit HX8357 Library"
copyright = "2019 Melissa LeBlanc-Williams"
author = "Melissa LeBlanc-Williams"

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = u'1.0'
version = "1.0"
# The full version, including alpha/beta/rc tags.
release = u'1.0'
release = "1.0"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand All @@ -58,7 +62,7 @@
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This patterns also effect to html_static_path and html_extra_path
exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '.env', 'CODE_OF_CONDUCT.md']
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store", ".env", "CODE_OF_CONDUCT.md"]

# The reST default role (used for this markup: `text`) to use for all
# documents.
Expand All @@ -70,7 +74,7 @@
add_function_parentheses = True

# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
pygments_style = "sphinx"

# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = False
Expand All @@ -85,68 +89,76 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
on_rtd = os.environ.get("READTHEDOCS", None) == "True"

if not on_rtd: # only import and set the theme if we're building docs locally
try:
import sphinx_rtd_theme
html_theme = 'sphinx_rtd_theme'
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), '.']

html_theme = "sphinx_rtd_theme"
html_theme_path = [sphinx_rtd_theme.get_html_theme_path(), "."]
except:
html_theme = 'default'
html_theme_path = ['.']
html_theme = "default"
html_theme_path = ["."]
else:
html_theme_path = ['.']
html_theme_path = ["."]

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

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

# Output file base name for HTML help builder.
htmlhelp_basename = 'AdafruitHx8357Librarydoc'
htmlhelp_basename = "AdafruitHx8357Librarydoc"

# -- Options for LaTeX output ---------------------------------------------

latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',

# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',

# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',

# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
# The paper size ('letterpaper' or 'a4paper').
#
# 'papersize': 'letterpaper',
# The font size ('10pt', '11pt' or '12pt').
#
# 'pointsize': '10pt',
# Additional stuff for the LaTeX preamble.
#
# 'preamble': '',
# Latex figure (float) alignment
#
# 'figure_align': 'htbp',
}

# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'AdafruitHX8357Library.tex', u'AdafruitHX8357 Library Documentation',
author, 'manual'),
(
master_doc,
"AdafruitHX8357Library.tex",
"AdafruitHX8357 Library Documentation",
author,
"manual",
),
]

# -- Options for manual page output ---------------------------------------

# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'AdafruitHX8357library', u'Adafruit HX8357 Library Documentation',
[author], 1)
(
master_doc,
"AdafruitHX8357library",
"Adafruit HX8357 Library Documentation",
[author],
1,
)
]

# -- Options for Texinfo output -------------------------------------------
Expand All @@ -155,7 +167,13 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'AdafruitHX8357Library', u'Adafruit HX8357 Library Documentation',
author, 'AdafruitHX8357Library', 'One line description of project.',
'Miscellaneous'),
(
master_doc,
"AdafruitHX8357Library",
"Adafruit HX8357 Library Documentation",
author,
"AdafruitHX8357Library",
"One line description of project.",
"Miscellaneous",
),
]
14 changes: 5 additions & 9 deletions examples/hx8357_simpletest.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,23 @@

color_bitmap = displayio.Bitmap(480, 320, 1)
color_palette = displayio.Palette(1)
color_palette[0] = 0x00FF00 # Bright Green
color_palette[0] = 0x00FF00 # Bright Green

bg_sprite = displayio.TileGrid(color_bitmap,
pixel_shader=color_palette,
x=0, y=0)
bg_sprite = displayio.TileGrid(color_bitmap, pixel_shader=color_palette, x=0, y=0)
splash.append(bg_sprite)

# Draw a smaller inner rectangle
inner_bitmap = displayio.Bitmap(440, 280, 1)
inner_palette = displayio.Palette(1)
inner_palette[0] = 0xAA0088 # Purple
inner_sprite = displayio.TileGrid(inner_bitmap,
pixel_shader=inner_palette,
x=20, y=20)
inner_palette[0] = 0xAA0088 # Purple
inner_sprite = displayio.TileGrid(inner_bitmap, pixel_shader=inner_palette, x=20, y=20)
splash.append(inner_sprite)

# Draw a label
text_group = displayio.Group(max_size=10, scale=3, x=137, y=160)
text = "Hello World!"
text_area = label.Label(terminalio.FONT, text=text, color=0xFFFF00)
text_group.append(text_area) # Subgroup for text scaling
text_group.append(text_area) # Subgroup for text scaling
splash.append(text_group)

while True:
Expand Down

0 comments on commit 78cf68c

Please sign in to comment.