From 1bae65cec631420b712fe4e649f0a11094764b00 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Mon, 6 Nov 2023 17:40:51 -0500 Subject: [PATCH 1/2] Replace depreciated .show() & displayio changes --- README.rst | 10 ++++++++-- adafruit_ssd1675.py | 14 +++++++++++--- examples/ssd1675_2.13_monochrome.py | 14 +++++++++++--- examples/ssd1675_four_corners.py | 10 ++++++++-- examples/ssd1675_simpletest.py | 10 ++++++++-- 5 files changed, 46 insertions(+), 12 deletions(-) diff --git a/README.rst b/README.rst index 6047801..4c8baf2 100644 --- a/README.rst +++ b/README.rst @@ -71,6 +71,12 @@ Usage Example import board import busio import displayio + # Starting in CircuitPython 9.x, fourwire will be a seperate internal library + # rather than a component of the displayio library + try: + from fourwire import FourWire + except ImportError: + from displayio import FourWire import adafruit_ssd1675 displayio.release_displays() @@ -78,7 +84,7 @@ Usage Example epd_cs = board.D9 epd_dc = board.D10 - display_bus = displayio.FourWire(board.SPI(), command=epd_dc, chip_select=epd_cs, baudrate=1000000) + display_bus = FourWire(board.SPI(), command=epd_dc, chip_select=epd_cs, baudrate=1000000) time.sleep(1) display = adafruit_ssd1675.SSD1675(display_bus, width=250, height=122, rotation=90) @@ -96,7 +102,7 @@ Usage Example # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) - display.show(g) + display.root_group = g display.refresh() diff --git a/adafruit_ssd1675.py b/adafruit_ssd1675.py index d7299d1..672557f 100644 --- a/adafruit_ssd1675.py +++ b/adafruit_ssd1675.py @@ -26,7 +26,15 @@ """ -import displayio +# Starting in CircuitPython 9.x fourwire & EPaperDisplay will be seperate internal +# libraries rather than components of the displayio library +try: + from fourwire import FourWire + from epaperdisplay import EPaperDisplay +except ImportError: + from displayio import FourWire + from displayio import EPaperDisplay + __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_SSD1675.git" @@ -53,10 +61,10 @@ # pylint: disable=too-few-public-methods -class SSD1675(displayio.EPaperDisplay): +class SSD1675(EPaperDisplay): """SSD1675 driver""" - def __init__(self, bus: displayio.FourWire, **kwargs) -> None: + def __init__(self, bus: FourWire, **kwargs) -> None: stop_sequence = _STOP_SEQUENCE try: bus.reset() diff --git a/examples/ssd1675_2.13_monochrome.py b/examples/ssd1675_2.13_monochrome.py index 6cb2882..7f94ec0 100644 --- a/examples/ssd1675_2.13_monochrome.py +++ b/examples/ssd1675_2.13_monochrome.py @@ -12,6 +12,14 @@ import board import displayio import adafruit_ssd1675 +# Starting in CircuitPython 9.x fourwire will be a seperate internal library +# rather than a component of the displayio library +try: + from fourwire import FourWire +except ImportError: + from displayio import FourWire + + displayio.release_displays() @@ -22,7 +30,7 @@ epd_reset = board.D5 epd_busy = board.D6 -display_bus = displayio.FourWire( +display_bus = FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) time.sleep(1) @@ -43,8 +51,8 @@ # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) - display.show(g) - + display.root_group = g + display.refresh() print("refreshed") diff --git a/examples/ssd1675_four_corners.py b/examples/ssd1675_four_corners.py index a12658e..86ae29f 100644 --- a/examples/ssd1675_four_corners.py +++ b/examples/ssd1675_four_corners.py @@ -15,6 +15,12 @@ import displayio import terminalio import adafruit_ssd1675 +# Starting in CircuitPython 9.x fourwire will be a seperate internal library +# rather than a component of the displayio library +try: + from fourwire import FourWire +except ImportError: + from displayio import FourWire displayio.release_displays() @@ -27,7 +33,7 @@ epd_reset = board.EPD_RESET epd_busy = board.EPD_BUSY -display_bus = displayio.FourWire( +display_bus = FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) display = adafruit_ssd1675.SSD1675( @@ -41,7 +47,7 @@ # Make the display context main_group = displayio.Group() -display.show(main_group) +display.root_group = main_group palette = displayio.Palette(2) palette[0] = 0x000000 diff --git a/examples/ssd1675_simpletest.py b/examples/ssd1675_simpletest.py index 9fabbe4..7ebf4a1 100644 --- a/examples/ssd1675_simpletest.py +++ b/examples/ssd1675_simpletest.py @@ -12,13 +12,19 @@ import board import displayio import adafruit_ssd1675 +# Starting in CircuitPython 9.x fourwire will be a seperate internal library +# rather than a component of the displayio library +try: + from fourwire import FourWire +except ImportError: + from displayio import FourWire displayio.release_displays() epd_cs = board.D9 epd_dc = board.D10 -display_bus = displayio.FourWire( +display_bus = FourWire( board.SPI(), command=epd_dc, chip_select=epd_cs, baudrate=1000000 ) time.sleep(1) @@ -37,7 +43,7 @@ # t = displayio.TileGrid(pic, pixel_shader=pic.pixel_shader) g.append(t) - display.show(g) + display.root_group = g display.refresh() From 8c38e8243d0b21eeed5ef4c675592747ebc85ac9 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Mon, 6 Nov 2023 17:41:51 -0500 Subject: [PATCH 2/2] Replace depreciated .show() & displayio changes --- examples/ssd1675_2.13_monochrome.py | 4 ++-- examples/ssd1675_four_corners.py | 1 + examples/ssd1675_simpletest.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/ssd1675_2.13_monochrome.py b/examples/ssd1675_2.13_monochrome.py index 7f94ec0..468d410 100644 --- a/examples/ssd1675_2.13_monochrome.py +++ b/examples/ssd1675_2.13_monochrome.py @@ -12,6 +12,7 @@ import board import displayio import adafruit_ssd1675 + # Starting in CircuitPython 9.x fourwire will be a seperate internal library # rather than a component of the displayio library try: @@ -20,7 +21,6 @@ from displayio import FourWire - displayio.release_displays() # This pinout works on a Feather M4 and may need to be altered for other boards. @@ -52,7 +52,7 @@ g.append(t) display.root_group = g - + display.refresh() print("refreshed") diff --git a/examples/ssd1675_four_corners.py b/examples/ssd1675_four_corners.py index 86ae29f..e58220d 100644 --- a/examples/ssd1675_four_corners.py +++ b/examples/ssd1675_four_corners.py @@ -15,6 +15,7 @@ import displayio import terminalio import adafruit_ssd1675 + # Starting in CircuitPython 9.x fourwire will be a seperate internal library # rather than a component of the displayio library try: diff --git a/examples/ssd1675_simpletest.py b/examples/ssd1675_simpletest.py index 7ebf4a1..14e6929 100644 --- a/examples/ssd1675_simpletest.py +++ b/examples/ssd1675_simpletest.py @@ -12,6 +12,7 @@ import board import displayio import adafruit_ssd1675 + # Starting in CircuitPython 9.x fourwire will be a seperate internal library # rather than a component of the displayio library try: