Skip to content

Implement Tx only Flush #3433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
me-no-dev merged 13 commits into from
Nov 11, 2019
Merged

Implement Tx only Flush #3433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
995b9a0
add option to Flush() to only clear txQueue
stickbreaker Oct 30, 2019
48d28fb
support tx only flush()
stickbreaker Oct 30, 2019
92403a2
support tx only Flush()
stickbreaker Oct 30, 2019
4046a58
support txOnly for Flush()
stickbreaker Oct 30, 2019
be1a52e
compatibility to Stream()
stickbreaker Oct 30, 2019
8956c51
compatibility for Stream()
stickbreaker Oct 30, 2019
d7ccd54
default value error
stickbreaker Oct 30, 2019
fb82400
default value error
stickbreaker Oct 30, 2019
16b7589
Update esp32-hal-uart.h
stickbreaker Oct 30, 2019
070836a
Update esp32-hal-uart.c
stickbreaker Oct 30, 2019
715fcbe
Update HardwareSerial.cpp
stickbreaker Oct 30, 2019
62b11df
sp
stickbreaker Oct 30, 2019
f1628cc
correctly implement flushTxOnly()
stickbreaker Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cores/esp32/HardwareSerial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,16 @@ int HardwareSerial::read(void)
return -1;
}

void HardwareSerial::flush()
void HardwareSerial::flush(void)
{
uartFlush(_uart);
}

void HardwareSerial::flush(bool txOnly)
{
uartFlushTxOnly(_uart, txOnly);
}

size_t HardwareSerial::write(uint8_t c)
{
uartWrite(_uart, c);
Expand Down
1 change: 1 addition & 0 deletions cores/esp32/HardwareSerial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class HardwareSerial: public Stream
int peek(void);
int read(void);
void flush(void);
void flush( bool txOnly);
size_t write(uint8_t);
size_t write(const uint8_t *buffer, size_t size);

Expand Down
23 changes: 15 additions & 8 deletions cores/esp32/esp32-hal-uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,24 +327,31 @@ void uartWriteBuf(uart_t* uart, const uint8_t * data, size_t len)
}

void uartFlush(uart_t* uart)
{
uartFlushTxOnly(uart,false);
}

void uartFlushTxOnly(uart_t* uart, bool txOnly)
{
if(uart == NULL) {
return;
}

UART_MUTEX_LOCK();
while(uart->dev->status.txfifo_cnt || uart->dev->status.st_utx_out);

if( !txOnly ){
//Due to hardware issue, we can not use fifo_rst to reset uart fifo.
//See description about UART_TXFIFO_RST and UART_RXFIFO_RST in <<esp32_technical_reference_manual>> v2.6 or later.

//Due to hardware issue, we can not use fifo_rst to reset uart fifo.
//See description about UART_TXFIFO_RST and UART_RXFIFO_RST in <<esp32_technical_reference_manual>> v2.6 or later.
// we read the data out and make `fifo_len == 0 && rd_addr == wr_addr`.
while(uart->dev->status.rxfifo_cnt != 0 || (uart->dev->mem_rx_status.wr_addr != uart->dev->mem_rx_status.rd_addr)) {
READ_PERI_REG(UART_FIFO_REG(uart->num));
}

// we read the data out and make `fifo_len == 0 && rd_addr == wr_addr`.
while(uart->dev->status.rxfifo_cnt != 0 || (uart->dev->mem_rx_status.wr_addr != uart->dev->mem_rx_status.rd_addr)) {
READ_PERI_REG(UART_FIFO_REG(uart->num));
xQueueReset(uart->queue);
}

xQueueReset(uart->queue);


UART_MUTEX_UNLOCK();
}

Expand Down
1 change: 1 addition & 0 deletions cores/esp32/esp32-hal-uart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ void uartWrite(uart_t* uart, uint8_t c);
void uartWriteBuf(uart_t* uart, const uint8_t * data, size_t len);

void uartFlush(uart_t* uart);
void uartFlushTxOnly(uart_t* uart, bool txOnly );

void uartSetBaudRate(uart_t* uart, uint32_t baud_rate);
uint32_t uartGetBaudRate(uart_t* uart);
Expand Down