Skip to content

Commit e8875f5

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/main' into automount_sd
2 parents cb97ae6 + 61ed7c7 commit e8875f5

File tree

57 files changed

+1914
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1914
-211
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ runs:
55
steps:
66
- name: Get broadcom toolchain
77
run: |
8-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
9-
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
8+
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
9+
sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
1010
sudo apt-get update
1111
sudo apt-get install -y mtools
1212
shell: bash

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,8 @@ TAGS
9797
# clangd cache
9898
##############
9999
.cache
100+
101+
**/CLAUDE.local.md
102+
103+
# windsurf rules
104+
.windsurfrules

‎docs/environment.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,18 @@ This feature is not enabled on boards that the CIRCUITPY_OS_GETENV (os CIRCUIPTY
189189
flag has been set to 0. Currently this is primarily boards with limited flash including some
190190
of the Atmel_samd boards based on the SAMD21/M0 microprocessor.
191191

192+
CIRCUITPY_TERMINAL_FONT
193+
~~~~~~~~~~~~~~~~~~~~~~~
194+
Specifies a custom font file path to use for the terminalio console instead of the default
195+
``/fonts/terminal.lvfontbin``. This allows users to create and use custom fonts for the
196+
CircuitPython console.
197+
198+
This feature requires both CIRCUITPY_OS_GETENV and CIRCUITPY_LVFONTIO to be enabled.
199+
200+
Example:
201+
202+
.. code-block::
203+
204+
CIRCUITPY_TERMINAL_FONT="/fonts/myfont.lvfontbin"
205+
192206
`boards that the terminalio core module is available on <https://docs.circuitpython.org/en/latest/shared-bindings/terminalio/>`_

‎locale/ID.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ msgstr "Gagal menulis flash internal."
10761076
msgid "File exists"
10771077
msgstr "File sudah ada"
10781078

1079-
#: shared-module/os/getenv.c
1079+
#: shared-module/lvfontio/OnDiskFont.c shared-module/os/getenv.c
10801080
msgid "File not found"
10811081
msgstr ""
10821082

@@ -1272,6 +1272,7 @@ msgstr ""
12721272
#: shared-bindings/digitalio/DigitalInOut.c
12731273
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
12741274
#: shared-module/aurora_epaper/aurora_framebuffer.c
1275+
#: shared-module/lvfontio/OnDiskFont.c
12751276
msgid "Invalid %q"
12761277
msgstr ""
12771278

@@ -2010,6 +2011,7 @@ msgstr "Potongan dan nilai panjangnya berbeda."
20102011
#: shared-bindings/displayio/TileGrid.c
20112012
#: shared-bindings/memorymonitor/AllocationSize.c
20122013
#: shared-bindings/pulseio/PulseIn.c
2014+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
20132015
msgid "Slices not supported"
20142016
msgstr "Potongan tidak didukung"
20152017

@@ -2080,7 +2082,9 @@ msgstr ""
20802082
msgid "Tile height must exactly divide bitmap height"
20812083
msgstr "Tinggi tile harus persis membagi tinggi bitmap"
20822084

2083-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
2085+
#: shared-bindings/displayio/TileGrid.c
2086+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
2087+
#: shared-module/displayio/TileGrid.c
20842088
msgid "Tile index out of bounds"
20852089
msgstr "Indeks ubin di luar batas"
20862090

@@ -4326,7 +4330,9 @@ msgstr ""
43264330
msgid "unreadable attribute"
43274331
msgstr ""
43284332

4329-
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
4333+
#: shared-bindings/displayio/TileGrid.c shared-bindings/terminalio/Terminal.c
4334+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
4335+
#: shared-bindings/vectorio/VectorShape.c
43304336
msgid "unsupported %q type"
43314337
msgstr ""
43324338

‎locale/circuitpython.pot‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,7 +1051,7 @@ msgstr ""
10511051
msgid "File exists"
10521052
msgstr ""
10531053

1054-
#: shared-module/os/getenv.c
1054+
#: shared-module/lvfontio/OnDiskFont.c shared-module/os/getenv.c
10551055
msgid "File not found"
10561056
msgstr ""
10571057

@@ -1247,6 +1247,7 @@ msgstr ""
12471247
#: shared-bindings/digitalio/DigitalInOut.c
12481248
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
12491249
#: shared-module/aurora_epaper/aurora_framebuffer.c
1250+
#: shared-module/lvfontio/OnDiskFont.c
12501251
msgid "Invalid %q"
12511252
msgstr ""
12521253

@@ -4280,7 +4281,7 @@ msgstr ""
42804281
msgid "unreadable attribute"
42814282
msgstr ""
42824283

4283-
#: shared-bindings/displayio/TileGrid.c
4284+
#: shared-bindings/displayio/TileGrid.c shared-bindings/terminalio/Terminal.c
42844285
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
42854286
#: shared-bindings/vectorio/VectorShape.c
42864287
msgid "unsupported %q type"

‎locale/cs.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ msgstr "Nepodařilo se zapsat do interní paměti."
10691069
msgid "File exists"
10701070
msgstr "soubor existuje"
10711071

1072-
#: shared-module/os/getenv.c
1072+
#: shared-module/lvfontio/OnDiskFont.c shared-module/os/getenv.c
10731073
msgid "File not found"
10741074
msgstr "Soubor nenalezen"
10751075

@@ -1267,6 +1267,7 @@ msgstr ""
12671267
#: shared-bindings/digitalio/DigitalInOut.c
12681268
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
12691269
#: shared-module/aurora_epaper/aurora_framebuffer.c
1270+
#: shared-module/lvfontio/OnDiskFont.c
12701271
msgid "Invalid %q"
12711272
msgstr "Špatný %s"
12721273

@@ -1998,6 +1999,7 @@ msgstr ""
19981999
#: shared-bindings/displayio/TileGrid.c
19992000
#: shared-bindings/memorymonitor/AllocationSize.c
20002001
#: shared-bindings/pulseio/PulseIn.c
2002+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
20012003
msgid "Slices not supported"
20022004
msgstr ""
20032005

@@ -2065,7 +2067,9 @@ msgstr ""
20652067
msgid "Tile height must exactly divide bitmap height"
20662068
msgstr ""
20672069

2068-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
2070+
#: shared-bindings/displayio/TileGrid.c
2071+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
2072+
#: shared-module/displayio/TileGrid.c
20692073
msgid "Tile index out of bounds"
20702074
msgstr ""
20712075

@@ -4306,7 +4310,9 @@ msgstr "neshoduje se '%c' ve formátu"
43064310
msgid "unreadable attribute"
43074311
msgstr ""
43084312

4309-
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
4313+
#: shared-bindings/displayio/TileGrid.c shared-bindings/terminalio/Terminal.c
4314+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
4315+
#: shared-bindings/vectorio/VectorShape.c
43104316
msgid "unsupported %q type"
43114317
msgstr "nepodporovaný typ% q"
43124318

‎locale/de_DE.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,7 @@ msgstr "Interner Flash konnte nicht geschrieben werden."
10761076
msgid "File exists"
10771077
msgstr "Datei existiert"
10781078

1079-
#: shared-module/os/getenv.c
1079+
#: shared-module/lvfontio/OnDiskFont.c shared-module/os/getenv.c
10801080
msgid "File not found"
10811081
msgstr "Datei nicht gefunden"
10821082

@@ -1278,6 +1278,7 @@ msgstr "Unterbrochen durch Ausgabefunktion"
12781278
#: shared-bindings/digitalio/DigitalInOut.c
12791279
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
12801280
#: shared-module/aurora_epaper/aurora_framebuffer.c
1281+
#: shared-module/lvfontio/OnDiskFont.c
12811282
msgid "Invalid %q"
12821283
msgstr "Ungültiger %q"
12831284

@@ -2018,6 +2019,7 @@ msgstr "Slice und Wert (value) haben unterschiedliche Längen."
20182019
#: shared-bindings/displayio/TileGrid.c
20192020
#: shared-bindings/memorymonitor/AllocationSize.c
20202021
#: shared-bindings/pulseio/PulseIn.c
2022+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
20212023
msgid "Slices not supported"
20222024
msgstr "Slices werden nicht unterstützt"
20232025

@@ -2090,7 +2092,9 @@ msgstr ""
20902092
msgid "Tile height must exactly divide bitmap height"
20912093
msgstr "Die Kachelhöhe muss die Bitmaphöhe genau teilen"
20922094

2093-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
2095+
#: shared-bindings/displayio/TileGrid.c
2096+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
2097+
#: shared-module/displayio/TileGrid.c
20942098
msgid "Tile index out of bounds"
20952099
msgstr "Kachelindex außerhalb der Grenzen"
20962100

@@ -4366,7 +4370,9 @@ msgstr "'%c' in Format konnte nicht zugeordnet werden"
43664370
msgid "unreadable attribute"
43674371
msgstr "nicht lesbares Attribut"
43684372

4369-
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
4373+
#: shared-bindings/displayio/TileGrid.c shared-bindings/terminalio/Terminal.c
4374+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
4375+
#: shared-bindings/vectorio/VectorShape.c
43704376
msgid "unsupported %q type"
43714377
msgstr "Nicht unterstützter %q-Typ"
43724378

‎locale/el.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,7 +1077,7 @@ msgstr ""
10771077
msgid "File exists"
10781078
msgstr ""
10791079

1080-
#: shared-module/os/getenv.c
1080+
#: shared-module/lvfontio/OnDiskFont.c shared-module/os/getenv.c
10811081
msgid "File not found"
10821082
msgstr ""
10831083

@@ -1273,6 +1273,7 @@ msgstr ""
12731273
#: shared-bindings/digitalio/DigitalInOut.c
12741274
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
12751275
#: shared-module/aurora_epaper/aurora_framebuffer.c
1276+
#: shared-module/lvfontio/OnDiskFont.c
12761277
msgid "Invalid %q"
12771278
msgstr ""
12781279

@@ -2003,6 +2004,7 @@ msgstr ""
20032004
#: shared-bindings/displayio/TileGrid.c
20042005
#: shared-bindings/memorymonitor/AllocationSize.c
20052006
#: shared-bindings/pulseio/PulseIn.c
2007+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
20062008
msgid "Slices not supported"
20072009
msgstr ""
20082010

@@ -2070,7 +2072,9 @@ msgstr ""
20702072
msgid "Tile height must exactly divide bitmap height"
20712073
msgstr ""
20722074

2073-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
2075+
#: shared-bindings/displayio/TileGrid.c
2076+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
2077+
#: shared-module/displayio/TileGrid.c
20742078
msgid "Tile index out of bounds"
20752079
msgstr ""
20762080

@@ -4305,7 +4309,9 @@ msgstr ""
43054309
msgid "unreadable attribute"
43064310
msgstr ""
43074311

4308-
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
4312+
#: shared-bindings/displayio/TileGrid.c shared-bindings/terminalio/Terminal.c
4313+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
4314+
#: shared-bindings/vectorio/VectorShape.c
43094315
msgid "unsupported %q type"
43104316
msgstr ""
43114317

‎locale/en_GB.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ msgstr "Failed to write internal flash."
10691069
msgid "File exists"
10701070
msgstr "File exists"
10711071

1072-
#: shared-module/os/getenv.c
1072+
#: shared-module/lvfontio/OnDiskFont.c shared-module/os/getenv.c
10731073
msgid "File not found"
10741074
msgstr "File not found"
10751075

@@ -1266,6 +1266,7 @@ msgstr "Interrupted by output function"
12661266
#: shared-bindings/digitalio/DigitalInOut.c
12671267
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
12681268
#: shared-module/aurora_epaper/aurora_framebuffer.c
1269+
#: shared-module/lvfontio/OnDiskFont.c
12691270
msgid "Invalid %q"
12701271
msgstr "Invalid %q"
12711272

@@ -1999,6 +2000,7 @@ msgstr "Slice and value different lengths."
19992000
#: shared-bindings/displayio/TileGrid.c
20002001
#: shared-bindings/memorymonitor/AllocationSize.c
20012002
#: shared-bindings/pulseio/PulseIn.c
2003+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
20022004
msgid "Slices not supported"
20032005
msgstr "Slices not supported"
20042006

@@ -2068,7 +2070,9 @@ msgstr ""
20682070
msgid "Tile height must exactly divide bitmap height"
20692071
msgstr "Tile height must exactly divide bitmap height"
20702072

2071-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
2073+
#: shared-bindings/displayio/TileGrid.c
2074+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
2075+
#: shared-module/displayio/TileGrid.c
20722076
msgid "Tile index out of bounds"
20732077
msgstr "Tile index out of bounds"
20742078

@@ -4313,7 +4317,9 @@ msgstr "unmatched '%c' in format"
43134317
msgid "unreadable attribute"
43144318
msgstr "unreadable attribute"
43154319

4316-
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
4320+
#: shared-bindings/displayio/TileGrid.c shared-bindings/terminalio/Terminal.c
4321+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
4322+
#: shared-bindings/vectorio/VectorShape.c
43174323
msgid "unsupported %q type"
43184324
msgstr "unsupported %q type"
43194325

‎locale/es.po‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,7 +1080,7 @@ msgstr "Error al escribir el flash interno."
10801080
msgid "File exists"
10811081
msgstr "El archivo ya existe"
10821082

1083-
#: shared-module/os/getenv.c
1083+
#: shared-module/lvfontio/OnDiskFont.c shared-module/os/getenv.c
10841084
msgid "File not found"
10851085
msgstr "Archivo no encontrado"
10861086

@@ -1288,6 +1288,7 @@ msgstr "Interrumpido por resultado de función"
12881288
#: shared-bindings/digitalio/DigitalInOut.c
12891289
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
12901290
#: shared-module/aurora_epaper/aurora_framebuffer.c
1291+
#: shared-module/lvfontio/OnDiskFont.c
12911292
msgid "Invalid %q"
12921293
msgstr "%q inválido"
12931294

@@ -2029,6 +2030,7 @@ msgstr "Slice y value tienen tamaños diferentes."
20292030
#: shared-bindings/displayio/TileGrid.c
20302031
#: shared-bindings/memorymonitor/AllocationSize.c
20312032
#: shared-bindings/pulseio/PulseIn.c
2033+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
20322034
msgid "Slices not supported"
20332035
msgstr "Rebanadas no soportadas"
20342036

@@ -2099,7 +2101,9 @@ msgstr ""
20992101
msgid "Tile height must exactly divide bitmap height"
21002102
msgstr "La altura del Tile debe dividir exacto la altura del bitmap"
21012103

2102-
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
2104+
#: shared-bindings/displayio/TileGrid.c
2105+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
2106+
#: shared-module/displayio/TileGrid.c
21032107
msgid "Tile index out of bounds"
21042108
msgstr "Índice de mosaico fuera de límites"
21052109

@@ -4360,7 +4364,9 @@ msgstr "no coteja '%c' en formato"
43604364
msgid "unreadable attribute"
43614365
msgstr "atributo no legible"
43624366

4363-
#: shared-bindings/displayio/TileGrid.c shared-bindings/vectorio/VectorShape.c
4367+
#: shared-bindings/displayio/TileGrid.c shared-bindings/terminalio/Terminal.c
4368+
#: shared-bindings/tilepalettemapper/TilePaletteMapper.c
4369+
#: shared-bindings/vectorio/VectorShape.c
43644370
msgid "unsupported %q type"
43654371
msgstr "tipo de %q no soportado"
43664372

0 commit comments

Comments
 (0)