jacob.eva/arduino-esp32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes UART detach. Fixes #3878 (#3894)

Browse Source 
* Fixes UART detach.  Fixes #3878

* 0 is not a good holder value for pins!

* 0 is not a good holder value for pins!
This commit is contained in:
lbernstone 2020-09-30 06:04:18 -06:00 committed by GitHub
parent 8b6d020352
commit 80418fadcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cores/esp32/HardwareSerial.cpp
View File

@ -53,6 +53,8 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
} }
_uart = uartBegin(_uart_nr, baud ? baud : 9600, config, rxPin, txPin, 256, invert); _uart = uartBegin(_uart_nr, baud ? baud : 9600, config, rxPin, txPin, 256, invert);
_tx_pin = txPin;
_rx_pin = rxPin;
if(!baud) { if(!baud) {
uartStartDetectBaudrate(_uart); uartStartDetectBaudrate(_uart);
@ -70,6 +72,8 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
} else { } else {
log_e("Could not detect baudrate. Serial data at the port must be present within the timeout for detection to be possible"); log_e("Could not detect baudrate. Serial data at the port must be present within the timeout for detection to be possible");
_uart = NULL; _uart = NULL;
_tx_pin = 255;
_rx_pin = 255;
} }
} }
} }
@ -84,7 +88,8 @@ void HardwareSerial::end()
if(uartGetDebug() == _uart_nr) { if(uartGetDebug() == _uart_nr) {
uartSetDebug(0); uartSetDebug(0);
} }
uartEnd(_uart); log_v("pins %d %d",_tx_pin, _rx_pin);
uartEnd(_uart, _tx_pin, _rx_pin);
_uart = 0; _uart = 0;
} }

2
cores/esp32/HardwareSerial.h
View File

@ -104,6 +104,8 @@ public:
protected: protected:
int _uart_nr; int _uart_nr;
uart_t* _uart; uart_t* _uart;
uint8_t _tx_pin;
uint8_t _rx_pin;
}; };
extern void serialEventRun(void) __attribute__((weak)); extern void serialEventRun(void) __attribute__((weak));

14
cores/esp32/esp32-hal-uart.c
View File

@ -124,21 +124,21 @@ void uartDisableInterrupt(uart_t* uart)
UART_MUTEX_UNLOCK(); UART_MUTEX_UNLOCK();
} }
void uartDetachRx(uart_t* uart) void uartDetachRx(uart_t* uart, uint8_t rxPin)
{ {
if(uart == NULL) { if(uart == NULL) {
return; return;
} }
pinMatrixInDetach(UART_RXD_IDX(uart->num), false, false); pinMatrixInDetach(rxPin, false, false);
uartDisableInterrupt(uart); uartDisableInterrupt(uart);
} }
void uartDetachTx(uart_t* uart) void uartDetachTx(uart_t* uart, uint8_t txPin)
{ {
if(uart == NULL) { if(uart == NULL) {
return; return;
} }
pinMatrixOutDetach(UART_TXD_IDX(uart->num), false, false); pinMatrixOutDetach(txPin, false, false);
} }
void uartAttachRx(uart_t* uart, uint8_t rxPin, bool inverted) void uartAttachRx(uart_t* uart, uint8_t rxPin, bool inverted)
@ -226,7 +226,7 @@ uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rx
return uart; return uart;
} }
void uartEnd(uart_t* uart) void uartEnd(uart_t* uart, uint8_t txPin, uint8_t rxPin)
{ {
if(uart == NULL) { if(uart == NULL) {
return; return;
@ -243,8 +243,8 @@ void uartEnd(uart_t* uart)
UART_MUTEX_UNLOCK(); UART_MUTEX_UNLOCK();
uartDetachRx(uart); uartDetachRx(uart, rxPin);
uartDetachTx(uart); uartDetachTx(uart, txPin);
} }
size_t uartResizeRxBuffer(uart_t * uart, size_t new_size) { size_t uartResizeRxBuffer(uart_t * uart, size_t new_size) {

2
cores/esp32/esp32-hal-uart.h
View File

@ -52,7 +52,7 @@ struct uart_struct_t;
typedef struct uart_struct_t uart_t; typedef struct uart_struct_t uart_t;
uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint16_t queueLen, bool inverted); uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rxPin, int8_t txPin, uint16_t queueLen, bool inverted);
void uartEnd(uart_t* uart); void uartEnd(uart_t* uart, uint8_t rxPin, uint8_t txPin);
uint32_t uartAvailable(uart_t* uart); uint32_t uartAvailable(uart_t* uart);
uint32_t uartAvailableForWrite(uart_t* uart); uint32_t uartAvailableForWrite(uart_t* uart);