Skip to content

Fix for Serial flush() returning before transmission has completed #405

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
merged 2 commits into from
Nov 29, 2024
Merged

Fix for Serial flush() returning before transmission has completed #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
443a404
Serial: split uart events TX_COMPLETE from TX_DATA_EMPTY
Hsubtnarg May 28, 2024
51e2905
Serial: initialize tx flags to avoid locks
pennam Nov 29, 2024
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
28 changes: 17 additions & 11 deletions cores/arduino/Serial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,14 @@ void UART::WrapperCallback(uart_callback_args_t *p_args) {
{
break;
}
case UART_EVENT_TX_COMPLETE:
case UART_EVENT_TX_DATA_EMPTY:
case UART_EVENT_TX_COMPLETE: // This is call when the transmission is complete
{
//uint8_t to_enqueue = uart_ptr->txBuffer.available() < uart_ptr->uart_ctrl.fifo_depth ? uart_ptr->txBuffer.available() : uart_ptr->uart_ctrl.fifo_depth;
//while (to_enqueue) {
uart_ptr->tx_done = true;
uart_ptr->tx_complete = true;
break;
}
case UART_EVENT_TX_DATA_EMPTY: // This is called when the buffer is empty
{ // Last byte is transmitting, but ready for more data
uart_ptr->tx_empty = true;
break;
}
case UART_EVENT_RX_CHAR:
Expand All @@ -87,6 +89,8 @@ UART::UART(int _pin_tx, int _pin_rx, int _pin_rts, int _pin_cts):
rx_pin(_pin_rx),
rts_pin(_pin_rts),
cts_pin(_pin_cts),
tx_empty(true),
tx_complete(true),
init_ok(false) {
/* -------------------------------------------------------------------------- */
uart_cfg.txi_irq = FSP_INVALID_VECTOR;
Expand All @@ -109,9 +113,10 @@ bool UART::setUpUartIrqs(uart_cfg_t &cfg) {
size_t UART::write(uint8_t c) {
/* -------------------------------------------------------------------------- */
if(init_ok) {
tx_done = false;
tx_empty = false;
tx_complete = false;
R_SCI_UART_Write(&uart_ctrl, &c, 1);
while (!tx_done) {}
while (!tx_empty) {}
return 1;
}
else {
Expand All @@ -121,9 +126,10 @@ size_t UART::write(uint8_t c) {

size_t UART::write(uint8_t* c, size_t len) {
if(init_ok) {
tx_done = false;
tx_empty = false;
tx_complete = false;
R_SCI_UART_Write(&uart_ctrl, c, len);
while (!tx_done) {}
while (!tx_empty) {}
return len;
}
else {
Expand Down Expand Up @@ -322,7 +328,7 @@ int UART::read() {
/* -------------------------------------------------------------------------- */
void UART::flush() {
/* -------------------------------------------------------------------------- */
while(txBuffer.available());
while(!tx_complete);
}

/* -------------------------------------------------------------------------- */
Expand All @@ -335,4 +341,4 @@ size_t UART::write_raw(uint8_t* c, size_t len) {
i++;
}
return len;
}
}
3 changes: 2 additions & 1 deletion cores/arduino/Serial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ class UART : public arduino::HardwareSerial {
arduino::SafeRingBufferN<SERIAL_BUFFER_SIZE> rxBuffer;
arduino::SafeRingBufferN<SERIAL_BUFFER_SIZE> txBuffer;

volatile bool tx_done;
volatile bool tx_empty;
volatile bool tx_complete;

sci_uart_instance_ctrl_t uart_ctrl;
uart_cfg_t uart_cfg;
Expand Down
Loading