Merge pull request #18 from RetiredWizard/main

Replace depreciated .show() & displayio changes

Author: dhalbert

README.rst

@@ -37,6 +37,12 @@ Usage Example
 
     import board
     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 terminalio
     from adafruit_display_text import label
     from adafruit_ssd1331 import SSD1331
@@ -46,13 +52,13 @@ Usage Example
     tft_dc = board.D6
 
     displayio.release_displays()
-    display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=board.D9)
+    display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=board.D9)
 
     display = SSD1331(display_bus, width=96, height=64)
 
     # Make the display context
     splash = displayio.Group()
-    display.show(splash)
+    display.root_group = splash
 
     color_bitmap = displayio.Bitmap(96, 64, 1)
     color_palette = displayio.Palette(1)

adafruit_ssd1331.py

@@ -26,7 +26,14 @@
 
 """
 
-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
+    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_SSD1331.git"
@@ -56,10 +63,10 @@
 
 
 # pylint: disable=too-few-public-methods
-class SSD1331(displayio.Display):
+class SSD1331(BusDisplay):
     """SSD1331 driver"""
 
-    def __init__(self, bus: displayio.FourWire, **kwargs) -> None:
+    def __init__(self, bus: FourWire, **kwargs) -> None:
         super().__init__(
             bus,
             _INIT_SEQUENCE,

examples/ssd1331_simpletest.py

@@ -9,6 +9,13 @@
 import board
 import terminalio
 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
 from adafruit_display_text import label
 from adafruit_ssd1331 import SSD1331
 
@@ -19,15 +26,13 @@
 tft_cs = board.D5
 tft_dc = board.D6
 
-display_bus = displayio.FourWire(
-    spi, command=tft_dc, chip_select=tft_cs, reset=board.D9
-)
+display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=board.D9)
 
 display = SSD1331(display_bus, width=96, height=64)
 
 # Make the display context
 splash = displayio.Group()
-display.show(splash)
+display.root_group = splash
 
 color_bitmap = displayio.Bitmap(96, 64, 1)
 color_palette = displayio.Palette(1)