Skip to content

Commit dbd3a77

Browse files
tannewttannewt
authored
Merge pull request micropython#1375 from dhalbert/uart-timeout-interrupt
allow KeyboardInterrupt on UART read; fix nrf UART pin claiming; rename feather 52840 UART pins
2 parents 7f6da78 + 8b034b8 commit dbd3a77

File tree

13 files changed

+387
-324
lines changed

13 files changed

+387
-324
lines changed

‎locale/circuitpython.pot

Lines changed: 26 additions & 22 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: 2018-12-03 15:57-0500\n"
11+
"POT-Creation-Date: 2018-12-04 16:17-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 <LL@li.org>\n"
@@ -360,7 +360,7 @@ msgstr ""
360360

361361
#: ports/atmel-samd/common-hal/busio/I2C.c:78
362362
#: ports/atmel-samd/common-hal/busio/SPI.c:171
363-
#: ports/atmel-samd/common-hal/busio/UART.c:119
363+
#: ports/atmel-samd/common-hal/busio/UART.c:120
364364
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
365365
#: ports/nrf/common-hal/busio/I2C.c:82
366366
msgid "Invalid pins"
@@ -374,31 +374,31 @@ msgstr ""
374374
msgid "Unsupported baudrate"
375375
msgstr ""
376376

377-
#: ports/atmel-samd/common-hal/busio/UART.c:66
377+
#: ports/atmel-samd/common-hal/busio/UART.c:67
378378
msgid "bytes > 8 bits not supported"
379379
msgstr ""
380380

381-
#: ports/atmel-samd/common-hal/busio/UART.c:72
382-
#: ports/nrf/common-hal/busio/UART.c:82
381+
#: ports/atmel-samd/common-hal/busio/UART.c:73
382+
#: ports/nrf/common-hal/busio/UART.c:83
383383
msgid "tx and rx cannot both be None"
384384
msgstr ""
385385

386-
#: ports/atmel-samd/common-hal/busio/UART.c:145
387-
#: ports/nrf/common-hal/busio/UART.c:115
386+
#: ports/atmel-samd/common-hal/busio/UART.c:146
387+
#: ports/nrf/common-hal/busio/UART.c:116
388388
msgid "Failed to allocate RX buffer"
389389
msgstr ""
390390

391-
#: ports/atmel-samd/common-hal/busio/UART.c:153
391+
#: ports/atmel-samd/common-hal/busio/UART.c:154
392392
msgid "Could not initialize UART"
393393
msgstr ""
394394

395-
#: ports/atmel-samd/common-hal/busio/UART.c:240
396-
#: ports/nrf/common-hal/busio/UART.c:149
395+
#: ports/atmel-samd/common-hal/busio/UART.c:241
396+
#: ports/nrf/common-hal/busio/UART.c:157
397397
msgid "No RX pin"
398398
msgstr ""
399399

400-
#: ports/atmel-samd/common-hal/busio/UART.c:294
401-
#: ports/nrf/common-hal/busio/UART.c:195
400+
#: ports/atmel-samd/common-hal/busio/UART.c:300
401+
#: ports/nrf/common-hal/busio/UART.c:207
402402
msgid "No TX pin"
403403
msgstr ""
404404

@@ -807,24 +807,24 @@ msgstr ""
807807
msgid "All SPI peripherals are in use"
808808
msgstr ""
809809

810-
#: ports/nrf/common-hal/busio/UART.c:48
810+
#: ports/nrf/common-hal/busio/UART.c:49
811811
#, c-format
812812
msgid "error = 0x%08lX"
813813
msgstr ""
814814

815-
#: ports/nrf/common-hal/busio/UART.c:86
815+
#: ports/nrf/common-hal/busio/UART.c:87
816816
msgid "Invalid buffer size"
817817
msgstr ""
818818

819-
#: ports/nrf/common-hal/busio/UART.c:90
819+
#: ports/nrf/common-hal/busio/UART.c:91
820820
msgid "Odd parity is not supported"
821821
msgstr ""
822822

823-
#: ports/nrf/common-hal/busio/UART.c:322 ports/nrf/common-hal/busio/UART.c:326
824-
#: ports/nrf/common-hal/busio/UART.c:331 ports/nrf/common-hal/busio/UART.c:336
825-
#: ports/nrf/common-hal/busio/UART.c:342 ports/nrf/common-hal/busio/UART.c:347
826-
#: ports/nrf/common-hal/busio/UART.c:352 ports/nrf/common-hal/busio/UART.c:356
827-
#: ports/nrf/common-hal/busio/UART.c:364
823+
#: ports/nrf/common-hal/busio/UART.c:334 ports/nrf/common-hal/busio/UART.c:338
824+
#: ports/nrf/common-hal/busio/UART.c:343 ports/nrf/common-hal/busio/UART.c:348
825+
#: ports/nrf/common-hal/busio/UART.c:354 ports/nrf/common-hal/busio/UART.c:359
826+
#: ports/nrf/common-hal/busio/UART.c:364 ports/nrf/common-hal/busio/UART.c:368
827+
#: ports/nrf/common-hal/busio/UART.c:376
828828
msgid "busio.UART not available"
829829
msgstr ""
830830

@@ -2140,14 +2140,18 @@ msgstr ""
21402140
msgid "Function requires lock."
21412141
msgstr ""
21422142

2143-
#: shared-bindings/busio/UART.c:104
2143+
#: shared-bindings/busio/UART.c:106
21442144
msgid "bits must be 7, 8 or 9"
21452145
msgstr ""
21462146

2147-
#: shared-bindings/busio/UART.c:116
2147+
#: shared-bindings/busio/UART.c:118
21482148
msgid "stop must be 1 or 2"
21492149
msgstr ""
21502150

2151+
#: shared-bindings/busio/UART.c:123
2152+
msgid "timeout >100 (units are now seconds, not msecs)"
2153+
msgstr ""
2154+
21512155
#: shared-bindings/digitalio/DigitalInOut.c:211
21522156
msgid "Invalid direction."
21532157
msgstr ""

‎locale/de_DE.po

Lines changed: 45 additions & 41 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: 2018-12-03 15:57-0500\n"
10+
"POT-Creation-Date: 2018-12-04 16:17-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -369,7 +369,7 @@ msgstr "Nicht genug Pins vorhanden"
369369

370370
#: ports/atmel-samd/common-hal/busio/I2C.c:78
371371
#: ports/atmel-samd/common-hal/busio/SPI.c:171
372-
#: ports/atmel-samd/common-hal/busio/UART.c:119
372+
#: ports/atmel-samd/common-hal/busio/UART.c:120
373373
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
374374
#: ports/nrf/common-hal/busio/I2C.c:82
375375
msgid "Invalid pins"
@@ -383,31 +383,31 @@ msgstr "SDA oder SCL brauchen pull up"
383383
msgid "Unsupported baudrate"
384384
msgstr "Baudrate wird nicht unterstützt"
385385

386-
#: ports/atmel-samd/common-hal/busio/UART.c:66
386+
#: ports/atmel-samd/common-hal/busio/UART.c:67
387387
msgid "bytes > 8 bits not supported"
388388
msgstr "bytes mit merh als 8 bits werden nicht unterstützt"
389389

390-
#: ports/atmel-samd/common-hal/busio/UART.c:72
391-
#: ports/nrf/common-hal/busio/UART.c:82
390+
#: ports/atmel-samd/common-hal/busio/UART.c:73
391+
#: ports/nrf/common-hal/busio/UART.c:83
392392
msgid "tx and rx cannot both be None"
393393
msgstr "tx und rx können nicht beide None sein"
394394

395-
#: ports/atmel-samd/common-hal/busio/UART.c:145
396-
#: ports/nrf/common-hal/busio/UART.c:115
395+
#: ports/atmel-samd/common-hal/busio/UART.c:146
396+
#: ports/nrf/common-hal/busio/UART.c:116
397397
msgid "Failed to allocate RX buffer"
398398
msgstr "Konnte keinen RX Buffer allozieren"
399399

400-
#: ports/atmel-samd/common-hal/busio/UART.c:153
400+
#: ports/atmel-samd/common-hal/busio/UART.c:154
401401
msgid "Could not initialize UART"
402402
msgstr "Konnte UART nicht initialisieren"
403403

404-
#: ports/atmel-samd/common-hal/busio/UART.c:240
405-
#: ports/nrf/common-hal/busio/UART.c:149
404+
#: ports/atmel-samd/common-hal/busio/UART.c:241
405+
#: ports/nrf/common-hal/busio/UART.c:157
406406
msgid "No RX pin"
407407
msgstr "Kein RX Pin"
408408

409-
#: ports/atmel-samd/common-hal/busio/UART.c:294
410-
#: ports/nrf/common-hal/busio/UART.c:195
409+
#: ports/atmel-samd/common-hal/busio/UART.c:300
410+
#: ports/nrf/common-hal/busio/UART.c:207
411411
msgid "No TX pin"
412412
msgstr "Kein TX Pin"
413413

@@ -822,26 +822,26 @@ msgstr "Alle timer werden benutzt"
822822
msgid "All SPI peripherals are in use"
823823
msgstr "Alle timer werden benutzt"
824824

825-
#: ports/nrf/common-hal/busio/UART.c:48
825+
#: ports/nrf/common-hal/busio/UART.c:49
826826
#, c-format
827827
msgid "error = 0x%08lX"
828828
msgstr ""
829829

830-
#: ports/nrf/common-hal/busio/UART.c:86
830+
#: ports/nrf/common-hal/busio/UART.c:87
831831
#, fuzzy
832832
msgid "Invalid buffer size"
833833
msgstr "ungültiger dupterm index"
834834

835-
#: ports/nrf/common-hal/busio/UART.c:90
835+
#: ports/nrf/common-hal/busio/UART.c:91
836836
#, fuzzy
837837
msgid "Odd parity is not supported"
838838
msgstr "bytes mit merh als 8 bits werden nicht unterstützt"
839839

840-
#: ports/nrf/common-hal/busio/UART.c:322 ports/nrf/common-hal/busio/UART.c:326
841-
#: ports/nrf/common-hal/busio/UART.c:331 ports/nrf/common-hal/busio/UART.c:336
842-
#: ports/nrf/common-hal/busio/UART.c:342 ports/nrf/common-hal/busio/UART.c:347
843-
#: ports/nrf/common-hal/busio/UART.c:352 ports/nrf/common-hal/busio/UART.c:356
844-
#: ports/nrf/common-hal/busio/UART.c:364
840+
#: ports/nrf/common-hal/busio/UART.c:334 ports/nrf/common-hal/busio/UART.c:338
841+
#: ports/nrf/common-hal/busio/UART.c:343 ports/nrf/common-hal/busio/UART.c:348
842+
#: ports/nrf/common-hal/busio/UART.c:354 ports/nrf/common-hal/busio/UART.c:359
843+
#: ports/nrf/common-hal/busio/UART.c:364 ports/nrf/common-hal/busio/UART.c:368
844+
#: ports/nrf/common-hal/busio/UART.c:376
845845
msgid "busio.UART not available"
846846
msgstr ""
847847

@@ -2163,14 +2163,18 @@ msgstr ""
21632163
msgid "Function requires lock."
21642164
msgstr ""
21652165

2166-
#: shared-bindings/busio/UART.c:104
2166+
#: shared-bindings/busio/UART.c:106
21672167
msgid "bits must be 7, 8 or 9"
21682168
msgstr ""
21692169

2170-
#: shared-bindings/busio/UART.c:116
2170+
#: shared-bindings/busio/UART.c:118
21712171
msgid "stop must be 1 or 2"
21722172
msgstr ""
21732173

2174+
#: shared-bindings/busio/UART.c:123
2175+
msgid "timeout >100 (units are now seconds, not msecs)"
2176+
msgstr ""
2177+
21742178
#: shared-bindings/digitalio/DigitalInOut.c:211
21752179
msgid "Invalid direction."
21762180
msgstr ""
@@ -2546,32 +2550,32 @@ msgstr "USB beschäftigt"
25462550
msgid "USB Error"
25472551
msgstr "USB Fehler"
25482552

2549-
#~ msgid "Can not add Characteristic."
2550-
#~ msgstr "Kann das Merkmal nicht hinzufügen."
2551-
2552-
#~ msgid "Can not add Service."
2553-
#~ msgstr "Kann den Dienst nicht hinzufügen."
2553+
#~ msgid "Invalid Service type"
2554+
#~ msgstr "Ungültiger Diensttyp"
25542555

2555-
#~ msgid "Can not apply advertisement data. status: 0x%02x"
2556-
#~ msgstr "Kann advertisement data nicht anwenden. Status: 0x%02x"
2556+
#~ msgid "Can not query for the device address."
2557+
#~ msgstr "Kann nicht nach der Geräteadresse suchen."
25572558

2558-
#~ msgid "Can not apply device name in the stack."
2559-
#~ msgstr "Der Gerätename kann nicht im Stack verwendet werden."
2559+
#~ msgid "Cannot set PPCP parameters."
2560+
#~ msgstr "Kann PPCP Parameter nicht setzen."
25602561

2561-
#~ msgid "Can encode UUID into the advertisement packet."
2562-
#~ msgstr "Kann UUID in das advertisement packet kodieren."
2562+
#~ msgid "Cannot apply GAP parameters."
2563+
#~ msgstr "Kann GAP Parameter nicht anwenden."
25632564

25642565
#~ msgid "Can not encode UUID, to check length."
25652566
#~ msgstr "Kann UUID nicht kodieren, um die Länge zu überprüfen."
25662567

2567-
#~ msgid "Cannot apply GAP parameters."
2568-
#~ msgstr "Kann GAP Parameter nicht anwenden."
2568+
#~ msgid "Can encode UUID into the advertisement packet."
2569+
#~ msgstr "Kann UUID in das advertisement packet kodieren."
25692570

2570-
#~ msgid "Cannot set PPCP parameters."
2571-
#~ msgstr "Kann PPCP Parameter nicht setzen."
2571+
#~ msgid "Can not apply device name in the stack."
2572+
#~ msgstr "Der Gerätename kann nicht im Stack verwendet werden."
25722573

2573-
#~ msgid "Can not query for the device address."
2574-
#~ msgstr "Kann nicht nach der Geräteadresse suchen."
2574+
#~ msgid "Can not apply advertisement data. status: 0x%02x"
2575+
#~ msgstr "Kann advertisement data nicht anwenden. Status: 0x%02x"
25752576

2576-
#~ msgid "Invalid Service type"
2577-
#~ msgstr "Ungültiger Diensttyp"
2577+
#~ msgid "Can not add Service."
2578+
#~ msgstr "Kann den Dienst nicht hinzufügen."
2579+
2580+
#~ msgid "Can not add Characteristic."
2581+
#~ msgstr "Kann das Merkmal nicht hinzufügen."

‎locale/en_US.po

Lines changed: 26 additions & 22 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: 2018-12-03 15:57-0500\n"
10+
"POT-Creation-Date: 2018-12-04 16:17-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -360,7 +360,7 @@ msgstr ""
360360

361361
#: ports/atmel-samd/common-hal/busio/I2C.c:78
362362
#: ports/atmel-samd/common-hal/busio/SPI.c:171
363-
#: ports/atmel-samd/common-hal/busio/UART.c:119
363+
#: ports/atmel-samd/common-hal/busio/UART.c:120
364364
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c:45
365365
#: ports/nrf/common-hal/busio/I2C.c:82
366366
msgid "Invalid pins"
@@ -374,31 +374,31 @@ msgstr ""
374374
msgid "Unsupported baudrate"
375375
msgstr ""
376376

377-
#: ports/atmel-samd/common-hal/busio/UART.c:66
377+
#: ports/atmel-samd/common-hal/busio/UART.c:67
378378
msgid "bytes > 8 bits not supported"
379379
msgstr ""
380380

381-
#: ports/atmel-samd/common-hal/busio/UART.c:72
382-
#: ports/nrf/common-hal/busio/UART.c:82
381+
#: ports/atmel-samd/common-hal/busio/UART.c:73
382+
#: ports/nrf/common-hal/busio/UART.c:83
383383
msgid "tx and rx cannot both be None"
384384
msgstr ""
385385

386-
#: ports/atmel-samd/common-hal/busio/UART.c:145
387-
#: ports/nrf/common-hal/busio/UART.c:115
386+
#: ports/atmel-samd/common-hal/busio/UART.c:146
387+
#: ports/nrf/common-hal/busio/UART.c:116
388388
msgid "Failed to allocate RX buffer"
389389
msgstr ""
390390

391-
#: ports/atmel-samd/common-hal/busio/UART.c:153
391+
#: ports/atmel-samd/common-hal/busio/UART.c:154
392392
msgid "Could not initialize UART"
393393
msgstr ""
394394

395-
#: ports/atmel-samd/common-hal/busio/UART.c:240
396-
#: ports/nrf/common-hal/busio/UART.c:149
395+
#: ports/atmel-samd/common-hal/busio/UART.c:241
396+
#: ports/nrf/common-hal/busio/UART.c:157
397397
msgid "No RX pin"
398398
msgstr ""
399399

400-
#: ports/atmel-samd/common-hal/busio/UART.c:294
401-
#: ports/nrf/common-hal/busio/UART.c:195
400+
#: ports/atmel-samd/common-hal/busio/UART.c:300
401+
#: ports/nrf/common-hal/busio/UART.c:207
402402
msgid "No TX pin"
403403
msgstr ""
404404

@@ -807,24 +807,24 @@ msgstr ""
807807
msgid "All SPI peripherals are in use"
808808
msgstr ""
809809

810-
#: ports/nrf/common-hal/busio/UART.c:48
810+
#: ports/nrf/common-hal/busio/UART.c:49
811811
#, c-format
812812
msgid "error = 0x%08lX"
813813
msgstr ""
814814

815-
#: ports/nrf/common-hal/busio/UART.c:86
815+
#: ports/nrf/common-hal/busio/UART.c:87
816816
msgid "Invalid buffer size"
817817
msgstr ""
818818

819-
#: ports/nrf/common-hal/busio/UART.c:90
819+
#: ports/nrf/common-hal/busio/UART.c:91
820820
msgid "Odd parity is not supported"
821821
msgstr ""
822822

823-
#: ports/nrf/common-hal/busio/UART.c:322 ports/nrf/common-hal/busio/UART.c:326
824-
#: ports/nrf/common-hal/busio/UART.c:331 ports/nrf/common-hal/busio/UART.c:336
825-
#: ports/nrf/common-hal/busio/UART.c:342 ports/nrf/common-hal/busio/UART.c:347
826-
#: ports/nrf/common-hal/busio/UART.c:352 ports/nrf/common-hal/busio/UART.c:356
827-
#: ports/nrf/common-hal/busio/UART.c:364
823+
#: ports/nrf/common-hal/busio/UART.c:334 ports/nrf/common-hal/busio/UART.c:338
824+
#: ports/nrf/common-hal/busio/UART.c:343 ports/nrf/common-hal/busio/UART.c:348
825+
#: ports/nrf/common-hal/busio/UART.c:354 ports/nrf/common-hal/busio/UART.c:359
826+
#: ports/nrf/common-hal/busio/UART.c:364 ports/nrf/common-hal/busio/UART.c:368
827+
#: ports/nrf/common-hal/busio/UART.c:376
828828
msgid "busio.UART not available"
829829
msgstr ""
830830

@@ -2140,14 +2140,18 @@ msgstr ""
21402140
msgid "Function requires lock."
21412141
msgstr ""
21422142

2143-
#: shared-bindings/busio/UART.c:104
2143+
#: shared-bindings/busio/UART.c:106
21442144
msgid "bits must be 7, 8 or 9"
21452145
msgstr ""
21462146

2147-
#: shared-bindings/busio/UART.c:116
2147+
#: shared-bindings/busio/UART.c:118
21482148
msgid "stop must be 1 or 2"
21492149
msgstr ""
21502150

2151+
#: shared-bindings/busio/UART.c:123
2152+
msgid "timeout >100 (units are now seconds, not msecs)"
2153+
msgstr ""
2154+
21512155
#: shared-bindings/digitalio/DigitalInOut.c:211
21522156
msgid "Invalid direction."
21532157
msgstr ""

0 commit comments

Comments
 (0)