From 1d4cf221580d920d4e2b2be38bcc597c6e1a9e11 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 2 Oct 2023 08:28:39 -0700 Subject: [PATCH 1/2] Fix column offset for ssd1680 instead of ssd1675 --- adafruit_ssd1680.py | 2 +- examples/ssd1680_simpletest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_ssd1680.py b/adafruit_ssd1680.py index 23fa7e6..d65f4c2 100755 --- a/adafruit_ssd1680.py +++ b/adafruit_ssd1680.py @@ -68,7 +68,7 @@ class SSD1680(displayio.EPaperDisplay): def __init__(self, bus: displayio.FourWire, **kwargs) -> None: if "colstart" not in kwargs: - kwargs["colstart"] = 1 + kwargs["colstart"] = 8 stop_sequence = bytearray(_STOP_SEQUENCE) try: bus.reset() diff --git a/examples/ssd1680_simpletest.py b/examples/ssd1680_simpletest.py index a545412..1ca1d11 100644 --- a/examples/ssd1680_simpletest.py +++ b/examples/ssd1680_simpletest.py @@ -37,7 +37,7 @@ # For issues with display not updating top/bottom rows correctly set colstart to 8 display = adafruit_ssd1680.SSD1680( display_bus, - colstart=1, + colstart=8, width=250, height=122, busy_pin=epd_busy, From 6e602b34f0e3707426e89f24780605f1ca8143d8 Mon Sep 17 00:00:00 2001 From: Melissa LeBlanc-Williams Date: Mon, 2 Oct 2023 09:22:54 -0700 Subject: [PATCH 2/2] Update examples to remove older style tilegrid creation --- examples/ssd1680_2.13_featherwing.py | 4 +--- examples/ssd1680_2.13_tricolor_breakout.py | 4 +--- examples/ssd1680_simpletest.py | 7 +------ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/examples/ssd1680_2.13_featherwing.py b/examples/ssd1680_2.13_featherwing.py index 2732f83..c194735 100644 --- a/examples/ssd1680_2.13_featherwing.py +++ b/examples/ssd1680_2.13_featherwing.py @@ -45,9 +45,7 @@ with open("/display-ruler.bmp", "rb") as f: pic = displayio.OnDiskBitmap(f) - t = displayio.TileGrid( - pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter()) - ) + t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) diff --git a/examples/ssd1680_2.13_tricolor_breakout.py b/examples/ssd1680_2.13_tricolor_breakout.py index 11f6bd6..7f6992d 100644 --- a/examples/ssd1680_2.13_tricolor_breakout.py +++ b/examples/ssd1680_2.13_tricolor_breakout.py @@ -44,9 +44,7 @@ with open("/display-ruler.bmp", "rb") as f: pic = displayio.OnDiskBitmap(f) - t = displayio.TileGrid( - pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter()) - ) + t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) diff --git a/examples/ssd1680_simpletest.py b/examples/ssd1680_simpletest.py index 1ca1d11..a59d230 100644 --- a/examples/ssd1680_simpletest.py +++ b/examples/ssd1680_simpletest.py @@ -50,12 +50,7 @@ with open("/display-ruler.bmp", "rb") as f: pic = displayio.OnDiskBitmap(f) - # CircuitPython 6 & 7 compatible - t = displayio.TileGrid( - pic, pixel_shader=getattr(pic, "pixel_shader", displayio.ColorConverter()) - ) - # CircuitPython 7 compatible only - # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) + t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) display.show(g)