diff options
| -rw-r--r-- | locale/ID.po | 8 | ||||
| -rw-r--r-- | locale/circuitpython.pot | 8 | ||||
| -rw-r--r-- | locale/cs.po | 8 | ||||
| -rw-r--r-- | locale/de_DE.po | 8 | ||||
| -rw-r--r-- | locale/en_US.po | 8 | ||||
| -rw-r--r-- | locale/en_x_pirate.po | 8 | ||||
| -rw-r--r-- | locale/es.po | 8 | ||||
| -rw-r--r-- | locale/fil.po | 8 | ||||
| -rw-r--r-- | locale/fr.po | 8 | ||||
| -rw-r--r-- | locale/it_IT.po | 8 | ||||
| -rw-r--r-- | locale/ko.po | 8 | ||||
| -rw-r--r-- | locale/nl.po | 8 | ||||
| -rw-r--r-- | locale/pl.po | 8 | ||||
| -rw-r--r-- | locale/pt_BR.po | 8 | ||||
| -rw-r--r-- | locale/sv.po | 8 | ||||
| -rw-r--r-- | locale/zh_Latn_pinyin.po | 8 | ||||
| -rw-r--r-- | ports/mimxrt10xx/common-hal/busio/UART.c | 10 |
17 files changed, 36 insertions, 102 deletions
diff --git a/locale/ID.po b/locale/ID.po index f7328236e..16d7865ff 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -816,7 +816,7 @@ msgstr "" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1538,10 +1538,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 343eef907..4b72833a7 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -805,7 +805,7 @@ msgstr "" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1522,10 +1522,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index 8341513e6..c333ca8eb 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -805,7 +805,7 @@ msgstr "" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1522,10 +1522,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index ec9774f90..6a630d903 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2020-05-18 02:48+0000\n" "Last-Translator: Jeff Epler <jepler@gmail.com>\n" "Language-Team: German <https://later.unpythonic.net/projects/circuitpython/" @@ -818,7 +818,7 @@ msgstr "Gruppe voll" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1548,10 +1548,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/en_US.po b/locale/en_US.po index c5e928cc8..ff72c4a5d 100644 --- a/locale/en_US.po +++ b/locale/en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: \n" "Language-Team: \n" @@ -805,7 +805,7 @@ msgstr "" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1522,10 +1522,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/en_x_pirate.po b/locale/en_x_pirate.po index 0a6e2282e..809c31553 100644 --- a/locale/en_x_pirate.po +++ b/locale/en_x_pirate.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2020-03-30 22:11+0000\n" "Last-Translator: Tannewt <devnull@unpythonic.net>\n" "Language-Team: English <https://later.unpythonic.net/projects/circuitpython/" @@ -814,7 +814,7 @@ msgstr "" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1531,10 +1531,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/es.po b/locale/es.po index bacda465c..391820d82 100644 --- a/locale/es.po +++ b/locale/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2020-05-17 20:56+0000\n" "Last-Translator: Jeff Epler <jepler@gmail.com>\n" "Language-Team: \n" @@ -812,7 +812,7 @@ msgstr "Group lleno" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1540,10 +1540,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/fil.po b/locale/fil.po index 7c58be3f7..6744a4547 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2018-12-20 22:15-0800\n" "Last-Translator: Timothy <me@timothygarcia.ca>\n" "Language-Team: fil\n" @@ -819,7 +819,7 @@ msgstr "Puno ang group" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1545,10 +1545,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index b5b0a7580..19a3cd98d 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2020-05-17 20:56+0000\n" "Last-Translator: Anonymous <noreply@weblate.org>\n" "Language-Team: French <https://later.unpythonic.net/projects/circuitpython/" @@ -834,7 +834,7 @@ msgstr "Groupe plein" msgid "Hardware busy, try alternative pins" msgstr "Matériel occupé, essayez d'autres broches" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "Matériel utilisé, essayez d'autres broches" @@ -1576,10 +1576,6 @@ msgstr "Erreur d'initialisation UART" msgid "UART Re-init error" msgstr "Erreur de réinitialisation UART" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "Erreur d'écriture UART" diff --git a/locale/it_IT.po b/locale/it_IT.po index e34b81c69..5dafec864 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2018-10-02 16:27+0200\n" "Last-Translator: Enrico Paganin <enrico.paganin@mail.com>\n" "Language-Team: \n" @@ -819,7 +819,7 @@ msgstr "Gruppo pieno" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1556,10 +1556,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index c6e4d52b4..b7af51667 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2019-05-06 14:22-0700\n" "Last-Translator: \n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -809,7 +809,7 @@ msgstr "" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1526,10 +1526,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index c6d3de032..957fa91fb 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2020-05-19 17:08+0000\n" "Last-Translator: Dustin Watts <dustin_watts@yahoo.com>\n" "Language-Team: none\n" @@ -823,7 +823,7 @@ msgstr "Groep is vol" msgid "Hardware busy, try alternative pins" msgstr "Hardware bezig, probeer alternatieve pinnen" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "Hardware in gebruik, probeer alternatieve pinnen" @@ -1564,10 +1564,6 @@ msgstr "UART Init Fout" msgid "UART Re-init error" msgstr "UART Re-init Fout" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "UART schrijf fout" diff --git a/locale/pl.po b/locale/pl.po index 5229fd535..80a3b2012 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2019-03-19 18:37-0700\n" "Last-Translator: Radomir Dopieralski <circuitpython@sheep.art.pl>\n" "Language-Team: pl\n" @@ -808,7 +808,7 @@ msgstr "Grupa pełna" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1527,10 +1527,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 3658d91c6..1bfb574ed 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2018-10-02 21:14-0000\n" "Last-Translator: \n" "Language-Team: \n" @@ -814,7 +814,7 @@ msgstr "Grupo cheio" msgid "Hardware busy, try alternative pins" msgstr "" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "" @@ -1539,10 +1539,6 @@ msgstr "" msgid "UART Re-init error" msgstr "" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "" diff --git a/locale/sv.po b/locale/sv.po index e10e7bfc3..07652af7d 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2020-05-17 20:56+0000\n" "Last-Translator: Anonymous <noreply@weblate.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -822,7 +822,7 @@ msgstr "Gruppen är full" msgid "Hardware busy, try alternative pins" msgstr "Hårdvaran är upptagen, prova alternativa pinnar" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "Hårdvaran används redan, prova alternativa pinnar" @@ -1561,10 +1561,6 @@ msgstr "UART Init-fel" msgid "UART Re-init error" msgstr "UART reinit-fel" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "UART skrivfel" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index db421973b..58637394e 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: circuitpython-cn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-20 13:28-0400\n" +"POT-Creation-Date: 2020-05-21 11:18-0400\n" "PO-Revision-Date: 2019-04-13 10:10-0700\n" "Last-Translator: hexthat\n" "Language-Team: Chinese Hanyu Pinyin\n" @@ -816,7 +816,7 @@ msgstr "Fēnzǔ yǐ mǎn" msgid "Hardware busy, try alternative pins" msgstr "Yìngjiàn máng, qǐng chángshì qítā zhēnjiǎo" -#: ports/stm/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "Hardware in use, try alternative pins" msgstr "Shǐyòng de yìngjiàn, qǐng chángshì qítā yǐn jiǎo" @@ -1548,10 +1548,6 @@ msgstr "UART chūshǐhuà cuòwù" msgid "UART Re-init error" msgstr "UART chóngxīn chūshǐhuà cuòwù" -#: ports/mimxrt10xx/common-hal/busio/UART.c -msgid "UART peripheral is already in use" -msgstr "" - #: ports/stm/common-hal/busio/UART.c msgid "UART write error" msgstr "UART xiě cuòwù" diff --git a/ports/mimxrt10xx/common-hal/busio/UART.c b/ports/mimxrt10xx/common-hal/busio/UART.c index af4328c74..015b0188f 100644 --- a/ports/mimxrt10xx/common-hal/busio/UART.c +++ b/ports/mimxrt10xx/common-hal/busio/UART.c @@ -39,7 +39,7 @@ #include "fsl_lpuart.h" -//arrays use 0 based numbering: UART is stored at index 0 +//arrays use 0 based numbering: UART1 is stored at index 0 #define MAX_UART 8 STATIC bool reserved_uart[MAX_UART]; @@ -85,10 +85,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, self->character_bits = bits; self->timeout_ms = timeout * 1000; - bool is_onedirection = false; - if (!rx != !tx) { - is_onedirection = true; - } + // We are transmitting one direction if one pin is NULL and the other isn't. + bool is_onedirection = (rx != NULL) != (tx != NULL); bool uart_taken = false; const uint32_t rx_count = MP_ARRAY_SIZE(mcu_uart_rx_list); @@ -145,7 +143,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, } if (uart_taken) { - mp_raise_RuntimeError(translate("UART peripheral is already in use")); + mp_raise_RuntimeError(translate("Hardware in use, try alternative pins")); } if(self->rx == NULL && self->tx == NULL) { |
