diff --git a/README.rst b/README.rst index a1b2dfc..3e85caf 100644 --- a/README.rst +++ b/README.rst @@ -36,6 +36,13 @@ 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 + from adafruit_st7789 import ST7789 displayio.release_displays() @@ -48,13 +55,13 @@ Usage Example 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 = ST7789(display_bus, width=240, height=240, rowstart=80) # Make the display context splash = displayio.Group() - display.show(splash) + display.root_group = splash color_bitmap = displayio.Bitmap(240, 240, 1) color_palette = displayio.Palette(1) diff --git a/adafruit_st7789.py b/adafruit_st7789.py index 42c28b6..b37f264 100755 --- a/adafruit_st7789.py +++ b/adafruit_st7789.py @@ -40,7 +40,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_ST7789.git" @@ -58,8 +65,8 @@ # pylint: disable=too-few-public-methods -class ST7789(displayio.Display): +class ST7789(BusDisplay): """ST7789 driver""" - def __init__(self, bus: displayio.FourWire, **kwargs) -> None: + def __init__(self, bus: FourWire, **kwargs) -> None: super().__init__(bus, _INIT_SEQUENCE, **kwargs) diff --git a/examples/st7789_170x320_1.9_simpletest.py b/examples/st7789_170x320_1.9_simpletest.py index 10d854a..c3fc4cf 100644 --- a/examples/st7789_170x320_1.9_simpletest.py +++ b/examples/st7789_170x320_1.9_simpletest.py @@ -8,6 +8,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_st7789 import ST7789 @@ -22,13 +29,13 @@ tft_dc = board.D6 tft_rst = board.D9 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=tft_rst) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=tft_rst) display = ST7789(display_bus, width=320, height=170, colstart=35, rotation=90) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(display.width, display.height, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_172x320_1.47_simpletest.py b/examples/st7789_172x320_1.47_simpletest.py index 101113f..a61a5ae 100644 --- a/examples/st7789_172x320_1.47_simpletest.py +++ b/examples/st7789_172x320_1.47_simpletest.py @@ -8,6 +8,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_st7789 import ST7789 @@ -34,13 +41,13 @@ # tft_dc = board.GP6 # tft_rst = board.GP7 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=tft_rst) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=tft_rst) display = ST7789(display_bus, width=320, height=172, colstart=34, rotation=270) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(display.width, display.height, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_240x135_pitft_simpletest.py b/examples/st7789_240x135_pitft_simpletest.py index 5f2db09..e9a050d 100644 --- a/examples/st7789_240x135_pitft_simpletest.py +++ b/examples/st7789_240x135_pitft_simpletest.py @@ -10,6 +10,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_st7789 import ST7789 @@ -27,14 +34,14 @@ tft_cs = board.CE0 tft_dc = board.D25 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = ST7789( display_bus, rotation=90, width=240, height=135, rowstart=40, colstart=53 ) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(display.width, display.height, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_240x135_simpletest.py b/examples/st7789_240x135_simpletest.py index 7d878ab..0821810 100644 --- a/examples/st7789_240x135_simpletest.py +++ b/examples/st7789_240x135_simpletest.py @@ -8,6 +8,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_st7789 import ST7789 @@ -25,14 +32,14 @@ tft_cs = board.D5 tft_dc = board.D6 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = ST7789( display_bus, rotation=270, width=240, height=135, rowstart=40, colstart=53 ) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(display.width, display.height, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py b/examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py index 09f7505..3691a31 100644 --- a/examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py +++ b/examples/st7789_240x135_simpletest_Pimoroni_Pico_Display_Pack.py @@ -5,6 +5,13 @@ import busio 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_st7789 import ST7789 @@ -24,14 +31,14 @@ spi_clk = board.GP18 spi = busio.SPI(spi_clk, spi_mosi) -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = ST7789( display_bus, rotation=270, width=240, height=135, rowstart=40, colstart=53 ) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(display.width, display.height, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_240x240_bonnet_simpletest.py b/examples/st7789_240x240_bonnet_simpletest.py index d208ca8..3e24f57 100644 --- a/examples/st7789_240x240_bonnet_simpletest.py +++ b/examples/st7789_240x240_bonnet_simpletest.py @@ -10,6 +10,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_st7789 import ST7789 @@ -21,7 +28,7 @@ tft_dc = board.D25 tft_lite = board.D26 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = ST7789( display_bus, @@ -34,7 +41,7 @@ # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(240, 240, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_240x240_pitft_simpletest.py b/examples/st7789_240x240_pitft_simpletest.py index 7df1753..a779d47 100644 --- a/examples/st7789_240x240_pitft_simpletest.py +++ b/examples/st7789_240x240_pitft_simpletest.py @@ -10,6 +10,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_st7789 import ST7789 @@ -20,13 +27,13 @@ tft_cs = board.CE0 tft_dc = board.D25 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = ST7789(display_bus, width=240, height=240, rowstart=80, rotation=180) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(240, 240, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py b/examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py index 67b0adf..930d773 100644 --- a/examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py +++ b/examples/st7789_240x240_simpletest_Pimoroni_Pico_Explorer.py @@ -9,6 +9,13 @@ import busio 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_st7789 import ST7789 @@ -21,13 +28,13 @@ spi_clk = board.GP18 spi = busio.SPI(spi_clk, spi_mosi) -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = ST7789(display_bus, width=240, height=240, rowstart=80, rotation=180) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(240, 240, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_240x240_simpletest_Waveshare_PicoLCD_1_3.py b/examples/st7789_240x240_simpletest_Waveshare_PicoLCD_1_3.py index c379bb1..ddb35c9 100644 --- a/examples/st7789_240x240_simpletest_Waveshare_PicoLCD_1_3.py +++ b/examples/st7789_240x240_simpletest_Waveshare_PicoLCD_1_3.py @@ -9,6 +9,13 @@ import busio 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_st7789 import ST7789 @@ -23,7 +30,7 @@ backlight = board.GP13 spi = busio.SPI(spi_clk, spi_mosi) -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=tft_rst) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs, reset=tft_rst) display = ST7789( display_bus, @@ -36,7 +43,7 @@ # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(240, 240, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_280x240_simpletest.py b/examples/st7789_280x240_simpletest.py index 926990d..f2ed86f 100644 --- a/examples/st7789_280x240_simpletest.py +++ b/examples/st7789_280x240_simpletest.py @@ -8,6 +8,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_st7789 import ST7789 @@ -18,15 +25,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 = ST7789(display_bus, width=280, height=240, rowstart=20, rotation=90) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(280, 240, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_320x240_simpletest.py b/examples/st7789_320x240_simpletest.py index 3fac5aa..c68913a 100644 --- a/examples/st7789_320x240_simpletest.py +++ b/examples/st7789_320x240_simpletest.py @@ -8,6 +8,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_st7789 import ST7789 @@ -18,15 +25,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 = ST7789(display_bus, width=320, height=240, rotation=90) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(320, 240, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_320x240_simpletest_Pimoroni_Pico_Display_2_0.py b/examples/st7789_320x240_simpletest_Pimoroni_Pico_Display_2_0.py index d88d91d..3e8f0e0 100644 --- a/examples/st7789_320x240_simpletest_Pimoroni_Pico_Display_2_0.py +++ b/examples/st7789_320x240_simpletest_Pimoroni_Pico_Display_2_0.py @@ -9,6 +9,13 @@ import busio 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_st7789 import ST7789 @@ -22,7 +29,7 @@ spi = busio.SPI(spi_clk, spi_mosi) backlight = board.GP20 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = ST7789( display_bus, rotation=270, width=320, height=240, backlight_pin=backlight @@ -30,7 +37,7 @@ # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(320, 240, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_simpletest.py b/examples/st7789_simpletest.py index 990630e..1e80711 100644 --- a/examples/st7789_simpletest.py +++ b/examples/st7789_simpletest.py @@ -8,6 +8,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_st7789 import ST7789 @@ -18,15 +25,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 = ST7789(display_bus, width=240, height=240, rowstart=80) # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(240, 240, 1) color_palette = displayio.Palette(1) diff --git a/examples/st7789_tft_gizmo_simpletest.py b/examples/st7789_tft_gizmo_simpletest.py index 0869521..40403a6 100644 --- a/examples/st7789_tft_gizmo_simpletest.py +++ b/examples/st7789_tft_gizmo_simpletest.py @@ -9,6 +9,13 @@ import busio 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_st7789 import ST7789 @@ -20,7 +27,7 @@ tft_dc = board.TX tft_backlight = board.A3 -display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs) +display_bus = FourWire(spi, command=tft_dc, chip_select=tft_cs) display = ST7789( display_bus, @@ -33,7 +40,7 @@ # Make the display context splash = displayio.Group() -display.show(splash) +display.root_group = splash color_bitmap = displayio.Bitmap(240, 240, 1) color_palette = displayio.Palette(1)