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

raspberrypi: Claim UART after checking pins

Browse Source 
If, for some reason, you mix up TX and RX when calling `busio.UART` (who would do that ;) ), you get `Invalid pins`. When you go to try again, you'll get `All UART peripherals are in use` because the interface was claimed as busy before pins are verified. This should fix that issue.
This commit is contained in:
arturo182 2022-01-11 15:13:36 +01:00 committed by GitHub
parent d23d2e7bf4
commit 2251d0f4b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/raspberrypi/common-hal/busio/UART.c
View File

@ -118,17 +118,17 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
uint8_t uart_id = ((((tx != NULL) ? tx->number : rx->number) + 4) / 8) % NUM_UARTS; uint8_t uart_id = ((((tx != NULL) ? tx->number : rx->number) + 4) / 8) % NUM_UARTS;
self->tx_pin = pin_init(uart_id, tx, 0);
self->rx_pin = pin_init(uart_id, rx, 1);
self->cts_pin = pin_init(uart_id, cts, 2);
self->rts_pin = pin_init(uart_id, rts, 3);
if (uart_status[uart_id] != STATUS_FREE) { if (uart_status[uart_id] != STATUS_FREE) {
mp_raise_RuntimeError(translate("All UART peripherals are in use")); mp_raise_RuntimeError(translate("All UART peripherals are in use"));
} else { } else {
uart_status[uart_id] = STATUS_BUSY; uart_status[uart_id] = STATUS_BUSY;
} }
self->tx_pin = pin_init(uart_id, tx, 0);
self->rx_pin = pin_init(uart_id, rx, 1);
self->cts_pin = pin_init(uart_id, cts, 2);
self->rts_pin = pin_init(uart_id, rts, 3);
self->uart = UART_INST(uart_id); self->uart = UART_INST(uart_id);
self->uart_id = uart_id; self->uart_id = uart_id;
self->baudrate = baudrate; self->baudrate = baudrate;