Skip to content

Commit a1a4959

Browse files
tannewttannewt
authored
Merge pull request adafruit#1541 from dhalbert/nrf-two-uarts
nrf: Add second UARTE to busio.UART. Init uarts on startup.
2 parents d6cbd5b + ab4194f commit a1a4959

13 files changed

Lines changed: 224 additions & 275 deletions

File tree

‎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: 2019-02-12 15:01-0800\n"
11+
"POT-Creation-Date: 2019-02-12 22:32-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"
@@ -347,12 +347,12 @@ msgid "bytes > 8 bits not supported"
347347
msgstr "byte > 8 bit tidak didukung"
348348

349349
#: ports/atmel-samd/common-hal/busio/UART.c:73
350-
#: ports/nrf/common-hal/busio/UART.c:91
350+
#: ports/nrf/common-hal/busio/UART.c:149
351351
msgid "tx and rx cannot both be None"
352352
msgstr "tx dan rx keduanya tidak boleh kosong"
353353

354354
#: ports/atmel-samd/common-hal/busio/UART.c:146
355-
#: ports/nrf/common-hal/busio/UART.c:132
355+
#: ports/nrf/common-hal/busio/UART.c:188
356356
msgid "Failed to allocate RX buffer"
357357
msgstr "Gagal untuk mengalokasikan buffer RX"
358358

@@ -361,12 +361,12 @@ msgid "Could not initialize UART"
361361
msgstr "Tidak dapat menginisialisasi UART"
362362

363363
#: ports/atmel-samd/common-hal/busio/UART.c:241
364-
#: ports/nrf/common-hal/busio/UART.c:174
364+
#: ports/nrf/common-hal/busio/UART.c:230
365365
msgid "No RX pin"
366366
msgstr "Tidak pin RX"
367367

368368
#: ports/atmel-samd/common-hal/busio/UART.c:300
369-
#: ports/nrf/common-hal/busio/UART.c:209
369+
#: ports/nrf/common-hal/busio/UART.c:265
370370
msgid "No TX pin"
371371
msgstr "Tidak ada pin TX"
372372

@@ -850,27 +850,24 @@ msgstr "Semua perangkat I2C sedang digunakan"
850850
msgid "All SPI peripherals are in use"
851851
msgstr "Semua perangkat SPI sedang digunakan"
852852

853-
#: ports/nrf/common-hal/busio/UART.c:49
853+
#: ports/nrf/common-hal/busio/UART.c:47
854854
#, c-format
855855
msgid "error = 0x%08lX"
856856
msgstr "error = 0x%08lX"
857857

858-
#: ports/nrf/common-hal/busio/UART.c:95
858+
#: ports/nrf/common-hal/busio/UART.c:145
859+
#, fuzzy
860+
msgid "All UART peripherals are in use"
861+
msgstr "Semua perangkat I2C sedang digunakan"
862+
863+
#: ports/nrf/common-hal/busio/UART.c:153
859864
msgid "Invalid buffer size"
860865
msgstr "Ukuran buffer tidak valid"
861866

862-
#: ports/nrf/common-hal/busio/UART.c:99
867+
#: ports/nrf/common-hal/busio/UART.c:157
863868
msgid "Odd parity is not supported"
864869
msgstr "Parity ganjil tidak didukung"
865870

866-
#: ports/nrf/common-hal/busio/UART.c:335 ports/nrf/common-hal/busio/UART.c:339
867-
#: ports/nrf/common-hal/busio/UART.c:344 ports/nrf/common-hal/busio/UART.c:349
868-
#: ports/nrf/common-hal/busio/UART.c:355 ports/nrf/common-hal/busio/UART.c:360
869-
#: ports/nrf/common-hal/busio/UART.c:365 ports/nrf/common-hal/busio/UART.c:369
870-
#: ports/nrf/common-hal/busio/UART.c:377
871-
msgid "busio.UART not available"
872-
msgstr "busio.UART tidak tersedia"
873-
874871
#: ports/nrf/common-hal/microcontroller/Processor.c:48
875872
#, fuzzy
876873
msgid "Cannot get temperature"
@@ -2880,3 +2877,6 @@ msgstr ""
28802877
#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
28812878
#~ msgstr ""
28822879
#~ "Silahkan taruh masalah disini dengan isi dari CIRCUITPY drive: anda \n"
2880+
2881+
#~ msgid "busio.UART not available"
2882+
#~ msgstr "busio.UART tidak tersedia"

‎locale/circuitpython.pot‎

Lines changed: 12 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: 2019-02-12 15:01-0800\n"
11+
"POT-Creation-Date: 2019-02-12 22:32-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"
@@ -340,12 +340,12 @@ msgid "bytes > 8 bits not supported"
340340
msgstr ""
341341

342342
#: ports/atmel-samd/common-hal/busio/UART.c:73
343-
#: ports/nrf/common-hal/busio/UART.c:91
343+
#: ports/nrf/common-hal/busio/UART.c:149
344344
msgid "tx and rx cannot both be None"
345345
msgstr ""
346346

347347
#: ports/atmel-samd/common-hal/busio/UART.c:146
348-
#: ports/nrf/common-hal/busio/UART.c:132
348+
#: ports/nrf/common-hal/busio/UART.c:188
349349
msgid "Failed to allocate RX buffer"
350350
msgstr ""
351351

@@ -354,12 +354,12 @@ msgid "Could not initialize UART"
354354
msgstr ""
355355

356356
#: ports/atmel-samd/common-hal/busio/UART.c:241
357-
#: ports/nrf/common-hal/busio/UART.c:174
357+
#: ports/nrf/common-hal/busio/UART.c:230
358358
msgid "No RX pin"
359359
msgstr ""
360360

361361
#: ports/atmel-samd/common-hal/busio/UART.c:300
362-
#: ports/nrf/common-hal/busio/UART.c:209
362+
#: ports/nrf/common-hal/busio/UART.c:265
363363
msgid "No TX pin"
364364
msgstr ""
365365

@@ -824,25 +824,21 @@ msgstr ""
824824
msgid "All SPI peripherals are in use"
825825
msgstr ""
826826

827-
#: ports/nrf/common-hal/busio/UART.c:49
827+
#: ports/nrf/common-hal/busio/UART.c:47
828828
#, c-format
829829
msgid "error = 0x%08lX"
830830
msgstr ""
831831

832-
#: ports/nrf/common-hal/busio/UART.c:95
833-
msgid "Invalid buffer size"
832+
#: ports/nrf/common-hal/busio/UART.c:145
833+
msgid "All UART peripherals are in use"
834834
msgstr ""
835835

836-
#: ports/nrf/common-hal/busio/UART.c:99
837-
msgid "Odd parity is not supported"
836+
#: ports/nrf/common-hal/busio/UART.c:153
837+
msgid "Invalid buffer size"
838838
msgstr ""
839839

840-
#: ports/nrf/common-hal/busio/UART.c:335 ports/nrf/common-hal/busio/UART.c:339
841-
#: ports/nrf/common-hal/busio/UART.c:344 ports/nrf/common-hal/busio/UART.c:349
842-
#: ports/nrf/common-hal/busio/UART.c:355 ports/nrf/common-hal/busio/UART.c:360
843-
#: ports/nrf/common-hal/busio/UART.c:365 ports/nrf/common-hal/busio/UART.c:369
844-
#: ports/nrf/common-hal/busio/UART.c:377
845-
msgid "busio.UART not available"
840+
#: ports/nrf/common-hal/busio/UART.c:157
841+
msgid "Odd parity is not supported"
846842
msgstr ""
847843

848844
#: ports/nrf/common-hal/microcontroller/Processor.c:48

‎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: 2019-02-12 15:01-0800\n"
10+
"POT-Creation-Date: 2019-02-12 22:32-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -345,12 +345,12 @@ msgid "bytes > 8 bits not supported"
345345
msgstr "bytes mit mehr als 8 bits werden nicht unterstützt"
346346

347347
#: ports/atmel-samd/common-hal/busio/UART.c:73
348-
#: ports/nrf/common-hal/busio/UART.c:91
348+
#: ports/nrf/common-hal/busio/UART.c:149
349349
msgid "tx and rx cannot both be None"
350350
msgstr "tx und rx können nicht beide None sein"
351351

352352
#: ports/atmel-samd/common-hal/busio/UART.c:146
353-
#: ports/nrf/common-hal/busio/UART.c:132
353+
#: ports/nrf/common-hal/busio/UART.c:188
354354
msgid "Failed to allocate RX buffer"
355355
msgstr "Konnte keinen RX Buffer allozieren"
356356

@@ -359,12 +359,12 @@ msgid "Could not initialize UART"
359359
msgstr "Konnte UART nicht initialisieren"
360360

361361
#: ports/atmel-samd/common-hal/busio/UART.c:241
362-
#: ports/nrf/common-hal/busio/UART.c:174
362+
#: ports/nrf/common-hal/busio/UART.c:230
363363
msgid "No RX pin"
364364
msgstr "Kein RX Pin"
365365

366366
#: ports/atmel-samd/common-hal/busio/UART.c:300
367-
#: ports/nrf/common-hal/busio/UART.c:209
367+
#: ports/nrf/common-hal/busio/UART.c:265
368368
msgid "No TX pin"
369369
msgstr "Kein TX Pin"
370370

@@ -833,27 +833,24 @@ msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
833833
msgid "All SPI peripherals are in use"
834834
msgstr "Alle SPI-Peripheriegeräte sind in Benutzung"
835835

836-
#: ports/nrf/common-hal/busio/UART.c:49
836+
#: ports/nrf/common-hal/busio/UART.c:47
837837
#, c-format
838838
msgid "error = 0x%08lX"
839839
msgstr "error = 0x%08lX"
840840

841-
#: ports/nrf/common-hal/busio/UART.c:95
841+
#: ports/nrf/common-hal/busio/UART.c:145
842+
#, fuzzy
843+
msgid "All UART peripherals are in use"
844+
msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
845+
846+
#: ports/nrf/common-hal/busio/UART.c:153
842847
msgid "Invalid buffer size"
843848
msgstr "Ungültige Puffergröße"
844849

845-
#: ports/nrf/common-hal/busio/UART.c:99
850+
#: ports/nrf/common-hal/busio/UART.c:157
846851
msgid "Odd parity is not supported"
847852
msgstr "Ungerade Parität wird nicht unterstützt"
848853

849-
#: ports/nrf/common-hal/busio/UART.c:335 ports/nrf/common-hal/busio/UART.c:339
850-
#: ports/nrf/common-hal/busio/UART.c:344 ports/nrf/common-hal/busio/UART.c:349
851-
#: ports/nrf/common-hal/busio/UART.c:355 ports/nrf/common-hal/busio/UART.c:360
852-
#: ports/nrf/common-hal/busio/UART.c:365 ports/nrf/common-hal/busio/UART.c:369
853-
#: ports/nrf/common-hal/busio/UART.c:377
854-
msgid "busio.UART not available"
855-
msgstr "busio.UART nicht verfügbar"
856-
857854
#: ports/nrf/common-hal/microcontroller/Processor.c:48
858855
msgid "Cannot get temperature"
859856
msgstr "Kann Temperatur nicht holen"
@@ -2854,3 +2851,6 @@ msgstr ""
28542851

28552852
#~ msgid "All PWM peripherals are in use"
28562853
#~ msgstr "Alle PWM-Peripheriegeräte werden verwendet"
2854+
2855+
#~ msgid "busio.UART not available"
2856+
#~ msgstr "busio.UART nicht verfügbar"

‎locale/en_US.po‎

Lines changed: 12 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: 2019-02-12 15:01-0800\n"
10+
"POT-Creation-Date: 2019-02-12 22:32-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -340,12 +340,12 @@ msgid "bytes > 8 bits not supported"
340340
msgstr ""
341341

342342
#: ports/atmel-samd/common-hal/busio/UART.c:73
343-
#: ports/nrf/common-hal/busio/UART.c:91
343+
#: ports/nrf/common-hal/busio/UART.c:149
344344
msgid "tx and rx cannot both be None"
345345
msgstr ""
346346

347347
#: ports/atmel-samd/common-hal/busio/UART.c:146
348-
#: ports/nrf/common-hal/busio/UART.c:132
348+
#: ports/nrf/common-hal/busio/UART.c:188
349349
msgid "Failed to allocate RX buffer"
350350
msgstr ""
351351

@@ -354,12 +354,12 @@ msgid "Could not initialize UART"
354354
msgstr ""
355355

356356
#: ports/atmel-samd/common-hal/busio/UART.c:241
357-
#: ports/nrf/common-hal/busio/UART.c:174
357+
#: ports/nrf/common-hal/busio/UART.c:230
358358
msgid "No RX pin"
359359
msgstr ""
360360

361361
#: ports/atmel-samd/common-hal/busio/UART.c:300
362-
#: ports/nrf/common-hal/busio/UART.c:209
362+
#: ports/nrf/common-hal/busio/UART.c:265
363363
msgid "No TX pin"
364364
msgstr ""
365365

@@ -824,25 +824,21 @@ msgstr ""
824824
msgid "All SPI peripherals are in use"
825825
msgstr ""
826826

827-
#: ports/nrf/common-hal/busio/UART.c:49
827+
#: ports/nrf/common-hal/busio/UART.c:47
828828
#, c-format
829829
msgid "error = 0x%08lX"
830830
msgstr ""
831831

832-
#: ports/nrf/common-hal/busio/UART.c:95
833-
msgid "Invalid buffer size"
832+
#: ports/nrf/common-hal/busio/UART.c:145
833+
msgid "All UART peripherals are in use"
834834
msgstr ""
835835

836-
#: ports/nrf/common-hal/busio/UART.c:99
837-
msgid "Odd parity is not supported"
836+
#: ports/nrf/common-hal/busio/UART.c:153
837+
msgid "Invalid buffer size"
838838
msgstr ""
839839

840-
#: ports/nrf/common-hal/busio/UART.c:335 ports/nrf/common-hal/busio/UART.c:339
841-
#: ports/nrf/common-hal/busio/UART.c:344 ports/nrf/common-hal/busio/UART.c:349
842-
#: ports/nrf/common-hal/busio/UART.c:355 ports/nrf/common-hal/busio/UART.c:360
843-
#: ports/nrf/common-hal/busio/UART.c:365 ports/nrf/common-hal/busio/UART.c:369
844-
#: ports/nrf/common-hal/busio/UART.c:377
845-
msgid "busio.UART not available"
840+
#: ports/nrf/common-hal/busio/UART.c:157
841+
msgid "Odd parity is not supported"
846842
msgstr ""
847843

848844
#: ports/nrf/common-hal/microcontroller/Processor.c:48

‎locale/es.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: \n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-02-12 15:01-0800\n"
11+
"POT-Creation-Date: 2019-02-12 22:32-0500\n"
1212
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -346,12 +346,12 @@ msgid "bytes > 8 bits not supported"
346346
msgstr "bytes > 8 bits no soportados"
347347

348348
#: ports/atmel-samd/common-hal/busio/UART.c:73
349-
#: ports/nrf/common-hal/busio/UART.c:91
349+
#: ports/nrf/common-hal/busio/UART.c:149
350350
msgid "tx and rx cannot both be None"
351351
msgstr "Ambos tx y rx no pueden ser None"
352352

353353
#: ports/atmel-samd/common-hal/busio/UART.c:146
354-
#: ports/nrf/common-hal/busio/UART.c:132
354+
#: ports/nrf/common-hal/busio/UART.c:188
355355
msgid "Failed to allocate RX buffer"
356356
msgstr "Ha fallado la asignación del buffer RX"
357357

@@ -360,12 +360,12 @@ msgid "Could not initialize UART"
360360
msgstr "No se puede inicializar la UART"
361361

362362
#: ports/atmel-samd/common-hal/busio/UART.c:241
363-
#: ports/nrf/common-hal/busio/UART.c:174
363+
#: ports/nrf/common-hal/busio/UART.c:230
364364
msgid "No RX pin"
365365
msgstr "Sin pin RX"
366366

367367
#: ports/atmel-samd/common-hal/busio/UART.c:300
368-
#: ports/nrf/common-hal/busio/UART.c:209
368+
#: ports/nrf/common-hal/busio/UART.c:265
369369
msgid "No TX pin"
370370
msgstr "Sin pin TX"
371371

@@ -847,27 +847,24 @@ msgstr "Todos los timers están siendo usados"
847847
msgid "All SPI peripherals are in use"
848848
msgstr "Todos los timers están siendo usados"
849849

850-
#: ports/nrf/common-hal/busio/UART.c:49
850+
#: ports/nrf/common-hal/busio/UART.c:47
851851
#, c-format
852852
msgid "error = 0x%08lX"
853853
msgstr "error = 0x%08lx"
854854

855-
#: ports/nrf/common-hal/busio/UART.c:95
855+
#: ports/nrf/common-hal/busio/UART.c:145
856+
#, fuzzy
857+
msgid "All UART peripherals are in use"
858+
msgstr "Todos los timers están siendo usados"
859+
860+
#: ports/nrf/common-hal/busio/UART.c:153
856861
msgid "Invalid buffer size"
857862
msgstr "Tamaño de buffer inválido"
858863

859-
#: ports/nrf/common-hal/busio/UART.c:99
864+
#: ports/nrf/common-hal/busio/UART.c:157
860865
msgid "Odd parity is not supported"
861866
msgstr "Paridad impar no soportada"
862867

863-
#: ports/nrf/common-hal/busio/UART.c:335 ports/nrf/common-hal/busio/UART.c:339
864-
#: ports/nrf/common-hal/busio/UART.c:344 ports/nrf/common-hal/busio/UART.c:349
865-
#: ports/nrf/common-hal/busio/UART.c:355 ports/nrf/common-hal/busio/UART.c:360
866-
#: ports/nrf/common-hal/busio/UART.c:365 ports/nrf/common-hal/busio/UART.c:369
867-
#: ports/nrf/common-hal/busio/UART.c:377
868-
msgid "busio.UART not available"
869-
msgstr "busio.UART no disponible"
870-
871868
#: ports/nrf/common-hal/microcontroller/Processor.c:48
872869
#, fuzzy
873870
msgid "Cannot get temperature"
@@ -2975,3 +2972,6 @@ msgstr ""
29752972

29762973
#~ msgid "Can not apply advertisement data. status: 0x%02x"
29772974
#~ msgstr "No se puede aplicar los datos de anuncio. status: 0x%02x"
2975+
2976+
#~ msgid "busio.UART not available"
2977+
#~ msgstr "busio.UART no disponible"

0 commit comments

Comments
 (0)