From 6df68af24027a79647c42ab3f33cf663b25bf91a Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 25 Mar 2024 17:07:04 -0500 Subject: [PATCH 1/2] 9x compatibility --- adafruit_il91874.py | 12 +++++++++--- examples/il91874_simpletest.py | 11 ++++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/adafruit_il91874.py b/adafruit_il91874.py index de5f945..f07ed27 100644 --- a/adafruit_il91874.py +++ b/adafruit_il91874.py @@ -25,7 +25,13 @@ """ -import displayio +# Compatibility with both CircuitPython 8.x.x and 9.x.x. +# Remove after 8.x.x is no longer a supported release. +try: + from epaperdisplay import EPaperDisplay + from fourwire import FourWire +except ImportError: + from displayio import EPaperDisplay, FourWire __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_IL91874.git" @@ -67,10 +73,10 @@ # pylint: disable=too-few-public-methods -class IL91874(displayio.EPaperDisplay): +class IL91874(EPaperDisplay): """IL91874 display driver""" - def __init__(self, bus: displayio.FourWire, **kwargs) -> None: + def __init__(self, bus: FourWire, **kwargs) -> None: start_sequence = bytearray(_START_SEQUENCE) width = kwargs["width"] diff --git a/examples/il91874_simpletest.py b/examples/il91874_simpletest.py index 98816c2..bbfbd05 100644 --- a/examples/il91874_simpletest.py +++ b/examples/il91874_simpletest.py @@ -14,6 +14,15 @@ import time import board import displayio + +# Compatibility with both CircuitPython 8.x.x and 9.x.x. +# Remove after 8.x.x is no longer a supported release. +try: + from fourwire import FourWire +except ImportError: + # pylint: disable=ungrouped-imports + from displayio import FourWire + import adafruit_il91874 # Used to ensure the display is free in CircuitPython @@ -27,7 +36,7 @@ epd_busy = board.D6 # Create the displayio connection to the display pins -display_bus = displayio.FourWire( +display_bus = FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) time.sleep(1) # Wait a bit From 31d64a8aa260ed3e1495efb7d95e519dfd356c78 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 1 Apr 2024 09:03:43 -0500 Subject: [PATCH 2/2] blinka displayio req --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 7a984a4..007b042 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ # SPDX-License-Identifier: Unlicense Adafruit-Blinka +Adafruit-Blinka-Displayio