From 8b1eb6d0c47b14e4a7bb04c6a8efaa473ec905ce Mon Sep 17 00:00:00 2001 From: dherrada Date: Mon, 9 Mar 2020 19:32:37 -0400 Subject: [PATCH] Ran black, updated to pylint 2.x --- .github/workflows/build.yml | 2 +- adafruit_st7735r.py | 41 ++++--- docs/conf.py | 112 ++++++++++-------- examples/st7735r_128x160_simpletest.py | 18 ++- examples/st7735r_18tftshield_buttons.py | 2 +- .../st7735r_minitft_featherwing_simpletest.py | 18 ++- examples/st7735r_minitft_simpletest.py | 22 ++-- examples/st7735r_simpletest.py | 16 ++- 8 files changed, 123 insertions(+), 108 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fff3aa9..97fe64d 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 pylint black==19.10b0 Sphinx sphinx-rtd-theme - name: Library version run: git describe --dirty --always --tags - name: PyLint diff --git a/adafruit_st7735r.py b/adafruit_st7735r.py index 3f585fd..9864d46 100755 --- a/adafruit_st7735r.py +++ b/adafruit_st7735r.py @@ -57,39 +57,42 @@ __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ST7735R.git" _INIT_SEQUENCE = bytearray( - b"\x01\x80\x96" # SWRESET and Delay 150ms - b"\x11\x80\xff" # SLPOUT and Delay - b"\xb1\x03\x01\x2C\x2D" # _FRMCTR1 - b"\xb2\x03\x01\x2C\x2D" # _FRMCTR2 - b"\xb3\x06\x01\x2C\x2D\x01\x2C\x2D" # _FRMCTR3 - b"\xb4\x01\x07" # _INVCTR line inversion - b"\xc0\x03\xa2\x02\x84" # _PWCTR1 GVDD = 4.7V, 1.0uA - b"\xc1\x01\xc5" # _PWCTR2 VGH=14.7V, VGL=-7.35V - b"\xc2\x02\x0a\x00" # _PWCTR3 Opamp current small, Boost frequency + b"\x01\x80\x96" # SWRESET and Delay 150ms + b"\x11\x80\xff" # SLPOUT and Delay + b"\xb1\x03\x01\x2C\x2D" # _FRMCTR1 + b"\xb2\x03\x01\x2C\x2D" # _FRMCTR2 + b"\xb3\x06\x01\x2C\x2D\x01\x2C\x2D" # _FRMCTR3 + b"\xb4\x01\x07" # _INVCTR line inversion + b"\xc0\x03\xa2\x02\x84" # _PWCTR1 GVDD = 4.7V, 1.0uA + b"\xc1\x01\xc5" # _PWCTR2 VGH=14.7V, VGL=-7.35V + b"\xc2\x02\x0a\x00" # _PWCTR3 Opamp current small, Boost frequency b"\xc3\x02\x8a\x2a" b"\xc4\x02\x8a\xee" - b"\xc5\x01\x0e" # _VMCTR1 VCOMH = 4V, VOML = -1.1V - b"\x20\x00" # _INVOFF - b"\x36\x01\x18" # _MADCTL bottom to top refresh + b"\xc5\x01\x0e" # _VMCTR1 VCOMH = 4V, VOML = -1.1V + b"\x20\x00" # _INVOFF + b"\x36\x01\x18" # _MADCTL bottom to top refresh # 1 clk cycle nonoverlap, 2 cycle gate rise, 3 sycle osc equalie, # fix on VTL - b"\x3a\x01\x05" # COLMOD - 16bit color - b"\xe0\x10\x02\x1c\x07\x12\x37\x32\x29\x2d\x29\x25\x2B\x39\x00\x01\x03\x10" # _GMCTRP1 Gamma - b"\xe1\x10\x03\x1d\x07\x06\x2E\x2C\x29\x2D\x2E\x2E\x37\x3F\x00\x00\x02\x10" # _GMCTRN1 - b"\x13\x80\x0a" # _NORON - b"\x29\x80\x64" # _DISPON + b"\x3a\x01\x05" # COLMOD - 16bit color + b"\xe0\x10\x02\x1c\x07\x12\x37\x32\x29\x2d\x29\x25\x2B\x39\x00\x01\x03\x10" # _GMCTRP1 Gamma + b"\xe1\x10\x03\x1d\x07\x06\x2E\x2C\x29\x2D\x2E\x2E\x37\x3F\x00\x00\x02\x10" # _GMCTRN1 + b"\x13\x80\x0a" # _NORON + b"\x29\x80\x64" # _DISPON ) # pylint: disable=too-few-public-methods class ST7735R(displayio.Display): """ST7735 driver for ST7735R""" + def __init__(self, bus, *, bgr=False, invert=False, **kwargs): """ :param bool bgr: (Optional) An extra init sequence to append (default=False) """ init_sequence = _INIT_SEQUENCE if bgr: - init_sequence += b"\x36\x01\xC0" # _MADCTL Default rotation plus BGR encoding + init_sequence += ( + b"\x36\x01\xC0" # _MADCTL Default rotation plus BGR encoding + ) if invert: - init_sequence += b"\x21\x00" # _INVON + init_sequence += b"\x21\x00" # _INVON super().__init__(bus, init_sequence, **kwargs) diff --git a/docs/conf.py b/docs/conf.py index 31434cc..03597ae 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 ST7735R Library' -copyright = u'2019 Scott Shawcroft' -author = u'Scott Shawcroft' +project = "Adafruit ST7735R Library" +copyright = "2019 Scott Shawcroft" +author = "Scott Shawcroft" # 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 = 'AdafruitSt7735RLibrarydoc' +htmlhelp_basename = "AdafruitSt7735RLibrarydoc" # -- 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, 'AdafruitST7735RLibrary.tex', u'AdafruitST7735R Library Documentation', - author, 'manual'), + ( + master_doc, + "AdafruitST7735RLibrary.tex", + "AdafruitST7735R 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, 'AdafruitST7735Rlibrary', u'Adafruit ST7735R Library Documentation', - [author], 1) + ( + master_doc, + "AdafruitST7735Rlibrary", + "Adafruit ST7735R 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, 'AdafruitST7735RLibrary', u'Adafruit ST7735R Library Documentation', - author, 'AdafruitST7735RLibrary', 'One line description of project.', - 'Miscellaneous'), + ( + master_doc, + "AdafruitST7735RLibrary", + "Adafruit ST7735R Library Documentation", + author, + "AdafruitST7735RLibrary", + "One line description of project.", + "Miscellaneous", + ), ] diff --git a/examples/st7735r_128x160_simpletest.py b/examples/st7735r_128x160_simpletest.py index cda5f6d..80d0ca7 100644 --- a/examples/st7735r_128x160_simpletest.py +++ b/examples/st7735r_128x160_simpletest.py @@ -16,7 +16,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 = ST7735R(display_bus, width=160, height=128, rotation=90, bgr=True) @@ -26,27 +28,23 @@ color_bitmap = displayio.Bitmap(160, 128, 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(150, 118, 1) inner_palette = displayio.Palette(1) -inner_palette[0] = 0xAA0088 # Purple -inner_sprite = displayio.TileGrid(inner_bitmap, - pixel_shader=inner_palette, - x=5, y=5) +inner_palette[0] = 0xAA0088 # Purple +inner_sprite = displayio.TileGrid(inner_bitmap, pixel_shader=inner_palette, x=5, y=5) splash.append(inner_sprite) # Draw a label text_group = displayio.Group(max_size=10, scale=2, x=11, y=64) 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/st7735r_18tftshield_buttons.py b/examples/st7735r_18tftshield_buttons.py index b7c9347..bd79f10 100644 --- a/examples/st7735r_18tftshield_buttons.py +++ b/examples/st7735r_18tftshield_buttons.py @@ -50,4 +50,4 @@ if buttons.c: print("Button C!") - time.sleep(.001) + time.sleep(0.001) diff --git a/examples/st7735r_minitft_featherwing_simpletest.py b/examples/st7735r_minitft_featherwing_simpletest.py index 12d3fb0..6dc1b1b 100644 --- a/examples/st7735r_minitft_featherwing_simpletest.py +++ b/examples/st7735r_minitft_featherwing_simpletest.py @@ -25,7 +25,9 @@ display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) ss.digital_write(reset_pin, True) -display = ST7735R(display_bus, width=160, height=80, colstart=24, rotation=270, bgr=True) +display = ST7735R( + display_bus, width=160, height=80, colstart=24, rotation=270, bgr=True +) # Make the display context splash = displayio.Group(max_size=10) @@ -33,27 +35,23 @@ color_bitmap = displayio.Bitmap(160, 80, 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(150, 70, 1) inner_palette = displayio.Palette(1) -inner_palette[0] = 0xAA0088 # Purple -inner_sprite = displayio.TileGrid(inner_bitmap, - pixel_shader=inner_palette, - x=5, y=5) +inner_palette[0] = 0xAA0088 # Purple +inner_sprite = displayio.TileGrid(inner_bitmap, pixel_shader=inner_palette, x=5, y=5) splash.append(inner_sprite) # Draw a label text_group = displayio.Group(max_size=10, scale=2, x=11, y=40) 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/st7735r_minitft_simpletest.py b/examples/st7735r_minitft_simpletest.py index 8ec9cad..0eee372 100644 --- a/examples/st7735r_minitft_simpletest.py +++ b/examples/st7735r_minitft_simpletest.py @@ -16,9 +16,13 @@ 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 = ST7735R(display_bus, width=160, height=80, colstart=24, rotation=270, bgr=True) +display = ST7735R( + display_bus, width=160, height=80, colstart=24, rotation=270, bgr=True +) # Make the display context splash = displayio.Group(max_size=10) @@ -26,27 +30,23 @@ color_bitmap = displayio.Bitmap(160, 80, 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(150, 70, 1) inner_palette = displayio.Palette(1) -inner_palette[0] = 0xAA0088 # Purple -inner_sprite = displayio.TileGrid(inner_bitmap, - pixel_shader=inner_palette, - x=5, y=5) +inner_palette[0] = 0xAA0088 # Purple +inner_sprite = displayio.TileGrid(inner_bitmap, pixel_shader=inner_palette, x=5, y=5) splash.append(inner_sprite) # Draw a label text_group = displayio.Group(max_size=10, scale=2, x=11, y=40) 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/st7735r_simpletest.py b/examples/st7735r_simpletest.py index af3a25a..f4a9392 100644 --- a/examples/st7735r_simpletest.py +++ b/examples/st7735r_simpletest.py @@ -16,7 +16,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 = ST7735R(display_bus, width=128, height=128, colstart=2, rowstart=1) @@ -26,20 +28,16 @@ color_bitmap = displayio.Bitmap(128, 128, 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(108, 108, 1) inner_palette = displayio.Palette(1) -inner_palette[0] = 0xAA0088 # Purple -inner_sprite = displayio.TileGrid(inner_bitmap, - pixel_shader=inner_palette, - x=10, y=10) +inner_palette[0] = 0xAA0088 # Purple +inner_sprite = displayio.TileGrid(inner_bitmap, pixel_shader=inner_palette, x=10, y=10) splash.append(inner_sprite) # Draw a label