Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SebastienFauque/Adafruit_CircuitPython_SharpMemoryDisplay
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: adafruit/Adafruit_CircuitPython_SharpMemoryDisplay
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 10 commits
  • 7 files changed
  • 3 contributors

Commits on Apr 28, 2023

  1. Merge pull request adafruit#23 from SebastienFauque/main

    added typing for image, scs, and, reverse_bit num
    FoamyGuy authored Apr 28, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b633527 View commit details

Commits on May 10, 2023

  1. Update pre-commit hooks

    Signed-off-by: Tekktrik <tekktrik@gmail.com>
    tekktrik committed May 10, 2023
    Copy the full SHA
    7000b15 View commit details

Commits on May 11, 2023

  1. Run pre-commit

    tekktrik committed May 11, 2023
    Copy the full SHA
    8fd70d4 View commit details

Commits on May 24, 2023

  1. Update .pylintrc, fix jQuery for docs

    Signed-off-by: Tekktrik <tekktrik@gmail.com>
    tekktrik committed May 24, 2023
    Copy the full SHA
    39b83e0 View commit details

Commits on Sep 18, 2023

  1. "fix rtd theme

    "
    FoamyGuy committed Sep 18, 2023
    Copy the full SHA
    ae0f74d View commit details

Commits on Dec 4, 2023

  1. unpin sphinx and add sphinx-rtd-theme to docs reqs

    Signed-off-by: foamyguy <foamyguy@gmail.com>
    FoamyGuy committed Dec 4, 2023
    Copy the full SHA
    404a6f5 View commit details

Commits on Mar 26, 2024

  1. Copy the full SHA
    dda5d65 View commit details

Commits on Apr 1, 2024

  1. Merge pull request adafruit#24 from makermelissa/master

    Update Pillow Demo for latest version
    makermelissa authored Apr 1, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    9f6be44 View commit details

Commits on Oct 7, 2024

  1. remove deprecated get_html_theme_path() call

    Signed-off-by: foamyguy <foamyguy@gmail.com>
    FoamyGuy committed Oct 7, 2024
    Copy the full SHA
    f85e165 View commit details

Commits on Jan 16, 2025

  1. add sphinx configuration to rtd.yaml

    Signed-off-by: foamyguy <foamyguy@gmail.com>
    FoamyGuy committed Jan 16, 2025
    Copy the full SHA
    cd02126 View commit details
Showing with 18 additions and 21 deletions.
  1. +4 −4 .pre-commit-config.yaml
  2. +1 −1 .pylintrc
  3. +3 −0 .readthedocs.yaml
  4. +0 −1 adafruit_sharpmemorydisplay.py
  5. +4 −13 docs/conf.py
  6. +3 −1 docs/requirements.txt
  7. +3 −1 examples/sharpmemorydisplay_pillow_demo.py
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -4,21 +4,21 @@

repos:
- repo: https://github.com/python/black
rev: 22.3.0
rev: 23.3.0
hooks:
- id: black
- repo: https://github.com/fsfe/reuse-tool
rev: v0.14.0
rev: v1.1.2
hooks:
- id: reuse
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.2.0
rev: v4.4.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/pycqa/pylint
rev: v2.15.5
rev: v2.17.4
hooks:
- id: pylint
name: pylint (library code)
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
@@ -396,4 +396,4 @@ min-public-methods=1

# Exceptions that will emit a warning when being caught. Defaults to
# "Exception"
overgeneral-exceptions=Exception
overgeneral-exceptions=builtins.Exception
3 changes: 3 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -8,6 +8,9 @@
# Required
version: 2

sphinx:
configuration: docs/conf.py

build:
os: ubuntu-20.04
tools:
1 change: 0 additions & 1 deletion adafruit_sharpmemorydisplay.py
Original file line number Diff line number Diff line change
@@ -103,7 +103,6 @@ def show(self) -> None:
"""

with self.spi_device as spi:

image_buffer = bytearray()
# toggle the VCOM bit
self._buf[0] = _SHARPMEM_BIT_WRITECMD
17 changes: 4 additions & 13 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
# ones.
extensions = [
"sphinx.ext.autodoc",
"sphinxcontrib.jquery",
"sphinx.ext.intersphinx",
"sphinx.ext.napoleon",
"sphinx.ext.todo",
@@ -100,19 +101,9 @@
# 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"

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(), "."]
except:
html_theme = "default"
html_theme_path = ["."]
else:
html_theme_path = ["."]
import sphinx_rtd_theme

html_theme = "sphinx_rtd_theme"

# 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,
4 changes: 3 additions & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -2,4 +2,6 @@
#
# SPDX-License-Identifier: Unlicense

sphinx>=4.0.0
sphinx
sphinxcontrib-jquery
sphinx-rtd-theme
4 changes: 3 additions & 1 deletion examples/sharpmemorydisplay_pillow_demo.py
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@
scs = digitalio.DigitalInOut(board.D6) # inverted chip select

# display = adafruit_sharpmemorydisplay.SharpMemoryDisplay(spi, scs, 96, 96)
# display = adafruit_sharpmemorydisplay.SharpMemoryDisplay(spi, scs, 400, 240)
display = adafruit_sharpmemorydisplay.SharpMemoryDisplay(spi, scs, 144, 168)

# Clear display.
@@ -56,7 +57,8 @@

# Draw Some Text
text = "Hello World!"
(font_width, font_height) = font.getsize(text)
bbox = font.getbbox(text)
(font_width, font_height) = bbox[2] - bbox[0], bbox[3] - bbox[1]
draw.text(
(display.width // 2 - font_width // 2, display.height // 2 - font_height // 2),
text,