Skip to content

Commit 4439b66

Browse files
authored
Merge branch 'adafruit:main' into mtm_computer_dac_audio
2 parents 981a818 + f7f0fd6 commit 4439b66

File tree

83 files changed

+1856
-189
lines changed

Some content is hidden

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

83 files changed

+1856
-189
lines changed

.github/actions/deps/ports/zephyr-cp/action.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,18 @@ name: Fetch Zephyr port deps
33
runs:
44
using: composite
55
steps:
6-
- name: Get libusb and mtools
6+
- name: Get Linux build dependencies
77
if: runner.os == 'Linux'
88
run: |
9+
echo "--- cpu model ---"
10+
grep "model name" /proc/cpuinfo | head -1
11+
sudo dpkg --add-architecture i386
912
sudo apt-get update
10-
sudo apt-get install -y libusb-1.0-0-dev libudev-dev mtools
13+
sudo apt-get install -y libusb-1.0-0-dev libudev-dev pkg-config mtools
14+
# We have to hold python3 so the following install works. See https://github.com/actions/runner-images/issues/13803
15+
sudo apt-mark hold python3
16+
sudo apt-get install -y libsdl2-dev:i386 libsdl2-image-dev:i386
17+
echo "PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" >> $GITHUB_ENV
1118
shell: bash
1219
- name: Setup Zephyr project
1320
uses: zephyrproject-rtos/action-zephyr-setup@v1

AGENTS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
- Capture CircuitPython output by finding the matching device in `/dev/serial/by-id`
22
- You can mount the CIRCUITPY drive by doing `udisksctl mount -b /dev/disk/by-label/CIRCUITPY` and access it via `/run/media/<user>/CIRCUITPY`.
33
- `circup` is a command line tool to install libraries and examples to CIRCUITPY.
4+
- When connecting to serial devices on Linux use /dev/serial/by-id. These will be more stable than /dev/ttyACM*.

locale/circuitpython.pot

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ msgstr ""
168168
msgid "%q must be %d"
169169
msgstr ""
170170

171-
#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c
172-
#: shared-bindings/displayio/Bitmap.c
171+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c py/argcheck.c
172+
#: shared-bindings/busdisplay/BusDisplay.c shared-bindings/displayio/Bitmap.c
173173
#: shared-bindings/framebufferio/FramebufferDisplay.c
174174
#: shared-bindings/is31fl3741/FrameBuffer.c
175175
#: shared-bindings/rgbmatrix/RGBMatrix.c
@@ -461,6 +461,7 @@ msgstr ""
461461
msgid ", in %q\n"
462462
msgstr ""
463463

464+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c
464465
#: shared-bindings/busdisplay/BusDisplay.c
465466
#: shared-bindings/epaperdisplay/EPaperDisplay.c
466467
#: shared-bindings/framebufferio/FramebufferDisplay.c
@@ -650,6 +651,7 @@ msgstr ""
650651
msgid "Baudrate not supported by peripheral"
651652
msgstr ""
652653

654+
#: ports/zephyr-cp/common-hal/zephyr_display/Display.c
653655
#: shared-module/busdisplay/BusDisplay.c
654656
#: shared-module/framebufferio/FramebufferDisplay.c
655657
msgid "Below minimum frame rate"
@@ -672,6 +674,7 @@ msgstr ""
672674
msgid "Both RX and TX required for flow control"
673675
msgstr ""
674676

677+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c
675678
#: shared-bindings/busdisplay/BusDisplay.c
676679
#: shared-bindings/framebufferio/FramebufferDisplay.c
677680
msgid "Brightness not adjustable"
@@ -1142,6 +1145,7 @@ msgstr ""
11421145
msgid "Generic Failure"
11431146
msgstr ""
11441147

1148+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c
11451149
#: shared-bindings/framebufferio/FramebufferDisplay.c
11461150
#: shared-module/busdisplay/BusDisplay.c
11471151
#: shared-module/framebufferio/FramebufferDisplay.c

locale/cs.po

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ msgstr "%q v %q musí být typu %q, ne %q"
124124

125125
#: ports/espressif/common-hal/espulp/ULP.c
126126
#: ports/espressif/common-hal/mipidsi/Bus.c
127+
#: ports/espressif/common-hal/qspibus/QSPIBus.c
127128
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
128129
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
129130
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
@@ -146,6 +147,7 @@ msgstr "Indexy %q musí být celá čísla, nikoli %s"
146147

147148
#: ports/analog/common-hal/busio/SPI.c ports/analog/common-hal/busio/UART.c
148149
#: shared-bindings/digitalio/DigitalInOutProtocol.c
150+
#: shared-module/busdisplay/BusDisplay.c
149151
msgid "%q init failed"
150152
msgstr "Inicializace %q selhala"
151153

@@ -177,8 +179,8 @@ msgstr "Délka %q musí být >= %d"
177179
msgid "%q must be %d"
178180
msgstr "%q musí být %d"
179181

180-
#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c
181-
#: shared-bindings/displayio/Bitmap.c
182+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c py/argcheck.c
183+
#: shared-bindings/busdisplay/BusDisplay.c shared-bindings/displayio/Bitmap.c
182184
#: shared-bindings/framebufferio/FramebufferDisplay.c
183185
#: shared-bindings/is31fl3741/FrameBuffer.c
184186
#: shared-bindings/rgbmatrix/RGBMatrix.c
@@ -470,6 +472,7 @@ msgstr "∗x musí být cíl přiřazení"
470472
msgid ", in %q\n"
471473
msgstr ", v% q\n"
472474

475+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c
473476
#: shared-bindings/busdisplay/BusDisplay.c
474477
#: shared-bindings/epaperdisplay/EPaperDisplay.c
475478
#: shared-bindings/framebufferio/FramebufferDisplay.c
@@ -660,6 +663,7 @@ msgstr ""
660663
msgid "Baudrate not supported by peripheral"
661664
msgstr "Baudrate není podporován periférií"
662665

666+
#: ports/zephyr-cp/common-hal/zephyr_display/Display.c
663667
#: shared-module/busdisplay/BusDisplay.c
664668
#: shared-module/framebufferio/FramebufferDisplay.c
665669
msgid "Below minimum frame rate"
@@ -682,6 +686,7 @@ msgstr "Bootovací zařízení musí být první (rozhraní #0)."
682686
msgid "Both RX and TX required for flow control"
683687
msgstr "RX a TX jsou vyžadovány pro kontrolu toku"
684688

689+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c
685690
#: shared-bindings/busdisplay/BusDisplay.c
686691
#: shared-bindings/framebufferio/FramebufferDisplay.c
687692
msgid "Brightness not adjustable"
@@ -873,7 +878,7 @@ msgstr "Pole souřadnic mají různé délky"
873878
msgid "Coordinate arrays types have different sizes"
874879
msgstr ""
875880

876-
#: shared-module/usb/core/Device.c ports/espressif/common-hal/qspibus/QSPIBus.c
881+
#: ports/espressif/common-hal/qspibus/QSPIBus.c shared-module/usb/core/Device.c
877882
msgid "Could not allocate DMA capable buffer"
878883
msgstr ""
879884

@@ -1040,10 +1045,6 @@ msgstr "Nepodařilo se alokovat paměť pro wifi scan"
10401045
msgid "Failed to buffer the sample"
10411046
msgstr "Nepodařilo se nabufferovat sample"
10421047

1043-
#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
1044-
msgid "Failed to connect"
1045-
msgstr ""
1046-
10471048
#: ports/espressif/common-hal/_bleio/Adapter.c
10481049
#: ports/nordic/common-hal/_bleio/Adapter.c
10491050
#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
@@ -1163,6 +1164,7 @@ msgstr "Inicializace GNSS"
11631164
msgid "Generic Failure"
11641165
msgstr "Základní chyba"
11651166

1167+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c
11661168
#: shared-bindings/framebufferio/FramebufferDisplay.c
11671169
#: shared-module/busdisplay/BusDisplay.c
11681170
#: shared-module/framebufferio/FramebufferDisplay.c
@@ -3264,10 +3266,6 @@ msgstr ""
32643266
msgid "float unsupported"
32653267
msgstr "float není podporován"
32663268

3267-
#: shared-bindings/_stage/Text.c
3268-
msgid "font must be 2048 bytes long"
3269-
msgstr ""
3270-
32713269
#: extmod/moddeflate.c
32723270
msgid "format"
32733271
msgstr ""
@@ -3349,10 +3347,6 @@ msgstr ""
33493347
msgid "generator raised StopIteration"
33503348
msgstr "generátor způsobil StopIteration"
33513349

3352-
#: shared-bindings/_stage/Layer.c
3353-
msgid "graphic must be 2048 bytes long"
3354-
msgstr ""
3355-
33563350
#: extmod/modhashlib.c
33573351
msgid "hash is final"
33583352
msgstr "hash je konečný"
@@ -4074,10 +4068,6 @@ msgstr ""
40744068
msgid "pack expected %d items for packing (got %d)"
40754069
msgstr ""
40764070

4077-
#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c
4078-
msgid "palette must be 32 bytes long"
4079-
msgstr ""
4080-
40814071
#: py/emitinlinerv32.c
40824072
msgid "parameters must be registers in sequence a0 to a3"
40834073
msgstr ""

locale/el.po

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ msgstr "%q στο %q πρέπει να είναι τύπου %q, όχι %q"
128128

129129
#: ports/espressif/common-hal/espulp/ULP.c
130130
#: ports/espressif/common-hal/mipidsi/Bus.c
131+
#: ports/espressif/common-hal/qspibus/QSPIBus.c
131132
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
132133
#: ports/mimxrt10xx/common-hal/usb_host/Port.c
133134
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c
@@ -150,6 +151,7 @@ msgstr "%q δείκτες πρέπει να είναι ακέραιοι, όχι
150151

151152
#: ports/analog/common-hal/busio/SPI.c ports/analog/common-hal/busio/UART.c
152153
#: shared-bindings/digitalio/DigitalInOutProtocol.c
154+
#: shared-module/busdisplay/BusDisplay.c
153155
msgid "%q init failed"
154156
msgstr "%q εκκίνηση απέτυχε"
155157

@@ -181,8 +183,8 @@ msgstr "%q μήκος πρέπει να είναι >= %d"
181183
msgid "%q must be %d"
182184
msgstr "%q πρέπει να είναι %d"
183185

184-
#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c
185-
#: shared-bindings/displayio/Bitmap.c
186+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c py/argcheck.c
187+
#: shared-bindings/busdisplay/BusDisplay.c shared-bindings/displayio/Bitmap.c
186188
#: shared-bindings/framebufferio/FramebufferDisplay.c
187189
#: shared-bindings/is31fl3741/FrameBuffer.c
188190
#: shared-bindings/rgbmatrix/RGBMatrix.c
@@ -474,6 +476,7 @@ msgstr "*x πρέπει να είναι στόχος ανάθεσης"
474476
msgid ", in %q\n"
475477
msgstr ", στο %q\n"
476478

479+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c
477480
#: shared-bindings/busdisplay/BusDisplay.c
478481
#: shared-bindings/epaperdisplay/EPaperDisplay.c
479482
#: shared-bindings/framebufferio/FramebufferDisplay.c
@@ -664,6 +667,7 @@ msgstr ""
664667
msgid "Baudrate not supported by peripheral"
665668
msgstr "Baudrate δεν υποστηρίζεται από την περιφεριακή συσκευή"
666669

670+
#: ports/zephyr-cp/common-hal/zephyr_display/Display.c
667671
#: shared-module/busdisplay/BusDisplay.c
668672
#: shared-module/framebufferio/FramebufferDisplay.c
669673
msgid "Below minimum frame rate"
@@ -686,6 +690,7 @@ msgstr "Η συσκευή εκκίνησης πρέπει να επιλεχθε
686690
msgid "Both RX and TX required for flow control"
687691
msgstr "Και RX και TX απαιτούνται για έλεγχο flow"
688692

693+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c
689694
#: shared-bindings/busdisplay/BusDisplay.c
690695
#: shared-bindings/framebufferio/FramebufferDisplay.c
691696
msgid "Brightness not adjustable"
@@ -879,7 +884,7 @@ msgstr ""
879884
msgid "Coordinate arrays types have different sizes"
880885
msgstr ""
881886

882-
#: shared-module/usb/core/Device.c ports/espressif/common-hal/qspibus/QSPIBus.c
887+
#: ports/espressif/common-hal/qspibus/QSPIBus.c shared-module/usb/core/Device.c
883888
msgid "Could not allocate DMA capable buffer"
884889
msgstr ""
885890

@@ -1048,10 +1053,6 @@ msgstr ""
10481053
msgid "Failed to buffer the sample"
10491054
msgstr ""
10501055

1051-
#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
1052-
msgid "Failed to connect"
1053-
msgstr ""
1054-
10551056
#: ports/espressif/common-hal/_bleio/Adapter.c
10561057
#: ports/nordic/common-hal/_bleio/Adapter.c
10571058
#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
@@ -1169,6 +1170,7 @@ msgstr ""
11691170
msgid "Generic Failure"
11701171
msgstr ""
11711172

1173+
#: ports/zephyr-cp/bindings/zephyr_display/Display.c
11721174
#: shared-bindings/framebufferio/FramebufferDisplay.c
11731175
#: shared-module/busdisplay/BusDisplay.c
11741176
#: shared-module/framebufferio/FramebufferDisplay.c
@@ -3263,10 +3265,6 @@ msgstr ""
32633265
msgid "float unsupported"
32643266
msgstr ""
32653267

3266-
#: shared-bindings/_stage/Text.c
3267-
msgid "font must be 2048 bytes long"
3268-
msgstr ""
3269-
32703268
#: extmod/moddeflate.c
32713269
msgid "format"
32723270
msgstr ""
@@ -3348,10 +3346,6 @@ msgstr ""
33483346
msgid "generator raised StopIteration"
33493347
msgstr ""
33503348

3351-
#: shared-bindings/_stage/Layer.c
3352-
msgid "graphic must be 2048 bytes long"
3353-
msgstr ""
3354-
33553349
#: extmod/modhashlib.c
33563350
msgid "hash is final"
33573351
msgstr ""
@@ -4073,10 +4067,6 @@ msgstr ""
40734067
msgid "pack expected %d items for packing (got %d)"
40744068
msgstr ""
40754069

4076-
#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c
4077-
msgid "palette must be 32 bytes long"
4078-
msgstr ""
4079-
40804070
#: py/emitinlinerv32.c
40814071
msgid "parameters must be registers in sequence a0 to a3"
40824072
msgstr ""

0 commit comments

Comments
 (0)