Skip to content

Commit e906873

Browse files
committed
Merge branch 'main' into typing-fixes
2 parents deaac91 + 58b1ce4 commit e906873

File tree

33 files changed

+354
-265
lines changed

33 files changed

+354
-265
lines changed

ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CIRCUITPY_USB_MIDI = 0
2020
# So not all of displayio, sorry!
2121
CIRCUITPY_VECTORIO = 0
2222
CIRCUITPY_BITMAPTOOLS = 0
23-
CIRCUITPY_PARALLELDISPLAY = 0
23+
CIRCUITPY_PARALLELDISPLAYBUS = 0
2424

2525
# Include these Python libraries in firmware.
2626
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx

ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CIRCUITPY_LTO_PARTITION = one
1414

1515
CIRCUITPY_AESIO = 0
1616
CIRCUITPY_FLOPPYIO = 0
17-
CIRCUITPY_PARALLELDISPLAY = 0
17+
CIRCUITPY_PARALLELDISPLAYBUS = 0
1818
CIRCUITPY_SHARPDISPLAY = 0
1919
CIRCUITPY_ULAB = 0
2020

ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CIRCUITPY_FREQUENCYIO = 0
2222
CIRCUITPY_I2CTARGET = 0
2323
CIRCUITPY_NEOPIXEL_WRITE = 0
2424
CIRCUITPY_ONEWIREIO = 0
25-
CIRCUITPY_PARALLELDISPLAY = 0
25+
CIRCUITPY_PARALLELDISPLAYBUS = 0
2626
CIRCUITPY_PIXELBUF = 0
2727
CIRCUITPY_PS2IO = 0
2828
CIRCUITPY_PULSEIO = 0

ports/atmel-samd/boards/ugame10/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ CIRCUITPY_BITMAPTOOLS = 0
2424
CIRCUITPY_FREQUENCYIO = 0
2525
CIRCUITPY_I2CTARGET = 0
2626
CIRCUITPY_NEOPIXEL_WRITE = 0
27-
CIRCUITPY_PARALLELDISPLAY = 0
27+
CIRCUITPY_PARALLELDISPLAYBUS = 0
2828
CIRCUITPY_PIXELBUF = 0
2929
CIRCUITPY_RTC = 0
3030
CIRCUITPY_TOUCHIO = 0

ports/espressif/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,9 @@ endif
490490
ifneq ($(CIRCUITPY_DOTCLOCKFRAMEBUFFER),0)
491491
ESP_IDF_COMPONENTS_LINK += esp_lcd
492492
endif
493+
ifneq ($(CIRCUITPY_PARALLELDISPLAYBUS),0)
494+
ESP_IDF_COMPONENTS_LINK += esp_lcd
495+
endif
493496

494497
ESP_IDF_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a)
495498

ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CIRCUITPY_ESPCAMERA = 1
2020
CIRCUITPY_FRAMEBUFFERIO = 0
2121
CIRCUITPY_KEYPAD = 0
2222
CIRCUITPY_ONEWIREIO = 0
23-
CIRCUITPY_PARALLELDISPLAY = 0
23+
CIRCUITPY_PARALLELDISPLAYBUS = 0
2424
CIRCUITPY_RGBMATRIX = 0
2525
CIRCUITPY_ROTARYIO = 0
2626

ports/espressif/boards/adafruit_feather_esp32s3_4mbflash_2mbpsram/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ CIRCUITPY_ESP_PSRAM_FREQ = 80m
1515

1616
OPTIMIZATION_FLAGS = -Os
1717
CIRCUITPY_ESPCAMERA = 0
18+
CIRCUITPY_PARALLELDISPLAYBUS = 0

ports/espressif/boards/adafruit_feather_esp32s3_reverse_tft/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,6 @@ CIRCUITPY_ESP_PSRAM_MODE = qio
1515
CIRCUITPY_ESP_PSRAM_FREQ = 80m
1616

1717
CIRCUITPY_ESPCAMERA = 0
18+
CIRCUITPY_PARALLELDISPLAYBUS = 0
1819

1920
OPTIMIZATION_FLAGS = -Os

ports/espressif/boards/adafruit_feather_esp32s3_tft/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB
1212

1313
OPTIMIZATION_FLAGS = -Os
1414
CIRCUITPY_ESPCAMERA = 0
15+
CIRCUITPY_PARALLELDISPLAYBUS = 0
1516

1617
CIRCUITPY_ESP_PSRAM_SIZE = 2MB
1718
CIRCUITPY_ESP_PSRAM_MODE = qio

ports/espressif/boards/adafruit_matrixportal_s3/mpconfigboard.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ CIRCUITPY_ESP_PSRAM_MODE = qio
1414
CIRCUITPY_ESP_PSRAM_FREQ = 80m
1515

1616
CIRCUITPY_ESP32_CAMERA = 0
17+
18+
# Not enough pins.
19+
CIRCUITPY_PARALLELDISPLAYBUS = 0

0 commit comments

Comments
 (0)