Merge pull request #10208 from tannewt/lvfontio

Add support for on disk fonts to terminalio

Author: dhalbert

.github/actions/deps/ports/broadcom/action.yml

@@ -5,8 +5,8 @@ runs:
   steps:
     - name: Get broadcom toolchain
       run: |
-        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
-        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
         sudo apt-get update
         sudo apt-get install -y mtools
       shell: bash

.gitignore

@@ -97,3 +97,8 @@ TAGS
 # clangd cache
 ##############
 .cache
+
+**/CLAUDE.local.md
+
+# windsurf rules
+.windsurfrules

docs/environment.rst

@@ -189,4 +189,18 @@ This feature is not enabled on boards that the CIRCUITPY_OS_GETENV (os CIRCUIPTY
 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.
 
+CIRCUITPY_TERMINAL_FONT
+~~~~~~~~~~~~~~~~~~~~~~~
+Specifies a custom font file path to use for the terminalio console instead of the default
+``/fonts/terminal.lvfontbin``. This allows users to create and use custom fonts for the
+CircuitPython console.
+
+This feature requires both CIRCUITPY_OS_GETENV and CIRCUITPY_LVFONTIO to be enabled.
+
+Example:
+
+.. code-block::
+
+    CIRCUITPY_TERMINAL_FONT="/fonts/myfont.lvfontbin"
+
 `boards that the terminalio core module is available on <https://docs.circuitpython.org/en/latest/shared-bindings/terminalio/>`_

locale/circuitpython.pot

@@ -1051,7 +1051,7 @@ msgstr ""
 msgid "File exists"
 msgstr ""
 
-#: shared-module/os/getenv.c
+#: shared-module/lvfontio/OnDiskFont.c shared-module/os/getenv.c
 msgid "File not found"
 msgstr ""
 
@@ -1247,6 +1247,7 @@ msgstr ""
 #: shared-bindings/digitalio/DigitalInOut.c
 #: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
 #: shared-module/aurora_epaper/aurora_framebuffer.c
+#: shared-module/lvfontio/OnDiskFont.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -1975,6 +1976,7 @@ msgstr ""
 #: shared-bindings/displayio/TileGrid.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
 msgid "Slices not supported"
 msgstr ""
 
@@ -2042,7 +2044,9 @@ msgstr ""
 msgid "Tile height must exactly divide bitmap height"
 msgstr ""
 
-#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
+#: shared-bindings/displayio/TileGrid.c
+#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
+#: shared-module/displayio/TileGrid.c
 msgid "Tile index out of bounds"
 msgstr ""
 
@@ -4277,7 +4281,9 @@ msgstr ""
 msgid "unreadable attribute"
 msgstr ""
 
-#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
+#: shared-bindings/displayio/TileGrid.c shared-bindings/terminalio/Terminal.c
+#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
+#: shared-bindings/vectorio/VectorShape.c
 msgid "unsupported %q type"
 msgstr ""
 

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.

ports/raspberrypi/common-hal/picodvi/__init__.c

@@ -74,11 +74,11 @@ static bool picodvi_autoconstruct_enabled(mp_int_t *default_width, mp_int_t *def
                     if ((established_timings & 0x80) != 0 &&
                         preferred_width % 1920 == 0 &&
                         preferred_height % 1080 == 0) {
-                        *default_width = 720 / 2;
-                        *default_height = 400 / 2;
+                        *default_width = 720;
+                        *default_height = 400;
                     } else {
-                        *default_width = 640 / 2;
-                        *default_height = 480 / 2;
+                        *default_width = 640;
+                        *default_height = 480;
                     }
                 }
             }
@@ -95,15 +95,15 @@ void picodvi_autoconstruct(void) {
         return;
     }
 
-    mp_int_t default_width = 320;
-    mp_int_t default_height = 240;
+    mp_int_t default_width = 640;
+    mp_int_t default_height = 480;
     if (!picodvi_autoconstruct_enabled(&default_width, &default_height)) {
         return;
     }
 
     mp_int_t width = default_width;
     mp_int_t height = 0;
-    mp_int_t color_depth = 16;
+    mp_int_t color_depth = 8;
     mp_int_t rotation = 0;
 
     (void)common_hal_os_getenv_int("CIRCUITPY_DISPLAY_WIDTH", &width);
@@ -113,6 +113,9 @@ void picodvi_autoconstruct(void) {
 
     if (height == 0) {
         switch (width) {
+            case 720:
+                height = 400;
+                break;
             case 640:
                 height = 480;
                 break;
@@ -134,7 +137,7 @@ void picodvi_autoconstruct(void) {
         // invalid configuration, set back to default
         width = default_width;
         height = default_height;
-        color_depth = 16;
+        color_depth = 8;
     }
 
     // construct framebuffer and display

ports/stm/boards/meowbit_v121/mpconfigboard.mk

@@ -27,6 +27,8 @@ CIRCUITPY_BITMAPFILTER = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_EPAPERDISPLAY = 0
+CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_I2CDISPLAYBUS = 0
 CIRCUITPY_KEYPAD_DEMUX = 0
 CIRCUITPY_SHARPDISPLAY = 0
 CIRCUITPY_TILEPALETTEMAPPER = 0

ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk

@@ -9,6 +9,8 @@ MCU_SERIES = F4
 MCU_VARIANT = STM32F411xE
 MCU_PACKAGE = LQFP100_f4
 
+OPTIMIZATION_FLAGS = -Os
+
 LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F411_fs.ld
 

ports/stm/boards/thunderpack_v11/mpconfigboard.mk

@@ -13,6 +13,8 @@ MCU_SERIES = F4
 MCU_VARIANT = STM32F411xE
 MCU_PACKAGE = UFQFPN48
 
+OPTIMIZATION_FLAGS = -Os
+
 LD_COMMON = boards/common_nvm.ld
 LD_FILE = boards/STM32F411_nvm.ld
 

ports/stm/boards/thunderpack_v12/mpconfigboard.mk

@@ -25,11 +25,7 @@ MCU_SERIES = F4
 MCU_VARIANT = STM32F411xE
 MCU_PACKAGE = UFQFPN48
 
+OPTIMIZATION_FLAGS = -Os
+
 LD_COMMON = boards/common_nvm.ld
 LD_FILE = boards/STM32F411_nvm_nofs.ld
-
-# Disable TERMINALIO on translations with missing characters.
-ifneq (,$(filter $(TRANSLATION),ja ko ru))
-CIRCUITPY_TERMINALIO = 0
-RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
-endif