From 7778c34a194b32f773a9f8c9db4668eb0cbe1e5c Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 25 Mar 2024 15:29:17 -0500 Subject: [PATCH 1/3] 9.x compatibility in examples --- examples/displayio_ssd1306_64x32_simpletest.py | 10 +++++++++- examples/displayio_ssd1306_featherwing.py | 10 +++++++++- examples/displayio_ssd1306_picowbell_tempsensor.py | 10 +++++++++- examples/displayio_ssd1306_simpletest.py | 10 +++++++++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/examples/displayio_ssd1306_64x32_simpletest.py b/examples/displayio_ssd1306_64x32_simpletest.py index 38b3673..2fa287c 100644 --- a/examples/displayio_ssd1306_64x32_simpletest.py +++ b/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 diff --git a/examples/displayio_ssd1306_featherwing.py b/examples/displayio_ssd1306_featherwing.py index b77942d..14734b5 100644 --- a/examples/displayio_ssd1306_featherwing.py +++ b/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 diff --git a/examples/displayio_ssd1306_picowbell_tempsensor.py b/examples/displayio_ssd1306_picowbell_tempsensor.py index 85032e4..6d781b7 100644 --- a/examples/displayio_ssd1306_picowbell_tempsensor.py +++ b/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 diff --git a/examples/displayio_ssd1306_simpletest.py b/examples/displayio_ssd1306_simpletest.py index 27c107f..cbc5904 100644 --- a/examples/displayio_ssd1306_simpletest.py +++ b/examples/displayio_ssd1306_simpletest.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 @@ -19,7 +27,7 @@ # 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() From 0e07f44a07635e24ffc9ae1538b1b959f66955b1 Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 25 Mar 2024 15:31:50 -0500 Subject: [PATCH 2/3] fourwire also --- examples/displayio_ssd1306_simpletest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/examples/displayio_ssd1306_simpletest.py b/examples/displayio_ssd1306_simpletest.py index cbc5904..b0b1b54 100644 --- a/examples/displayio_ssd1306_simpletest.py +++ b/examples/displayio_ssd1306_simpletest.py @@ -13,9 +13,13 @@ # 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 @@ -33,7 +37,7 @@ # 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 From e8d65779dd74d31a0dab9265608d65ea7a05159e Mon Sep 17 00:00:00 2001 From: foamyguy Date: Mon, 25 Mar 2024 17:10:43 -0500 Subject: [PATCH 3/3] update requirements --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 7a984a4..007b042 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ # SPDX-License-Identifier: Unlicense Adafruit-Blinka +Adafruit-Blinka-Displayio