From b906e5797e138cbb90fd28e14248d557b972540d Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <Rodrigo.Garcia@espressif.com>
Date: Mon, 23 Aug 2021 15:04:55 -0300
Subject: [PATCH 1/2] Adds rxBufferSize parameter to begin()
---
cores/esp32/HardwareSerial.cpp | 6 +++---
cores/esp32/HardwareSerial.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cores/esp32/HardwareSerial.cpp b/cores/esp32/HardwareSerial.cpp
index cde85b491bb..3a017be1b0a 100644
--- a/cores/esp32/HardwareSerial.cpp
+++ b/cores/esp32/HardwareSerial.cpp
@@ -105,7 +105,7 @@ void serialEventRun(void)
HardwareSerial::HardwareSerial(int uart_nr) : _uart_nr(uart_nr), _uart(NULL) {}
-void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, int8_t txPin, bool invert, unsigned long timeout_ms, uint8_t rxfifo_full_thrhd)
+void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, int8_t txPin, bool invert, unsigned long timeout_ms, uint8_t rxfifo_full_thrhd, size_t rxBufferSize)
{
if(0 > _uart_nr || _uart_nr >= SOC_UART_NUM) {
log_e("Serial number is invalid, please use numers from 0 to %u", SOC_UART_NUM - 1);
@@ -133,7 +133,7 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
}
#endif
- _uart = uartBegin(_uart_nr, baud ? baud : 9600, config, rxPin, txPin, 256, invert, rxfifo_full_thrhd);
+ _uart = uartBegin(_uart_nr, baud ? baud : 9600, config, rxPin, txPin, rxBufferSize, invert, rxfifo_full_thrhd);
if (!baud) {
// using baud rate as zero, forces it to try to detect the current baud rate in place
uartStartDetectBaudrate(_uart);
@@ -147,7 +147,7 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
if(detectedBaudRate) {
delay(100); // Give some time...
- _uart = uartBegin(_uart_nr, detectedBaudRate, config, rxPin, txPin, 256, invert, rxfifo_full_thrhd);
+ _uart = uartBegin(_uart_nr, detectedBaudRate, config, rxPin, txPin, rxBufferSize, invert, rxfifo_full_thrhd);
} else {
log_e("Could not detect baudrate. Serial data at the port must be present within the timeout for detection to be possible");
_uart = NULL;
diff --git a/cores/esp32/HardwareSerial.h b/cores/esp32/HardwareSerial.h
index 87807cde8dd..efbe36ebbbd 100644
--- a/cores/esp32/HardwareSerial.h
+++ b/cores/esp32/HardwareSerial.h
@@ -56,7 +56,7 @@ class HardwareSerial: public Stream
public:
HardwareSerial(int uart_nr);
- void begin(unsigned long baud, uint32_t config=SERIAL_8N1, int8_t rxPin=-1, int8_t txPin=-1, bool invert=false, unsigned long timeout_ms = 20000UL, uint8_t rxfifo_full_thrhd = 112);
+ void begin(unsigned long baud, uint32_t config=SERIAL_8N1, int8_t rxPin=-1, int8_t txPin=-1, bool invert=false, unsigned long timeout_ms = 20000UL, uint8_t rxfifo_full_thrhd = 112, size_t rxBufferSize = 256);
void end(bool turnOffDebug = true);
void updateBaudRate(unsigned long baud);
int available(void);
From 4d16d26c797832ecbf7f2c8169381be7bf02f55a Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <Rodrigo.Garcia@espressif.com>
Date: Mon, 23 Aug 2021 20:46:41 -0300
Subject: [PATCH 2/2] Adds HardwareSerial::setRXBufferSize()
---
cores/esp32/HardwareSerial.cpp | 23 +++++++++++++++++++----
cores/esp32/HardwareSerial.h | 4 +++-
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/cores/esp32/HardwareSerial.cpp b/cores/esp32/HardwareSerial.cpp
index 3a017be1b0a..32411514212 100644
--- a/cores/esp32/HardwareSerial.cpp
+++ b/cores/esp32/HardwareSerial.cpp
@@ -103,9 +103,9 @@ void serialEventRun(void)
}
-HardwareSerial::HardwareSerial(int uart_nr) : _uart_nr(uart_nr), _uart(NULL) {}
+HardwareSerial::HardwareSerial(int uart_nr) : _uart_nr(uart_nr), _uart(NULL), _rxBufferSize(256) {}
-void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, int8_t txPin, bool invert, unsigned long timeout_ms, uint8_t rxfifo_full_thrhd, size_t rxBufferSize)
+void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, int8_t txPin, bool invert, unsigned long timeout_ms, uint8_t rxfifo_full_thrhd)
{
if(0 > _uart_nr || _uart_nr >= SOC_UART_NUM) {
log_e("Serial number is invalid, please use numers from 0 to %u", SOC_UART_NUM - 1);
@@ -133,7 +133,7 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
}
#endif
- _uart = uartBegin(_uart_nr, baud ? baud : 9600, config, rxPin, txPin, rxBufferSize, invert, rxfifo_full_thrhd);
+ _uart = uartBegin(_uart_nr, baud ? baud : 9600, config, rxPin, txPin, _rxBufferSize, invert, rxfifo_full_thrhd);
if (!baud) {
// using baud rate as zero, forces it to try to detect the current baud rate in place
uartStartDetectBaudrate(_uart);
@@ -147,7 +147,7 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
if(detectedBaudRate) {
delay(100); // Give some time...
- _uart = uartBegin(_uart_nr, detectedBaudRate, config, rxPin, txPin, rxBufferSize, invert, rxfifo_full_thrhd);
+ _uart = uartBegin(_uart_nr, detectedBaudRate, config, rxPin, txPin, _rxBufferSize, invert, rxfifo_full_thrhd);
} else {
log_e("Could not detect baudrate. Serial data at the port must be present within the timeout for detection to be possible");
_uart = NULL;
@@ -268,3 +268,18 @@ void HardwareSerial::setPins(uint8_t rxPin, uint8_t txPin)
uartSetPins(_uart, rxPin, txPin);
}
+size_t HardwareSerial::setRxBufferSize(size_t new_size) {
+
+ if (_uart) {
+ log_e("RX Buffer can't be resized when Serial is already running.\n");
+ return 0;
+ }
+
+ if (new_size <= SOC_UART_FIFO_LEN) {
+ log_e("RX Buffer must be higher than %d.\n", SOC_UART_FIFO_LEN);
+ return 0;
+ }
+
+ _rxBufferSize = new_size;
+ return _rxBufferSize;
+}
diff --git a/cores/esp32/HardwareSerial.h b/cores/esp32/HardwareSerial.h
index efbe36ebbbd..04b9604581c 100644
--- a/cores/esp32/HardwareSerial.h
+++ b/cores/esp32/HardwareSerial.h
@@ -56,7 +56,7 @@ class HardwareSerial: public Stream
public:
HardwareSerial(int uart_nr);
- void begin(unsigned long baud, uint32_t config=SERIAL_8N1, int8_t rxPin=-1, int8_t txPin=-1, bool invert=false, unsigned long timeout_ms = 20000UL, uint8_t rxfifo_full_thrhd = 112, size_t rxBufferSize = 256);
+ void begin(unsigned long baud, uint32_t config=SERIAL_8N1, int8_t rxPin=-1, int8_t txPin=-1, bool invert=false, unsigned long timeout_ms = 20000UL, uint8_t rxfifo_full_thrhd = 112);
void end(bool turnOffDebug = true);
void updateBaudRate(unsigned long baud);
int available(void);
@@ -103,10 +103,12 @@ class HardwareSerial: public Stream
void setRxInvert(bool);
void setPins(uint8_t rxPin, uint8_t txPin);
+ size_t setRxBufferSize(size_t new_size);
protected:
int _uart_nr;
uart_t* _uart;
+ size_t _rxBufferSize;
};
extern void serialEventRun(void) __attribute__((weak));