Skip to content

Commit d0eab5c

Browse files
tannewttannewt
authored
Merge pull request #4256 from kmatch98/bt_cleanup
Add `bitmaptools` module
2 parents 7991ac5 + ec4cd68 commit d0eab5c

File tree

39 files changed

+526
-4
lines changed

39 files changed

+526
-4
lines changed

‎locale/circuitpython.pot

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,7 +1887,7 @@ msgstr ""
18871887
msgid "Read-only filesystem"
18881888
msgstr ""
18891889

1890-
#: shared-module/displayio/Bitmap.c
1890+
#: shared-module/bitmaptools/__init__.c shared-module/displayio/Bitmap.c
18911891
msgid "Read-only object"
18921892
msgstr ""
18931893

@@ -2716,6 +2716,10 @@ msgstr ""
27162716
msgid "circle can only be registered in one parent"
27172717
msgstr ""
27182718

2719+
#: shared-bindings/bitmaptools/__init__.c
2720+
msgid "clip point must be (x,y) tuple"
2721+
msgstr ""
2722+
27192723
#: shared-bindings/msgpack/ExtType.c
27202724
msgid "code outside range 0~127"
27212725
msgstr ""
@@ -3865,7 +3869,7 @@ msgstr ""
38653869
msgid "sosfilt requires iterable arguments"
38663870
msgstr ""
38673871

3868-
#: shared-bindings/displayio/Bitmap.c
3872+
#: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c
38693873
msgid "source palette too large"
38703874
msgstr ""
38713875

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ EXTERNAL_FLASH_DEVICES = "MX25L51245G","GD25S512MD"
1212
LONGINT_IMPL = MPZ
1313

1414
CIRCUITPY_BITBANGIO = 0
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_COUNTIO = 0
1617
CIRCUITPY_I2CPERIPHERAL = 0
1718
CIRCUITPY_MSGPACK = 0

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

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

1414
CIRCUITPY_BITBANGIO = 0
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_COUNTIO = 0
1617
CIRCUITPY_FREQUENCYIO = 0
1718
CIRCUITPY_I2CPERIPHERAL = 0

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

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

1414
# Make room for frozen libs.
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_DISPLAYIO = 0
1617
CIRCUITPY_FREQUENCYIO = 0
1718
CIRCUITPY_I2CPERIPHERAL = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
1313
# Turn off features and optimizations for Crickit build to make room for additional frozen libs.
1414
LONGINT_IMPL = NONE
1515
CIRCUITPY_BITBANGIO = 0
16+
CIRCUITPY_BITMAPTOOLS = 0
1617
CIRCUITPY_DISPLAYIO = 0
1718
CIRCUITPY_FREQUENCYIO = 0
1819
CIRCUITPY_I2CPERIPHERAL = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
1313
# Turn off features and optimizations for Crickit build to make room for additional frozen libs.
1414
LONGINT_IMPL = NONE
1515
CIRCUITPY_BITBANGIO = 0
16+
CIRCUITPY_BITMAPTOOLS = 0
1617
CIRCUITPY_COUNTIO = 0
1718
CIRCUITPY_FREQUENCYIO = 0
1819
CIRCUITPY_I2CPERIPHERAL = 0

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

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

1515
CIRCUITPY_FULLBUILD = 0
1616
CIRCUITPY_BITBANGIO = 0
17+
CIRCUITPY_BITMAPTOOLS = 0
1718
CIRCUITPY_FREQUENCYIO = 0
1819
CIRCUITPY_COUNTIO = 0
1920
CIRCUITPY_I2CPERIPHERAL = 1

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

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

1414
CIRCUITPY_BITBANGIO = 0
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_FREQUENCYIO = 0
1617
CIRCUITPY_COUNTIO = 0
1718
CIRCUITPY_I2CPERIPHERAL = 0

‎ports/atmel-samd/boards/feather_m0_express_crickit/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
# Make space for frozen libs
1515
CIRCUITPY_BITBANGIO = 0
16+
CIRCUITPY_BITMAPTOOLS = 0
1617
CIRCUITPY_DISPLAYIO = 0
1718
CIRCUITPY_FREQUENCYIO = 0
1819
CIRCUITPY_I2CPERIPHERAL = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ CIRCUITPY_FULL_BUILD = 0
1313
# A number of modules are removed for RFM69 to make room for frozen libraries.
1414
# Many I/O functions are not available.
1515
CIRCUITPY_ANALOGIO = 1
16+
CIRCUITPY_BITMAPTOOLS = 0
1617
CIRCUITPY_PULSEIO = 0
1718
CIRCUITPY_NEOPIXEL_WRITE = 1
1819
CIRCUITPY_ROTARYIO = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ CIRCUITPY_FULL_BUILD = 0
1414
# A number of modules are removed for RFM9x to make room for frozen libraries.
1515
# Many I/O functions are not available.
1616
CIRCUITPY_ANALOGIO = 1
17+
CIRCUITPY_BITMAPTOOLS = 0
1718
CIRCUITPY_PULSEIO = 0
1819
CIRCUITPY_NEOPIXEL_WRITE = 1
1920
CIRCUITPY_ROTARYIO = 0

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

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

1414
CIRCUITPY_BITBANGIO = 0
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_FREQUENCYIO = 0
1617
CIRCUITPY_COUNTIO = 0
1718
CIRCUITPY_I2CPERIPHERAL = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CIRCUITPY_BITBANG_APA102 = 1
1515

1616
CIRCUITPY_AUDIOBUSIO = 0
1717
CIRCUITPY_BITBANGIO = 0
18+
CIRCUITPY_BITMAPTOOLS = 0
1819
CIRCUITPY_COUNTIO = 0
1920
CIRCUITPY_FREQUENCYIO = 0
2021
CIRCUITPY_GAMEPAD = 0

‎ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
1212
# Not needed.
1313
CIRCUITPY_AUDIOBUSIO = 0
1414
CIRCUITPY_AUDIOMP3 = 0
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_BLEIO_HCI = 0
1617
CIRCUITPY_DISPLAYIO = 0
1718
CIRCUITPY_FRAMEBUFFERIO = 0

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

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

1414
CIRCUITPY_BITBANGIO = 0
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_COUNTIO = 0
1617
CIRCUITPY_I2CPERIPHERAL = 0
1718
CIRCUITPY_MSGPACK = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CIRCUITPY_DRIVE_LABEL = "PYCUBED"
1515

1616
# Not needed.
1717
CIRCUITPY_AUDIOBUSIO = 0
18+
CIRCUITPY_BITMAPTOOLS = 0
1819
CIRCUITPY_DISPLAYIO = 0
1920
CIRCUITPY_FRAMEBUFFERIO = 0
2021
CIRCUITPY_GAMEPAD = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ CIRCUITPY_DRIVE_LABEL = "PYCUBED"
1515

1616
# Not needed.
1717
CIRCUITPY_AUDIOBUSIO = 0
18+
CIRCUITPY_BITMAPTOOLS = 0
1819
CIRCUITPY_DISPLAYIO = 0
1920
CIRCUITPY_FRAMEBUFFERIO = 0
2021
CIRCUITPY_GAMEPAD = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
1414

1515
CIRCUITPY_AUDIOBUSIO = 0
1616
CIRCUITPY_BITBANGIO = 0
17+
CIRCUITPY_BITMAPTOOLS = 0
1718
CIRCUITPY_COUNTIO = 0
1819
CIRCUITPY_FREQUENCYIO = 0
1920
CIRCUITPY_I2CPERIPHERAL = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ LONGINT_IMPL = MPZ
1616
# No I2S on SAMD51G
1717
CIRCUITPY_AUDIOBUSIO = 0
1818
# Make room for more stuff
19+
CIRCUITPY_BITMAPTOOLS = 0
1920
CIRCUITPY_DISPLAYIO = 0
2021
CIRCUITPY_FRAMEBUFFERIO = 0
2122
CIRCUITPY_FREQUENCYIO = 0

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

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

1414
CIRCUITPY_AUDIOBUSIO = 0
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_FREQUENCYIO = 0
1617
CIRCUITPY_GAMEPAD = 0
1718
CIRCUITPY_BUSDEVICE = 0

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

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

1414
CIRCUITPY_BITBANGIO = 0
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_GAMEPAD = 0
1617
CIRCUITPY_I2CPERIPHERAL = 0
1718
CIRCUITPY_MSGPACK = 0

‎ports/atmel-samd/boards/sparkfun_lumidrive/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_AUDIOIO = 0
1515
CIRCUITPY_AUDIOBUSIO = 0
16+
CIRCUITPY_BITMAPTOOLS = 0
1617
CIRCUITPY_VECTORIO = 0
1718
CIRCUITPY_BUSDEVICE = 0
1819

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

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

1414
CIRCUITPY_BITBANGIO = 0
15+
CIRCUITPY_BITMAPTOOLS = 0
1516
CIRCUITPY_COUNTIO = 0
1617
CIRCUITPY_GAMEPAD = 0
1718
CIRCUITPY_I2CPERIPHERAL = 0

‎ports/atmel-samd/boards/stackrduino_m0_pro/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

1515
CIRCUITPY_BITBANGIO = 0
16+
CIRCUITPY_BITMAPTOOLS = 0
1617
CIRCUITPY_FREQUENCYIO = 0
1718
CIRCUITPY_COUNTIO = 0
1819
CIRCUITPY_I2CPERIPHERAL = 0

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

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

1717
CIRCUITPY_AUDIOBUSIO = 0
1818
CIRCUITPY_BITBANGIO = 0
19+
CIRCUITPY_BITMAPTOOLS = 0
1920
CIRCUITPY_GAMEPAD = 0
2021
CIRCUITPY_I2CPERIPHERAL = 0
2122
CIRCUITPY_RTC = 0

‎ports/atmel-samd/boards/trinket_m0_haxpress/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_AUDIOBUSIO = 0
1515
CIRCUITPY_BITBANGIO = 0
16+
CIRCUITPY_BITMAPTOOLS = 0
1617
CIRCUITPY_COUNTIO = 0
1718
CIRCUITPY_RTC = 0
1819
CIRCUITPY_FREQUENCYIO = 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_DISPLAYIO = 1
2020

2121
CIRCUITPY_AUDIOBUSIO = 0
2222
CIRCUITPY_BITBANGIO = 0
23+
CIRCUITPY_BITMAPTOOLS = 0
2324
CIRCUITPY_FREQUENCYIO = 0
2425
CIRCUITPY_I2CPERIPHERAL = 0
2526
CIRCUITPY_NEOPIXEL_WRITE = 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
@@ -17,6 +17,7 @@ CIRCUITPY_AUDIOIO = 1
1717

1818
# Disable modules that are unusable on this special-purpose board.
1919
CIRCUITPY_BITBANGIO = 0
20+
CIRCUITPY_BITMAPTOOLS = 0
2021
CIRCUITPY_FRAMEBUFFERIO = 0
2122
CIRCUITPY_FREQUENCYIO = 0
2223
CIRCUITPY_AUDIOBUSIO = 0

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

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

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

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

66
INTERNAL_FLASH_FILESYSTEM = 1
7-
7+
CIRCUITPY_BITMAPTOOLS = 0
88
CIRCUITPY_MSGPACK = 0

‎ports/nrf/boards/pca10100/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ INTERNAL_FLASH_FILESYSTEM = 1
99

1010
CIRCUITPY_AUDIOMP3 = 0
1111
CIRCUITPY_BITBANGIO = 0
12+
CIRCUITPY_BITMAPTOOLS = 0
1213
CIRCUITPY_BUSIO = 1
1314
CIRCUITPY_COUNTIO = 0
1415
CIRCUITPY_DISPLAYIO = 0

‎ports/nrf/boards/simmel/mpconfigboard.mk

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

1414
CIRCUITPY_AESIO = 1
1515
CIRCUITPY_AUDIOMP3 = 0
16+
CIRCUITPY_BITMAPTOOLS = 0
1617
CIRCUITPY_BUSDEVICE = 0
1718
CIRCUITPY_BUSIO = 1
1819
CIRCUITPY_DISPLAYIO = 0

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ LD_FILE = boards/STM32F401xd_fs.ld
2121
# meantime
2222
CIRCUITPY_ULAB = 0
2323
CIRCUITPY_BUSDEVICE = 0
24+
CIRCUITPY_BITMAPTOOLS = 0
2425
CIRCUITPY_FRAMEBUFFERIO = 0
2526

2627
SUPEROPT_GC = 0

‎py/circuitpy_defns.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ endif
139139
ifeq ($(CIRCUITPY_BITBANG_APA102),1)
140140
SRC_PATTERNS += bitbangio/SPI%
141141
endif
142+
ifeq ($(CIRCUITPY_BITMAPTOOLS),1)
143+
SRC_PATTERNS += bitmaptools/%
144+
endif
142145
ifeq ($(CIRCUITPY_BITOPS),1)
143146
SRC_PATTERNS += bitops/%
144147
endif
@@ -472,6 +475,7 @@ SRC_SHARED_MODULE_ALL = \
472475
bitbangio/OneWire.c \
473476
bitbangio/SPI.c \
474477
bitbangio/__init__.c \
478+
bitmaptools/__init__.c \
475479
bitops/__init__.c \
476480
board/__init__.c \
477481
adafruit_bus_device/__init__.c \

‎py/circuitpy_mpconfig.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,14 +306,20 @@ extern const struct _mp_obj_module_t bitbangio_module;
306306
#define BITBANGIO_MODULE
307307
#endif
308308

309+
#if CIRCUITPY_BITMAPTOOLS
310+
#define BITMAPTOOLS_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_bitmaptools), (mp_obj_t)&bitmaptools_module },
311+
extern const struct _mp_obj_module_t bitmaptools_module;
312+
#else
313+
#define BITMAPTOOLS_MODULE
314+
#endif
315+
309316
#if CIRCUITPY_BITOPS
310317
extern const struct _mp_obj_module_t bitops_module;
311318
#define BITOPS_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_bitops),(mp_obj_t)&bitops_module },
312319
#else
313320
#define BITOPS_MODULE
314321
#endif
315322

316-
317323
#if CIRCUITPY_BLEIO
318324
#define BLEIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR__bleio), (mp_obj_t)&bleio_module },
319325
extern const struct _mp_obj_module_t bleio_module;
@@ -835,6 +841,7 @@ extern const struct _mp_obj_module_t msgpack_module;
835841
AUDIOPWMIO_MODULE \
836842
BINASCII_MODULE \
837843
BITBANGIO_MODULE \
844+
BITMAPTOOLS_MODULE \
838845
BITOPS_MODULE \
839846
BLEIO_MODULE \
840847
BOARD_MODULE \

‎py/circuitpy_mpconfig.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,15 @@ CFLAGS += -DCIRCUITPY_ERRNO=$(CIRCUITPY_ERRNO)
152152
CIRCUITPY_ESPIDF ?= 0
153153
CFLAGS += -DCIRCUITPY_ESPIDF=$(CIRCUITPY_ESPIDF)
154154

155+
# bitmaptools and framebufferio rely on displayio
155156
ifeq ($(CIRCUITPY_DISPLAYIO),1)
157+
CIRCUITPY_BITMAPTOOLS ?= $(CIRCUITPY_FULL_BUILD)
156158
CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD)
157159
else
160+
CIRCUITPY_BITMAPTOOLS ?= 0
158161
CIRCUITPY_FRAMEBUFFERIO ?= 0
159162
endif
163+
CFLAGS += -DCIRCUITPY_BITMAPTOOLS=$(CIRCUITPY_BITMAPTOOLS)
160164
CFLAGS += -DCIRCUITPY_FRAMEBUFFERIO=$(CIRCUITPY_FRAMEBUFFERIO)
161165

162166
CIRCUITPY_VECTORIO ?= $(CIRCUITPY_DISPLAYIO)

0 commit comments

Comments
 (0)