Skip to content

Commit 322a88e

Browse files
committed
Merge commit 'a54ddb329b382d84915b3340400a3cd6950ed097'
2 parents c9d65d1 + a54ddb3 commit 322a88e

File tree

84 files changed

+2232
-159
lines changed

Some content is hidden

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

84 files changed

+2232
-159
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ update-frozen-libraries:
299299

300300
one-of-each: samd21 litex mimxrt10xx nordic stm
301301

302+
analog:
303+
$(MAKE) -C ports/analog/ BOARD=apard32690
304+
302305
samd21:
303306
$(MAKE) -C ports/atmel-samd BOARD=trinket_m0
304307

docs/workflows.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ A few boards have SD card automounting. (This is based on the ``DEFAULT_SD`` set
4444
``mpconfigboard.h``.) The card is writable from CircuitPython by default and read-only to the host.
4545
`storage.remount()` can be used to remount the drive to the host as read-write.
4646

47+
On most other boards, except for ``atmel-samd`` boards, an SD card mounted in user code
48+
at ``/sd`` will become visible after a few seconds on the attached host computer, as an
49+
additional drive besides CIRCUITPY and (if present) CPSAVES. It will present with the volume
50+
label on the SD card. Depending on the host operating system settings, the drive may or may not be
51+
auto-mounted on the host. Host writes to drives mounted by user code will not trigger a reload.
52+
4753
### CDC serial
4854
CircuitPython exposes one CDC USB interface for CircuitPython serial. This is a standard serial
4955
USB interface.

locale/circuitpython.pot

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ msgstr ""
130130
msgid "%q indices must be integers, not %s"
131131
msgstr ""
132132

133+
#: ports/analog/common-hal/busio/SPI.c ports/analog/common-hal/busio/UART.c
133134
#: shared-module/bitbangio/SPI.c
134135
msgid "%q init failed"
135136
msgstr ""
@@ -158,6 +159,10 @@ msgstr ""
158159
msgid "%q length must be >= %d"
159160
msgstr ""
160161

162+
#: py/runtime.c
163+
msgid "%q moved from %q to %q"
164+
msgstr ""
165+
161166
#: py/argcheck.c
162167
msgid "%q must be %d"
163168
msgstr ""
@@ -237,6 +242,7 @@ msgstr ""
237242
msgid "%q out of bounds"
238243
msgstr ""
239244

245+
#: ports/analog/common-hal/busio/SPI.c
240246
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
241247
#: ports/cxd56/common-hal/pulseio/PulseIn.c
242248
#: ports/nordic/common-hal/pulseio/PulseIn.c
@@ -498,7 +504,8 @@ msgstr ""
498504
msgid "All SPI peripherals are in use"
499505
msgstr ""
500506

501-
#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c
507+
#: ports/analog/common-hal/busio/UART.c ports/espressif/common-hal/busio/UART.c
508+
#: ports/nordic/common-hal/busio/UART.c
502509
msgid "All UART peripherals are in use"
503510
msgstr ""
504511

@@ -649,6 +656,7 @@ msgstr ""
649656
msgid "Boot device must be first (interface #0)."
650657
msgstr ""
651658

659+
#: ports/analog/common-hal/busio/UART.c
652660
#: ports/mimxrt10xx/common-hal/busio/UART.c
653661
msgid "Both RX and TX required for flow control"
654662
msgstr ""
@@ -844,6 +852,10 @@ msgstr ""
844852
msgid "Coordinate arrays types have different sizes"
845853
msgstr ""
846854

855+
#: shared-module/usb/core/Device.c
856+
msgid "Could not allocate DMA capable buffer"
857+
msgstr ""
858+
847859
#: ports/espressif/common-hal/rclcpy/Publisher.c
848860
msgid "Could not publish to ROS topic"
849861
msgstr ""
@@ -987,7 +999,7 @@ msgid ""
987999
"Failed to add service TXT record; non-string or bytes found in txt_records"
9881000
msgstr ""
9891001

990-
#: shared-module/rgbmatrix/RGBMatrix.c
1002+
#: ports/analog/common-hal/busio/UART.c shared-module/rgbmatrix/RGBMatrix.c
9911003
msgid "Failed to allocate %q buffer"
9921004
msgstr ""
9931005

@@ -1045,6 +1057,10 @@ msgstr ""
10451057
msgid "Failed to release mutex, err 0x%04x"
10461058
msgstr ""
10471059

1060+
#: ports/analog/common-hal/busio/SPI.c
1061+
msgid "Failed to set SPI Clock Mode"
1062+
msgstr ""
1063+
10481064
#: ports/zephyr-cp/common-hal/wifi/Radio.c
10491065
msgid "Failed to set hostname"
10501066
msgstr ""
@@ -1247,6 +1263,10 @@ msgstr ""
12471263
msgid "Interrupted by output function"
12481264
msgstr ""
12491265

1266+
#: ports/analog/common-hal/busio/UART.c
1267+
#: ports/analog/peripherals/max32690/max32_i2c.c
1268+
#: ports/analog/peripherals/max32690/max32_spi.c
1269+
#: ports/analog/peripherals/max32690/max32_uart.c
12501270
#: ports/espressif/common-hal/_bleio/Service.c
12511271
#: ports/espressif/common-hal/espulp/ULP.c
12521272
#: ports/espressif/common-hal/microcontroller/Processor.c
@@ -1339,6 +1359,7 @@ msgstr ""
13391359
msgid "Invalid socket for TLS"
13401360
msgstr ""
13411361

1362+
#: ports/analog/common-hal/busio/SPI.c
13421363
#: ports/espressif/common-hal/espidf/__init__.c
13431364
#: ports/nordic/common-hal/_bleio/__init__.c
13441365
msgid "Invalid state"
@@ -1898,6 +1919,7 @@ msgstr ""
18981919
msgid "ROS topic failed to initialize"
18991920
msgstr ""
19001921

1922+
#: ports/analog/common-hal/busio/UART.c
19011923
#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
19021924
#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
19031925
msgid "RS485"
@@ -1990,6 +2012,10 @@ msgstr ""
19902012
msgid "SPI init error"
19912013
msgstr ""
19922014

2015+
#: ports/analog/common-hal/busio/SPI.c
2016+
msgid "SPI needs MOSI, MISO, and SCK"
2017+
msgstr ""
2018+
19932019
#: ports/raspberrypi/common-hal/busio/SPI.c
19942020
msgid "SPI peripheral in use"
19952021
msgstr ""
@@ -2121,6 +2147,10 @@ msgstr ""
21212147
msgid "Timeout is too long: Maximum timeout length is %d seconds"
21222148
msgstr ""
21232149

2150+
#: ports/analog/common-hal/busio/UART.c
2151+
msgid "Timeout must be < 100 seconds"
2152+
msgstr ""
2153+
21242154
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21252155
msgid "Too many channels in sample"
21262156
msgstr ""
@@ -2164,6 +2194,10 @@ msgstr ""
21642194
msgid "UART init"
21652195
msgstr ""
21662196

2197+
#: ports/analog/common-hal/busio/UART.c
2198+
msgid "UART needs TX & RX"
2199+
msgstr ""
2200+
21672201
#: ports/raspberrypi/common-hal/busio/UART.c
21682202
msgid "UART peripheral in use"
21692203
msgstr ""
@@ -2172,6 +2206,14 @@ msgstr ""
21722206
msgid "UART re-init"
21732207
msgstr ""
21742208

2209+
#: ports/analog/common-hal/busio/UART.c
2210+
msgid "UART read error"
2211+
msgstr ""
2212+
2213+
#: ports/analog/common-hal/busio/UART.c
2214+
msgid "UART transaction timeout"
2215+
msgstr ""
2216+
21752217
#: ports/stm/common-hal/busio/UART.c
21762218
msgid "UART write"
21772219
msgstr ""

locale/cs.po

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ msgstr "Index %q je mimo rozsah"
141141
msgid "%q indices must be integers, not %s"
142142
msgstr "Indexy %q musí být celá čísla, nikoli %s"
143143

144+
#: ports/analog/common-hal/busio/SPI.c ports/analog/common-hal/busio/UART.c
144145
#: shared-module/bitbangio/SPI.c
145146
msgid "%q init failed"
146147
msgstr "Inicializace %q selhala"
@@ -169,6 +170,10 @@ msgstr "Délka %q musí být <= %d"
169170
msgid "%q length must be >= %d"
170171
msgstr "Délka %q musí být >= %d"
171172

173+
#: py/runtime.c
174+
msgid "%q moved from %q to %q"
175+
msgstr ""
176+
172177
#: py/argcheck.c
173178
msgid "%q must be %d"
174179
msgstr "%q musí být %d"
@@ -248,6 +253,7 @@ msgstr "%q musí být mocnina 2"
248253
msgid "%q out of bounds"
249254
msgstr "%q je mimo hranice"
250255

256+
#: ports/analog/common-hal/busio/SPI.c
251257
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
252258
#: ports/cxd56/common-hal/pulseio/PulseIn.c
253259
#: ports/nordic/common-hal/pulseio/PulseIn.c
@@ -509,7 +515,8 @@ msgstr "Všechny RX FIFO jsou používány"
509515
msgid "All SPI peripherals are in use"
510516
msgstr "Všechny SPI periferie jsou používány"
511517

512-
#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c
518+
#: ports/analog/common-hal/busio/UART.c ports/espressif/common-hal/busio/UART.c
519+
#: ports/nordic/common-hal/busio/UART.c
513520
msgid "All UART peripherals are in use"
514521
msgstr "Všechny UART periferie jsou používány"
515522

@@ -662,6 +669,7 @@ msgstr "Velikost bitmapy a počet bitů na hodnotu se musí shodovat"
662669
msgid "Boot device must be first (interface #0)."
663670
msgstr "Bootovací zařízení musí být první (rozhraní #0)."
664671

672+
#: ports/analog/common-hal/busio/UART.c
665673
#: ports/mimxrt10xx/common-hal/busio/UART.c
666674
msgid "Both RX and TX required for flow control"
667675
msgstr "RX a TX jsou vyžadovány pro kontrolu toku"
@@ -861,6 +869,10 @@ msgstr "Pole souřadnic mají různé délky"
861869
msgid "Coordinate arrays types have different sizes"
862870
msgstr ""
863871

872+
#: shared-module/usb/core/Device.c
873+
msgid "Could not allocate DMA capable buffer"
874+
msgstr ""
875+
864876
#: ports/espressif/common-hal/rclcpy/Publisher.c
865877
msgid "Could not publish to ROS topic"
866878
msgstr ""
@@ -1005,7 +1017,7 @@ msgid ""
10051017
"Failed to add service TXT record; non-string or bytes found in txt_records"
10061018
msgstr ""
10071019

1008-
#: shared-module/rgbmatrix/RGBMatrix.c
1020+
#: ports/analog/common-hal/busio/UART.c shared-module/rgbmatrix/RGBMatrix.c
10091021
msgid "Failed to allocate %q buffer"
10101022
msgstr "Chyba alokace %q bufferu"
10111023

@@ -1063,6 +1075,10 @@ msgstr ""
10631075
msgid "Failed to release mutex, err 0x%04x"
10641076
msgstr "Nepodařilo se uvolnit mutex, err 0x%04x"
10651077

1078+
#: ports/analog/common-hal/busio/SPI.c
1079+
msgid "Failed to set SPI Clock Mode"
1080+
msgstr ""
1081+
10661082
#: ports/zephyr-cp/common-hal/wifi/Radio.c
10671083
msgid "Failed to set hostname"
10681084
msgstr ""
@@ -1267,6 +1283,10 @@ msgstr "Chyba přerušení."
12671283
msgid "Interrupted by output function"
12681284
msgstr ""
12691285

1286+
#: ports/analog/common-hal/busio/UART.c
1287+
#: ports/analog/peripherals/max32690/max32_i2c.c
1288+
#: ports/analog/peripherals/max32690/max32_spi.c
1289+
#: ports/analog/peripherals/max32690/max32_uart.c
12701290
#: ports/espressif/common-hal/_bleio/Service.c
12711291
#: ports/espressif/common-hal/espulp/ULP.c
12721292
#: ports/espressif/common-hal/microcontroller/Processor.c
@@ -1359,6 +1379,7 @@ msgstr "Chybná velikost"
13591379
msgid "Invalid socket for TLS"
13601380
msgstr "Chybný soket pro TLS"
13611381

1382+
#: ports/analog/common-hal/busio/SPI.c
13621383
#: ports/espressif/common-hal/espidf/__init__.c
13631384
#: ports/nordic/common-hal/_bleio/__init__.c
13641385
msgid "Invalid state"
@@ -1921,6 +1942,7 @@ msgstr ""
19211942
msgid "ROS topic failed to initialize"
19221943
msgstr ""
19231944

1945+
#: ports/analog/common-hal/busio/UART.c
19241946
#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
19251947
#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
19261948
msgid "RS485"
@@ -2013,6 +2035,10 @@ msgstr "Konfigurace SPI selhala"
20132035
msgid "SPI init error"
20142036
msgstr "Chyba inicializace SPI"
20152037

2038+
#: ports/analog/common-hal/busio/SPI.c
2039+
msgid "SPI needs MOSI, MISO, and SCK"
2040+
msgstr ""
2041+
20162042
#: ports/raspberrypi/common-hal/busio/SPI.c
20172043
msgid "SPI peripheral in use"
20182044
msgstr "SPI periferie je používána"
@@ -2144,6 +2170,10 @@ msgstr "Čas je v minulosti."
21442170
msgid "Timeout is too long: Maximum timeout length is %d seconds"
21452171
msgstr "Časový limit je příliš dlouhý: maximální limit je %d vteřin"
21462172

2173+
#: ports/analog/common-hal/busio/UART.c
2174+
msgid "Timeout must be < 100 seconds"
2175+
msgstr ""
2176+
21472177
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
21482178
msgid "Too many channels in sample"
21492179
msgstr "V samplu je příliš mnoho kanálů"
@@ -2188,6 +2218,10 @@ msgstr "De-inicializace UART"
21882218
msgid "UART init"
21892219
msgstr "Inicializace UART"
21902220

2221+
#: ports/analog/common-hal/busio/UART.c
2222+
msgid "UART needs TX & RX"
2223+
msgstr ""
2224+
21912225
#: ports/raspberrypi/common-hal/busio/UART.c
21922226
msgid "UART peripheral in use"
21932227
msgstr "UART periférie je používána"
@@ -2196,6 +2230,14 @@ msgstr "UART periférie je používána"
21962230
msgid "UART re-init"
21972231
msgstr "Opětovná inicializace UART"
21982232

2233+
#: ports/analog/common-hal/busio/UART.c
2234+
msgid "UART read error"
2235+
msgstr ""
2236+
2237+
#: ports/analog/common-hal/busio/UART.c
2238+
msgid "UART transaction timeout"
2239+
msgstr ""
2240+
21992241
#: ports/stm/common-hal/busio/UART.c
22002242
msgid "UART write"
22012243
msgstr "Zápis na UART"

0 commit comments

Comments
 (0)