Skip to content

Commit 42db18e

Browse files
dhalbertdhalbert
committed
merge from main
2 parents 90053fe + ec5cca6 commit 42db18e

File tree

56 files changed

+1852
-291
lines changed

Some content is hidden

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

56 files changed

+1852
-291
lines changed

‎docs/environment.rst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ CircuitPython behavior
5656
CircuitPython will also read the environment to configure its behavior. Other
5757
keys are ignored by CircuitPython. Here are the keys it uses:
5858

59+
Core CircuitPython keys
60+
^^^^^^^^^^^^^^^^^^^^^^^
61+
5962
CIRCUITPY_BLE_NAME
6063
~~~~~~~~~~~~~~~~~~
6164
Default BLE name the board advertises as, including for the BLE workflow.
@@ -94,3 +97,25 @@ Wi-Fi password used to auto connect to CIRCUITPY_WIFI_SSID.
9497
CIRCUITPY_WIFI_SSID
9598
~~~~~~~~~~~~~~~~~~~
9699
Wi-Fi SSID to auto-connect to even if user code is not running.
100+
101+
Additional board specific keys
102+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
103+
104+
`MaTouch ESP32-S3 Parallel TFT with Touch 7“ <https://circuitpython.org/board/makerfabs_tft7/>`_
105+
106+
CIRCUITPY_DISPLAY_WIDTH
107+
~~~~~~~~~~~~~~~~~~~~~~~
108+
Selects the correct screen resolution (1024x600 or 800x640) for the particular board variant.
109+
If the CIRCUITPY_DISPLAY_WIDTH parameter is set to a value of 1024 the display is initialized
110+
during power up at 1024x600 otherwise the display will be initialized at a resolution
111+
of 800x480.
112+
113+
`Sunton ESP32-2432S028 <https://circuitpython.org/board/sunton_esp32_2432S028/>`_
114+
115+
CIRCUITPY_DISPLAY_ROTATION
116+
~~~~~~~~~~~~~~~~~~~~~~~~~~
117+
Selects the correct screen rotation (0, 90, 180 or 270) for the particular board variant.
118+
If the CIRCUITPY_DISPLAY_ROTATION parameter is set the display will be initialized
119+
during power up with the selected rotation, otherwise the display will be initialized with
120+
a rotation of 0. Attempting to initialize the screen with a rotation other than 0,
121+
90, 180 or 270 is not supported and will result in an unexpected screen rotation.

‎locale/ID.po

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -666,12 +666,12 @@ msgid "Buffer length %d too big. It must be less than %d"
666666
msgstr "Panjang buffer %d terlalu besar. Itu harus kurang dari %d"
667667

668668
#: ports/atmel-samd/common-hal/sdioio/SDCard.c
669-
#: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c
670-
msgid "Buffer length must be a multiple of 512"
671-
msgstr "Panjang buffer harus kelipatan 512"
672-
669+
#: ports/cxd56/common-hal/sdioio/SDCard.c
670+
#: ports/espressif/common-hal/sdioio/SDCard.c
673671
#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c
674-
msgid "Buffer must be a multiple of 512 bytes"
672+
#: shared-module/sdcardio/SDCard.c
673+
#, c-format
674+
msgid "Buffer must be a multiple of %d bytes"
675675
msgstr ""
676676

677677
#: shared-bindings/_bleio/PacketBuffer.c
@@ -1191,11 +1191,13 @@ msgstr ""
11911191
msgid "Interrupted by output function"
11921192
msgstr ""
11931193

1194+
#: ports/espressif/common-hal/_bleio/Service.c
11941195
#: ports/espressif/common-hal/espulp/ULP.c
11951196
#: ports/espressif/common-hal/microcontroller/Processor.c
11961197
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
11971198
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
11981199
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
1200+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
11991201
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c py/argcheck.c
12001202
#: shared-bindings/digitalio/DigitalInOut.c
12011203
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
@@ -1315,6 +1317,7 @@ msgid "MAC address was invalid"
13151317
msgstr ""
13161318

13171319
#: ports/espressif/common-hal/_bleio/Characteristic.c
1320+
#: ports/espressif/common-hal/_bleio/Descriptor.c
13181321
msgid "MITM security not supported"
13191322
msgstr ""
13201323

@@ -1547,8 +1550,9 @@ msgid "Not supported JPEG standard"
15471550
msgstr ""
15481551

15491552
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
1553+
#: ports/espressif/common-hal/sdioio/SDCard.c
15501554
#, c-format
1551-
msgid "Number of data_pins must be 8 or 16, not %d"
1555+
msgid "Number of data_pins must be %d or %d, not %d"
15521556
msgstr ""
15531557

15541558
#: shared-bindings/util.c
@@ -1884,9 +1888,10 @@ msgstr ""
18841888
msgid "SDIO GetCardInfo Error %d"
18851889
msgstr ""
18861890

1891+
#: ports/espressif/common-hal/sdioio/SDCard.c
18871892
#: ports/stm/common-hal/sdioio/SDCard.c
18881893
#, c-format
1889-
msgid "SDIO Init Error %d"
1894+
msgid "SDIO Init Error %x"
18901895
msgstr ""
18911896

18921897
#: ports/espressif/common-hal/busio/SPI.c
@@ -2264,14 +2269,12 @@ msgid "Update failed"
22642269
msgstr ""
22652270

22662271
#: ports/espressif/common-hal/_bleio/Characteristic.c
2267-
#: ports/espressif/common-hal/_bleio/Descriptor.c
22682272
#: ports/nordic/common-hal/_bleio/Characteristic.c
22692273
#: ports/nordic/common-hal/_bleio/Descriptor.c
22702274
msgid "Value length != required fixed length"
22712275
msgstr "Panjang nilai != Panjang tetap yang dibutuhkan"
22722276

22732277
#: ports/espressif/common-hal/_bleio/Characteristic.c
2274-
#: ports/espressif/common-hal/_bleio/Descriptor.c
22752278
#: ports/nordic/common-hal/_bleio/Characteristic.c
22762279
#: ports/nordic/common-hal/_bleio/Descriptor.c
22772280
msgid "Value length > max_length"
@@ -3120,7 +3123,8 @@ msgstr "fungsi kehilangan argumen keyword '%q' yang dibutuhkan"
31203123
msgid "function missing required positional argument #%d"
31213124
msgstr "fungsi kehilangan argumen posisi #%d yang dibutuhkan"
31223125

3123-
#: py/argcheck.c py/bc.c py/objnamedtuple.c shared-bindings/time/__init__.c
3126+
#: py/argcheck.c py/bc.c py/objnamedtuple.c shared-bindings/_eve/__init__.c
3127+
#: shared-bindings/time/__init__.c
31243128
#, c-format
31253129
msgid "function takes %d positional arguments but %d were given"
31263130
msgstr "fungsi mengambil posisi argumen %d tapi %d yang diberikan"
@@ -3272,7 +3276,7 @@ msgstr ""
32723276
msgid "input must be a dense ndarray"
32733277
msgstr ""
32743278

3275-
#: extmod/ulab/code/user/user.c
3279+
#: extmod/ulab/code/user/user.c shared-bindings/_eve/__init__.c
32763280
msgid "input must be an ndarray"
32773281
msgstr ""
32783282

@@ -4384,6 +4388,9 @@ msgstr "zi harus berjenis float"
43844388
msgid "zi must be of shape (n_section, 2)"
43854389
msgstr "Zi harus berbentuk (n_section, 2)"
43864390

4391+
#~ msgid "Buffer length must be a multiple of 512"
4392+
#~ msgstr "Panjang buffer harus kelipatan 512"
4393+
43874394
#~ msgid "struct: index out of range"
43884395
#~ msgstr "struct: index keluar dari jangkauan"
43894396

‎locale/circuitpython.pot

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -661,12 +661,12 @@ msgid "Buffer length %d too big. It must be less than %d"
661661
msgstr ""
662662

663663
#: ports/atmel-samd/common-hal/sdioio/SDCard.c
664-
#: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c
665-
msgid "Buffer length must be a multiple of 512"
666-
msgstr ""
667-
664+
#: ports/cxd56/common-hal/sdioio/SDCard.c
665+
#: ports/espressif/common-hal/sdioio/SDCard.c
668666
#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c
669-
msgid "Buffer must be a multiple of 512 bytes"
667+
#: shared-module/sdcardio/SDCard.c
668+
#, c-format
669+
msgid "Buffer must be a multiple of %d bytes"
670670
msgstr ""
671671

672672
#: shared-bindings/_bleio/PacketBuffer.c
@@ -1183,11 +1183,13 @@ msgstr ""
11831183
msgid "Interrupted by output function"
11841184
msgstr ""
11851185

1186+
#: ports/espressif/common-hal/_bleio/Service.c
11861187
#: ports/espressif/common-hal/espulp/ULP.c
11871188
#: ports/espressif/common-hal/microcontroller/Processor.c
11881189
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
11891190
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
11901191
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
1192+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
11911193
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c py/argcheck.c
11921194
#: shared-bindings/digitalio/DigitalInOut.c
11931195
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
@@ -1307,6 +1309,7 @@ msgid "MAC address was invalid"
13071309
msgstr ""
13081310

13091311
#: ports/espressif/common-hal/_bleio/Characteristic.c
1312+
#: ports/espressif/common-hal/_bleio/Descriptor.c
13101313
msgid "MITM security not supported"
13111314
msgstr ""
13121315

@@ -1539,8 +1542,9 @@ msgid "Not supported JPEG standard"
15391542
msgstr ""
15401543

15411544
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
1545+
#: ports/espressif/common-hal/sdioio/SDCard.c
15421546
#, c-format
1543-
msgid "Number of data_pins must be 8 or 16, not %d"
1547+
msgid "Number of data_pins must be %d or %d, not %d"
15441548
msgstr ""
15451549

15461550
#: shared-bindings/util.c
@@ -1864,9 +1868,10 @@ msgstr ""
18641868
msgid "SDIO GetCardInfo Error %d"
18651869
msgstr ""
18661870

1871+
#: ports/espressif/common-hal/sdioio/SDCard.c
18671872
#: ports/stm/common-hal/sdioio/SDCard.c
18681873
#, c-format
1869-
msgid "SDIO Init Error %d"
1874+
msgid "SDIO Init Error %x"
18701875
msgstr ""
18711876

18721877
#: ports/espressif/common-hal/busio/SPI.c
@@ -2242,14 +2247,12 @@ msgid "Update failed"
22422247
msgstr ""
22432248

22442249
#: ports/espressif/common-hal/_bleio/Characteristic.c
2245-
#: ports/espressif/common-hal/_bleio/Descriptor.c
22462250
#: ports/nordic/common-hal/_bleio/Characteristic.c
22472251
#: ports/nordic/common-hal/_bleio/Descriptor.c
22482252
msgid "Value length != required fixed length"
22492253
msgstr ""
22502254

22512255
#: ports/espressif/common-hal/_bleio/Characteristic.c
2252-
#: ports/espressif/common-hal/_bleio/Descriptor.c
22532256
#: ports/nordic/common-hal/_bleio/Characteristic.c
22542257
#: ports/nordic/common-hal/_bleio/Descriptor.c
22552258
msgid "Value length > max_length"
@@ -3098,7 +3101,8 @@ msgstr ""
30983101
msgid "function missing required positional argument #%d"
30993102
msgstr ""
31003103

3101-
#: py/argcheck.c py/bc.c py/objnamedtuple.c shared-bindings/time/__init__.c
3104+
#: py/argcheck.c py/bc.c py/objnamedtuple.c shared-bindings/_eve/__init__.c
3105+
#: shared-bindings/time/__init__.c
31023106
#, c-format
31033107
msgid "function takes %d positional arguments but %d were given"
31043108
msgstr ""
@@ -3250,7 +3254,7 @@ msgstr ""
32503254
msgid "input must be a dense ndarray"
32513255
msgstr ""
32523256

3253-
#: extmod/ulab/code/user/user.c
3257+
#: extmod/ulab/code/user/user.c shared-bindings/_eve/__init__.c
32543258
msgid "input must be an ndarray"
32553259
msgstr ""
32563260

‎locale/cs.po

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -674,13 +674,13 @@ msgid "Buffer length %d too big. It must be less than %d"
674674
msgstr "Délka vyrovnávací paměti %d je příliš velká. Musí být menší než %d"
675675

676676
#: ports/atmel-samd/common-hal/sdioio/SDCard.c
677-
#: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c
678-
msgid "Buffer length must be a multiple of 512"
679-
msgstr "Délka vyrovnávací paměti musí být násobkem 512"
680-
677+
#: ports/cxd56/common-hal/sdioio/SDCard.c
678+
#: ports/espressif/common-hal/sdioio/SDCard.c
681679
#: ports/stm/common-hal/sdioio/SDCard.c shared-bindings/floppyio/__init__.c
682-
msgid "Buffer must be a multiple of 512 bytes"
683-
msgstr "Buffer musí být násobkem 512 bajtů"
680+
#: shared-module/sdcardio/SDCard.c
681+
#, c-format
682+
msgid "Buffer must be a multiple of %d bytes"
683+
msgstr ""
684684

685685
#: shared-bindings/_bleio/PacketBuffer.c
686686
#, c-format
@@ -1203,11 +1203,13 @@ msgstr "Chyba přerušení."
12031203
msgid "Interrupted by output function"
12041204
msgstr ""
12051205

1206+
#: ports/espressif/common-hal/_bleio/Service.c
12061207
#: ports/espressif/common-hal/espulp/ULP.c
12071208
#: ports/espressif/common-hal/microcontroller/Processor.c
12081209
#: ports/mimxrt10xx/common-hal/audiobusio/__init__.c
12091210
#: ports/mimxrt10xx/common-hal/pwmio/PWMOut.c
12101211
#: ports/raspberrypi/bindings/picodvi/Framebuffer.c
1212+
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
12111213
#: ports/raspberrypi/common-hal/picodvi/Framebuffer_RP2040.c py/argcheck.c
12121214
#: shared-bindings/digitalio/DigitalInOut.c
12131215
#: shared-bindings/epaperdisplay/EPaperDisplay.c shared-bindings/pwmio/PWMOut.c
@@ -1327,6 +1329,7 @@ msgid "MAC address was invalid"
13271329
msgstr "MAC adresa byla chybná"
13281330

13291331
#: ports/espressif/common-hal/_bleio/Characteristic.c
1332+
#: ports/espressif/common-hal/_bleio/Descriptor.c
13301333
msgid "MITM security not supported"
13311334
msgstr ""
13321335

@@ -1559,9 +1562,10 @@ msgid "Not supported JPEG standard"
15591562
msgstr ""
15601563

15611564
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
1565+
#: ports/espressif/common-hal/sdioio/SDCard.c
15621566
#, c-format
1563-
msgid "Number of data_pins must be 8 or 16, not %d"
1564-
msgstr "Počet data_pins musí být 8 nebo 16, nikoli %d"
1567+
msgid "Number of data_pins must be %d or %d, not %d"
1568+
msgstr ""
15651569

15661570
#: shared-bindings/util.c
15671571
msgid ""
@@ -1889,10 +1893,11 @@ msgstr "Inicializace SD karty"
18891893
msgid "SDIO GetCardInfo Error %d"
18901894
msgstr "SDIO GetCardInfo chyba %d"
18911895

1896+
#: ports/espressif/common-hal/sdioio/SDCard.c
18921897
#: ports/stm/common-hal/sdioio/SDCard.c
18931898
#, c-format
1894-
msgid "SDIO Init Error %d"
1895-
msgstr "Inicializace SDIO chyba %d"
1899+
msgid "SDIO Init Error %x"
1900+
msgstr ""
18961901

18971902
#: ports/espressif/common-hal/busio/SPI.c
18981903
msgid "SPI configuration failed"
@@ -2268,14 +2273,12 @@ msgid "Update failed"
22682273
msgstr ""
22692274

22702275
#: ports/espressif/common-hal/_bleio/Characteristic.c
2271-
#: ports/espressif/common-hal/_bleio/Descriptor.c
22722276
#: ports/nordic/common-hal/_bleio/Characteristic.c
22732277
#: ports/nordic/common-hal/_bleio/Descriptor.c
22742278
msgid "Value length != required fixed length"
22752279
msgstr ""
22762280

22772281
#: ports/espressif/common-hal/_bleio/Characteristic.c
2278-
#: ports/espressif/common-hal/_bleio/Descriptor.c
22792282
#: ports/nordic/common-hal/_bleio/Characteristic.c
22802283
#: ports/nordic/common-hal/_bleio/Descriptor.c
22812284
msgid "Value length > max_length"
@@ -3129,7 +3132,8 @@ msgstr "funkci chybí argument specifikovaný klíčovým slovem"
31293132
msgid "function missing required positional argument #%d"
31303133
msgstr "funkci chybí požadovaný argument na pozici #%d"
31313134

3132-
#: py/argcheck.c py/bc.c py/objnamedtuple.c shared-bindings/time/__init__.c
3135+
#: py/argcheck.c py/bc.c py/objnamedtuple.c shared-bindings/_eve/__init__.c
3136+
#: shared-bindings/time/__init__.c
31333137
#, c-format
31343138
msgid "function takes %d positional arguments but %d were given"
31353139
msgstr ""
@@ -3281,7 +3285,7 @@ msgstr "vstup musí být 1D ndarray"
32813285
msgid "input must be a dense ndarray"
32823286
msgstr "vstup musí být hustý ndarray"
32833287

3284-
#: extmod/ulab/code/user/user.c
3288+
#: extmod/ulab/code/user/user.c shared-bindings/_eve/__init__.c
32853289
msgid "input must be an ndarray"
32863290
msgstr "vstup musí být ndarray"
32873291

@@ -4393,6 +4397,20 @@ msgstr ""
43934397
msgid "zi must be of shape (n_section, 2)"
43944398
msgstr ""
43954399

4400+
#~ msgid "Buffer length must be a multiple of 512"
4401+
#~ msgstr "Délka vyrovnávací paměti musí být násobkem 512"
4402+
4403+
#~ msgid "Buffer must be a multiple of 512 bytes"
4404+
#~ msgstr "Buffer musí být násobkem 512 bajtů"
4405+
4406+
#, c-format
4407+
#~ msgid "Number of data_pins must be 8 or 16, not %d"
4408+
#~ msgstr "Počet data_pins musí být 8 nebo 16, nikoli %d"
4409+
4410+
#, c-format
4411+
#~ msgid "SDIO Init Error %d"
4412+
#~ msgstr "Inicializace SDIO chyba %d"
4413+
43964414
#~ msgid "Name too long"
43974415
#~ msgstr "Jméno je příliš dlouhé"
43984416

0 commit comments

Comments
 (0)