Skip to content

Commit 18a037d

Browse files
authored
Merge pull request #2755 from FoamyGuy/displayio_api_9x
Displayio api 9x
2 parents 109eebc + 52416a2 commit 18a037d

File tree

66 files changed

+143
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+143
-72
lines changed

4x4_MIDI_Messenger/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from rainbowio import colorwheel
99
import keypad
1010
import displayio
11+
import i2cdisplaybus
1112
import busio
1213
import adafruit_seesaw.seesaw
1314
import adafruit_seesaw.neopixel
@@ -50,7 +51,7 @@
5051

5152
i2c = board.STEMMA_I2C()
5253
# STEMMA OLED setup
53-
display_bus = displayio.I2CDisplay(i2c, device_address=0x3D, reset=oled_reset)
54+
display_bus = i2cdisplaybus.I2CDisplayBus(i2c, device_address=0x3D, reset=oled_reset)
5455
display = adafruit_displayio_ssd1306.SSD1306(display_bus, width=128, height=64)
5556

5657
splash = displayio.Group()

AHT20_OLED/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
# OLED
1313
import displayio
14+
import i2cdisplaybus
1415
import terminalio
1516
from adafruit_display_text import label
1617
import adafruit_displayio_ssd1306
@@ -25,7 +26,7 @@
2526

2627

2728
#OLED
28-
display_bus = displayio.I2CDisplay(i2c, device_address=0x3C)
29+
display_bus = i2cdisplaybus.I2CDisplayBus(i2c, device_address=0x3C)
2930
display = adafruit_displayio_ssd1306.SSD1306(display_bus, width=128, height=32)
3031

3132
# Make the display context

CAN_Bus_BFF/CircuitPython/can_bus_bff_receiver.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import board
66
import terminalio
77
import displayio
8+
import i2cdisplaybus
89
from digitalio import DigitalInOut
910
from adafruit_mcp2515.canio import Message, RemoteTransmissionRequest
1011
from adafruit_mcp2515 import MCP2515 as CAN
@@ -15,7 +16,7 @@
1516

1617
i2c = board.STEMMA_I2C()
1718
# STEMMA OLED setup
18-
display_bus = displayio.I2CDisplay(i2c, device_address=0x3D, reset=None)
19+
display_bus = i2cdisplaybus.I2CDisplayBus(i2c, device_address=0x3D, reset=None)
1920
display = adafruit_displayio_ssd1306.SSD1306(display_bus, width=128, height=64)
2021

2122
cs = DigitalInOut(board.A3)

CircuitPython_ESP32_Camera/esp32-kaluga-onionskin-gif/code.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@
5252
import board
5353
import busio
5454
import bitmaptools
55+
import fourwire
5556
import displayio
57+
import busdisplay
5658
import sdcardio
5759
import storage
5860
import gifio
@@ -68,7 +70,7 @@ def record_pressed():
6870

6971
displayio.release_displays()
7072
spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK)
71-
display_bus = displayio.FourWire(
73+
display_bus = fourwire.FourWire(
7274
spi,
7375
command=board.LCD_D_C,
7476
chip_select=board.LCD_CS,
@@ -101,7 +103,7 @@ def record_pressed():
101103
b"\x29\x80\x78" # Display on then delay 0x78 (120ms)
102104
)
103105

104-
display = displayio.Display(display_bus, _INIT_SEQUENCE, width=320, height=240)
106+
display = busdisplay.BusDisplay(display_bus, _INIT_SEQUENCE, width=320, height=240)
105107

106108
sd_spi = busio.SPI(clock=board.IO18, MOSI=board.IO14, MISO=board.IO17)
107109
sd_cs = board.IO12
@@ -193,7 +195,7 @@ def take_stop_motion_gif(n_frames=10, replay_frame_time=.3):
193195
writer.add_frame(frame, replay_frame_time)
194196
for i in range(1, n_frames):
195197
print(f"{i}/{n_frames}")
196-
old_frame.blit(0, 0, frame, x1=0, y1=0, x2=cam.width, y2=cam.height)
198+
bitmaptools.blit(old_frame, frame, 0, 0, x1=0, y1=0, x2=cam.width, y2=cam.height)
197199
frame = wait_record_pressed_update_display(False, cam)
198200
writer.add_frame(frame, replay_frame_time)
199201
print("done")

CircuitPython_Flying_Toasters/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from random import seed, randint
2222
import board
2323
import displayio
24+
import fourwire
2425
from adafruit_st7789 import ST7789
2526
import adafruit_imageload
2627

@@ -63,7 +64,7 @@ def make_display():
6364
spi.configure(baudrate=24000000) # Configure SPI for 24MHz
6465
spi.unlock()
6566
displayio.release_displays()
66-
display_bus = displayio.FourWire(spi, command=board.D7, chip_select=board.D10, reset=board.D9)
67+
display_bus = fourwire.FourWire(spi, command=board.D7, chip_select=board.D10, reset=board.D9)
6768

6869
return ST7789(display_bus, width=240, height=240, rowstart=80, auto_refresh=True)
6970

CircuitPython_GetSuperpower_PicoW_OpenAI/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import board
99
import displayio
10+
import i2cdisplaybus
1011
import digitalio
1112
import keypad
1213
import socketpool
@@ -75,7 +76,7 @@
7576

7677
# STEMMA I2C on picowbell
7778
i2c = board.STEMMA_I2C()
78-
display_bus = displayio.I2CDisplay(i2c, device_address=0x3D, reset=oled_reset)
79+
display_bus = i2cdisplaybus.I2CDisplayBus(i2c, device_address=0x3D, reset=oled_reset)
7980

8081
WIDTH = 128
8182
HEIGHT = 64

CircuitPython_KeyPad_Calculator/code/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import board
66
import displayio
7+
import i2cdisplaybus
78
import keypad
89
import adafruit_displayio_sh1107
910
from adafruit_hid.keyboard import Keyboard
@@ -57,7 +58,7 @@ def lookup(layer, key_number):
5758
# Use for I2C
5859
i2c = board.I2C() # uses board.SCL and board.SDA
5960
# i2c = board.STEMMA_I2C() # For using the built-in STEMMA QT connector on a microcontroller
60-
display_bus = displayio.I2CDisplay(i2c, device_address=0x3C)
61+
display_bus = i2cdisplaybus.I2CDisplayBus(i2c, device_address=0x3C)
6162

6263
# SH1107 is vertically oriented 64x128
6364
WIDTH = 128

CircuitPython_Knob_Sketcher/feather_sketcher/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import time
1010
import board
1111
import displayio
12+
import fourwire
1213
import digitalio
1314
import analogio
1415
import adafruit_ili9341
@@ -55,7 +56,7 @@
5556
tft_cs = board.D9
5657
tft_dc = board.D10
5758
tft_rst = board.D6
58-
display_bus = displayio.FourWire(
59+
display_bus = fourwire.FourWire(
5960
spi, command=tft_dc, chip_select=tft_cs, reset=tft_rst
6061
)
6162
display = adafruit_ili9341.ILI9341(display_bus, width=DISPLAY_WIDTH, height=DISPLAY_HEIGHT)

CircuitPython_OLED_Watch/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import board
66
import displayio
7+
import i2cdisplaybus
78
import adafruit_displayio_ssd1306
89
import terminalio
910
import adafruit_ds3231
@@ -17,7 +18,7 @@
1718

1819
i2c = board.I2C() # uses board.SCL and board.SDA
1920
# i2c = board.STEMMA_I2C() # For using the built-in STEMMA QT connector on a microcontroller
20-
display_bus = displayio.I2CDisplay(i2c, device_address=0x3c)
21+
display_bus = i2cdisplaybus.I2CDisplayBus(i2c, device_address=0x3c)
2122
oled = adafruit_displayio_ssd1306.SSD1306(display_bus, width=128, height=32)
2223

2324
rtc = adafruit_ds3231.DS3231(i2c)

CircuitPython_Scrolling_Clouds/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from random import seed, randint
2222
import board
2323
import displayio
24+
import fourwire
2425
from adafruit_st7789 import ST7789
2526
import adafruit_imageload
2627

@@ -54,7 +55,7 @@ def make_display():
5455
spi.unlock()
5556

5657
displayio.release_displays()
57-
display_bus = displayio.FourWire(spi, command=board.D7, chip_select=board.D10, reset=board.D9)
58+
display_bus = fourwire.FourWire(spi, command=board.D7, chip_select=board.D10, reset=board.D9)
5859

5960
return ST7789(display_bus, width=240, height=240, rowstart=80, auto_refresh=True)
6061

CircuitPython_Sip_and_Puff/puff_detector.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from adafruit_display_text import label
1111
from displayio import Group
1212
import displayio
13+
import i2cdisplaybus
1314
import adafruit_displayio_ssd1306
1415
import adafruit_lps35hw
1516

@@ -94,7 +95,7 @@ def _init_stuff(self):
9495
displayio.release_displays()
9596
i2c = board.I2C()
9697

97-
display_bus = displayio.I2CDisplay(i2c, device_address=0x3D)
98+
display_bus = i2cdisplaybus.I2CDisplayBus(i2c, device_address=0x3D)
9899
self.display = adafruit_displayio_ssd1306.SSD1306(
99100
display_bus, width=DISPLAY_WIDTH, height=DISPLAY_HEIGHT
100101
)

CircuitPython_displayio/displayio_display_driver/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import board
66
import displayio
7+
import fourwire
78
import adafruit_ili9341
89

910
# Release any previously configured displays
@@ -17,7 +18,7 @@
1718
tft_dc = board.D9
1819

1920
# Setup the display bus
20-
display_bus = displayio.FourWire(spi_bus, command=tft_dc, chip_select=tft_cs)
21+
display_bus = fourwire.FourWire(spi_bus, command=tft_dc, chip_select=tft_cs)
2122

2223
# Setup the Display
2324
display = adafruit_ili9341.ILI9341(display_bus, width=320, height=240)

CircuitPython_displayio/displayio_display_manual/code.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
import board
66
import displayio
7+
import busdisplay
8+
import fourwire
79

810
# Release any previously configured displays
911
displayio.release_displays()
@@ -16,7 +18,7 @@
1618
tft_dc = board.D9
1719

1820
# Setup the display bus
19-
display_bus = displayio.FourWire(spi_bus, command=tft_dc, chip_select=tft_cs)
21+
display_bus = fourwire.FourWire(spi_bus, command=tft_dc, chip_select=tft_cs)
2022

2123
# Setup the initialization sequence
2224
# stolen from adafruit_ili9341.py
@@ -47,7 +49,7 @@
4749
)
4850

4951
# Setup the Display
50-
display = displayio.Display(display_bus, INIT_SEQUENCE, width=320, height=240)
52+
display = busdisplay.BusDisplay(display_bus, INIT_SEQUENCE, width=320, height=240)
5153

5254
#
5355
# DONE - now you can use the display however you want

CircuitPython_displayio/displayio_parallelbus/code.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44

55
import board
66
import displayio
7+
import busdisplay
8+
import paralleldisplaybus
79

810
# Release any previously configured displays
911
displayio.release_displays()
1012

1113
# Setup the display bus
1214
# Tested with a Metro M4 Express
13-
display_bus = displayio.ParallelBus(data0=board.D13,
15+
display_bus = paralleldisplaybus.ParallelBus(data0=board.D13,
1416
command=board.D6,
1517
chip_select=board.D7,
1618
write=board.D5,
@@ -45,7 +47,7 @@
4547
)
4648

4749
# Setup the Display
48-
display = displayio.Display(display_bus, INIT_SEQUENCE, width=320, height=240)
50+
display = busdisplay.BusDisplay(display_bus, INIT_SEQUENCE, width=320, height=240)
4951

5052
#
5153
# DONE - now you can use the display however you want

CircuitPython_qrio/adafruit_io/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import board
1616
import busio
1717
import displayio
18+
import fourwire
1819
import qrio
1920
import socketpool
2021
import wifi
@@ -30,7 +31,7 @@
3031
print("Initializing display")
3132
displayio.release_displays()
3233
spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK)
33-
display_bus = displayio.FourWire(
34+
display_bus = fourwire.FourWire(
3435
spi, command=board.LCD_D_C, chip_select=board.LCD_CS, reset=board.LCD_RST
3536
)
3637
display = ILI9341(display_bus, width=320, height=240, rotation=90)

CircuitPython_qrio/repl/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import board
1313
import busio
1414
import displayio
15+
import fourwire
1516
import qrio
1617
import adafruit_ov2640
1718
from adafruit_display_text.bitmap_label import Label
@@ -20,7 +21,7 @@
2021
print("Initializing display")
2122
displayio.release_displays()
2223
spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK)
23-
display_bus = displayio.FourWire(
24+
display_bus = fourwire.FourWire(
2425
spi, command=board.LCD_D_C, chip_select=board.LCD_CS, reset=board.LCD_RST
2526
)
2627
display = ILI9341(display_bus, width=320, height=240, rotation=90)

CircuitPython_qrio/usb_hid/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import board
1414
import busio
1515
import displayio
16+
import fourwire
1617
import qrio
1718
import adafruit_ov2640
1819
from adafruit_display_text.bitmap_label import Label
@@ -24,7 +25,7 @@
2425
print("Initializing display")
2526
displayio.release_displays()
2627
spi = busio.SPI(MOSI=board.LCD_MOSI, clock=board.LCD_CLK)
27-
display_bus = displayio.FourWire(
28+
display_bus = fourwire.FourWire(
2829
spi, command=board.LCD_D_C, chip_select=board.LCD_CS, reset=board.LCD_RST
2930
)
3031
display = ILI9341(display_bus, width=320, height=240, rotation=90)

Circuit_Playground_O_Phonor/notes_tft/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import busio
99
import audiobusio
1010
import displayio
11+
import fourwire
1112
from adafruit_st7789 import ST7789
1213
from adafruit_bitmap_font import bitmap_font
1314
from adafruit_display_text import label
@@ -46,7 +47,7 @@
4647
tft_dc = board.TX
4748
tft_backlight = board.A3
4849

49-
display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs)
50+
display_bus = fourwire.FourWire(spi, command=tft_dc, chip_select=tft_cs)
5051

5152
display = ST7789(display_bus, width=240, height=240, rowstart=80,
5253
backlight_pin=tft_backlight, rotation=180)

EInk_CircuitPython_Quickstart/213_tricolor_eink_fw_badge/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import time
1818
import board
1919
import displayio
20+
import fourwire
2021
import adafruit_il0373
2122
import terminalio
2223
from adafruit_display_text import label
@@ -43,7 +44,7 @@
4344
epd_busy = board.D6
4445

4546
# Create the displayio connection to the display pins
46-
display_bus = displayio.FourWire(spi, command=epd_dc, chip_select=epd_cs,
47+
display_bus = fourwire.FourWire(spi, command=epd_dc, chip_select=epd_cs,
4748
reset=epd_reset, baudrate=1000000)
4849
time.sleep(1) # Wait a bit
4950

EInk_CircuitPython_Quickstart/213_tricolor_eink_fw_text/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import time
1919
import board
2020
import displayio
21+
import fourwire
2122
import adafruit_il0373
2223
import terminalio
2324
from adafruit_display_text import label
@@ -44,7 +45,7 @@
4445
epd_busy = board.D6
4546

4647
# Create the displayio connection to the display pins
47-
display_bus = displayio.FourWire(spi, command=epd_dc, chip_select=epd_cs,
48+
display_bus = fourwire.FourWire(spi, command=epd_dc, chip_select=epd_cs,
4849
reset=epd_reset, baudrate=1000000)
4950
time.sleep(1) # Wait a bit
5051

EInk_CircuitPython_Quickstart/27_tricolor_eink_shield_badge/code.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import time
1717
import board
1818
import displayio
19+
import fourwire
1920
import adafruit_il91874
2021
import terminalio
2122
from adafruit_display_text import label
@@ -39,7 +40,7 @@
3940
epd_dc = board.D9
4041

4142
# Create the displayio connection to the display pins
42-
display_bus = displayio.FourWire(spi, command=epd_dc, chip_select=epd_cs,
43+
display_bus = fourwire.FourWire(spi, command=epd_dc, chip_select=epd_cs,
4344
baudrate=1000000)
4445
time.sleep(1) # Wait a bit
4546

0 commit comments

Comments
 (0)