From cdaccdbda3e51089bd477458bfc472542755792b Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Tue, 25 Feb 2025 03:05:58 -0500 Subject: [PATCH 1/8] Add CIRCUITPY_TERMINAL_SCALE settings.toml parameter --- docs/environment.rst | 8 ++++++++ supervisor/shared/display.c | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/environment.rst b/docs/environment.rst index 461fd9273acd8..8f46d717ef1f0 100644 --- a/docs/environment.rst +++ b/docs/environment.rst @@ -174,3 +174,11 @@ Example: Configure the display to 640x480 black and white (1 bit per pixel): `Adafruit Feather RP2350 `_ `Adafruit Metro RP2350 `_ + +CIRCUITPY_TERMINAL_SCALE +~~~~~~~~~~~~~~~~~~~~~~~~ +Allows the entry of a display scaling factor used during the terminalio console construction. +The entered scaling factor only affects the terminalio console and has no impact on +the UART, Web Workflow, BLE Workflow, etc consoles. + +`boards that the terminalio core module is available on ` diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index f6788af0a8db4..c00872ebb36d0 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -36,6 +36,7 @@ #if CIRCUITPY_TERMINALIO #include "supervisor/port.h" +#include "shared-module/os/__init__.h" #endif #if CIRCUITPY_REPL_LOGO @@ -55,7 +56,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { } // Default the scale to 2 because we may show blinka without the terminal for // languages that don't have font support. - uint8_t scale = 2; + mp_int_t scale = 2; #if CIRCUITPY_TERMINALIO displayio_tilegrid_t *scroll_area = &supervisor_terminal_scroll_area_text_grid; @@ -66,6 +67,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { if (width_in_tiles <= 80) { scale = 1; } + (void)common_hal_os_getenv_int("CIRCUITPY_TERMINAL_SCALE", &scale); width_in_tiles = MAX(1, width_px / (scroll_area->tile_width * scale)); uint16_t height_in_tiles = MAX(2, height_px / (scroll_area->tile_height * scale)); From 2ba8d26314e8024715cba2d28d912b1d1dadbfbe Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Tue, 25 Feb 2025 11:50:26 -0500 Subject: [PATCH 2/8] disable scaling for small M0 builds --- docs/environment.rst | 5 ++++- .../boards/circuitbrains_basic_m0/mpconfigboard.mk | 1 + ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk | 1 + .../atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk | 2 ++ ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk | 2 ++ .../atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk | 2 ++ ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk | 2 ++ ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk | 2 ++ ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk | 2 ++ ports/atmel-samd/boards/snekboard/mpconfigboard.mk | 2 ++ .../boards/sparkfun_redboard_turbo/mpconfigboard.mk | 1 + ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk | 1 + .../atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk | 2 ++ ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk | 1 + py/circuitpy_mpconfig.mk | 3 +++ supervisor/shared/display.c | 4 ++++ 16 files changed, 32 insertions(+), 1 deletion(-) diff --git a/docs/environment.rst b/docs/environment.rst index 8f46d717ef1f0..fff46970f5f6a 100644 --- a/docs/environment.rst +++ b/docs/environment.rst @@ -181,4 +181,7 @@ Allows the entry of a display scaling factor used during the terminalio console The entered scaling factor only affects the terminalio console and has no impact on the UART, Web Workflow, BLE Workflow, etc consoles. -`boards that the terminalio core module is available on ` +This feature is not enabled on some CircuitPython board with limited Flash, currently +this includes some of the Atmel_samd boards based on the M0 microprocessor. + +`boards that the terminalio core module is available on `_ diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk index c647039bc8aaf..8c7bd1a95e26a 100755 --- a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk @@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ" LONGINT_IMPL = MPZ CIRCUITPY_JPEGIO = 0 +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk index 004181148415a..2603031a0e413 100644 --- a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk @@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ" LONGINT_IMPL = MPZ CIRCUITPY_RAINBOWIO = 0 +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk index 811336885b86d..e2f85520bbc0f 100644 --- a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL064L" LONGINT_IMPL = MPZ + +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk b/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk index 5e9a1372b4509..a3d99752442c6 100644 --- a/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk +++ b/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" LONGINT_IMPL = MPZ + +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk index 6dce23e506de1..7110a5f9f08b0 100644 --- a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk @@ -13,3 +13,5 @@ LONGINT_IMPL = MPZ CIRCUITPY_BITBANG_APA102 = 1 CIRCUITPY_PULSEIO = 0 + +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk index d758d6878fb7f..73ec92e3b307e 100644 --- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk @@ -12,3 +12,5 @@ LONGINT_IMPL = MPZ CIRCUITPY_CODEOP = 0 CIRCUITPY_RAINBOWIO = 0 + +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk index 823f5698156cd..4c9edb494ecea 100644 --- a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk @@ -61,6 +61,8 @@ CIRCUITPY_USB_VENDOR = 0 CIRCUITPY_VECTORIO = 0 CIRCUITPY_RAINBOWIO = 0 +CIRCUITPY_NOTFLASH_LIMITED = 0 + CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf OPTIMIZATION_FLAGS = -Os FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-lcd diff --git a/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk index 1aca913467477..54cb556bb505c 100644 --- a/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk +++ b/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk @@ -7,5 +7,7 @@ CHIP_VARIANT = SAMD21E18A CHIP_FAMILY = samd21 LONGINT_IMPL = MPZ +CIRCUITPY_NOTFLASH_LIMITED = 0 + SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ,W25Q32FV" diff --git a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk index d19e606319b63..43ad4c006c06e 100644 --- a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk +++ b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk @@ -6,6 +6,8 @@ USB_MANUFACTURER = "keithp.com" CHIP_VARIANT = SAMD21G18A CHIP_FAMILY = samd21 +CIRCUITPY_NOTFLASH_LIMITED = 0 + SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" LONGINT_IMPL = MPZ diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk index 64049e8d5981c..a6c2addb0051f 100755 --- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk @@ -12,3 +12,4 @@ LONGINT_IMPL = MPZ CIRCUITPY_CODEOP = 0 CIRCUITPY_RAINBOWIO = 0 +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk index d6071f4b66e10..f7d14cf16fdad 100644 --- a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk +++ b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk @@ -12,3 +12,4 @@ LONGINT_IMPL = MPZ CIRCUITPY_CODEOP = 0 CIRCUITPY_PARALLELDISPLAYBUS = 0 +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk index 706797928ec13..00dd065e6766d 100644 --- a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk @@ -15,3 +15,5 @@ CIRCUITPY_KEYPAD = 0 CIRCUITPY_USB_MIDI = 0 CIRCUITPY_BITBANG_APA102 = 1 + +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk index 29b5865d419dd..f6e532107342d 100644 --- a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk +++ b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk @@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = W25Q32BV LONGINT_IMPL = MPZ CIRCUITPY_CODEOP = 0 +CIRCUITPY_NOTFLASH_LIMITED = 0 diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 3a240ba1e1db7..d7f0be2773030 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -58,6 +58,9 @@ CFLAGS += -DCIRCUITPY=$(CIRCUITPY) CIRCUITPY_FULL_BUILD ?= 1 CFLAGS += -DCIRCUITPY_FULL_BUILD=$(CIRCUITPY_FULL_BUILD) +# Smaller builds can't support newest Circuitpython features +CIRCUITPY_NOTFLASH_LIMITED ?= 1 + # By default, aggressively reduce the size of in-flash messages, at the cost of # increased build time CIRCUITPY_MESSAGE_COMPRESSION_LEVEL ?= 9 diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index c00872ebb36d0..d5e8ff68011a6 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -36,8 +36,10 @@ #if CIRCUITPY_TERMINALIO #include "supervisor/port.h" +#if CIRCUITPY_NOTFLASH_LIMITED #include "shared-module/os/__init__.h" #endif +#endif #if CIRCUITPY_REPL_LOGO extern uint32_t blinka_bitmap_data[]; @@ -67,7 +69,9 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { if (width_in_tiles <= 80) { scale = 1; } + #if CIRCUITPY_NOTFLASH_LIMITED (void)common_hal_os_getenv_int("CIRCUITPY_TERMINAL_SCALE", &scale); + #endif width_in_tiles = MAX(1, width_px / (scroll_area->tile_width * scale)); uint16_t height_in_tiles = MAX(2, height_px / (scroll_area->tile_height * scale)); From 64ff25b58369adff7724664d4f57a6ae8876e5e9 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Tue, 25 Feb 2025 12:10:54 -0500 Subject: [PATCH 3/8] define new parameter in compile flags --- py/circuitpy_mpconfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index d7f0be2773030..f0c7a13d482c2 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -60,6 +60,7 @@ CFLAGS += -DCIRCUITPY_FULL_BUILD=$(CIRCUITPY_FULL_BUILD) # Smaller builds can't support newest Circuitpython features CIRCUITPY_NOTFLASH_LIMITED ?= 1 +CFLAGS += -DCIRCUITPY_NOTFLASH_LIMITED=$(CIRCUITPY_NOTFLASH_LIMITED) # By default, aggressively reduce the size of in-flash messages, at the cost of # increased build time From 43b90ac299757a698d3321fb26bf5ac774b8ae34 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Tue, 25 Feb 2025 16:05:06 -0500 Subject: [PATCH 4/8] Use CIRCUITPY_FULL_BUILD to reduce size of m0 boards --- .../circuitbrains_basic_m0/mpconfigboard.mk | 34 ++++++++++++++++-- .../feather_m0_express/mpconfigboard.mk | 34 +++++++++++++++++- .../feather_m0_supersized/mpconfigboard.mk | 33 ++++++++++++++++- .../boards/huntercat_nfc/mpconfigboard.mk | 33 ++++++++++++++++- .../itsybitsy_m0_express/mpconfigboard.mk | 35 +++++++++++++++++-- .../boards/metro_m0_express/mpconfigboard.mk | 34 ++++++++++++++++-- .../boards/pewpew_lcd/mpconfigboard.mk | 2 -- .../boards/qtpy_m0_haxpress/mpconfigboard.mk | 34 +++++++++++++++++- .../boards/snekboard/mpconfigboard.mk | 35 +++++++++++++++++-- .../sparkfun_redboard_turbo/mpconfigboard.mk | 35 +++++++++++++++++-- .../stackrduino_m0_pro/mpconfigboard.mk | 33 +++++++++++++++-- .../stringcar_m0_express/mpconfigboard.mk | 34 ++++++++++++++++-- .../trinket_m0_haxpress/mpconfigboard.mk | 32 ++++++++++++++++- ports/atmel-samd/mpconfigport.mk | 1 - py/circuitpy_mpconfig.mk | 4 --- supervisor/shared/display.c | 4 +-- 16 files changed, 388 insertions(+), 29 deletions(-) diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk index 8c7bd1a95e26a..3f8d22bbf4766 100755 --- a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk @@ -10,5 +10,35 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ" LONGINT_IMPL = MPZ -CIRCUITPY_JPEGIO = 0 -CIRCUITPY_NOTFLASH_LIMITED = 0 +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk index 2603031a0e413..83fb3e485ec6e 100644 --- a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk @@ -11,4 +11,36 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ" LONGINT_IMPL = MPZ CIRCUITPY_RAINBOWIO = 0 -CIRCUITPY_NOTFLASH_LIMITED = 0 + +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk index e2f85520bbc0f..afdf3c4e429df 100644 --- a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk @@ -10,4 +10,35 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL064L" LONGINT_IMPL = MPZ -CIRCUITPY_NOTFLASH_LIMITED = 0 +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk b/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk index a3d99752442c6..036474d44ec8c 100644 --- a/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk +++ b/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk @@ -10,4 +10,35 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" LONGINT_IMPL = MPZ -CIRCUITPY_NOTFLASH_LIMITED = 0 +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk index 7110a5f9f08b0..d9e370ec9db10 100644 --- a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk @@ -12,6 +12,35 @@ LONGINT_IMPL = MPZ CIRCUITPY_BITBANG_APA102 = 1 -CIRCUITPY_PULSEIO = 0 - -CIRCUITPY_NOTFLASH_LIMITED = 0 +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk index 73ec92e3b307e..2ad93f6e7f8c0 100644 --- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk @@ -10,7 +10,37 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ" LONGINT_IMPL = MPZ -CIRCUITPY_CODEOP = 0 CIRCUITPY_RAINBOWIO = 0 -CIRCUITPY_NOTFLASH_LIMITED = 0 +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk index 4c9edb494ecea..823f5698156cd 100644 --- a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk @@ -61,8 +61,6 @@ CIRCUITPY_USB_VENDOR = 0 CIRCUITPY_VECTORIO = 0 CIRCUITPY_RAINBOWIO = 0 -CIRCUITPY_NOTFLASH_LIMITED = 0 - CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf OPTIMIZATION_FLAGS = -Os FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-lcd diff --git a/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk index 54cb556bb505c..ca33caf8de703 100644 --- a/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk +++ b/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk @@ -7,7 +7,39 @@ CHIP_VARIANT = SAMD21E18A CHIP_FAMILY = samd21 LONGINT_IMPL = MPZ -CIRCUITPY_NOTFLASH_LIMITED = 0 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ,W25Q32FV" + +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk index 43ad4c006c06e..1ea6aa5cc248c 100644 --- a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk +++ b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk @@ -6,8 +6,39 @@ USB_MANUFACTURER = "keithp.com" CHIP_VARIANT = SAMD21G18A CHIP_FAMILY = samd21 -CIRCUITPY_NOTFLASH_LIMITED = 0 - SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" LONGINT_IMPL = MPZ + +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk index a6c2addb0051f..e0a2b9bc03384 100755 --- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk @@ -10,6 +10,37 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q32FV" LONGINT_IMPL = MPZ -CIRCUITPY_CODEOP = 0 CIRCUITPY_RAINBOWIO = 0 -CIRCUITPY_NOTFLASH_LIMITED = 0 + +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk index f7d14cf16fdad..941b82e86f864 100644 --- a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk +++ b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk @@ -10,6 +10,35 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" LONGINT_IMPL = MPZ +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 CIRCUITPY_CODEOP = 0 -CIRCUITPY_PARALLELDISPLAYBUS = 0 -CIRCUITPY_NOTFLASH_LIMITED = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk index 00dd065e6766d..b837bb49ddea5 100644 --- a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk @@ -11,9 +11,39 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = AT25SF161 LONGINT_IMPL = MPZ -CIRCUITPY_KEYPAD = 0 CIRCUITPY_USB_MIDI = 0 CIRCUITPY_BITBANG_APA102 = 1 -CIRCUITPY_NOTFLASH_LIMITED = 0 +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 +CIRCUITPY_CODEOP = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk index f6e532107342d..7191945037557 100644 --- a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk +++ b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk @@ -10,5 +10,35 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = W25Q32BV LONGINT_IMPL = MPZ +CIRCUITPY_FULL_BUILD = 0 +MICROPY_PY_ASYNC_AWAIT = 1 +CIRCUITPY_AESIO = 0 +CIRCUITPY_ATEXIT = 1 +CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOIO = 0 +CIRCUITPY_AUDIOMP3 = 0 +CIRCUITPY_BINASCII = 0 +CIRCUITPY_BITBANGIO = 1 +CIRCUITPY_BLEIO_HCI = 0 +CIRCUITPY_BUSDEVICE = 1 +CIRCUITPY_BUILTINS_POW3 = 0 CIRCUITPY_CODEOP = 0 -CIRCUITPY_NOTFLASH_LIMITED = 0 +CIRCUITPY_COUNTIO = 1 +CIRCUITPY_DISPLAYIO = 1 +CIRCUITPY_OS_GETENV = 1 +CIRCUITPY_ERRNO = 1 +CIRCUITPY_FREQUENCYIO = 1 +CIRCUITPY_GETPASS = 0 +CIRCUITPY_I2CTARGET = 0 +CIRCUITPY_JSON = 0 +CIRCUITPY_KEYPAD = 0 +CIRCUITPY_LOCALE = 1 +CIRCUITPY_MSGPACK = 0 +CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 +CIRCUITPY_PULSEIO = 1 +CIRCUITPY_RE = 0 +CIRCUITPY_SDCARDIO = 1 +CIRCUITPY_TRACEBACK = 1 +CIRCUITPY_ZLIB = 0 +CIRCUITPY_ULAB = 0 +CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 3dde2885d1f68..f7095a3466a1e 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -39,7 +39,6 @@ CIRCUITPY_COUNTIO ?= 0 # Not enough RAM for framebuffers CIRCUITPY_FRAMEBUFFERIO ?= 0 CIRCUITPY_FREQUENCYIO ?= 0 -CIRCUITPY_GETPASS ?= 0 CIRCUITPY_GIFIO ?= 0 CIRCUITPY_I2CTARGET ?= 0 CIRCUITPY_JSON ?= 0 diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index f0c7a13d482c2..3a240ba1e1db7 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -58,10 +58,6 @@ CFLAGS += -DCIRCUITPY=$(CIRCUITPY) CIRCUITPY_FULL_BUILD ?= 1 CFLAGS += -DCIRCUITPY_FULL_BUILD=$(CIRCUITPY_FULL_BUILD) -# Smaller builds can't support newest Circuitpython features -CIRCUITPY_NOTFLASH_LIMITED ?= 1 -CFLAGS += -DCIRCUITPY_NOTFLASH_LIMITED=$(CIRCUITPY_NOTFLASH_LIMITED) - # By default, aggressively reduce the size of in-flash messages, at the cost of # increased build time CIRCUITPY_MESSAGE_COMPRESSION_LEVEL ?= 9 diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index d5e8ff68011a6..605488ae0391d 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -36,7 +36,7 @@ #if CIRCUITPY_TERMINALIO #include "supervisor/port.h" -#if CIRCUITPY_NOTFLASH_LIMITED +#if CIRCUITPY_FULL_BUILD #include "shared-module/os/__init__.h" #endif #endif @@ -69,7 +69,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { if (width_in_tiles <= 80) { scale = 1; } - #if CIRCUITPY_NOTFLASH_LIMITED + #if CIRCUITPY_FULL_BUILD (void)common_hal_os_getenv_int("CIRCUITPY_TERMINAL_SCALE", &scale); #endif From bda348adda37694ba6f519a9b3466ed495af5416 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Tue, 25 Feb 2025 16:11:18 -0500 Subject: [PATCH 5/8] add the samd CIRCUITPY_GETPASS default back in --- ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk | 2 +- ports/atmel-samd/mpconfigport.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk index d9e370ec9db10..e31ccc748f0cc 100644 --- a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk @@ -37,7 +37,7 @@ CIRCUITPY_KEYPAD = 0 CIRCUITPY_LOCALE = 1 CIRCUITPY_MSGPACK = 0 CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 +CIRCUITPY_PULSEIO = 0 CIRCUITPY_RE = 0 CIRCUITPY_SDCARDIO = 1 CIRCUITPY_TRACEBACK = 1 diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index f7095a3466a1e..3dde2885d1f68 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -39,6 +39,7 @@ CIRCUITPY_COUNTIO ?= 0 # Not enough RAM for framebuffers CIRCUITPY_FRAMEBUFFERIO ?= 0 CIRCUITPY_FREQUENCYIO ?= 0 +CIRCUITPY_GETPASS ?= 0 CIRCUITPY_GIFIO ?= 0 CIRCUITPY_I2CTARGET ?= 0 CIRCUITPY_JSON ?= 0 From 93f8076e5d05a4cc13be7342c41236b0ec7a5253 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Wed, 26 Feb 2025 10:00:45 -0500 Subject: [PATCH 6/8] Remove cond on FULL_BUILD & mpconfigboard.mk changes --- .../circuitbrains_basic_m0/mpconfigboard.mk | 33 +----------------- .../feather_m0_express/mpconfigboard.mk | 33 ------------------ .../feather_m0_supersized/mpconfigboard.mk | 33 ------------------ .../boards/huntercat_nfc/mpconfigboard.mk | 33 ------------------ .../itsybitsy_m0_express/mpconfigboard.mk | 31 ----------------- .../boards/metro_m0_express/mpconfigboard.mk | 34 +------------------ .../boards/qtpy_m0_haxpress/mpconfigboard.mk | 34 ------------------- .../boards/snekboard/mpconfigboard.mk | 33 ------------------ .../sparkfun_redboard_turbo/mpconfigboard.mk | 34 +------------------ .../stackrduino_m0_pro/mpconfigboard.mk | 32 +---------------- .../stringcar_m0_express/mpconfigboard.mk | 34 +------------------ .../trinket_m0_haxpress/mpconfigboard.mk | 31 ----------------- supervisor/shared/display.c | 4 --- 13 files changed, 5 insertions(+), 394 deletions(-) diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk index 3f8d22bbf4766..c647039bc8aaf 100755 --- a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk @@ -10,35 +10,4 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ" LONGINT_IMPL = MPZ -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 -CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 +CIRCUITPY_JPEGIO = 0 diff --git a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk index 83fb3e485ec6e..004181148415a 100644 --- a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk @@ -11,36 +11,3 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ" LONGINT_IMPL = MPZ CIRCUITPY_RAINBOWIO = 0 - -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 -CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk index afdf3c4e429df..811336885b86d 100644 --- a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk +++ b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk @@ -9,36 +9,3 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL064L" LONGINT_IMPL = MPZ - -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 -CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk b/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk index 036474d44ec8c..5e9a1372b4509 100644 --- a/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk +++ b/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk @@ -9,36 +9,3 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" LONGINT_IMPL = MPZ - -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 -CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk index e31ccc748f0cc..6dce23e506de1 100644 --- a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk @@ -12,35 +12,4 @@ LONGINT_IMPL = MPZ CIRCUITPY_BITBANG_APA102 = 1 -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 -CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 CIRCUITPY_PULSEIO = 0 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk index 2ad93f6e7f8c0..d758d6878fb7f 100644 --- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk @@ -10,37 +10,5 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ" LONGINT_IMPL = MPZ -CIRCUITPY_RAINBOWIO = 0 - -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 +CIRCUITPY_RAINBOWIO = 0 diff --git a/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk index ca33caf8de703..1aca913467477 100644 --- a/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk +++ b/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk @@ -7,39 +7,5 @@ CHIP_VARIANT = SAMD21E18A CHIP_FAMILY = samd21 LONGINT_IMPL = MPZ - SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ,W25Q32FV" - -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 -CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk index 1ea6aa5cc248c..d19e606319b63 100644 --- a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk +++ b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk @@ -9,36 +9,3 @@ CHIP_FAMILY = samd21 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" LONGINT_IMPL = MPZ - -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 -CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk index e0a2b9bc03384..64049e8d5981c 100755 --- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk +++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk @@ -10,37 +10,5 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q32FV" LONGINT_IMPL = MPZ -CIRCUITPY_RAINBOWIO = 0 - -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 +CIRCUITPY_RAINBOWIO = 0 diff --git a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk index 941b82e86f864..d6071f4b66e10 100644 --- a/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk +++ b/ports/atmel-samd/boards/stackrduino_m0_pro/mpconfigboard.mk @@ -10,35 +10,5 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" LONGINT_IMPL = MPZ -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 +CIRCUITPY_PARALLELDISPLAYBUS = 0 diff --git a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk index b837bb49ddea5..706797928ec13 100644 --- a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk @@ -11,39 +11,7 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = AT25SF161 LONGINT_IMPL = MPZ +CIRCUITPY_KEYPAD = 0 CIRCUITPY_USB_MIDI = 0 CIRCUITPY_BITBANG_APA102 = 1 - -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 -CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk index 7191945037557..29b5865d419dd 100644 --- a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk +++ b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk @@ -10,35 +10,4 @@ SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = W25Q32BV LONGINT_IMPL = MPZ -CIRCUITPY_FULL_BUILD = 0 -MICROPY_PY_ASYNC_AWAIT = 1 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ATEXIT = 1 -CIRCUITPY_AUDIOBUSIO = 0 -CIRCUITPY_AUDIOIO = 0 -CIRCUITPY_AUDIOMP3 = 0 -CIRCUITPY_BINASCII = 0 -CIRCUITPY_BITBANGIO = 1 -CIRCUITPY_BLEIO_HCI = 0 -CIRCUITPY_BUSDEVICE = 1 -CIRCUITPY_BUILTINS_POW3 = 0 CIRCUITPY_CODEOP = 0 -CIRCUITPY_COUNTIO = 1 -CIRCUITPY_DISPLAYIO = 1 -CIRCUITPY_OS_GETENV = 1 -CIRCUITPY_ERRNO = 1 -CIRCUITPY_FREQUENCYIO = 1 -CIRCUITPY_GETPASS = 0 -CIRCUITPY_I2CTARGET = 0 -CIRCUITPY_JSON = 0 -CIRCUITPY_KEYPAD = 0 -CIRCUITPY_LOCALE = 1 -CIRCUITPY_MSGPACK = 0 -CIRCUITPY_OPT_MAP_LOOKUP_CACHE = 1 -CIRCUITPY_PULSEIO = 1 -CIRCUITPY_RE = 0 -CIRCUITPY_SDCARDIO = 1 -CIRCUITPY_TRACEBACK = 1 -CIRCUITPY_ZLIB = 0 -CIRCUITPY_ULAB = 0 -CIRCUITPY_WARNINGS = 1 diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index 605488ae0391d..c00872ebb36d0 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -36,10 +36,8 @@ #if CIRCUITPY_TERMINALIO #include "supervisor/port.h" -#if CIRCUITPY_FULL_BUILD #include "shared-module/os/__init__.h" #endif -#endif #if CIRCUITPY_REPL_LOGO extern uint32_t blinka_bitmap_data[]; @@ -69,9 +67,7 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { if (width_in_tiles <= 80) { scale = 1; } - #if CIRCUITPY_FULL_BUILD (void)common_hal_os_getenv_int("CIRCUITPY_TERMINAL_SCALE", &scale); - #endif width_in_tiles = MAX(1, width_px / (scroll_area->tile_width * scale)); uint16_t height_in_tiles = MAX(2, height_px / (scroll_area->tile_height * scale)); From 761d787148cfabf2b3502802195c6d7bb31188a2 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Wed, 26 Feb 2025 16:00:02 -0500 Subject: [PATCH 7/8] Use CIRCUITPY_OS_GETENV to guard new feature --- docs/environment.rst | 5 +++-- supervisor/shared/display.c | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/environment.rst b/docs/environment.rst index fff46970f5f6a..9f6b47c6fa849 100644 --- a/docs/environment.rst +++ b/docs/environment.rst @@ -181,7 +181,8 @@ Allows the entry of a display scaling factor used during the terminalio console The entered scaling factor only affects the terminalio console and has no impact on the UART, Web Workflow, BLE Workflow, etc consoles. -This feature is not enabled on some CircuitPython board with limited Flash, currently -this includes some of the Atmel_samd boards based on the M0 microprocessor. +This feature is not enabled on boards that the CIRCUITPY_OS_GETENV (os CIRCUIPTY_FULL_BUILD) +flag has been set to 0. Currently this is primarily boards with limited flash including some +of the Atmel_samd boards based on the SAMD21/M0 microprocessor. `boards that the terminalio core module is available on `_ diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index c00872ebb36d0..32df5be74efce 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -36,8 +36,10 @@ #if CIRCUITPY_TERMINALIO #include "supervisor/port.h" +#if CIRCUITPY_OS_GETENV #include "shared-module/os/__init__.h" #endif +#endif #if CIRCUITPY_REPL_LOGO extern uint32_t blinka_bitmap_data[]; @@ -67,7 +69,9 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { if (width_in_tiles <= 80) { scale = 1; } + #if CIRCUITPY_OS_GETENV (void)common_hal_os_getenv_int("CIRCUITPY_TERMINAL_SCALE", &scale); + #endif width_in_tiles = MAX(1, width_px / (scroll_area->tile_width * scale)); uint16_t height_in_tiles = MAX(2, height_px / (scroll_area->tile_height * scale)); From e1260eb2ae73a48f17f5e7f41d2540988ca022a1 Mon Sep 17 00:00:00 2001 From: RetiredWizard Date: Wed, 26 Feb 2025 16:24:35 -0500 Subject: [PATCH 8/8] guard shared-module/os/getenv.c as well --- shared-module/os/getenv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c index 39c3b4cee4ac7..c7bfadf3418d8 100644 --- a/shared-module/os/getenv.c +++ b/shared-module/os/getenv.c @@ -27,6 +27,8 @@ #include "extmod/vfs.h" #include "extmod/vfs_fat.h" + +#if CIRCUITPY_OS_GETENV typedef FIL file_arg; static bool open_file(const char *name, file_arg *active_file) { #if defined(UNIX) @@ -412,3 +414,4 @@ os_getenv_err_t common_hal_os_getenv_int(const char *key, mp_int_t *value) { common_hal_os_getenv_showerr(key, result); return result; } +#endif