From 565518ecfefae69ab9f676529e5183f3375755c8 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 31 Mar 2025 11:40:28 -0700 Subject: [PATCH] Default lvfontio off on SAMD. Fix non-terminalio builds --- ports/atmel-samd/mpconfigport.mk | 1 + supervisor/shared/display.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 15013b2d83..861ef37464 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -12,6 +12,7 @@ CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1 CIRCUITPY_LTO = 1 CIRCUITPY_KEYPAD_DEMUX ?= 0 +CIRCUITPY_LVFONTIO ?= 0 ###################################################################### # Put samd21-only choices here. diff --git a/supervisor/shared/display.c b/supervisor/shared/display.c index 973cce0cba..87af13d646 100644 --- a/supervisor/shared/display.c +++ b/supervisor/shared/display.c @@ -133,11 +133,12 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) { if (supervisor_terminal_started()) { return; } + + #if CIRCUITPY_TERMINALIO // Default the scale to 2 because we may show blinka without the terminal for // languages that don't have font support. mp_int_t scale = 2; - #if CIRCUITPY_TERMINALIO displayio_tilegrid_t *scroll_area = &supervisor_terminal_scroll_area_text_grid; displayio_tilegrid_t *status_bar = &supervisor_terminal_status_bar_text_grid; bool reset_tiles = false;