Skip to content

Fix serialTransmitBuffer overrun - drain buffer when it gets full #518

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 1 commit into from
Mar 7, 2023
Merged

Fix serialTransmitBuffer overrun - drain buffer when it gets full #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions Firmware/LoRaSerial/Serial.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ void serialBufferOutput(uint8_t * data, uint16_t dataLength)
{
int length;

//Make sure there is enough room in the buffer
if ((sizeof(serialTransmitBuffer) - availableTXBytes()) < (dataLength + 32))
outputSerialData(true);

length = 0;
if ((txHead + dataLength) > sizeof(serialTransmitBuffer))
{
Expand All @@ -55,6 +59,10 @@ void serialOutputByte(uint8_t data)
{
if (printerEndpoint == PRINT_TO_SERIAL)
{
//Make sure there is enough room in the buffer
if ((sizeof(serialTransmitBuffer) - availableTXBytes()) < 32)
outputSerialData(true);

//Add this byte to the serial output buffer
serialTransmitBuffer[txHead++] = data;
txHead %= sizeof(serialTransmitBuffer);
Expand Down