From 3795de03b6284b5480a38cef692a86125ab47dfb Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 27 Jun 2023 10:05:14 -0500 Subject: [PATCH 01/11] update ulab to 6.3.2 --- extmod/ulab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extmod/ulab b/extmod/ulab index 6619c20b3b..319df10cfe 160000 --- a/extmod/ulab +++ b/extmod/ulab @@ -1 +1 @@ -Subproject commit 6619c20b3b75864554fcee5f88846fac27df5701 +Subproject commit 319df10cfe9cb8f6e5e24627bda3fe1556d8b06b From 9a3fadc072e632bc636faa627b51f3b0e2d3d4f4 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 27 Jun 2023 10:23:26 -0500 Subject: [PATCH 02/11] run pre-commit --- locale/circuitpython.pot | 45 ++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 282d229856..3d0b516562 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -182,6 +182,7 @@ msgid "%q must be 1 when %q is True" msgstr "" #: py/argcheck.c shared-bindings/gifio/GifWriter.c +#: shared-module/gifio/OnDiskGif.c msgid "%q must be <= %d" msgstr "" @@ -1950,10 +1951,6 @@ msgstr "" msgid "Size not supported" msgstr "" -#: ports/raspberrypi/common-hal/alarm/SleepMemory.c -msgid "Sleep Memory not available" -msgstr "" - #: shared-bindings/alarm/SleepMemory.c shared-bindings/memorymap/AddressRange.c #: shared-bindings/nvm/ByteArray.c msgid "Slice and value different lengths." @@ -2797,6 +2794,10 @@ msgstr "" msgid "cannot create instance" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot delete array elements" +msgstr "" + #: py/runtime.c msgid "cannot import name %q" msgstr "" @@ -3254,6 +3255,14 @@ msgstr "" msgid "inline assembler must be a function" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "input and output dimensions differ" +msgstr "" + +#: extmod/ulab/code/numpy/vector.c +msgid "input and output shapes differ" +msgstr "" + #: extmod/ulab/code/numpy/create.c msgid "input argument must be an integer, a tuple, or a list" msgstr "" @@ -3582,6 +3591,10 @@ msgstr "" msgid "native yield" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "ndarray length overflows" +msgstr "" + #: py/runtime.c #, c-format msgid "need more than %d values to unpack" @@ -3685,6 +3698,10 @@ msgstr "" msgid "not implemented for complex dtype" msgstr "" +#: extmod/ulab/code/numpy/bitwise.c +msgid "not supported for input types" +msgstr "" + #: extmod/ulab/code/numpy/create.c msgid "number of points must be at least 2" msgstr "" @@ -3795,8 +3812,8 @@ msgstr "" msgid "opcode" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/compare.c -#: extmod/ulab/code/numpy/vector.c +#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/bitwise.c +#: extmod/ulab/code/numpy/compare.c extmod/ulab/code/numpy/vector.c msgid "operands could not be broadcast together" msgstr "" @@ -3833,10 +3850,26 @@ msgstr "" msgid "out array is too small" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "out keyword is not supported for complex dtype" +msgstr "" + +#: extmod/ulab/code/numpy/vector.c +msgid "out keyword is not supported for function" +msgstr "" + #: extmod/ulab/code/utils/utils.c msgid "out must be a float dense array" msgstr "" +#: extmod/ulab/code/numpy/vector.c +msgid "out must be an ndarray" +msgstr "" + +#: extmod/ulab/code/numpy/vector.c +msgid "out must be of float dtype" +msgstr "" + #: shared-bindings/bitmaptools/__init__.c msgid "out of range of target" msgstr "" From a9c987d3ce07c8300ef4173c123589f49373b21e Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 27 Jun 2023 10:41:02 -0500 Subject: [PATCH 03/11] Add expected-output file for this test .. because the first test is actually accepted on python 3.10 and newer. --- tests/basics/string_format_error.py.exp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tests/basics/string_format_error.py.exp diff --git a/tests/basics/string_format_error.py.exp b/tests/basics/string_format_error.py.exp new file mode 100644 index 0000000000..d6d28b2111 --- /dev/null +++ b/tests/basics/string_format_error.py.exp @@ -0,0 +1,17 @@ +ValueError +IndexError +ValueError +ValueError +ValueError +ValueError +ValueError +ValueError +IndexError +KeyError +ValueError +IndexError +ValueError +ValueError +ValueError +ValueError +ValueError From b5ad7f91a30e2a57ffdb6dcbf3f16a110023eae7 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 27 Jun 2023 11:11:23 -0500 Subject: [PATCH 04/11] update expected data for test skip all the byecode hex data, it's adequately checked by the disassembly just below This was tripped up because in exactly the right conditions some qstr could be of the form 'xx 63' and make the expression `\.\+63` match something other than what was intended. This test was re-worked upstream for mpy version 6 so it'll be a conflict to resolve when we get to that. :-/ --- tests/cmdline/cmd_parsetree.py.exp | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/cmdline/cmd_parsetree.py.exp b/tests/cmdline/cmd_parsetree.py.exp index bee4fc99d1..291cc7ecda 100644 --- a/tests/cmdline/cmd_parsetree.py.exp +++ b/tests/cmdline/cmd_parsetree.py.exp @@ -42,7 +42,6 @@ File cmdline/cmd_parsetree.py, code block '' (descriptor: \.\+, bytecode @\.\+ bytes) Raw bytecode (code_info_size=\\d\+, bytecode_size=\\d\+): ######## -\.\+63 arg names: (N_STATE 5) (N_EXC_STACK 0) From 0f241c9415429d4eb8fd1b92eb20d55a9bf9d2ce Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 27 Jun 2023 10:41:02 -0500 Subject: [PATCH 05/11] bump ulab to fix rp2040 build error --- extmod/ulab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extmod/ulab b/extmod/ulab index 319df10cfe..3728d22732 160000 --- a/extmod/ulab +++ b/extmod/ulab @@ -1 +1 @@ -Subproject commit 319df10cfe9cb8f6e5e24627bda3fe1556d8b06b +Subproject commit 3728d22732dedc8a591b7df18a16d3ef1aed6a39 From 164fcb22c25f61a9578c70e2c631d500bd01f3af Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 28 Jun 2023 09:59:57 -0500 Subject: [PATCH 06/11] Enable "from __future__ import annotations" on unix build --- .../unix/variants/coverage/mpconfigvariant.mk | 2 ++ tests/unix/extra_coverage.py.exp | 32 +++++++++---------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk index f63054bdd6..9289e9cb4d 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.mk +++ b/ports/unix/variants/coverage/mpconfigvariant.mk @@ -28,6 +28,7 @@ $(BUILD)/lib/quirc/lib/%.o: CFLAGS += -Wno-shadow -Wno-sign-compare -include sha SRC_BITMAP := \ shared/runtime/context_manager_helpers.c \ displayio_min.c \ + shared-bindings/__future__/__init__.c \ shared-bindings/aesio/aes.c \ shared-bindings/aesio/__init__.c \ shared-bindings/audiocore/__init__.c \ @@ -85,6 +86,7 @@ CFLAGS += \ -DCIRCUITPY_AUDIOCORE_DEBUG=1 \ -DCIRCUITPY_BITMAPTOOLS=1 \ -DCIRCUITPY_DISPLAYIO_UNIX=1 \ + -DCIRCUITPY_FUTURE=1 \ -DCIRCUITPY_GIFIO=1 \ -DCIRCUITPY_OS_GETENV=1 \ -DCIRCUITPY_RAINBOWIO=1 \ diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp index c750ca0e95..0711da6a22 100644 --- a/tests/unix/extra_coverage.py.exp +++ b/tests/unix/extra_coverage.py.exp @@ -29,22 +29,22 @@ RuntimeError: ame__ mport -builtins micropython _asyncio _thread -_uasyncio aesio array audiocore -audiomixer binascii bitmaptools btree -cexample cmath collections cppexample -displayio errno ffi framebuf -gc hashlib json math -qrio rainbowio re struct -synthio sys termios traceback -ubinascii uctypes uerrno uheapq -uio ujson ulab ulab.numpy -ulab.numpy.fft ulab.numpy.linalg ulab.scipy -ulab.scipy.linalg ulab.scipy.optimize -ulab.scipy.signal ulab.scipy.special -ulab.utils uos urandom ure -uselect utime utimeq uzlib -zlib +builtins micropython __future__ _asyncio +_thread _uasyncio aesio array +audiocore audiomixer binascii bitmaptools +btree cexample cmath collections +cppexample displayio errno ffi +framebuf gc hashlib json +math qrio rainbowio re +struct synthio sys termios +traceback ubinascii uctypes uerrno +uheapq uio ujson ulab +ulab.numpy ulab.numpy.fft ulab.numpy.linalg +ulab.scipy ulab.scipy.linalg +ulab.scipy.optimize ulab.scipy.signal +ulab.scipy.special ulab.utils uos +urandom ure uselect utime +utimeq uzlib zlib ime utime utimeq From 8579766edea063dc681a8cac503f0af8101f569e Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 25 Jul 2023 09:35:49 -0500 Subject: [PATCH 07/11] Optimize ulab for size on samd51/same51 --- ports/atmel-samd/mpconfigport.mk | 2 ++ py/circuitpy_mpconfig.mk | 3 +++ py/py.mk | 3 +++ 3 files changed, 8 insertions(+) diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 032e49ce36..5f4bf1e603 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -106,6 +106,7 @@ CIRCUITPY_PS2IO ?= 1 CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO) CIRCUITPY_SAMD ?= 1 CIRCUITPY_SYNTHIO_MAX_CHANNELS = 12 +CIRCUITPY_ULAB_OPTIMIZE_SIZE ?= 1 CIRCUITPY_WATCHDOG ?= 1 endif # samd51 @@ -131,6 +132,7 @@ CIRCUITPY_SAMD ?= 1 CIRCUITPY_FLOPPYIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_FRAMEBUFFERIO ?= $(CIRCUITPY_FULL_BUILD) CIRCUITPY_RGBMATRIX ?= $(CIRCUITPY_FRAMEBUFFERIO) +CIRCUITPY_ULAB_OPTIMIZE_SIZE ?= 1 endif # same51 ###################################################################### diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 3e43909687..90ef13ad9b 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -559,6 +559,9 @@ CFLAGS += -DCIRCUITPY_ZLIB=$(CIRCUITPY_ZLIB) CIRCUITPY_ULAB ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_ULAB=$(CIRCUITPY_ULAB) +# whether to use -Os optimization on files in ulab +CIRCUITPY_ULAB_OPTIMIZE_SIZE ?= 0 + # CIRCUITPY_VIDEOCORE is handled in the broadcom tree. # Only for Broadcom chips. # Assume not a Broadcom build. diff --git a/py/py.mk b/py/py.mk index c598f44cbd..4a2d8544f1 100644 --- a/py/py.mk +++ b/py/py.mk @@ -57,6 +57,9 @@ ULAB_SRCS := $(shell find $(TOP)/extmod/ulab/code -type f -name "*.c") SRC_MOD += $(patsubst $(TOP)/%,%,$(ULAB_SRCS)) CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1 -DULAB_HAS_USER_MODULE=0 -iquote $(TOP)/extmod/ulab/code $(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-missing-declarations -Wno-missing-prototypes -Wno-unused-parameter -Wno-float-equal -Wno-sign-compare -Wno-cast-align -Wno-shadow -DCIRCUITPY +ifeq ($(CIRCUITPY_ULAB_OPTIMIZE_SIZE),1) +$(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Os +endif endif # py object files From adc2dab3a99f2facda156874e354b3e42fb04014 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 25 Jul 2023 09:35:55 -0500 Subject: [PATCH 08/11] disable ulab on pyb_nano_v2 --- ports/stm/boards/pyb_nano_v2/mpconfigboard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk index c8b548c50f..1ab3c91a08 100644 --- a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk +++ b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk @@ -17,3 +17,4 @@ LD_FILE = boards/STM32F411_fs.ld CIRCUITPY_AUDIOCORE = 0 CIRCUITPY_AUDIOPWMIO = 0 CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_ULAB = 0 From 509ddf2f890dffc106d0685b8ba3f95184088524 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 25 Jul 2023 10:48:35 -0500 Subject: [PATCH 09/11] samd: disable some modules so updated ulab fits * floppyio: disable on itsybitsy m4, metro m4 express & airlift, pybadge, pygamer, wio terminal * gifio: disable on itsybitsy m4 express * framebufferio: disable on treills m4 express, wio terminal * terminalio: disable on metro m4 express/airlift for ja/ko/ru --- .../boards/itsybitsy_m4_express/mpconfigboard.mk | 2 ++ .../boards/metro_m4_airlift_lite/mpconfigboard.mk | 11 +++++++++++ .../boards/metro_m4_express/mpconfigboard.mk | 11 +++++++++++ ports/atmel-samd/boards/pybadge/mpconfigboard.mk | 1 + ports/atmel-samd/boards/pygamer/mpconfigboard.mk | 1 + .../boards/seeeduino_wio_terminal/mpconfigboard.mk | 2 ++ .../boards/trellis_m4_express/mpconfigboard.mk | 2 ++ 7 files changed, 30 insertions(+) diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk index 7a45ef21e9..d805d49aff 100644 --- a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk @@ -12,5 +12,7 @@ LONGINT_IMPL = MPZ # No I2S on SAMD51G CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_FLOPPYIO = 0 +CIRCUITPY_GIFIO = 0 CIRCUITPY_BITBANG_APA102 = 1 diff --git a/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk index ed1cd2455c..065c48d064 100644 --- a/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk +++ b/ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk @@ -11,4 +11,15 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C" LONGINT_IMPL = MPZ CIRCUITPY__EVE = 1 +CIRCUITPY_FLOPPYIO = 0 CIRCUITPY_SYNTHIO = 0 + +# We don't have room for the fonts for terminalio for certain languages, +# so turn off terminalio, and if it's off and displayio is on, +# force a clean build. +# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an +# ifeq, because it's not set yet. +ifneq (,$(filter $(TRANSLATION),ja ko ru)) +CIRCUITPY_TERMINALIO = 0 +RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO) +endif diff --git a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk index 50780cff07..61bc46ea4b 100644 --- a/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk @@ -11,4 +11,15 @@ EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C" LONGINT_IMPL = MPZ CIRCUITPY__EVE = 1 +CIRCUITPY_FLOPPYIO = 0 CIRCUITPY_SYNTHIO = 0 + +# We don't have room for the fonts for terminalio for certain languages, +# so turn off terminalio, and if it's off and displayio is on, +# force a clean build. +# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an +# ifeq, because it's not set yet. +ifneq (,$(filter $(TRANSLATION),ja ko ru)) +CIRCUITPY_TERMINALIO = 0 +RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO) +endif diff --git a/ports/atmel-samd/boards/pybadge/mpconfigboard.mk b/ports/atmel-samd/boards/pybadge/mpconfigboard.mk index fd002609b1..baaea5ca63 100644 --- a/ports/atmel-samd/boards/pybadge/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pybadge/mpconfigboard.mk @@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C LONGINT_IMPL = MPZ CIRCUITPY_AESIO = 0 +CIRCUITPY_FLOPPYIO = 0 CIRCUITPY_FRAMEBUFFERIO = 0 CIRCUITPY_GIFIO = 0 CIRCUITPY_KEYPAD = 1 diff --git a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk index f6112b4110..080592bcd3 100644 --- a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk @@ -11,6 +11,7 @@ EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ" LONGINT_IMPL = MPZ CIRCUITPY_AESIO = 0 +CIRCUITPY_FLOPPYIO = 0 CIRCUITPY_FRAMEBUFFERIO = 0 CIRCUITPY_GIFIO = 0 CIRCUITPY_KEYPAD = 1 diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk b/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk index 3441e601b8..dd8afd51f6 100644 --- a/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk +++ b/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk @@ -9,4 +9,6 @@ CHIP_FAMILY = samd51 QSPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ" LONGINT_IMPL = MPZ +CIRCUITPY_FLOPPYIO = 0 +CIRCUITPY_FRAMEBUFFERIO = 0 CIRCUITPY_SYNTHIO = 0 diff --git a/ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk index 81df26b0c6..687138a1f7 100644 --- a/ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk @@ -12,5 +12,7 @@ LONGINT_IMPL = MPZ # No I2S on SAMD51G CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_FLOPPYIO = 0 +CIRCUITPY_FRAMEBUFFERIO = 0 CIRCUITPY_BITBANG_APA102 = 1 From 6a5e4e665257a13d65559c57001fc11d9cea16f8 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 25 Jul 2023 11:19:16 -0500 Subject: [PATCH 10/11] turn off terminalio in a few more builds for space --- .../atmel-samd/boards/feather_m4_can/mpconfigboard.mk | 10 ++++++++++ .../boards/feather_m4_express/mpconfigboard.mk | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk index 8c9779e5f9..b1ea31f867 100644 --- a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk @@ -15,3 +15,13 @@ CIRCUITPY_CANIO = 1 CIRCUITPY_SYNTHIO = 0 CIRCUITPY_LTO_PARTITION = one + +# We don't have room for the fonts for terminalio for certain languages, +# so turn off terminalio, and if it's off and displayio is on, +# force a clean build. +# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an +# ifeq, because it's not set yet. +ifneq (,$(filter $(TRANSLATION),ja ko ru)) +CIRCUITPY_TERMINALIO = 0 +RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO) +endif diff --git a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk index 9a5008be85..c763fa44d5 100644 --- a/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk @@ -12,3 +12,13 @@ LONGINT_IMPL = MPZ CIRCUITPY__EVE = 1 CIRCUITPY_SYNTHIO = 0 + +# We don't have room for the fonts for terminalio for certain languages, +# so turn off terminalio, and if it's off and displayio is on, +# force a clean build. +# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an +# ifeq, because it's not set yet. +ifneq (,$(filter $(TRANSLATION),ja ko ru)) +CIRCUITPY_TERMINALIO = 0 +RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO) +endif From 318191433d0d01519db869ee72a536ebc0801cf6 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Tue, 25 Jul 2023 14:03:47 -0500 Subject: [PATCH 11/11] disable gifio on feather_m4_can --- ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk index b1ea31f867..b68a2c989b 100644 --- a/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk @@ -13,6 +13,7 @@ LONGINT_IMPL = MPZ CIRCUITPY__EVE = 1 CIRCUITPY_CANIO = 1 CIRCUITPY_SYNTHIO = 0 +CIRCUITPY_GIFIO = 0 CIRCUITPY_LTO_PARTITION = one