From e48fdf1678546b7f2eb1d4dd513265fe4aa2e380 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Thu, 2 Nov 2023 09:26:19 -0500 Subject: [PATCH 1/9] Update with display.root_group for CircuitPython 9 --- examples/spd1656_4in_acep.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/spd1656_4in_acep.py b/examples/spd1656_4in_acep.py index 30716ca..7b54bf3 100644 --- a/examples/spd1656_4in_acep.py +++ b/examples/spd1656_4in_acep.py @@ -39,7 +39,7 @@ t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) - display.show(g) + display.root_group = g display.refresh() From 7e0b69c6b923402d5b56cfd649723a1ee2eca1c6 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Thu, 2 Nov 2023 09:26:50 -0500 Subject: [PATCH 2/9] Update with display.root_group for CircuitPython 9 --- examples/spd1656_color_stripes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/spd1656_color_stripes.py b/examples/spd1656_color_stripes.py index 9c63e16..9e953e1 100644 --- a/examples/spd1656_color_stripes.py +++ b/examples/spd1656_color_stripes.py @@ -56,7 +56,7 @@ tg = displayio.TileGrid(bitmap=bmp, pixel_shader=p) g.append(tg) -display.show(g) +display.root_group = g display.refresh() From d81ff7af5adaa28e87097315f03c1ddf40b98601 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Thu, 2 Nov 2023 09:27:07 -0500 Subject: [PATCH 3/9] Update with display.root_group for CircuitPython 9 --- examples/spd1656_colors_and_text.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/spd1656_colors_and_text.py b/examples/spd1656_colors_and_text.py index ac3765a..27fd39c 100644 --- a/examples/spd1656_colors_and_text.py +++ b/examples/spd1656_colors_and_text.py @@ -55,7 +55,7 @@ lbl.anchored_position = (display.width // 2, display.height // 2) g.append(lbl) -display.show(g) +display.root_group = g display.refresh() while True: From 067a6f1290f6534f8bbe879e60150ea330ffa45d Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Thu, 2 Nov 2023 09:27:27 -0500 Subject: [PATCH 4/9] Update with display.root_group for CircuitPython 9 --- examples/spd1656_simpletest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/spd1656_simpletest.py b/examples/spd1656_simpletest.py index 9577fae..ab52b1e 100644 --- a/examples/spd1656_simpletest.py +++ b/examples/spd1656_simpletest.py @@ -38,7 +38,7 @@ t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) - display.show(g) + display.root_group = g display.refresh() From 568445ef8952ba7cdaf7e637d57f5385def07078 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Thu, 2 Nov 2023 09:31:45 -0500 Subject: [PATCH 5/9] Update with display.root_group for CircuitPython 9 --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 42321b9..80e92e1 100644 --- a/README.rst +++ b/README.rst @@ -138,7 +138,7 @@ Usage Example t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) - display.show(g) + display.root_group = g display.refresh() From 7a3b9619d01cb794b6574ddd6ec63b3ec8a29e60 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Thu, 2 Nov 2023 09:47:21 -0500 Subject: [PATCH 6/9] Update with fourwire module for CircuitPython 9 --- examples/spd1656_4in_acep.py | 4 +++- examples/spd1656_color_stripes.py | 4 +++- examples/spd1656_colors_and_text.py | 4 +++- examples/spd1656_simpletest.py | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/examples/spd1656_4in_acep.py b/examples/spd1656_4in_acep.py index 7b54bf3..e1cfee8 100644 --- a/examples/spd1656_4in_acep.py +++ b/examples/spd1656_4in_acep.py @@ -12,6 +12,8 @@ import board import displayio import adafruit_spd1656 +import fourwire + displayio.release_displays() @@ -22,7 +24,7 @@ epd_reset = board.D11 epd_busy = board.D12 -display_bus = displayio.FourWire( +display_bus = fourwire.FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) diff --git a/examples/spd1656_color_stripes.py b/examples/spd1656_color_stripes.py index 9e953e1..d2cfd5b 100644 --- a/examples/spd1656_color_stripes.py +++ b/examples/spd1656_color_stripes.py @@ -11,6 +11,8 @@ import displayio import bitmaptools import adafruit_spd1656 +import fourwire + displayio.release_displays() @@ -21,7 +23,7 @@ epd_reset = board.D11 epd_busy = board.D12 -display_bus = displayio.FourWire( +display_bus = fourwire.FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) diff --git a/examples/spd1656_colors_and_text.py b/examples/spd1656_colors_and_text.py index 27fd39c..0b92e80 100644 --- a/examples/spd1656_colors_and_text.py +++ b/examples/spd1656_colors_and_text.py @@ -14,6 +14,8 @@ import bitmaptools from adafruit_display_text.bitmap_label import Label import adafruit_spd1656 +import fourwire + displayio.release_displays() @@ -24,7 +26,7 @@ epd_reset = board.D11 epd_busy = board.D12 -display_bus = displayio.FourWire( +display_bus = fourwire.FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) diff --git a/examples/spd1656_simpletest.py b/examples/spd1656_simpletest.py index ab52b1e..f916e6c 100644 --- a/examples/spd1656_simpletest.py +++ b/examples/spd1656_simpletest.py @@ -11,6 +11,7 @@ import board import displayio import adafruit_spd1656 +import fourwire displayio.release_displays() @@ -21,7 +22,7 @@ epd_reset = board.D11 epd_busy = board.D12 -display_bus = displayio.FourWire( +display_bus = fourwire.FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) From d520b9d7db5b1ae175c9efecbae003200ed80d68 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Thu, 2 Nov 2023 09:51:09 -0500 Subject: [PATCH 7/9] Update import order per CI --- examples/spd1656_4in_acep.py | 2 +- examples/spd1656_color_stripes.py | 2 +- examples/spd1656_colors_and_text.py | 2 +- examples/spd1656_simpletest.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/spd1656_4in_acep.py b/examples/spd1656_4in_acep.py index e1cfee8..107996f 100644 --- a/examples/spd1656_4in_acep.py +++ b/examples/spd1656_4in_acep.py @@ -11,8 +11,8 @@ import time import board import displayio -import adafruit_spd1656 import fourwire +import adafruit_spd1656 displayio.release_displays() diff --git a/examples/spd1656_color_stripes.py b/examples/spd1656_color_stripes.py index d2cfd5b..2c3b0df 100644 --- a/examples/spd1656_color_stripes.py +++ b/examples/spd1656_color_stripes.py @@ -10,8 +10,8 @@ import board import displayio import bitmaptools -import adafruit_spd1656 import fourwire +import adafruit_spd1656 displayio.release_displays() diff --git a/examples/spd1656_colors_and_text.py b/examples/spd1656_colors_and_text.py index 0b92e80..fdff95a 100644 --- a/examples/spd1656_colors_and_text.py +++ b/examples/spd1656_colors_and_text.py @@ -13,8 +13,8 @@ import terminalio import bitmaptools from adafruit_display_text.bitmap_label import Label -import adafruit_spd1656 import fourwire +import adafruit_spd1656 displayio.release_displays() diff --git a/examples/spd1656_simpletest.py b/examples/spd1656_simpletest.py index f916e6c..e2e8bf2 100644 --- a/examples/spd1656_simpletest.py +++ b/examples/spd1656_simpletest.py @@ -10,8 +10,9 @@ import time import board import displayio -import adafruit_spd1656 import fourwire +import adafruit_spd1656 + displayio.release_displays() From ab65ff68488961b7bb5e0727d4b527225391bc98 Mon Sep 17 00:00:00 2001 From: Paul Cutler Date: Thu, 2 Nov 2023 09:55:12 -0500 Subject: [PATCH 8/9] Update with fourwire.FourWire in README.rst --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 80e92e1..229a687 100644 --- a/README.rst +++ b/README.rst @@ -121,7 +121,7 @@ Usage Example epd_reset = board.D11 epd_busy = board.D12 - display_bus = displayio.FourWire( + display_bus = fourwire.FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) From 8ba9146d717e5ae9a08ab32f0961c9d26375f4eb Mon Sep 17 00:00:00 2001 From: foamyguy Date: Tue, 20 Feb 2024 16:54:37 -0600 Subject: [PATCH 9/9] epaperdisplay module --- adafruit_spd1656.py | 4 ++-- docs/conf.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_spd1656.py b/adafruit_spd1656.py index 01f5dc6..7ac40fe 100644 --- a/adafruit_spd1656.py +++ b/adafruit_spd1656.py @@ -23,7 +23,7 @@ import struct -import displayio +import epaperdisplay __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_SPD1656.git" @@ -48,7 +48,7 @@ # pylint: disable=too-few-public-methods -class SPD1656(displayio.EPaperDisplay): +class SPD1656(epaperdisplay.EPaperDisplay): r"""SPD1656 display driver :param bus: The data bus the display is on diff --git a/docs/conf.py b/docs/conf.py index b9e4c21..8f1adb4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -27,7 +27,7 @@ # Uncomment the below if you use native CircuitPython modules such as # digitalio, micropython and busio. List the modules you use. Without it, the # autodoc module docs will fail to generate with a warning. -# autodoc_mock_imports = ["digitalio", "busio"] +autodoc_mock_imports = ["epaperdisplay"] autodoc_preserve_defaults = True