Merge remote-tracking branch 'upstream/main' into stm-alarm

extmod/ulab

@@ -1 +1 @@
-Subproject commit 743d86487c83e42024ed508ed50499ad0a527d5d
+Subproject commit b64fa6d4c73287edef9ccf09cfd6ec5009f9628b

frozen/Adafruit_CircuitPython_FocalTouch

@@ -1 +1 @@
-Subproject commit 1e3312ab1cba0b1d3bb1f559c52acfdc1a6d57b8
+Subproject commit 0cfa671b0c38386ba4da59119d61d399faa9b358

frozen/Adafruit_CircuitPython_Register

@@ -1 +1 @@
-Subproject commit dd7cc167c528a94a9feed81f9c52b5d372f68258
+Subproject commit 5fee6e0c3878110844bc51e16063eeae7d94c457

frozen/pew-pewpew-standalone-10.x

@@ -1 +1 @@
-Subproject commit a14da2e1ced1010a0da65f758199ff08eedd0bd5
+Subproject commit 88b8be84b5dce7660f58c02a63263f1d2ff0709f

lib/mp3

@@ -1 +1 @@
-Subproject commit bc58a654964c799e972719a63ff12694998f3549
+Subproject commit 7a5de1ad777e95b0f4fab7bbd35678c7d319b1b5

lib/protomatter

@@ -1 +1 @@
-Subproject commit 5e925cea7a55273e375a6129761cb29b4e750d4f
+Subproject commit c2c81ded118484f8925bf81e270b416739cd72d9

lib/tinyusb

@@ -1 +1 @@
-Subproject commit 045674745afa59028fbeed6dac5cb5a9c4a6033e
+Subproject commit 2adb7e719316b12c53a907153cfa0056db1abd70

locale/zh_Latn_pinyin.po

@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: circuitpython-cn\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-03-16 00:47+0000\n"
+"PO-Revision-Date: 2021-03-29 08:26+0000\n"
 "Last-Translator: hexthat <hexthat@gmail.com>\n"
 "Language-Team: Chinese Hanyu Pinyin\n"
 "Language: zh_Latn_pinyin\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.5.2-dev\n"
+"X-Generator: Weblate 4.6-dev\n"
 
 #: main.c
 msgid ""
@@ -350,7 +350,7 @@ msgstr "Suǒyǒu UART wàiwéi zhèngzài shǐyòng"
 
 #: shared-bindings/pwmio/PWMOut.c
 msgid "All channels in use"
-msgstr ""
+msgstr "suǒ yǒu shǐ yòng de tōng dào"
 
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "All event channels in use"
@@ -2882,7 +2882,7 @@ msgstr "chā yì shùn xù fàn wéi"
 
 #: extmod/ulab/code/linalg/linalg.c
 msgid "dimensions do not match"
-msgstr ""
+msgstr "chǐ cùn bù pǐ pèi"
 
 #: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c
 #: shared-bindings/math/__init__.c
@@ -3245,7 +3245,7 @@ msgstr "wúxiào de cānshù"
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid bits_per_pixel %d, must be, 1, 4, 8, 16, 24, or 32"
-msgstr ""
+msgstr "wú xiào bits_per_pixel %d， bì xū shì, 1, 4, 8, 16, 24, huò 32"
 
 #: extmod/modussl_axtls.c
 msgid "invalid cert"
@@ -3258,12 +3258,12 @@ msgstr "dupterm suǒyǐn wúxiào"
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element size %d for bits_per_pixel %d\n"
-msgstr ""
+msgstr "wú xiào yuán jiàn dà xiǎo %d wéi bits_per_pixel %d\n"
 
 #: shared-bindings/bitmaptools/__init__.c
 #, c-format
 msgid "invalid element_size %d, must be, 1, 2, or 4"
-msgstr ""
+msgstr "wú xiào element_size %d, bì xū shì, 1, 2, huò 4"
 
 #: extmod/modframebuf.c
 msgid "invalid format"

ports/esp32s2/esp-idf

@@ -1 +1 @@
-Subproject commit ebe7784258d8c10e9cc334ccc00c3fd270746c8b
+Subproject commit f30a865fd1a44d880b909b84112f74741412c2ce

ports/mimxrt10xx/boards/metro_m7_1011/pins.c

@@ -42,10 +42,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO_AD_03) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO_AD_04) },
 
-    // UART
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO_10) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO_09) },
-
     // I2C
     { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO_01) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO_02) },

ports/raspberrypi/sdk

@@ -1 +1 @@
-Subproject commit 55346c953012ef5b32f392fea3b42814db8df2a5
+Subproject commit f998690e65c5df740ef71cd167733dc8c6a11bdd

tools/usb_descriptor

@@ -1 +1 @@
-Subproject commit 701cafc50e2e574dccaf7a340eedbd64a0b41a42
+Subproject commit 2eaa6114b209fe7f0a795eda8d6a7b3b93d76d2e