Skip to content

Commit b74e78d

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/master' into stm32-cpython-compat
2 parents b778aee + a10cd85 commit b74e78d

File tree

137 files changed

+9249
-111
lines changed

Some content is hidden

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

137 files changed

+9249
-111
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,16 @@ jobs:
102102
- "feather_m0_rfm9x"
103103
- "feather_m0_supersized"
104104
- "feather_m4_express"
105+
- "feather_mimxrt1011"
106+
- "feather_mimxrt1062"
105107
- "feather_nrf52840_express"
106108
- "feather_radiofruit_zigbee"
107109
- "feather_stm32f405_express"
108110
- "gemma_m0"
109111
- "grandcentral_m4_express"
110112
- "hallowing_m0_express"
111113
- "hallowing_m4_express"
114+
- "imxrt1010_evk"
112115
- "itsybitsy_m0_express"
113116
- "itsybitsy_m4_express"
114117
- "itsybitsy_nrf52840_express"

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,6 @@
108108
[submodule "lib/mp3"]
109109
path = lib/mp3
110110
url = https://github.com/adafruit/Adafruit_MP3
111+
[submodule "ports/mimxrt10xx/sdk"]
112+
path = ports/mimxrt10xx/sdk
113+
url = https://github.com/arturo182/MIMXRT10xx_SDK

‎conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@
131131
"ports/esp8266/common-hal",
132132
"ports/esp8266/modules",
133133
"ports/minimal",
134+
"ports/mimxrt10xx/peripherals",
135+
"ports/mimxrt10xx/sdk",
134136
"ports/nrf/device",
135137
"ports/nrf/bluetooth",
136138
"ports/nrf/modules",

‎docs/shared_bindings_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import re
2727

2828

29-
SUPPORTED_PORTS = ["atmel-samd", "nrf"]
29+
SUPPORTED_PORTS = ["atmel-samd", "nrf", "mimxrt10xx"]
3030

3131

3232
def parse_port_config(contents, chip_keyword=None):

‎docs/supported_ports.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ and ESP8266.
88
:maxdepth: 2
99

1010
../ports/atmel-samd/README
11+
../ports/mimxrt10xx/README
1112
../ports/nrf/README
1213
../ports/stm32f4/README
1314
../ports/cxd56/README

‎frozen/Adafruit_CircuitPython_BusDevice

‎frozen/Adafruit_CircuitPython_HID

‎locale/ID.po

Lines changed: 12 additions & 3 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-01-01 17:29-0500\n"
11+
"POT-Creation-Date: 2020-01-07 14:31-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"
@@ -66,7 +66,8 @@ msgid "%q indices must be integers, not %s"
6666
msgstr ""
6767

6868
#: shared-bindings/_bleio/CharacteristicBuffer.c
69-
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
69+
#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
70+
#: shared-bindings/displayio/Shape.c
7071
#, fuzzy
7172
msgid "%q must be >= 1"
7273
msgstr "buffers harus mempunyai panjang yang sama"
@@ -377,6 +378,10 @@ msgstr ""
377378
msgid "Buffer must be at least length 1"
378379
msgstr ""
379380

381+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
382+
msgid "Buffer too large and unable to allocate"
383+
msgstr ""
384+
380385
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
381386
#: ports/nrf/common-hal/displayio/ParallelBus.c
382387
#, fuzzy, c-format
@@ -596,7 +601,7 @@ msgid "Expected a %q"
596601
msgstr ""
597602

598603
#: shared-bindings/_bleio/CharacteristicBuffer.c
599-
#: shared-bindings/_bleio/Descriptor.c
604+
#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
600605
msgid "Expected a Characteristic"
601606
msgstr ""
602607

@@ -1325,6 +1330,10 @@ msgstr ""
13251330
"\n"
13261331
"Untuk menampilkan modul built-in silahkan ketik `help(\"modules\")`.\n"
13271332

1333+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
1334+
msgid "Writes not supported on Characteristic"
1335+
msgstr ""
1336+
13281337
#: supervisor/shared/safe_mode.c
13291338
msgid "You are in safe mode: something unanticipated happened.\n"
13301339
msgstr ""

‎locale/circuitpython.pot

Lines changed: 12 additions & 3 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-01-01 17:29-0500\n"
11+
"POT-Creation-Date: 2020-01-07 14:31-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"
@@ -66,7 +66,8 @@ msgid "%q indices must be integers, not %s"
6666
msgstr ""
6767

6868
#: shared-bindings/_bleio/CharacteristicBuffer.c
69-
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
69+
#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
70+
#: shared-bindings/displayio/Shape.c
7071
msgid "%q must be >= 1"
7172
msgstr ""
7273

@@ -373,6 +374,10 @@ msgstr ""
373374
msgid "Buffer must be at least length 1"
374375
msgstr ""
375376

377+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
378+
msgid "Buffer too large and unable to allocate"
379+
msgstr ""
380+
376381
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
377382
#: ports/nrf/common-hal/displayio/ParallelBus.c
378383
#, c-format
@@ -585,7 +590,7 @@ msgid "Expected a %q"
585590
msgstr ""
586591

587592
#: shared-bindings/_bleio/CharacteristicBuffer.c
588-
#: shared-bindings/_bleio/Descriptor.c
593+
#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
589594
msgid "Expected a Characteristic"
590595
msgstr ""
591596

@@ -1302,6 +1307,10 @@ msgid ""
13021307
"To list built-in modules please do `help(\"modules\")`.\n"
13031308
msgstr ""
13041309

1310+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
1311+
msgid "Writes not supported on Characteristic"
1312+
msgstr ""
1313+
13051314
#: supervisor/shared/safe_mode.c
13061315
msgid "You are in safe mode: something unanticipated happened.\n"
13071316
msgstr ""

‎locale/de_DE.po

Lines changed: 12 additions & 3 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-01-01 17:29-0500\n"
10+
"POT-Creation-Date: 2020-01-07 14:31-0800\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"
@@ -68,7 +68,8 @@ msgid "%q indices must be integers, not %s"
6868
msgstr "%q Indizes müssen ganze Zahlen sein, nicht %s"
6969

7070
#: shared-bindings/_bleio/CharacteristicBuffer.c
71-
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
71+
#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
72+
#: shared-bindings/displayio/Shape.c
7273
msgid "%q must be >= 1"
7374
msgstr "%q muss >= 1 sein"
7475

@@ -377,6 +378,10 @@ msgstr "Die Pufferlänge %d ist zu groß. Sie muss kleiner als %d sein."
377378
msgid "Buffer must be at least length 1"
378379
msgstr "Der Puffer muss eine Mindestenslänge von 1 haben"
379380

381+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
382+
msgid "Buffer too large and unable to allocate"
383+
msgstr ""
384+
380385
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
381386
#: ports/nrf/common-hal/displayio/ParallelBus.c
382387
#, c-format
@@ -589,7 +594,7 @@ msgid "Expected a %q"
589594
msgstr "Erwartet ein(e) %q"
590595

591596
#: shared-bindings/_bleio/CharacteristicBuffer.c
592-
#: shared-bindings/_bleio/Descriptor.c
597+
#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
593598
msgid "Expected a Characteristic"
594599
msgstr "Characteristic wird erwartet"
595600

@@ -1330,6 +1335,10 @@ msgstr ""
13301335
"Um die integrierten Module aufzulisten, führe bitte `help(\"modules\")` "
13311336
"aus.\n"
13321337

1338+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
1339+
msgid "Writes not supported on Characteristic"
1340+
msgstr ""
1341+
13331342
#: supervisor/shared/safe_mode.c
13341343
msgid "You are in safe mode: something unanticipated happened.\n"
13351344
msgstr ""

‎locale/en_US.po

Lines changed: 12 additions & 3 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-01-01 17:29-0500\n"
10+
"POT-Creation-Date: 2020-01-07 14:31-0800\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -66,7 +66,8 @@ msgid "%q indices must be integers, not %s"
6666
msgstr ""
6767

6868
#: shared-bindings/_bleio/CharacteristicBuffer.c
69-
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
69+
#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
70+
#: shared-bindings/displayio/Shape.c
7071
msgid "%q must be >= 1"
7172
msgstr ""
7273

@@ -373,6 +374,10 @@ msgstr ""
373374
msgid "Buffer must be at least length 1"
374375
msgstr ""
375376

377+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
378+
msgid "Buffer too large and unable to allocate"
379+
msgstr ""
380+
376381
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
377382
#: ports/nrf/common-hal/displayio/ParallelBus.c
378383
#, c-format
@@ -585,7 +590,7 @@ msgid "Expected a %q"
585590
msgstr ""
586591

587592
#: shared-bindings/_bleio/CharacteristicBuffer.c
588-
#: shared-bindings/_bleio/Descriptor.c
593+
#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
589594
msgid "Expected a Characteristic"
590595
msgstr ""
591596

@@ -1302,6 +1307,10 @@ msgid ""
13021307
"To list built-in modules please do `help(\"modules\")`.\n"
13031308
msgstr ""
13041309

1310+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
1311+
msgid "Writes not supported on Characteristic"
1312+
msgstr ""
1313+
13051314
#: supervisor/shared/safe_mode.c
13061315
msgid "You are in safe mode: something unanticipated happened.\n"
13071316
msgstr ""

‎locale/en_x_pirate.po

Lines changed: 12 additions & 3 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-01-01 17:29-0500\n"
10+
"POT-Creation-Date: 2020-01-07 14:31-0800\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -68,7 +68,8 @@ msgid "%q indices must be integers, not %s"
6868
msgstr ""
6969

7070
#: shared-bindings/_bleio/CharacteristicBuffer.c
71-
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
71+
#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
72+
#: shared-bindings/displayio/Shape.c
7273
msgid "%q must be >= 1"
7374
msgstr ""
7475

@@ -377,6 +378,10 @@ msgstr ""
377378
msgid "Buffer must be at least length 1"
378379
msgstr ""
379380

381+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
382+
msgid "Buffer too large and unable to allocate"
383+
msgstr ""
384+
380385
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
381386
#: ports/nrf/common-hal/displayio/ParallelBus.c
382387
#, c-format
@@ -589,7 +594,7 @@ msgid "Expected a %q"
589594
msgstr ""
590595

591596
#: shared-bindings/_bleio/CharacteristicBuffer.c
592-
#: shared-bindings/_bleio/Descriptor.c
597+
#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
593598
msgid "Expected a Characteristic"
594599
msgstr ""
595600

@@ -1306,6 +1311,10 @@ msgid ""
13061311
"To list built-in modules please do `help(\"modules\")`.\n"
13071312
msgstr ""
13081313

1314+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
1315+
msgid "Writes not supported on Characteristic"
1316+
msgstr ""
1317+
13091318
#: supervisor/shared/safe_mode.c
13101319
msgid "You are in safe mode: something unanticipated happened.\n"
13111320
msgstr ""

‎locale/es.po

Lines changed: 12 additions & 3 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-01-01 17:29-0500\n"
10+
"POT-Creation-Date: 2020-01-07 14:31-0800\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -68,7 +68,8 @@ msgid "%q indices must be integers, not %s"
6868
msgstr "%q indices deben ser enteros, no %s"
6969

7070
#: shared-bindings/_bleio/CharacteristicBuffer.c
71-
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
71+
#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
72+
#: shared-bindings/displayio/Shape.c
7273
msgid "%q must be >= 1"
7374
msgstr "%q debe ser >= 1"
7475

@@ -379,6 +380,10 @@ msgstr ""
379380
msgid "Buffer must be at least length 1"
380381
msgstr "Buffer debe ser de longitud 1 como minimo"
381382

383+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
384+
msgid "Buffer too large and unable to allocate"
385+
msgstr ""
386+
382387
#: ports/atmel-samd/common-hal/displayio/ParallelBus.c
383388
#: ports/nrf/common-hal/displayio/ParallelBus.c
384389
#, c-format
@@ -591,7 +596,7 @@ msgid "Expected a %q"
591596
msgstr "Se espera un %q"
592597

593598
#: shared-bindings/_bleio/CharacteristicBuffer.c
594-
#: shared-bindings/_bleio/Descriptor.c
599+
#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
595600
msgid "Expected a Characteristic"
596601
msgstr "Se esperaba una Característica."
597602

@@ -1327,6 +1332,10 @@ msgstr ""
13271332
"\n"
13281333
"Para listar los módulos incorporados por favor haga `help(\"modules\")`.\n"
13291334

1335+
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
1336+
msgid "Writes not supported on Characteristic"
1337+
msgstr ""
1338+
13301339
#: supervisor/shared/safe_mode.c
13311340
msgid "You are in safe mode: something unanticipated happened.\n"
13321341
msgstr ""

0 commit comments

Comments
 (0)