diff --git a/examples/ov2640_bmp_sd_kaluga1_3.py b/examples/ov2640_bmp_sd_kaluga1_3.py index 6ae374b..c9a78d6 100644 --- a/examples/ov2640_bmp_sd_kaluga1_3.py +++ b/examples/ov2640_bmp_sd_kaluga1_3.py @@ -33,6 +33,14 @@ import board import busio 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: + from displayio import FourWire + import sdcardio import storage import adafruit_ov2640 @@ -47,7 +55,7 @@ displayio.release_displays() spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK) -display_bus = displayio.FourWire( +display_bus = FourWire( spi, command=board.LCD_D_C, chip_select=board.LCD_CS, diff --git a/examples/ov2640_directio_kaluga1_3_ili9341.py b/examples/ov2640_directio_kaluga1_3_ili9341.py index 40d5643..e2197e9 100644 --- a/examples/ov2640_directio_kaluga1_3_ili9341.py +++ b/examples/ov2640_directio_kaluga1_3_ili9341.py @@ -32,6 +32,14 @@ import board import busio 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: + from displayio import FourWire + import sdcardio import storage import adafruit_ov2640 @@ -45,7 +53,7 @@ displayio.release_displays() spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK) -display_bus = displayio.FourWire( +display_bus = FourWire( spi, command=board.LCD_D_C, chip_select=board.LCD_CS, diff --git a/examples/ov2640_displayio_kaluga1_3_ili9341.py b/examples/ov2640_displayio_kaluga1_3_ili9341.py index dc6ce94..bc96fe5 100644 --- a/examples/ov2640_displayio_kaluga1_3_ili9341.py +++ b/examples/ov2640_displayio_kaluga1_3_ili9341.py @@ -19,6 +19,14 @@ import board import busio 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: + from displayio import FourWire + from adafruit_ili9341 import ILI9341 import adafruit_ov2640 @@ -29,7 +37,7 @@ displayio.release_displays() spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK) -display_bus = displayio.FourWire( +display_bus = FourWire( spi, command=board.LCD_D_C, chip_select=board.LCD_CS, reset=board.LCD_RST ) display = ILI9341(display_bus, width=320, height=240, rotation=90) diff --git a/examples/ov2640_displayio_kaluga1_3_ili9341_ulab.py b/examples/ov2640_displayio_kaluga1_3_ili9341_ulab.py index 0c6fafc..bdb313a 100644 --- a/examples/ov2640_displayio_kaluga1_3_ili9341_ulab.py +++ b/examples/ov2640_displayio_kaluga1_3_ili9341_ulab.py @@ -22,6 +22,14 @@ import board import busio 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: + from displayio import FourWire + from adafruit_ili9341 import ILI9341 import ulab.numpy as np import adafruit_ov2640 @@ -33,7 +41,7 @@ displayio.release_displays() spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK) -display_bus = displayio.FourWire( +display_bus = FourWire( spi, command=board.LCD_D_C, chip_select=board.LCD_CS, reset=board.LCD_RST ) display = ILI9341(display_bus, width=320, height=240, rotation=90) diff --git a/examples/ov2640_displayio_kaluga1_3_st7789.py b/examples/ov2640_displayio_kaluga1_3_st7789.py index 61ee9fe..7253bf9 100644 --- a/examples/ov2640_displayio_kaluga1_3_st7789.py +++ b/examples/ov2640_displayio_kaluga1_3_st7789.py @@ -20,6 +20,14 @@ import board import busio 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: + from displayio import FourWire + from adafruit_st7789 import ST7789 import adafruit_ov2640 @@ -30,7 +38,7 @@ displayio.release_displays() spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK) -display_bus = displayio.FourWire( +display_bus = FourWire( spi, command=board.LCD_D_C, chip_select=board.LCD_CS, reset=board.LCD_RST ) display = ST7789( diff --git a/examples/ov2640_displayio_pico_st7789_2in.py b/examples/ov2640_displayio_pico_st7789_2in.py index e36c501..700364b 100644 --- a/examples/ov2640_displayio_pico_st7789_2in.py +++ b/examples/ov2640_displayio_pico_st7789_2in.py @@ -12,12 +12,19 @@ Bitmap, Group, TileGrid, - FourWire, release_displays, ColorConverter, Colorspace, ) +# 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 + from adafruit_st7789 import ST7789 import board import busio diff --git a/examples/ov2640_jpeg_sd_kaluga1_3.py b/examples/ov2640_jpeg_sd_kaluga1_3.py index 693ad99..2906619 100644 --- a/examples/ov2640_jpeg_sd_kaluga1_3.py +++ b/examples/ov2640_jpeg_sd_kaluga1_3.py @@ -33,6 +33,14 @@ import board import busio 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: + from displayio import FourWire + import sdcardio import storage from adafruit_ili9341 import ILI9341 @@ -47,7 +55,7 @@ displayio.release_displays() spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK) -display_bus = displayio.FourWire( +display_bus = FourWire( spi, command=board.LCD_D_C, chip_select=board.LCD_CS, reset=board.LCD_RST ) display = ILI9341(display_bus, width=320, height=240, rotation=90) diff --git a/examples/ov2640_jpeg_sd_pico_st7789_2in.py b/examples/ov2640_jpeg_sd_pico_st7789_2in.py index e5105c1..21d640c 100644 --- a/examples/ov2640_jpeg_sd_pico_st7789_2in.py +++ b/examples/ov2640_jpeg_sd_pico_st7789_2in.py @@ -28,11 +28,19 @@ Bitmap, Group, TileGrid, - FourWire, release_displays, ColorConverter, Colorspace, ) + +# 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 + from adafruit_st7789 import ST7789 import board import busio