Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Turn on bitmapfilter with the same criteria as bitmaptools #9156

Merged
merged 5 commits into from Apr 9, 2024
Merged

Turn on bitmapfilter with the same criteria as bitmaptools #9156

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0525214
Turn on bitmapfilter with the same criteria as bitmaptools
dhalbert Apr 8, 2024
f6d79bc
individual boards and samd21: turn off bitmapfilter when bitmaptools …
dhalbert Apr 8, 2024
2ccc6a9
turn off bitmapfilter on samd51; test fitting on all Espressif
dhalbert Apr 8, 2024
d15e6e8
Turn bitmapfilter on non-camera ESP32-S2
dhalbert Apr 8, 2024
a48be88
further pruning of bitmapfilter builds
dhalbert Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ CIRCUITPY_USB_MIDI = 0

# So not all of displayio, sorry!
CIRCUITPY_VECTORIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_PARALLELDISPLAYBUS = 0

Expand Down
1 change: 1 addition & 0 deletions ports/atmel-samd/boards/dynossat_edu_eps/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@ LONGINT_IMPL = MPZ

CIRCUITPY_FULLBUILD = 0
CIRCUITPY_BITBANGIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_BUSDEVICE = 0
CIRCUITPY_TOUCHIO = 0
Expand Down
3 changes: 1 addition & 2 deletions ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -39,8 +39,7 @@ CIRCUITPY_AUDIOMP3 = 0
CIRCUITPY_AUDIOPWMIO = 0
CIRCUITPY_BITBANG_APA102 = 0
CIRCUITPY_BITBANGIO = 0
CIRCUITPY_BITBANGIO = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_BLEIO = 0
CIRCUITPY_BUSDEVICE = 0
Expand Down
1 change: 1 addition & 0 deletions ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@ CIRCUITPY_USB_HID = 0
CIRCUITPY_USB_MIDI = 0
CIRCUITPY_VECTORIO = 0
CIRCUITPY_BUSDEVICE = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_GIFIO = 0
CIRCUITPY_WATCHDOG = 0
Expand Down
1 change: 1 addition & 0 deletions ports/atmel-samd/boards/robohatmm1_m4/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -13,6 +13,7 @@ EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
LONGINT_IMPL = MPZ

# Make room for more stuff
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_DISPLAYIO = 0
CIRCUITPY_FRAMEBUFFERIO = 0
Expand Down
1 change: 1 addition & 0 deletions ports/atmel-samd/boards/ugame10/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -20,6 +20,7 @@ CIRCUITPY_KEYPAD = 1
CIRCUITPY_PULSEIO = 0
CIRCUITPY_AUDIOBUSIO = 0
CIRCUITPY_BITBANGIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_FREQUENCYIO = 0
CIRCUITPY_I2CTARGET = 0
Expand Down
1 change: 1 addition & 0 deletions ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ CIRCUITPY_AUDIOIO = 1

# Disable modules that are unusable on this special-purpose board.
CIRCUITPY_BITBANGIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_FRAMEBUFFERIO = 0
CIRCUITPY_FREQUENCYIO = 0
Expand Down
1 change: 1 addition & 0 deletions ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ LONGINT_IMPL = MPZ
# Disable modules that are unusable on this special-purpose board.
CIRCUITPY_AUDIOBUSIO = 0
CIRCUITPY_AUDIOIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_BLEIO_HCI = 0
CIRCUITPY_DISPLAYIO = 0
Expand Down
3 changes: 3 additions & 0 deletions ports/atmel-samd/mpconfigport.mk
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ CIRCUITPY_AUDIOMIXER ?= 0
CIRCUITPY_AUDIOMP3 ?= 0
CIRCUITPY_BINASCII ?= 0
CIRCUITPY_BITBANGIO ?= 0
CIRCUITPY_BITMAPFILTER ?= 0
CIRCUITPY_BITMAPTOOLS ?= 0
CIRCUITPY_BLEIO_HCI = 0
CIRCUITPY_BUILTINS_POW3 ?= 0
Expand Down Expand Up @@ -102,6 +103,8 @@ endif


CIRCUITPY_ALARM ?= 1
# Not enough room for both bitmaptools and bitmapfilter on most boards.
CIRCUITPY_BITMAPFILTER ?= 0
CIRCUITPY_FLOPPYIO ?= $(CIRCUITPY_FULL_BUILD)
CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD)
CIRCUITPY_PS2IO ?= 1
Expand Down
1 change: 1 addition & 0 deletions ports/cxd56/boards/spresense/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -4,5 +4,6 @@ USB_PRODUCT = "Spresense"
USB_MANUFACTURER = "Sony"

INTERNAL_FLASH_FILESYSTEM = 1
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_MSGPACK = 0
1 change: 0 additions & 1 deletion ports/espressif/mpconfigport.mk
View file
Open in desktop
Expand Up @@ -125,7 +125,6 @@ CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0

else ifeq ($(IDF_TARGET),esp32s3)
# Modules
CIRCUITPY_BITMAPFILTER ?= $(CIRCUITPY_ESPCAMERA)
CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0

# No room for _bleio on boards with 4MB flash
Expand Down
1 change: 1 addition & 0 deletions ports/stm/boards/espruino_pico/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -22,6 +22,7 @@ CIRCUITPY_AUDIOCORE = 0
CIRCUITPY_AUDIOPWMIO = 0
CIRCUITPY_BLEIO_HCI = 0
CIRCUITPY_BUSDEVICE = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_FRAMEBUFFERIO = 0
CIRCUITPY_GIFIO = 0
Expand Down
1 change: 1 addition & 0 deletions ports/stm/boards/meowbit_v121/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@ LD_FILE = boards/STM32F401xe_boot.ld
# LD_FILE = boards/STM32F401xe_fs.ld

CIRCUITPY_AESIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_BLEIO_HCI = 0
CIRCUITPY_GIFIO = 0
Expand Down
1 change: 1 addition & 0 deletions ports/stm/boards/nucleo_f446re/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ LD_FILE = boards/STM32F446_fs.ld
# Too big for the flash
CIRCUITPY_AUDIOCORE = 0
CIRCUITPY_AUDIOPWMIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_BLEIO_HCI = 0
CIRCUITPY_VECTORIO = 0
Expand Down
1 change: 1 addition & 0 deletions ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ LD_FILE = boards/STM32F411_fs.ld
# Too big for the flash
CIRCUITPY_AUDIOCORE = 0
CIRCUITPY_AUDIOPWMIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_BLEIO_HCI = 0
CIRCUITPY_MSGPACK = 0
Expand Down
1 change: 1 addition & 0 deletions ports/stm/boards/thunderpack_v11/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@ LD_COMMON = boards/common_nvm.ld
LD_FILE = boards/STM32F411_nvm.ld

CIRCUITPY_AESIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_BLEIO_HCI = 0
CIRCUITPY_SYNTHIO = 0
Expand Down
1 change: 1 addition & 0 deletions ports/stm/boards/thunderpack_v12/mpconfigboard.mk
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@ SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICES = GD25Q16C

CIRCUITPY_AESIO = 0
CIRCUITPY_BITMAPFILTER = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_BLEIO_HCI = 0
CIRCUITPY_BUSDEVICE = 0
Expand Down
8 changes: 3 additions & 5 deletions py/circuitpy_mpconfig.mk
View file
Open in desktop
Expand Up @@ -147,10 +147,6 @@ CFLAGS += -DCIRCUITPY_BITBANG_APA102=$(CIRCUITPY_BITBANG_APA102)
CIRCUITPY_BITBANGIO ?= $(CIRCUITPY_FULL_BUILD)
CFLAGS += -DCIRCUITPY_BITBANGIO=$(CIRCUITPY_BITBANGIO)

# bitmapfilter also depends on displayio, but is disabled by default
CIRCUITPY_BITMAPFILTER ?= 0
CFLAGS += -DCIRCUITPY_BITMAPFILTER=$(CIRCUITPY_BITMAPFILTER)

CIRCUITPY_BITOPS ?= 0
CFLAGS += -DCIRCUITPY_BITOPS=$(CIRCUITPY_BITOPS)

Expand Down Expand Up @@ -238,10 +234,12 @@ CFLAGS += -DCIRCUITPY_PARALLELDISPLAYBUS=$(CIRCUITPY_PARALLELDISPLAYBUS)
CIRCUITPY_DOTCLOCKFRAMEBUFFER ?= 0
CFLAGS += -DCIRCUITPY_DOTCLOCKFRAMEBUFFER=$(CIRCUITPY_DOTCLOCKFRAMEBUFFER)

# bitmaptools and framebufferio rely on displayio and are not on small boards
# bitmapfilter, bitmaptools, and framebufferio rely on displayio and are not on small boards
CIRCUITPY_BITMAPFILTER ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO))
CIRCUITPY_BITMAPTOOLS ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO))
CIRCUITPY_FRAMEBUFFERIO ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO))
CIRCUITPY_VECTORIO ?= $(CIRCUITPY_DISPLAYIO)
CFLAGS += -DCIRCUITPY_BITMAPFILTER=$(CIRCUITPY_BITMAPFILTER)
CFLAGS += -DCIRCUITPY_BITMAPTOOLS=$(CIRCUITPY_BITMAPTOOLS)
CFLAGS += -DCIRCUITPY_FRAMEBUFFERIO=$(CIRCUITPY_FRAMEBUFFERIO)
CFLAGS += -DCIRCUITPY_VECTORIO=$(CIRCUITPY_VECTORIO)
Expand Down