Merge pull request #41 from FoamyGuy/9x_compatibility

9.x compatibility in examples

examples/displayio_ssd1306_64x32_simpletest.py

@@ -9,6 +9,14 @@
 
 import board
 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 i2cdisplaybus import I2CDisplayBus
+except ImportError:
+    from displayio import I2CDisplay as I2CDisplayBus
+
 import terminalio
 from adafruit_display_text import label
 import adafruit_displayio_ssd1306
@@ -18,7 +26,7 @@
 i2c = board.I2C()  # uses board.SCL and board.SDA
 # i2c = board.STEMMA_I2C()  # For using the built-in STEMMA QT connector on a microcontroller
 
-display_bus = displayio.I2CDisplay(i2c, device_address=0x3C)
+display_bus = I2CDisplayBus(i2c, device_address=0x3C)
 display = adafruit_displayio_ssd1306.SSD1306(display_bus, width=64, height=32)
 
 # Make the display context

examples/displayio_ssd1306_featherwing.py

@@ -8,6 +8,14 @@
 
 import board
 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 i2cdisplaybus import I2CDisplayBus
+except ImportError:
+    from displayio import I2CDisplay as I2CDisplayBus
+
 import terminalio
 from adafruit_display_text import label
 import adafruit_displayio_ssd1306
@@ -16,7 +24,7 @@
 
 i2c = board.I2C()  # uses board.SCL and board.SDA
 # i2c = board.STEMMA_I2C()  # For using the built-in STEMMA QT connector on a microcontroller
-display_bus = displayio.I2CDisplay(i2c, device_address=0x3C)
+display_bus = I2CDisplayBus(i2c, device_address=0x3C)
 display = adafruit_displayio_ssd1306.SSD1306(display_bus, width=128, height=32)
 
 # Make the display context

examples/displayio_ssd1306_picowbell_tempsensor.py

@@ -6,6 +6,14 @@
 import time
 import board
 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 i2cdisplaybus import I2CDisplayBus
+except ImportError:
+    from displayio import I2CDisplay as I2CDisplayBus
+
 import busio
 import terminalio
 from adafruit_display_text import label
@@ -29,7 +37,7 @@
 ssd_height = 32
 
 # Ensure the physical address of your SSD1306 is set here:
-ssd_bus = displayio.I2CDisplay(i2c0, device_address=0x3C)
+ssd_bus = I2CDisplayBus(i2c0, device_address=0x3C)
 display = ssd1306.SSD1306(ssd_bus, width=ssd_width, height=ssd_height)
 
 # Manually set your sea_level_pressure to your area

examples/displayio_ssd1306_simpletest.py

@@ -8,6 +8,18 @@
 
 import board
 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 i2cdisplaybus import I2CDisplayBus
+
+    # from fourwire import FourWire
+except ImportError:
+    from displayio import I2CDisplay as I2CDisplayBus
+
+    # from displayio import FourWire
+
 import terminalio
 from adafruit_display_text import label
 import adafruit_displayio_ssd1306
@@ -19,13 +31,13 @@
 # Use for I2C
 i2c = board.I2C()  # uses board.SCL and board.SDA
 # i2c = board.STEMMA_I2C()  # For using the built-in STEMMA QT connector on a microcontroller
-display_bus = displayio.I2CDisplay(i2c, device_address=0x3C, reset=oled_reset)
+display_bus = I2CDisplayBus(i2c, device_address=0x3C, reset=oled_reset)
 
 # Use for SPI
 # spi = board.SPI()
 # oled_cs = board.D5
 # oled_dc = board.D6
-# display_bus = displayio.FourWire(spi, command=oled_dc, chip_select=oled_cs,
+# display_bus = FourWire(spi, command=oled_dc, chip_select=oled_cs,
 #                                 reset=oled_reset, baudrate=1000000)
 
 WIDTH = 128

requirements.txt

@@ -3,3 +3,4 @@
 # SPDX-License-Identifier: Unlicense
 
 Adafruit-Blinka
+Adafruit-Blinka-Displayio