Skip to content

Commit e6df8e0

Browse files
mahollimaholli
committed
Merge branch 'master' into non-standard-nvm
2 parents 964040b + 90bd931 commit e6df8e0

67 files changed

Lines changed: 5742 additions & 579 deletions

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,14 @@ jobs:
330330
gcc --version
331331
riscv64-unknown-elf-gcc --version
332332
python3 --version
333-
- uses: actions/checkout@v1
333+
- uses: actions/checkout@v2
334334
with:
335335
submodules: true
336+
fetch-depth: 0
337+
- run: git fetch --recurse-submodules=no https://github.com/adafruit/circuitpython refs/tags/*:refs/tags/*
338+
- run: git submodule sync
339+
- run: git submodule foreach git remote -v
340+
- run: git submodule foreach git fetch --recurse-submodules=no origin +refs/tags/*:refs/tags/*
336341
- name: mpy-cross
337342
run: make -C mpy-cross -j2
338343
- name: build

‎docs/shared_bindings_matrix.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def build_module_map():
9898
for module in modules:
9999
full_name = module
100100
search_name = module.lstrip("_")
101-
re_pattern = "CIRCUITPY_{}\s=\s(.+)".format(search_name.upper())
101+
re_pattern = "CIRCUITPY_{}\s*\??=\s*(.+)".format(search_name.upper())
102102
find_config = re.findall(re_pattern, configs)
103103
if not find_config:
104104
continue

‎lib/protomatter‎

‎locale/ID.po‎

Lines changed: 39 additions & 2 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-27 18:34-0700\n"
11+
"POT-Creation-Date: 2020-05-06 17:47+0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -434,6 +434,10 @@ msgstr "buffers harus mempunyai panjang yang sama"
434434
msgid "Bytes must be between 0 and 255."
435435
msgstr ""
436436

437+
#: shared-bindings/aesio/aes.c
438+
msgid "CBC blocks must be multiples of 16 bytes"
439+
msgstr ""
440+
437441
#: py/objtype.c
438442
msgid "Call super().__init__() before accessing native object."
439443
msgstr ""
@@ -671,6 +675,10 @@ msgstr ""
671675
msgid "Drive mode not used when direction is input."
672676
msgstr ""
673677

678+
#: shared-bindings/aesio/aes.c
679+
msgid "ECB only operates on 16 bytes at a time"
680+
msgstr ""
681+
674682
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
675683
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
676684
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
@@ -682,7 +690,7 @@ msgstr "Channel EXTINT sedang digunakan"
682690
msgid "Error in regex"
683691
msgstr "Error pada regex"
684692

685-
#: shared-bindings/microcontroller/Pin.c
693+
#: shared-bindings/aesio/aes.c shared-bindings/microcontroller/Pin.c
686694
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
687695
#: shared-bindings/terminalio/Terminal.c
688696
msgid "Expected a %q"
@@ -809,6 +817,11 @@ msgstr ""
809817
msgid "I2C operation not supported"
810818
msgstr "operasi I2C tidak didukung"
811819

820+
#: shared-bindings/aesio/aes.c
821+
#, c-format
822+
msgid "IV must be %d bytes long"
823+
msgstr ""
824+
812825
#: py/persistentcode.c
813826
msgid ""
814827
"Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/"
@@ -988,6 +1001,10 @@ msgstr ""
9881001
msgid "Invalid word/bit length"
9891002
msgstr ""
9901003

1004+
#: shared-bindings/aesio/aes.c
1005+
msgid "Key must be 16, 24, or 32 bytes long"
1006+
msgstr ""
1007+
9911008
#: py/compile.c
9921009
msgid "LHS of keyword arg must be an id"
9931010
msgstr "LHS dari keyword arg harus menjadi sebuah id"
@@ -1096,6 +1113,10 @@ msgstr "Tidak ada pin TX"
10961113
msgid "No available clocks"
10971114
msgstr ""
10981115

1116+
#: shared-bindings/_bleio/PacketBuffer.c
1117+
msgid "No connection: length cannot be determined"
1118+
msgstr ""
1119+
10991120
#: shared-bindings/board/__init__.c
11001121
msgid "No default %q bus"
11011122
msgstr "Tidak ada standar bus %q"
@@ -1117,6 +1138,10 @@ msgstr ""
11171138
msgid "No hardware support on pin"
11181139
msgstr "Tidak ada dukungan hardware untuk pin"
11191140

1141+
#: shared-bindings/aesio/aes.c
1142+
msgid "No key was specified"
1143+
msgstr ""
1144+
11201145
#: ports/stm/common-hal/pulseio/PWMOut.c
11211146
msgid "No more timers available on this pin."
11221147
msgstr ""
@@ -1298,6 +1323,10 @@ msgstr "sistem file (filesystem) bersifat Read-only"
12981323
msgid "Refresh too soon"
12991324
msgstr ""
13001325

1326+
#: shared-bindings/aesio/aes.c
1327+
msgid "Requested AES mode is unsupported"
1328+
msgstr ""
1329+
13011330
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
13021331
msgid "Right channel unsupported"
13031332
msgstr "Channel Kanan tidak didukung"
@@ -1362,6 +1391,10 @@ msgstr ""
13621391
msgid "Slices not supported"
13631392
msgstr ""
13641393

1394+
#: shared-bindings/aesio/aes.c
1395+
msgid "Source and destination buffers must be the same length"
1396+
msgstr ""
1397+
13651398
#: extmod/modure.c
13661399
msgid "Splitting with sub-captures"
13671400
msgstr "Memisahkan dengan menggunakan sub-captures"
@@ -1445,6 +1478,10 @@ msgstr ""
14451478
msgid "Too many displays"
14461479
msgstr ""
14471480

1481+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
1482+
msgid "Total data to write is larger than outgoing_packet_length"
1483+
msgstr ""
1484+
14481485
#: py/obj.c
14491486
msgid "Traceback (most recent call last):\n"
14501487
msgstr ""

‎locale/circuitpython.pot‎

Lines changed: 39 additions & 2 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-27 18:34-0700\n"
11+
"POT-Creation-Date: 2020-05-06 17:47+0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -429,6 +429,10 @@ msgstr ""
429429
msgid "Bytes must be between 0 and 255."
430430
msgstr ""
431431

432+
#: shared-bindings/aesio/aes.c
433+
msgid "CBC blocks must be multiples of 16 bytes"
434+
msgstr ""
435+
432436
#: py/objtype.c
433437
msgid "Call super().__init__() before accessing native object."
434438
msgstr ""
@@ -660,6 +664,10 @@ msgstr ""
660664
msgid "Drive mode not used when direction is input."
661665
msgstr ""
662666

667+
#: shared-bindings/aesio/aes.c
668+
msgid "ECB only operates on 16 bytes at a time"
669+
msgstr ""
670+
663671
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
664672
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
665673
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
@@ -671,7 +679,7 @@ msgstr ""
671679
msgid "Error in regex"
672680
msgstr ""
673681

674-
#: shared-bindings/microcontroller/Pin.c
682+
#: shared-bindings/aesio/aes.c shared-bindings/microcontroller/Pin.c
675683
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
676684
#: shared-bindings/terminalio/Terminal.c
677685
msgid "Expected a %q"
@@ -798,6 +806,11 @@ msgstr ""
798806
msgid "I2C operation not supported"
799807
msgstr ""
800808

809+
#: shared-bindings/aesio/aes.c
810+
#, c-format
811+
msgid "IV must be %d bytes long"
812+
msgstr ""
813+
801814
#: py/persistentcode.c
802815
msgid ""
803816
"Incompatible .mpy file. Please update all .mpy files. See http://adafru.it/"
@@ -977,6 +990,10 @@ msgstr ""
977990
msgid "Invalid word/bit length"
978991
msgstr ""
979992

993+
#: shared-bindings/aesio/aes.c
994+
msgid "Key must be 16, 24, or 32 bytes long"
995+
msgstr ""
996+
980997
#: py/compile.c
981998
msgid "LHS of keyword arg must be an id"
982999
msgstr ""
@@ -1085,6 +1102,10 @@ msgstr ""
10851102
msgid "No available clocks"
10861103
msgstr ""
10871104

1105+
#: shared-bindings/_bleio/PacketBuffer.c
1106+
msgid "No connection: length cannot be determined"
1107+
msgstr ""
1108+
10881109
#: shared-bindings/board/__init__.c
10891110
msgid "No default %q bus"
10901111
msgstr ""
@@ -1106,6 +1127,10 @@ msgstr ""
11061127
msgid "No hardware support on pin"
11071128
msgstr ""
11081129

1130+
#: shared-bindings/aesio/aes.c
1131+
msgid "No key was specified"
1132+
msgstr ""
1133+
11091134
#: ports/stm/common-hal/pulseio/PWMOut.c
11101135
msgid "No more timers available on this pin."
11111136
msgstr ""
@@ -1283,6 +1308,10 @@ msgstr ""
12831308
msgid "Refresh too soon"
12841309
msgstr ""
12851310

1311+
#: shared-bindings/aesio/aes.c
1312+
msgid "Requested AES mode is unsupported"
1313+
msgstr ""
1314+
12861315
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
12871316
msgid "Right channel unsupported"
12881317
msgstr ""
@@ -1346,6 +1375,10 @@ msgstr ""
13461375
msgid "Slices not supported"
13471376
msgstr ""
13481377

1378+
#: shared-bindings/aesio/aes.c
1379+
msgid "Source and destination buffers must be the same length"
1380+
msgstr ""
1381+
13491382
#: extmod/modure.c
13501383
msgid "Splitting with sub-captures"
13511384
msgstr ""
@@ -1429,6 +1462,10 @@ msgstr ""
14291462
msgid "Too many displays"
14301463
msgstr ""
14311464

1465+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
1466+
msgid "Total data to write is larger than outgoing_packet_length"
1467+
msgstr ""
1468+
14321469
#: py/obj.c
14331470
msgid "Traceback (most recent call last):\n"
14341471
msgstr ""

0 commit comments

Comments
 (0)