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

mimxrt1011: UART: Add additional error checking

Browse Source 
.. and make the 'invalid pin' messages standard.

Closes #4502
This commit is contained in:
Jeff Epler 2021-03-30 10:11:12 -05:00
parent 2453d70e4c
commit 71eee45a37
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,6 +153,13 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
mp_raise_ValueError(translate("Supply at least one UART pin")); mp_raise_ValueError(translate("Supply at least one UART pin"));
} }
if (rx && !self->rx) {
mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_RX);
}
if (tx && !self->tx) {
mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_TX);
}
if (uart_taken) { if (uart_taken) {
mp_raise_ValueError(translate("Hardware in use, try alternative pins")); mp_raise_ValueError(translate("Hardware in use, try alternative pins"));
} }
@ -188,7 +195,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
} }
} }
if (self->rts == NULL) { if (self->rts == NULL) {
mp_raise_ValueError(translate("Selected RTS pin not valid")); mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_RTS);
} }
} }
@ -202,16 +209,19 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
} }
} }
if (self->cts == NULL) { if (self->cts == NULL) {
mp_raise_ValueError(translate("Selected CTS pin not valid")); mp_raise_ValueError_varg(translate("Invalid %q pin"), MP_QSTR_CTS);
} }
} }
if (self->rx) { if (self->rx) {
self->uart = mcu_uart_banks[self->rx->bank_idx - 1]; self->uart = mcu_uart_banks[self->rx->bank_idx - 1];
} else { } else {
assert(self->rx);
self->uart = mcu_uart_banks[self->tx->bank_idx - 1]; self->uart = mcu_uart_banks[self->tx->bank_idx - 1];
} }
assert(self->uart);
if (self->rx) { if (self->rx) {
config_periph_pin(self->rx); config_periph_pin(self->rx);
} }