Skip to content
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

Jump to bottom

uart: fix wdt input overrun #4536

Merged
merged 3 commits into from
Mar 21, 2018
Merged

uart: fix wdt input overrun #4536

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
546c8b7
uart: fix wdt on uart input overrun
d-a-v Mar 19, 2018
54cc463
uart: better make overrun an api than a global
d-a-v Mar 20, 2018
9ef14db
expose uart_has_overrun in HardwareSerial
d-a-v Mar 21, 2018
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
29 changes: 29 additions & 0 deletions cores/esp8266/uart.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ struct uart_ {
int baud_rate;
bool rx_enabled;
bool tx_enabled;
bool overrun;
uint8_t rx_pin;
uint8_t tx_pin;
struct uart_rx_buffer_ * rx_buffer;
Expand Down Expand Up @@ -102,13 +103,31 @@ inline size_t uart_rx_fifo_available(uart_t* uart) {
return (USS(uart->uart_nr) >> USRXC) & 0x7F;
}

char overrun_str [] ICACHE_RODATA_ATTR STORE_ATTR = "uart input full!\r\n";

// Copy all the rx fifo bytes that fit into the rx buffer
inline void uart_rx_copy_fifo_to_buffer(uart_t* uart) {
while(uart_rx_fifo_available(uart)){
size_t nextPos = (uart->rx_buffer->wpos + 1) % uart->rx_buffer->size;
if(nextPos == uart->rx_buffer->rpos) {

if (!uart->overrun) {
uart->overrun = true;
os_printf_plus(overrun_str);
}

// a choice has to be made here,
// do we discard newest or oldest data?
#if 0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm ok with either option here.

// discard newest data
// Stop copying if rx buffer is full
USF(uart->uart_nr);
break;
#else
// discard oldest data
if (++uart->rx_buffer->rpos == uart->rx_buffer->size)
uart->rx_buffer->rpos = 0;
#endif
}
uint8_t data = USF(uart->uart_nr);
uart->rx_buffer->buffer[uart->rx_buffer->wpos] = data;
Expand Down Expand Up @@ -281,6 +300,7 @@ uart_t* uart_init(int uart_nr, int baudrate, int config, int mode, int tx_pin, s
}

uart->uart_nr = uart_nr;
uart->overrun = false;

switch(uart->uart_nr) {
case UART0:
Expand Down Expand Up @@ -504,6 +524,15 @@ bool uart_rx_enabled(uart_t* uart)
return uart->rx_enabled;
}

bool uart_has_overrun (uart_t* uart)
{
if (uart == NULL || !uart->overrun) {
return false;
}
// clear flag
uart->overrun = false;
return true;
}

static void uart_ignore_char(char c)
{
Expand Down
2 changes: 2 additions & 0 deletions cores/esp8266/uart.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ size_t uart_tx_free(uart_t* uart);
void uart_wait_tx_empty(uart_t* uart);
void uart_flush(uart_t* uart);

bool uart_has_overrun (uart_t* uart); // returns then clear overrun flag

void uart_set_debug(int uart_nr);
int uart_get_debug();

Expand Down