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

Merge pull request #5388 from microDev1/serial-over-uart 

Fix espressif serial over uart
This commit is contained in:
microDev 2021-09-26 09:30:08 +05:30 committed by GitHub
parent 358a9336ff 1be6c41da4
commit bd997dd67e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,8 @@
#include "supervisor/shared/translate.h"
#include "supervisor/shared/tick.h"
uint8_t never_reset_uart_mask = 0;
void uart_reset(void) {
for (uart_port_t num = 0; num < UART_NUM_MAX; num++) {
// Ignore the UART used by the IDF.
@ -46,12 +48,20 @@ void uart_reset(void) {
continue;
}
#endif
if (uart_is_driver_installed(num)) {
if (uart_is_driver_installed(num) && !(never_reset_uart_mask & 1 << num)) {
uart_driver_delete(num);
}
}
}
void common_hal_busio_uart_never_reset(busio_uart_obj_t *self) {
common_hal_never_reset_pin(self->rx_pin);
common_hal_never_reset_pin(self->tx_pin);
common_hal_never_reset_pin(self->rts_pin);
common_hal_never_reset_pin(self->cts_pin);
never_reset_uart_mask |= 1 << self->uart_num;
}
void common_hal_busio_uart_construct(busio_uart_obj_t *self,
const mcu_pin_obj_t *tx, const mcu_pin_obj_t *rx,
const mcu_pin_obj_t *rts, const mcu_pin_obj_t *cts,

3
ports/espressif/common-hal/microcontroller/Pin.c
View File

@ -58,6 +58,9 @@ void never_reset_pin_number(gpio_num_t pin_number) {
}
void common_hal_never_reset_pin(const mcu_pin_obj_t *pin) {
if (pin == NULL) {
return;
}
never_reset_pin_number(pin->number);
}

1
ports/espressif/common-hal/microcontroller/Pin.h
View File

@ -36,6 +36,7 @@ void reset_all_pins(void);
// need to store a full pointer.
void reset_pin_number(gpio_num_t pin_number);
void common_hal_reset_pin(const mcu_pin_obj_t *pin);
void common_hal_never_reset_pin(const mcu_pin_obj_t *pin);
void claim_pin(const mcu_pin_obj_t *pin);
void claim_pin_number(gpio_num_t pin_number);
bool pin_number_is_free(gpio_num_t pin_number);