diff --git a/adafruit_uc8151d.py b/adafruit_uc8151d.py index 8dc91ed..50d1006 100755 --- a/adafruit_uc8151d.py +++ b/adafruit_uc8151d.py @@ -26,7 +26,14 @@ """ -import displayio +# For 8.x.x and 9.x.x. When 8.x.x is discontinued as a stable release, change this. +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_UC8151D.git" @@ -101,7 +108,7 @@ # pylint: disable=too-few-public-methods -class UC8151D(displayio.EPaperDisplay): +class UC8151D(EPaperDisplay): r"""UC8151D driver :param bus: The data bus the display is on @@ -117,7 +124,7 @@ class UC8151D(displayio.EPaperDisplay): Display rotation """ - def __init__(self, bus: displayio.FourWire, **kwargs) -> None: + def __init__(self, bus: FourWire, **kwargs) -> None: color_bits_inverted = kwargs.pop("color_bits_inverted", False) write_color_ram_command = 0x10 write_black_ram_command = 0x13 diff --git a/examples/uc8151d_1.54_grayscale.py b/examples/uc8151d_1.54_grayscale.py index b76ff3c..d06cf81 100644 --- a/examples/uc8151d_1.54_grayscale.py +++ b/examples/uc8151d_1.54_grayscale.py @@ -13,9 +13,14 @@ import board import displayio import busio -import fourwire import adafruit_uc8151d +# For 8.x.x and 9.x.x. When 8.x.x is discontinued as a stable release, change this. +try: + from fourwire import FourWire +except ImportError: + from displayio import FourWire + displayio.release_displays() # Pinout intended for use with a Raspberry Pi Pico @@ -26,7 +31,7 @@ rst = board.GP12 busy = board.GP13 -display_bus = fourwire.FourWire( +display_bus = FourWire( busio.SPI(clk, si), command=dc, chip_select=cs, reset=rst, baudrate=1000000 ) diff --git a/examples/uc8151d_2.9_color.py b/examples/uc8151d_2.9_color.py index b1b6f43..f1c0120 100644 --- a/examples/uc8151d_2.9_color.py +++ b/examples/uc8151d_2.9_color.py @@ -10,9 +10,14 @@ import time import board import displayio -import fourwire import adafruit_uc8151d +# For 8.x.x and 9.x.x. When 8.x.x is discontinued as a stable release, change this. +try: + from fourwire import FourWire +except ImportError: + from displayio import FourWire + # Used to ensure the display is free in CircuitPython displayio.release_displays() @@ -25,7 +30,7 @@ epd_busy = board.D6 # Create the displayio connection to the display pins -display_bus = fourwire.FourWire( +display_bus = FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) time.sleep(1) # Wait a bit diff --git a/examples/uc8151d_simpletest.py b/examples/uc8151d_simpletest.py index 6cb36db..1e776cc 100644 --- a/examples/uc8151d_simpletest.py +++ b/examples/uc8151d_simpletest.py @@ -14,9 +14,14 @@ import time import board import displayio -import fourwire import adafruit_uc8151d +# For 8.x.x and 9.x.x. When 8.x.x is discontinued as a stable release, change this. +try: + from fourwire import FourWire +except ImportError: + from displayio import FourWire + displayio.release_displays() # This pinout works on a Feather M4 and may need to be altered for other boards. @@ -26,7 +31,7 @@ epd_reset = board.D5 epd_busy = None -display_bus = fourwire.FourWire( +display_bus = FourWire( spi, command=epd_dc, chip_select=epd_cs, reset=epd_reset, baudrate=1000000 ) time.sleep(1)