diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fff3aa9..1dad804 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme - name: Library version run: git describe --dirty --always --tags - name: PyLint diff --git a/adafruit_st7789.py b/adafruit_st7789.py index 58b374e..bb0e0e7 100755 --- a/adafruit_st7789.py +++ b/adafruit_st7789.py @@ -48,18 +48,19 @@ __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ST7789.git" _INIT_SEQUENCE = ( - b"\x01\x80\x96" # _SWRESET and Delay 150ms - b"\x11\x80\xFF" # _SLPOUT and Delay 500ms - b"\x3A\x81\x55\x0A" # _COLMOD and Delay 10ms - b"\x36\x01\x08" # _MADCTL - b"\x21\x80\x0A" # _INVON Hack and Delay 10ms - b"\x13\x80\x0A" # _NORON and Delay 10ms - b"\x36\x01\xC0" # _MADCTL - b"\x29\x80\xFF" # _DISPON and Delay 500ms + b"\x01\x80\x96" # _SWRESET and Delay 150ms + b"\x11\x80\xFF" # _SLPOUT and Delay 500ms + b"\x3A\x81\x55\x0A" # _COLMOD and Delay 10ms + b"\x36\x01\x08" # _MADCTL + b"\x21\x80\x0A" # _INVON Hack and Delay 10ms + b"\x13\x80\x0A" # _NORON and Delay 10ms + b"\x36\x01\xC0" # _MADCTL + b"\x29\x80\xFF" # _DISPON and Delay 500ms ) # pylint: disable=too-few-public-methods class ST7789(displayio.Display): """ST7789 driver""" + def __init__(self, bus, **kwargs): super().__init__(bus, _INIT_SEQUENCE, **kwargs) diff --git a/docs/conf.py b/docs/conf.py index 814c23c..e7696c8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -2,7 +2,8 @@ import os import sys -sys.path.insert(0, os.path.abspath('..')) + +sys.path.insert(0, os.path.abspath("..")) # -- General configuration ------------------------------------------------ @@ -10,10 +11,10 @@ # 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! @@ -23,29 +24,32 @@ # autodoc_mock_imports = ["digitalio", "busio"] 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 ST7789 Library' -copyright = u'2019 Melissa LeBlanc-Williams' -author = u'Melissa LeBlanc-Williams' +project = "Adafruit ST7789 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. @@ -57,7 +61,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. @@ -69,7 +73,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 @@ -84,59 +88,62 @@ # 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 = 'AdafruitSt7789Librarydoc' +htmlhelp_basename = "AdafruitSt7789Librarydoc" # -- 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, 'AdafruitST7789Library.tex', u'AdafruitST7789 Library Documentation', - author, 'manual'), + ( + master_doc, + "AdafruitST7789Library.tex", + "AdafruitST7789 Library Documentation", + author, + "manual", + ), ] # -- Options for manual page output --------------------------------------- @@ -144,8 +151,13 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'AdafruitST7789library', u'Adafruit ST7789 Library Documentation', - [author], 1) + ( + master_doc, + "AdafruitST7789library", + "Adafruit ST7789 Library Documentation", + [author], + 1, + ) ] # -- Options for Texinfo output ------------------------------------------- @@ -154,7 +166,13 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'AdafruitST7789Library', u'Adafruit ST7789 Library Documentation', - author, 'AdafruitST7789Library', 'One line description of project.', - 'Miscellaneous'), + ( + master_doc, + "AdafruitST7789Library", + "Adafruit ST7789 Library Documentation", + author, + "AdafruitST7789Library", + "One line description of project.", + "Miscellaneous", + ), ] diff --git a/examples/st7789_240x135_simpletest.py b/examples/st7789_240x135_simpletest.py index 41b53fe..97da991 100644 --- a/examples/st7789_240x135_simpletest.py +++ b/examples/st7789_240x135_simpletest.py @@ -23,7 +23,9 @@ tft_dc = board.D6 display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) -display = ST7789(display_bus, rotation=270, width=240, height=135, rowstart=40, colstart=53) +display = ST7789( + display_bus, rotation=270, width=240, height=135, rowstart=40, colstart=53 +) # Make the display context splash = displayio.Group(max_size=10) @@ -33,27 +35,31 @@ color_palette = displayio.Palette(1) color_palette[0] = BACKGROUND_COLOR -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(display.width - BORDER * 2, display.height - BORDER * 2, 1) +inner_bitmap = displayio.Bitmap( + display.width - BORDER * 2, display.height - BORDER * 2, 1 +) inner_palette = displayio.Palette(1) inner_palette[0] = FOREGROUND_COLOR -inner_sprite = displayio.TileGrid(inner_bitmap, - pixel_shader=inner_palette, - x=BORDER, y=BORDER) +inner_sprite = displayio.TileGrid( + inner_bitmap, pixel_shader=inner_palette, x=BORDER, y=BORDER +) splash.append(inner_sprite) # Draw a label text = "Hello World!" text_area = label.Label(terminalio.FONT, text=text, color=TEXT_COLOR) text_width = text_area.bounding_box[2] * FONTSCALE -text_group = displayio.Group(max_size=10, scale=FONTSCALE, x=display.width // 2 - text_width // 2, - y=display.height // 2) -text_group.append(text_area) # Subgroup for text scaling +text_group = displayio.Group( + max_size=10, + scale=FONTSCALE, + x=display.width // 2 - text_width // 2, + y=display.height // 2, +) +text_group.append(text_area) # Subgroup for text scaling splash.append(text_group) while True: diff --git a/examples/st7789_320x240_simpletest.py b/examples/st7789_320x240_simpletest.py index 7ef1c1c..a0cbf23 100644 --- a/examples/st7789_320x240_simpletest.py +++ b/examples/st7789_320x240_simpletest.py @@ -15,7 +15,9 @@ tft_cs = board.D5 tft_dc = board.D6 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=board.D9) +display_bus = displayio.FourWire( + spi, command=tft_dc, chip_select=tft_cs, reset=board.D9 +) display = ST7789(display_bus, width=320, height=240, rotation=90) @@ -25,27 +27,23 @@ color_bitmap = displayio.Bitmap(320, 240, 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(280, 200, 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=57, y=120) 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: diff --git a/examples/st7789_simpletest.py b/examples/st7789_simpletest.py index bab202d..eb85629 100644 --- a/examples/st7789_simpletest.py +++ b/examples/st7789_simpletest.py @@ -15,7 +15,9 @@ tft_cs = board.D5 tft_dc = board.D6 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=board.D9) +display_bus = displayio.FourWire( + spi, command=tft_dc, chip_select=tft_cs, reset=board.D9 +) display = ST7789(display_bus, width=240, height=240, rowstart=80) @@ -25,27 +27,23 @@ color_bitmap = displayio.Bitmap(240, 240, 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(200, 200, 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=2, x=50, y=120) 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: diff --git a/examples/st7789_tft_gizmo_simpletest.py b/examples/st7789_tft_gizmo_simpletest.py index ff87cd3..e0bab93 100644 --- a/examples/st7789_tft_gizmo_simpletest.py +++ b/examples/st7789_tft_gizmo_simpletest.py @@ -19,8 +19,14 @@ display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) -display = ST7789(display_bus, width=240, height=240, rowstart=80, - backlight_pin=tft_backlight, rotation=180) +display = ST7789( + display_bus, + width=240, + height=240, + rowstart=80, + backlight_pin=tft_backlight, + rotation=180, +) # Make the display context splash = displayio.Group(max_size=10) @@ -28,27 +34,23 @@ color_bitmap = displayio.Bitmap(240, 240, 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(200, 200, 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=2, x=50, y=120) 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: