djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't check for RX and TX both none in ports: now checked in shared-bindings

This commit is contained in:
Dan Halbert 2023-02-20 17:02:46 -05:00
parent 6d51356324
commit 2684aeb838
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
locale/circuitpython.pot
View File

@ -1987,10 +1987,6 @@ msgstr ""
msgid "Stopping AP is not supported." msgid "Stopping AP is not supported."
msgstr "" msgstr ""
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
msgid "Supply at least one UART pin"
msgstr ""
#: shared-bindings/alarm/time/TimeAlarm.c #: shared-bindings/alarm/time/TimeAlarm.c
msgid "Supply one of monotonic_time or epoch_time" msgid "Supply one of monotonic_time or epoch_time"
msgstr "" msgstr ""
@ -4116,8 +4112,6 @@ msgstr ""
msgid "twai_start returned esp-idf error #%d" msgid "twai_start returned esp-idf error #%d"
msgstr "" msgstr ""
#: ports/atmel-samd/common-hal/busio/UART.c
#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
#: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c #: shared-bindings/busio/UART.c shared-bindings/canio/CAN.c
msgid "tx and rx cannot both be None" msgid "tx and rx cannot both be None"
msgstr "" msgstr ""

5
ports/espressif/common-hal/busio/UART.c
View File

@ -112,9 +112,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
uart_config_t uart_config = {0}; uart_config_t uart_config = {0};
bool have_rs485_dir = rs485_dir != NULL; bool have_rs485_dir = rs485_dir != NULL;
if (!have_tx && !have_rx) {
mp_raise_ValueError(translate("tx and rx cannot both be None")); // shared-bindings checks that TX and RX are not both None, so we don't need to check here.
}
// Filter for sane settings for RS485 // Filter for sane settings for RS485
if (have_rs485_dir) { if (have_rs485_dir) {

3
ports/mimxrt10xx/common-hal/busio/UART.c
View File

@ -179,7 +179,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
break; break;
} }
} else { } else {
mp_raise_ValueError(translate("tx and rx cannot both be None")); // TX and RX are both None. But this is already handled in shared-bindings, so
// we won't get here.
} }
if (rx && !rx_config) { if (rx && !rx_config) {

4
ports/nrf/common-hal/busio/UART.c
View File

@ -183,9 +183,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
mp_raise_ValueError(translate("All UART peripherals are in use")); mp_raise_ValueError(translate("All UART peripherals are in use"));
} }
if ((tx == NULL) && (rx == NULL)) { // shared-bindings checks that TX and RX are not both None, so we don't need to check here.
mp_raise_ValueError(translate("tx and rx cannot both be None"));
}
mp_arg_validate_int_min(receiver_buffer_size, 1, MP_QSTR_receiver_buffer_size); mp_arg_validate_int_min(receiver_buffer_size, 1, MP_QSTR_receiver_buffer_size);

6
ports/stm/common-hal/busio/UART.c
View File

@ -85,7 +85,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
bool sigint_enabled) { bool sigint_enabled) {
// match pins to UART objects // match pins to UART objects
USART_TypeDef *USARTx; USART_TypeDef *USARTx = NULL;
uint8_t tx_len = MP_ARRAY_SIZE(mcu_uart_tx_list); uint8_t tx_len = MP_ARRAY_SIZE(mcu_uart_tx_list);
uint8_t rx_len = MP_ARRAY_SIZE(mcu_uart_rx_list); uint8_t rx_len = MP_ARRAY_SIZE(mcu_uart_rx_list);
@ -159,8 +159,8 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
USARTx = assign_uart_or_throw(self, (self->tx != NULL), USARTx = assign_uart_or_throw(self, (self->tx != NULL),
periph_index, uart_taken); periph_index, uart_taken);
} else { } else {
// both pins cannot be empty // TX and RX are both None. But this is already handled in shared-bindings, so
mp_raise_ValueError(translate("tx and rx cannot both be None")); // we won't get here.
} }
// Other errors // Other errors