adafruit-mirror/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Default lvfontio off on SAMD. Fix non-terminalio builds

Browse source
This commit is contained in:
Scott Shawcroft 2025-03-31 11:40:28 -07:00
parent 04622e7c03
commit 565518ecfe
No known key found for this signature in database
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ports/atmel-samd/mpconfigport.mk
View file

@ -12,6 +12,7 @@ CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1
CIRCUITPY_LTO = 1 CIRCUITPY_LTO = 1
CIRCUITPY_KEYPAD_DEMUX ?= 0 CIRCUITPY_KEYPAD_DEMUX ?= 0
CIRCUITPY_LVFONTIO ?= 0
###################################################################### ######################################################################
# Put samd21-only choices here. # Put samd21-only choices here.

3
supervisor/shared/display.c
View file

@ -133,11 +133,12 @@ void supervisor_start_terminal(uint16_t width_px, uint16_t height_px) {
if (supervisor_terminal_started()) { if (supervisor_terminal_started()) {
return; return;
} }
#if CIRCUITPY_TERMINALIO
// Default the scale to 2 because we may show blinka without the terminal for // Default the scale to 2 because we may show blinka without the terminal for
// languages that don't have font support. // languages that don't have font support.
mp_int_t scale = 2; mp_int_t scale = 2;
#if CIRCUITPY_TERMINALIO
displayio_tilegrid_t *scroll_area = &supervisor_terminal_scroll_area_text_grid; displayio_tilegrid_t *scroll_area = &supervisor_terminal_scroll_area_text_grid;
displayio_tilegrid_t *status_bar = &supervisor_terminal_status_bar_text_grid; displayio_tilegrid_t *status_bar = &supervisor_terminal_status_bar_text_grid;
bool reset_tiles = false; bool reset_tiles = false;