Skip to content

Modify UART Class to Make Use of the txBuffer #304

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

Open
delta-G wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Modify UART Class to Make Use of the txBuffer #304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c180836
Use txBuffer
delta-G May 6, 2024
b4a4e37
fixed formatting
delta-G May 6, 2024
e975966
added availableForWrite
delta-G May 6, 2024
2878c5a
Use member variable in ISR instead of static veriable
delta-G Jun 29, 2024
0a14d85
Loads characters 16 at a time in the interrupt callback
delta-G Jul 3, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Loads characters 16 at a time in the interrupt callback
  • Loading branch information
@delta-G
delta-G committed Jul 3, 2024
commit 0a14d85dc2d14febd8d31523d6eb08289a5a6fd0
32 changes: 20 additions & 12 deletions cores/arduino/Serial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,22 @@ 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: // TEI interrupt
{
if(uart_ptr->txBuffer.available()){
uart_ptr->txc = uart_ptr->txBuffer.read_char();
R_SCI_UART_Write(&(uart_ptr->uart_ctrl), (uint8_t*)&(uart_ptr->txc) , 1);
} else {
int idx = 0;
while (uart_ptr->txBuffer.available() && (idx < 16)){
uart_ptr->txc[idx++] = uart_ptr->txBuffer.read_char();
}
R_SCI_UART_Write(&(uart_ptr->uart_ctrl), (uint8_t*)(uart_ptr->txc) , idx);
}
else {
uart_ptr->tx_done = true;
}
}
break;
}
case UART_EVENT_TX_DATA_EMPTY: // TXI interrupt had no more data to write
{
break;
}
case UART_EVENT_RX_CHAR:
Expand Down Expand Up @@ -113,12 +120,13 @@ size_t UART::write(uint8_t c) {
/* -------------------------------------------------------------------------- */
if(init_ok) {
while(txBuffer.isFull()){;}
txBuffer.store_char(c);
if(tx_done){
tx_done = false;
txc = txBuffer.read_char(); // clear out the char we just added and send it to start transmission.
R_SCI_UART_Write(&uart_ctrl, (uint8_t*)&txc , 1);
}
if (tx_done) {
tx_done = false;
txc[0] = c;
R_SCI_UART_Write(&uart_ctrl, (uint8_t*)txc , 1);
} else {
txBuffer.store_char(c);
}
return 1;
}
else {
Expand Down
2 changes: 1 addition & 1 deletion cores/arduino/Serial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class UART : public arduino::HardwareSerial {
arduino::SafeRingBufferN<SERIAL_BUFFER_SIZE> txBuffer;

volatile bool tx_done = true;
char txc;
volatile char txc[BSP_FEATURE_SCI_UART_FIFO_DEPTH];

sci_uart_instance_ctrl_t uart_ctrl;
uart_cfg_t uart_cfg;
Expand Down