diff --git a/adafruit_ili9341.py b/adafruit_ili9341.py index df34845..c6baaa1 100644 --- a/adafruit_ili9341.py +++ b/adafruit_ili9341.py @@ -52,7 +52,13 @@ except ImportError: pass -import displayio +# Support both 8.x.x and 9.x.x. Change when 8.x.x is discontinued as a stable release. +try: + from fourwire import FourWire + from busdisplay import BusDisplay +except ImportError: + from displayio import FourWire + from displayio import Display as BusDisplay __version__ = "0.0.0+auto.0" __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_ILI9341.git" @@ -85,12 +91,12 @@ # pylint: disable=too-few-public-methods -class ILI9341(displayio.Display): +class ILI9341(BusDisplay): """ ILI9341 display driver - :param displayio.FourWire bus: bus that the display is connected to + :param FourWire bus: bus that the display is connected to """ - def __init__(self, bus: displayio.FourWire, **kwargs: Any): + def __init__(self, bus: FourWire, **kwargs: Any): super().__init__(bus, _INIT_SEQUENCE, **kwargs) diff --git a/examples/ili9341_pitft_simpletest.py b/examples/ili9341_pitft_simpletest.py index 02e2553..10fc893 100644 --- a/examples/ili9341_pitft_simpletest.py +++ b/examples/ili9341_pitft_simpletest.py @@ -11,10 +11,15 @@ import board import terminalio import displayio -import fourwire from adafruit_display_text import label import adafruit_ili9341 +# Support both 8.x.x and 9.x.x. Change when 8.x.x is discontinued as a stable release. +try: + from fourwire import FourWire +except ImportError: + from displayio import FourWire + # Release any resources currently in use for the displays displayio.release_displays() @@ -22,7 +27,7 @@ tft_cs = board.CE0 tft_dc = board.D25 -display_bus = fourwire.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = adafruit_ili9341.ILI9341(display_bus, width=320, height=240) # Make the display context diff --git a/examples/ili9341_shield_simpletest.py b/examples/ili9341_shield_simpletest.py index 5294f77..773adea 100644 --- a/examples/ili9341_shield_simpletest.py +++ b/examples/ili9341_shield_simpletest.py @@ -10,10 +10,15 @@ import board import terminalio import displayio -import fourwire from adafruit_display_text import label import adafruit_ili9341 +# Support both 8.x.x and 9.x.x. Change when 8.x.x is discontinued as a stable release. +try: + from fourwire import FourWire +except ImportError: + from displayio import FourWire + # Release any resources currently in use for the displays displayio.release_displays() @@ -27,7 +32,7 @@ tft_cs = board.D10 tft_dc = board.D9 -display_bus = fourwire.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = adafruit_ili9341.ILI9341(display_bus, width=320, height=240) # Make the display context diff --git a/examples/ili9341_simpletest.py b/examples/ili9341_simpletest.py index fe38c1c..030d730 100644 --- a/examples/ili9341_simpletest.py +++ b/examples/ili9341_simpletest.py @@ -11,10 +11,15 @@ import board import terminalio import displayio -import fourwire from adafruit_display_text import label import adafruit_ili9341 +# Support both 8.x.x and 9.x.x. Change when 8.x.x is discontinued as a stable release. +try: + from fourwire import FourWire +except ImportError: + from displayio import FourWire + # Release any resources currently in use for the displays displayio.release_displays() @@ -22,7 +27,7 @@ tft_cs = board.D9 tft_dc = board.D10 -display_bus = fourwire.FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=board.D6) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=board.D6) display = adafruit_ili9341.ILI9341(display_bus, width=320, height=240) # Make the display context