Skip to content

Commit c6c7772

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/master' into stm32-docfix
2 parents 8791ca6 + ead7c6c commit c6c7772

File tree

85 files changed

+2537
-451
lines changed

Some content is hidden

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

85 files changed

+2537
-451
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ jobs:
200200
- "monster_m4sk"
201201
- "ndgarage_ndbit6"
202202
- "nfc_copy_cat"
203+
- "nucleo_f746zg"
203204
- "nucleo_f767zi"
204205
- "nucleo_h743zi_2"
205206
- "ohs2020_badge"

‎locale/ID.po

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-04-15 10:24-0400\n"
11+
"POT-Creation-Date: 2020-04-17 18:44-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -53,7 +53,7 @@ msgstr "output:\n"
5353
msgid "%%c requires int or char"
5454
msgstr ""
5555

56-
#: shared-bindings/_protomatter/Protomatter.c
56+
#: shared-bindings/rgbmatrix/RGBMatrix.c
5757
#, c-format
5858
msgid "%d address pins and %d rgb pins indicate a height of %d, not %d"
5959
msgstr ""
@@ -328,7 +328,7 @@ msgstr ""
328328
msgid "Array values should be single bytes."
329329
msgstr ""
330330

331-
#: shared-bindings/_protomatter/Protomatter.c
331+
#: shared-bindings/rgbmatrix/RGBMatrix.c
332332
msgid "At most %d %q may be specified (not %d)"
333333
msgstr ""
334334

@@ -365,9 +365,9 @@ msgstr ""
365365
msgid "Both pins must support hardware interrupts"
366366
msgstr "Kedua pin harus mendukung hardware interrut"
367367

368-
#: shared-bindings/_protomatter/Protomatter.c
369368
#: shared-bindings/displayio/Display.c
370369
#: shared-bindings/framebufferio/FramebufferDisplay.c
370+
#: shared-bindings/rgbmatrix/RGBMatrix.c
371371
msgid "Brightness must be 0-1.0"
372372
msgstr ""
373373

@@ -834,6 +834,11 @@ msgstr ""
834834
msgid "Internal define error"
835835
msgstr ""
836836

837+
#: shared-module/rgbmatrix/RGBMatrix.c
838+
#, c-format
839+
msgid "Internal error #%d"
840+
msgstr ""
841+
837842
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
838843
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
839844
msgid "Invalid %q pin"
@@ -869,7 +874,7 @@ msgstr ""
869874
msgid "Invalid UART pin selection"
870875
msgstr ""
871876

872-
#: py/moduerrno.c shared-module/_protomatter/Protomatter.c
877+
#: py/moduerrno.c shared-module/rgbmatrix/RGBMatrix.c
873878
msgid "Invalid argument"
874879
msgstr ""
875880

@@ -924,7 +929,7 @@ msgstr ""
924929

925930
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
926931
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
927-
#: shared-bindings/pulseio/PWMOut.c shared-module/_protomatter/Protomatter.c
932+
#: shared-bindings/pulseio/PWMOut.c shared-module/rgbmatrix/RGBMatrix.c
928933
msgid "Invalid pin"
929934
msgstr "Pin tidak valid"
930935

@@ -1039,7 +1044,7 @@ msgstr ""
10391044
msgid "Must provide MISO or MOSI pin"
10401045
msgstr ""
10411046

1042-
#: shared-bindings/_protomatter/Protomatter.c
1047+
#: shared-bindings/rgbmatrix/RGBMatrix.c
10431048
#, c-format
10441049
msgid "Must use a multiple of 6 rgb pins, not %d"
10451050
msgstr ""
@@ -1127,7 +1132,7 @@ msgstr ""
11271132
msgid "No such file/directory"
11281133
msgstr ""
11291134

1130-
#: shared-module/_protomatter/Protomatter.c
1135+
#: shared-module/rgbmatrix/RGBMatrix.c
11311136
msgid "No timer available"
11321137
msgstr ""
11331138

@@ -1207,7 +1212,7 @@ msgstr "Pin tidak mempunya kemampuan untuk ADC (Analog Digital Converter)"
12071212
msgid "Pin number already reserved by EXTI"
12081213
msgstr ""
12091214

1210-
#: shared-bindings/_protomatter/Protomatter.c
1215+
#: shared-bindings/rgbmatrix/RGBMatrix.c
12111216
#, c-format
12121217
msgid ""
12131218
"Pinout uses %d bytes per element, which consumes more than the ideal %d "
@@ -1233,11 +1238,6 @@ msgstr ""
12331238
"Tekan tombol apa saja untuk masuk ke dalam REPL. Gunakan CTRL+D untuk reset "
12341239
"(Reload)"
12351240

1236-
#: shared-module/_protomatter/Protomatter.c
1237-
#, c-format
1238-
msgid "Protomatter internal error #%d"
1239-
msgstr ""
1240-
12411241
#: shared-bindings/digitalio/DigitalInOut.c
12421242
msgid "Pull not used when direction is output."
12431243
msgstr ""
@@ -2817,12 +2817,12 @@ msgstr "anotasi return harus sebuah identifier"
28172817
msgid "return expected '%q' but got '%q'"
28182818
msgstr ""
28192819

2820-
#: shared-bindings/_protomatter/Protomatter.c
2820+
#: shared-bindings/rgbmatrix/RGBMatrix.c
28212821
#, c-format
28222822
msgid "rgb_pins[%d] duplicates another pin assignment"
28232823
msgstr ""
28242824

2825-
#: shared-bindings/_protomatter/Protomatter.c
2825+
#: shared-bindings/rgbmatrix/RGBMatrix.c
28262826
#, c-format
28272827
msgid "rgb_pins[%d] is not on the same port as clock"
28282828
msgstr ""

‎locale/circuitpython.pot

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-04-15 12:24-0400\n"
11+
"POT-Creation-Date: 2020-04-17 18:44-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -53,7 +53,7 @@ msgstr ""
5353
msgid "%%c requires int or char"
5454
msgstr ""
5555

56-
#: shared-bindings/_protomatter/Protomatter.c
56+
#: shared-bindings/rgbmatrix/RGBMatrix.c
5757
#, c-format
5858
msgid "%d address pins and %d rgb pins indicate a height of %d, not %d"
5959
msgstr ""
@@ -326,7 +326,7 @@ msgstr ""
326326
msgid "Array values should be single bytes."
327327
msgstr ""
328328

329-
#: shared-bindings/_protomatter/Protomatter.c
329+
#: shared-bindings/rgbmatrix/RGBMatrix.c
330330
msgid "At most %d %q may be specified (not %d)"
331331
msgstr ""
332332

@@ -361,9 +361,9 @@ msgstr ""
361361
msgid "Both pins must support hardware interrupts"
362362
msgstr ""
363363

364-
#: shared-bindings/_protomatter/Protomatter.c
365364
#: shared-bindings/displayio/Display.c
366365
#: shared-bindings/framebufferio/FramebufferDisplay.c
366+
#: shared-bindings/rgbmatrix/RGBMatrix.c
367367
msgid "Brightness must be 0-1.0"
368368
msgstr ""
369369

@@ -823,6 +823,11 @@ msgstr ""
823823
msgid "Internal define error"
824824
msgstr ""
825825

826+
#: shared-module/rgbmatrix/RGBMatrix.c
827+
#, c-format
828+
msgid "Internal error #%d"
829+
msgstr ""
830+
826831
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
827832
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
828833
msgid "Invalid %q pin"
@@ -858,7 +863,7 @@ msgstr ""
858863
msgid "Invalid UART pin selection"
859864
msgstr ""
860865

861-
#: py/moduerrno.c shared-module/_protomatter/Protomatter.c
866+
#: py/moduerrno.c shared-module/rgbmatrix/RGBMatrix.c
862867
msgid "Invalid argument"
863868
msgstr ""
864869

@@ -913,7 +918,7 @@ msgstr ""
913918

914919
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
915920
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
916-
#: shared-bindings/pulseio/PWMOut.c shared-module/_protomatter/Protomatter.c
921+
#: shared-bindings/pulseio/PWMOut.c shared-module/rgbmatrix/RGBMatrix.c
917922
msgid "Invalid pin"
918923
msgstr ""
919924

@@ -1028,7 +1033,7 @@ msgstr ""
10281033
msgid "Must provide MISO or MOSI pin"
10291034
msgstr ""
10301035

1031-
#: shared-bindings/_protomatter/Protomatter.c
1036+
#: shared-bindings/rgbmatrix/RGBMatrix.c
10321037
#, c-format
10331038
msgid "Must use a multiple of 6 rgb pins, not %d"
10341039
msgstr ""
@@ -1116,7 +1121,7 @@ msgstr ""
11161121
msgid "No such file/directory"
11171122
msgstr ""
11181123

1119-
#: shared-module/_protomatter/Protomatter.c
1124+
#: shared-module/rgbmatrix/RGBMatrix.c
11201125
msgid "No timer available"
11211126
msgstr ""
11221127

@@ -1195,7 +1200,7 @@ msgstr ""
11951200
msgid "Pin number already reserved by EXTI"
11961201
msgstr ""
11971202

1198-
#: shared-bindings/_protomatter/Protomatter.c
1203+
#: shared-bindings/rgbmatrix/RGBMatrix.c
11991204
#, c-format
12001205
msgid ""
12011206
"Pinout uses %d bytes per element, which consumes more than the ideal %d "
@@ -1219,11 +1224,6 @@ msgstr ""
12191224
msgid "Press any key to enter the REPL. Use CTRL-D to reload."
12201225
msgstr ""
12211226

1222-
#: shared-module/_protomatter/Protomatter.c
1223-
#, c-format
1224-
msgid "Protomatter internal error #%d"
1225-
msgstr ""
1226-
12271227
#: shared-bindings/digitalio/DigitalInOut.c
12281228
msgid "Pull not used when direction is output."
12291229
msgstr ""
@@ -2792,12 +2792,12 @@ msgstr ""
27922792
msgid "return expected '%q' but got '%q'"
27932793
msgstr ""
27942794

2795-
#: shared-bindings/_protomatter/Protomatter.c
2795+
#: shared-bindings/rgbmatrix/RGBMatrix.c
27962796
#, c-format
27972797
msgid "rgb_pins[%d] duplicates another pin assignment"
27982798
msgstr ""
27992799

2800-
#: shared-bindings/_protomatter/Protomatter.c
2800+
#: shared-bindings/rgbmatrix/RGBMatrix.c
28012801
#, c-format
28022802
msgid "rgb_pins[%d] is not on the same port as clock"
28032803
msgstr ""

‎locale/de_DE.po

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-04-15 10:24-0400\n"
10+
"POT-Creation-Date: 2020-04-17 18:44-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -55,7 +55,7 @@ msgstr " Ausgabe:\n"
5555
msgid "%%c requires int or char"
5656
msgstr "%%c erwartet int oder char"
5757

58-
#: shared-bindings/_protomatter/Protomatter.c
58+
#: shared-bindings/rgbmatrix/RGBMatrix.c
5959
#, c-format
6060
msgid "%d address pins and %d rgb pins indicate a height of %d, not %d"
6161
msgstr ""
@@ -328,7 +328,7 @@ msgstr "Array muss Halbwörter enthalten (type 'H')"
328328
msgid "Array values should be single bytes."
329329
msgstr "Array-Werte sollten aus Einzelbytes bestehen."
330330

331-
#: shared-bindings/_protomatter/Protomatter.c
331+
#: shared-bindings/rgbmatrix/RGBMatrix.c
332332
msgid "At most %d %q may be specified (not %d)"
333333
msgstr ""
334334

@@ -365,9 +365,9 @@ msgstr "Bit depth muss ein Vielfaches von 8 sein."
365365
msgid "Both pins must support hardware interrupts"
366366
msgstr "Beide pins müssen Hardware Interrupts unterstützen"
367367

368-
#: shared-bindings/_protomatter/Protomatter.c
369368
#: shared-bindings/displayio/Display.c
370369
#: shared-bindings/framebufferio/FramebufferDisplay.c
370+
#: shared-bindings/rgbmatrix/RGBMatrix.c
371371
msgid "Brightness must be 0-1.0"
372372
msgstr "Die Helligkeit muss zwischen 0 und 1.0 liegen"
373373

@@ -831,6 +831,11 @@ msgstr ""
831831
msgid "Internal define error"
832832
msgstr ""
833833

834+
#: shared-module/rgbmatrix/RGBMatrix.c
835+
#, c-format
836+
msgid "Internal error #%d"
837+
msgstr ""
838+
834839
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
835840
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
836841
msgid "Invalid %q pin"
@@ -866,7 +871,7 @@ msgstr ""
866871
msgid "Invalid UART pin selection"
867872
msgstr ""
868873

869-
#: py/moduerrno.c shared-module/_protomatter/Protomatter.c
874+
#: py/moduerrno.c shared-module/rgbmatrix/RGBMatrix.c
870875
msgid "Invalid argument"
871876
msgstr "Ungültiges Argument"
872877

@@ -921,7 +926,7 @@ msgstr "Ungültige Phase"
921926

922927
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
923928
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
924-
#: shared-bindings/pulseio/PWMOut.c shared-module/_protomatter/Protomatter.c
929+
#: shared-bindings/pulseio/PWMOut.c shared-module/rgbmatrix/RGBMatrix.c
925930
msgid "Invalid pin"
926931
msgstr "Ungültiger Pin"
927932

@@ -1037,7 +1042,7 @@ msgstr "Muss eine %q Unterklasse sein."
10371042
msgid "Must provide MISO or MOSI pin"
10381043
msgstr ""
10391044

1040-
#: shared-bindings/_protomatter/Protomatter.c
1045+
#: shared-bindings/rgbmatrix/RGBMatrix.c
10411046
#, c-format
10421047
msgid "Must use a multiple of 6 rgb pins, not %d"
10431048
msgstr ""
@@ -1125,7 +1130,7 @@ msgstr "Kein Speicherplatz mehr verfügbar auf dem Gerät"
11251130
msgid "No such file/directory"
11261131
msgstr "Keine solche Datei/Verzeichnis"
11271132

1128-
#: shared-module/_protomatter/Protomatter.c
1133+
#: shared-module/rgbmatrix/RGBMatrix.c
11291134
msgid "No timer available"
11301135
msgstr ""
11311136

@@ -1210,7 +1215,7 @@ msgstr "Pin hat keine ADC Funktionalität"
12101215
msgid "Pin number already reserved by EXTI"
12111216
msgstr ""
12121217

1213-
#: shared-bindings/_protomatter/Protomatter.c
1218+
#: shared-bindings/rgbmatrix/RGBMatrix.c
12141219
#, c-format
12151220
msgid ""
12161221
"Pinout uses %d bytes per element, which consumes more than the ideal %d "
@@ -1236,11 +1241,6 @@ msgstr ""
12361241
"Drücke eine Taste um dich mit der REPL zu verbinden. Drücke Strg-D zum neu "
12371242
"laden"
12381243

1239-
#: shared-module/_protomatter/Protomatter.c
1240-
#, c-format
1241-
msgid "Protomatter internal error #%d"
1242-
msgstr ""
1243-
12441244
#: shared-bindings/digitalio/DigitalInOut.c
12451245
msgid "Pull not used when direction is output."
12461246
msgstr "Pull wird nicht verwendet, wenn die Richtung output ist."
@@ -2830,12 +2830,12 @@ msgstr "return annotation muss ein identifier sein"
28302830
msgid "return expected '%q' but got '%q'"
28312831
msgstr ""
28322832

2833-
#: shared-bindings/_protomatter/Protomatter.c
2833+
#: shared-bindings/rgbmatrix/RGBMatrix.c
28342834
#, c-format
28352835
msgid "rgb_pins[%d] duplicates another pin assignment"
28362836
msgstr ""
28372837

2838-
#: shared-bindings/_protomatter/Protomatter.c
2838+
#: shared-bindings/rgbmatrix/RGBMatrix.c
28392839
#, c-format
28402840
msgid "rgb_pins[%d] is not on the same port as clock"
28412841
msgstr ""

0 commit comments

Comments
 (0)