8000 Merge pull request #9156 from dhalbert/bitmapfilter-on-if-bitmaptools-on · brushmate/circuitpython@050caf7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 050caf7

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#9156 from dhalbert/bitmapfilter-on-if-bitmaptools-on
Turn on bitmapfilter with the same criteria as bitmaptools
2 parents f9a18fb + a48be88 commit 050caf7

File tree

19 files changed

+28
-8
lines changed
  • robohatmm1_m4
  • ugame10
  • winterbloom_big_honking_button
  • winterbloom_sol
  • mpconfigport.mk
  • cxd56/boards/spresense
  • espressif
  • stm/boards
  • py

    • 19 files changed

    +28
    -8
    lines changed

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

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -19,6 +19,7 @@ CIRCUITPY_USB_MIDI = 0
    1919

    2020
    # So not all of displayio, sorry!
    2121
    CIRCUITPY_VECTORIO = 0
    22+
    CIRCUITPY_BITMAPFILTER = 0
    2223
    CIRCUITPY_BITMAPTOOLS = 0
    2324
    CIRCUITPY_PARALLELDISPLAYBUS = 0
    2425

    ‎ports/atmel-samd/boards/dynossat_edu_eps/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,6 +13,7 @@ LONGINT_IMPL = MPZ
    1313

    1414
    CIRCUITPY_FULLBUILD = 0
    1515
    CIRCUITPY_BITBANGIO = 0
    16+
    CIRCUITPY_BITMAPFILTER = 0
    1617
    CIRCUITPY_BITMAPTOOLS = 0
    1718
    CIRCUITPY_BUSDEVICE = 0
    1819
    CIRCUITPY_TOUCHIO = 0

    ‎ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ"
    1111
    LONGINT_IMPL = MPZ
    1212

    1313
    CIRCUITPY__EVE = 1
    14+
    CIRCUITPY_BITMAPFILTER = 0
    1415
    CIRCUITPY_CANIO = 1
    1516
    CIRCUITPY_SYNTHIO = 0
    1617
    CIRCUITPY_GIFIO = 0

    ‎ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk

    Lines changed: 1 addition & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -39,8 +39,7 @@ CIRCUITPY_AUDIOMP3 = 0
    3939
    CIRCUITPY_AUDIOPWMIO = 0
    4040
    CIRCUITPY_BITBANG_APA102 = 0
    4141
    CIRCUITPY_BITBANGIO = 0
    42-
    CIRCUITPY_BITBANGIO = 0
    43-
    CIRCUITPY_BITMAPTOOLS = 0
    42+
    CIRCUITPY_BITMAPFILTER = 0
    4443
    CIRCUITPY_BITMAPTOOLS = 0
    4544
    CIRCUITPY_BLEIO = 0
    4645
    CIRCUITPY_BUSDEVICE = 0

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

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -36,6 +36,7 @@ CIRCUITPY_USB_HID = 0
    3636
    CIRCUITPY_USB_MIDI = 0
    3737
    CIRCUITPY_VECTORIO = 0
    3838
    CIRCUITPY_BUSDEVICE = 0
    39+
    CIRCUITPY_BITMAPFILTER = 0
    3940
    CIRCUITPY_BITMAPTOOLS = 0
    4041
    CIRCUITPY_GIFIO = 0
    4142
    CIRCUITPY_WATCHDOG = 0

    ‎ports/atmel-samd/boards/robohatmm1_m4/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -13,6 +13,7 @@ EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ"
    1313
    LONGINT_IMPL = MPZ
    1414

    1515
    # Make room for more stuff
    16+
    CIRCUITPY_BITMAPFILTER = 0
    1617
    CIRCUITPY_BITMAPTOOLS = 0
    1718
    CIRCUITPY_DISPLAYIO = 0
    1819
    CIRCUITPY_FRAMEBUFFERIO = 0

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

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -20,6 +20,7 @@ CIRCUITPY_KEYPAD = 1
    2020
    CIRCUITPY_PULSEIO = 0
    2121
    CIRCUITPY_AUDIOBUSIO = 0
    2222
    CIRCUITPY_BITBANGIO = 0
    23+
    CIRCUITPY_BITMAPFILTER = 0
    2324
    CIRCUITPY_BITMAPTOOLS = 0
    2425
    CIRCUITPY_FREQUENCYIO = 0
    2526
    CIRCUITPY_I2CTARGET = 0

    ‎ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -16,6 +16,7 @@ CIRCUITPY_AUDIOIO = 1
    1616

    1717
    # Disable modules that are unusable on this special-purpose board.
    1818
    CIRCUITPY_BITBANGIO = 0
    19+
    CIRCUITPY_BITMAPFILTER = 0
    1920
    CIRCUITPY_BITMAPTOOLS = 0
    2021
    CIRCUITPY_FRAMEBUFFERIO = 0
    2122
    CIRCUITPY_FREQUENCYIO = 0

    ‎ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,6 +17,7 @@ LONGINT_IMPL = MPZ
    1717
    # Disable modules that are unusable on this special-purpose board.
    1818
    CIRCUITPY_AUDIOBUSIO = 0
    1919
    CIRCUITPY_AUDIOIO = 0
    20+
    CIRCUITPY_BITMAPFILTER = 0
    2021
    CIRCUITPY_BITMAPTOOLS = 0
    2122
    CIRCUITPY_BLEIO_HCI = 0
    2223
    CIRCUITPY_DISPLAYIO = 0

    ‎ports/atmel-samd/mpconfigport.mk

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -29,6 +29,7 @@ CIRCUITPY_AUDIOMIXER ?= 0
    2929
    CIRCUITPY_AUDIOMP3 ?= 0
    3030
    CIRCUITPY_BINASCII ?= 0
    3131
    CIRCUITPY_BITBANGIO ?= 0
    32+
    CIRCUITPY_BITMAPFILTER ?= 0
    3233
    CIRCUITPY_BITMAPTOOLS ?= 0
    3334
    CIRCUITPY_BLEIO_HCI = 0
    3435
    CIRCUITPY_BUILTINS_POW3 ?= 0
    @@ -102,6 +103,8 @@ endif
    102103

    103104

    104105
    CIRCUITPY_ALARM ?= 1
    106+
    # Not enough room for both bitmaptools and bitmapfilter on most boards.
    107+
    CIRCUITPY_BITMAPFILTER ?= 0
    105108
    CIRCUITPY_FLOPPYIO ?= $(CIRCUITPY_FULL_BUILD)
    106109
    CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD)
    107110
    CIRCUITPY_PS2IO ?= 1

    ‎ports/cxd56/boards/spresense/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -4,5 +4,6 @@ USB_PRODUCT = "Spresense"
    44
    USB_MANUFACTURER = "Sony"
    55

    66
    INTERNAL_FLASH_FILESYSTEM = 1
    7+
    CIRCUITPY_BITMAPFILTER = 0
    78
    CIRCUITPY_BITMAPTOOLS = 0
    89
    CIRCUITPY_MSGPACK = 0

    ‎ports/espressif/mpconfigport.mk

    Lines changed: 6 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -125,7 +125,6 @@ CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
    125125

    126126
    else ifeq ($(IDF_TARGET),esp32s3)
    127127
    # Modules
    128-
    CIRCUITPY_BITMAPFILTER ?= $(CIRCUITPY_ESPCAMERA)
    129128
    CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 0
    130129

    131130
    # No room for _bleio on boards with 4MB flash
    @@ -137,8 +136,14 @@ endif
    137136

    138137
    endif
    139138

    139+
    # bitmapfilter does not fit on 4MB boards unless they are set up as camera boards
    140+
    ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),4MB)
    141+
    CIRCUITPY_BITMAPFILTER ?= 0
    142+
    endif
    143+
    140144
    # No room for dualbank on boards with 2MB flash
    141145
    ifeq ($(CIRCUITPY_ESP_FLASH_SIZE),2MB)
    146+
    CIRCUITPY_BITMAPFILTER ?= 0
    142147
    CIRCUITPY_DUALBANK = 0
    143148
    endif
    144149

    ‎ports/stm/boards/espruino_pico/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -22,6 +22,7 @@ CIRCUITPY_AUDIOCORE = 0
    2222
    CIRCUITPY_AUDIOPWMIO = 0
    2323
    CIRCUITPY_BLEIO_HCI = 0
    2424
    CIRCUITPY_BUSDEVICE = 0
    25+
    CIRCUITPY_BITMAPFILTER = 0
    2526
    CIRCUITPY_BITMAPTOOLS = 0
    2627
    CIRCUITPY_FRAMEBUFFERIO = 0
    2728
    CIRCUITPY_GIFIO = 0

    ‎ports/stm/boards/meowbit_v121/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -23,6 +23,7 @@ LD_FILE = boards/STM32F401xe_boot.ld
    2323
    # LD_FILE = boards/STM32F401xe_fs.ld
    2424

    2525
    CIRCUITPY_AESIO = 0
    26+
    CIRCUITPY_BITMAPFILTER = 0
    2627
    CIRCUITPY_BITMAPTOOLS = 0
    2728
    CIRCUITPY_BLEIO_HCI = 0
    2829
    CIRCUITPY_GIFIO = 0

    ‎ports/stm/boards/nucleo_f446re/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@ LD_FILE = boards/STM32F446_fs.ld
    1515
    # Too big for the flash
    1616
    CIRCUITPY_AUDIOCORE = 0
    1717
    CIRCUITPY_AUDIOPWMIO = 0
    18+
    CIRCUITPY_BITMAPFILTER = 0
    1819
    CIRCUITPY_BITMAPTOOLS = 0
    1920
    CIRCUITPY_BLEIO_HCI = 0
    2021
    CIRCUITPY_VECTORIO = 0

    ‎ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -15,6 +15,7 @@ LD_FILE = boards/STM32F411_fs.ld
    1515
    # Too big for the flash
    1616
    CIRCUITPY_AUDIOCORE = 0
    1717
    CIRCUITPY_AUDIOPWMIO = 0
    18+
    CIRCUITPY_BITMAPFILTER = 0
    1819
    CIRCUITPY_BITMAPTOOLS = 0
    1920
    CIRCUITPY_BLEIO_HCI = 0
    2021
    CIRCUITPY_MSGPACK = 0

    ‎ports/stm/boards/thunderpack_v11/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -17,6 +17,7 @@ LD_COMMON = boards/common_nvm.ld
    1717
    LD_FILE = boards/STM32F411_nvm.ld
    1818

    1919
    CIRCUITPY_AESIO = 0
    20+
    CIRCUITPY_BITMAPFILTER = 0
    2021
    CIRCUITPY_BITMAPTOOLS = 0
    2122
    CIRCUITPY_BLEIO_HCI = 0
    2223
    CIRCUITPY_SYNTHIO = 0

    ‎ports/stm/boards/thunderpack_v12/mpconfigboard.mk

    Lines changed: 1 addition & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,6 +12,7 @@ SPI_FLASH_FILESYSTEM = 1
    1212
    EXTERNAL_FLASH_DEVICES = GD25Q16C
    1313

    1414
    CIRCUITPY_AESIO = 0
    15+
    CIRCUITPY_BITMAPFILTER = 0
    1516
    CIRCUITPY_BITMAPTOOLS = 0
    1617
    CIRCUITPY_BLEIO_HCI = 0
    1718
    CIRCUITPY_BUSDEVICE = 0

    ‎py/circuitpy_mpconfig.mk

    Lines changed: 3 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -147,10 +147,6 @@ CFLAGS += -DCIRCUITPY_BITBANG_APA102=$(CIRCUITPY_BITBANG_APA102)
    147147
    CIRCUITPY_BITBANGIO ?= $(CIRCUITPY_FULL_BUILD)
    148148
    CFLAGS += -DCIRCUITPY_BITBANGIO=$(CIRCUITPY_BITBANGIO)
    149149

    150-
    # bitmapfilter also depends on displayio, but is disabled by default
    151-
    CIRCUITPY_BITMAPFILTER ?= 0
    152-
    CFLAGS += -DCIRCUITPY_BITMAPFILTER=$(CIRCUITPY_BITMAPFILTER)
    153-
    154150
    CIRCUITPY_BITOPS ?= 0
    155151
    CFLAGS += -DCIRCUITPY_BITOPS=$(CIRCUITPY_BITOPS)
    156152

    @@ -238,10 +234,12 @@ CFLAGS += -DCIRCUITPY_PARALLELDISPLAYBUS=$(CIRCUITPY_PARALLELDISPLAYBUS)
    238234
    CIRCUITPY_DOTCLOCKFRAMEBUFFER ?= 0
    239235
    CFLAGS += -DCIRCUITPY_DOTCLOCKFRAMEBUFFER=$(CIRCUITPY_DOTCLOCKFRAMEBUFFER)
    240236

    241-
    # bitmaptools and framebufferio rely on displayio and are not on small boards
    237+
    # bitmapfilter, bitmaptools, and framebufferio rely on displayio and are not on small boards
    238+
    CIRCUITPY_BITMAPFILTER ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO))
    242239
    CIRCUITPY_BITMAPTOOLS ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO))
    243240
    CIRCUITPY_FRAMEBUFFERIO ?= $(call enable-if-all,$(CIRCUITPY_FULL_BUILD) $(CIRCUITPY_DISPLAYIO))
    244241
    CIRCUITPY_VECTORIO ?= $(CIRCUITPY_DISPLAYIO)
    242+
    CFLAGS += -DCIRCUITPY_BITMAPFILTER=$(CIRCUITPY_BITMAPFILTER)
    245243
    CFLAGS += -DCIRCUITPY_BITMAPTOOLS=$(CIRCUITPY_BITMAPTOOLS)
    246244
    CFLAGS += -DCIRCUITPY_FRAMEBUFFERIO=$(CIRCUITPY_FRAMEBUFFERIO)
    247245
    CFLAGS += -DCIRCUITPY_VECTORIO=$(CIRCUITPY_VECTORIO)

    0 commit comments

    Comments
     (0)
    0