disable scaling for small M0 builds

RetiredWizard · RetiredWizard · commit 2ba8d26314e8 · 2025-02-25T11:50:26.000-05:00
diff --git 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 <https://docs.circuitpython.org/en/latest/shared-bindings/terminalio/>`
+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 <https://docs.circuitpython.org/en/latest/shared-bindings/terminalio/>`_
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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));

Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"`
`11`	`11`	`LONGINT_IMPL = MPZ`
`12`	`12`
`13`	`13`	`CIRCUITPY_JPEGIO = 0`
	`14`	`+CIRCUITPY_NOTFLASH_LIMITED = 0`