Merge pull request #9156 from dhalbert/bitmapfilter-on-if-bitmaptools-on

dhalbert · web-flow · commit 050caf753c05 · 2024-04-09T18:42:54.000-04:00
Turn on bitmapfilter with the same criteria as bitmaptools
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
@@ -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
 
diff --git a/ports/atmel-samd/boards/dynossat_edu_eps/mpconfigboard.mk b/ports/atmel-samd/boards/dynossat_edu_eps/mpconfigboard.mk
@@ -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
diff --git a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk
@@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY__EVE = 1
+CIRCUITPY_BITMAPFILTER = 0
 CIRCUITPY_CANIO = 1
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_GIFIO = 0
diff --git a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk
@@ -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
diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -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
diff --git a/ports/atmel-samd/boards/robohatmm1_m4/mpconfigboard.mk b/ports/atmel-samd/boards/robohatmm1_m4/mpconfigboard.mk
@@ -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
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
@@ -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
diff --git a/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
@@ -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
diff --git a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
@@ -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
diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk
@@ -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
@@ -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
diff --git a/ports/cxd56/boards/spresense/mpconfigboard.mk b/ports/cxd56/boards/spresense/mpconfigboard.mk
@@ -4,5 +4,6 @@ USB_PRODUCT = "Spresense"
 USB_MANUFACTURER = "Sony"
 
 INTERNAL_FLASH_FILESYSTEM = 1
+CIRCUITPY_BITMAPFILTER = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_MSGPACK = 0
diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk
@@ -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
@@ -137,8 +136,14 @@ endif
 
 endif
 
+# bitmapfilter does not fit on 4MB boards unless they are set up as camera boards
+ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),4MB)
+CIRCUITPY_BITMAPFILTER ?= 0
+endif
+
 # No room for dualbank on boards with 2MB flash
 ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),2MB)
+CIRCUITPY_BITMAPFILTER ?= 0
 CIRCUITPY_DUALBANK = 0
 endif
 
diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.mk b/ports/stm/boards/espruino_pico/mpconfigboard.mk
@@ -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
diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.mk b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
@@ -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
diff --git a/ports/stm/boards/nucleo_f446re/mpconfigboard.mk b/ports/stm/boards/nucleo_f446re/mpconfigboard.mk
@@ -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
diff --git a/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk b/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
@@ -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
diff --git a/ports/stm/boards/thunderpack_v11/mpconfigboard.mk b/ports/stm/boards/thunderpack_v11/mpconfigboard.mk
@@ -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
diff --git a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk
@@ -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
diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk
@@ -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)
 
@@ -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)
