Skip to content

Commit fd60ccc

Browse files
committed
Re-enable ulab at the expense of some other modules
.. and gate audiomixer based on audiocore (should be no net change) .. and get rid of now-redundant enables in the espressif mpconfigport
1 parent 45b6c84 commit fd60ccc

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

ports/espressif/boards/adafruit_esp32s3_camera/mpconfigboard.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,12 @@ CIRCUITPY_ESP_FLASH_MODE = dio
99
CIRCUITPY_ESP_FLASH_FREQ = 40m
1010
CIRCUITPY_ESP_FLASH_SIZE = 4MB
1111

12+
CIRCUITPY_AUDIOBUSIO = 0
13+
CIRCUITPY_CANIO = 0
1214
CIRCUITPY_ESPCAMERA = 1
13-
CIRCUITPY_ULAB = 0
15+
CIRCUITPY_FRAMEBUFFERIO = 0
16+
CIRCUITPY_KEYPAD = 0
17+
CIRCUITPY_ONEWIREIO = 0
18+
CIRCUITPY_PARALLELDISPLAY = 0
19+
CIRCUITPY_RGBMATRIX = 0
20+
CIRCUITPY_ROTARYIO = 0

ports/espressif/mpconfigport.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ CIRCUITPY_ANALOGBUFIO ?= 1
1616
CIRCUITPY_AUDIOBUSIO ?= 1
1717
CIRCUITPY_AUDIOBUSIO_I2SOUT ?= 1
1818
CIRCUITPY_AUDIOBUSIO_PDMIN ?= 0
19-
CIRCUITPY_AUDIOCORE ?= 1
2019
CIRCUITPY_AUDIOIO ?= 0
21-
CIRCUITPY_AUDIOMIXER ?= 1
2220
CIRCUITPY_AUDIOMP3 ?= 0
2321
CIRCUITPY_BLEIO ?= 1
2422
CIRCUITPY_BLEIO_HCI = 0

py/circuitpy_mpconfig.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ endif
104104
endif
105105
CFLAGS += -DCIRCUITPY_AUDIOCORE=$(CIRCUITPY_AUDIOCORE)
106106

107-
CIRCUITPY_AUDIOMIXER ?= $(CIRCUITPY_AUDIOIO)
107+
CIRCUITPY_AUDIOMIXER ?= $(CIRCUITPY_AUDIOCORE)
108108
CFLAGS += -DCIRCUITPY_AUDIOMIXER=$(CIRCUITPY_AUDIOMIXER)
109109

110110
ifndef CIRCUITPY_AUDIOCORE_DEBUG

0 commit comments

Comments
 (0)