Skip to content

Use static buffer in serial #29

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
frostmorn merged 2 commits into from
Mar 16, 2026
Merged

Use static buffer in serial #29

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
12be162
Use static buffer in serial
frostmorn Mar 16, 2026
6369812
cppcheck
frostmorn Mar 16, 2026
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
21 changes: 12 additions & 9 deletions lib/lilka/src/lilka/serial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,40 +68,43 @@ void SerialInterface::begin(unsigned long baud) {
}

void SerialInterface::log(const char* format, ...) {
char buffer[TX_BUFFER_SIZE];
va_list args;
va_start(args, format);
vsnprintf(buffer, sizeof(buffer), format, args);
lock();
vsnprintf(msgbuffer, sizeof(msgbuffer), format, args);
unlock();
va_end(args);
serial.lock();
char millisCstr[11]; // 10 digits + 1 for null terminator
snprintf(millisCstr, sizeof(millisCstr), "%010lu", millis());
serialQueue.push(String("[ ") + millisCstr + " ]" + String(LILKA_LOG_FORMAT) + buffer);
serialQueue.push(String("[ ") + millisCstr + " ]" + String(LILKA_LOG_FORMAT) + msgbuffer);
serial.unlock();
}

void SerialInterface::err(const char* format, ...) {
char buffer[TX_BUFFER_SIZE];
va_list args;
va_start(args, format);
vsnprintf(buffer, sizeof(buffer), format, args);
lock();
vsnprintf(msgbuffer, sizeof(msgbuffer), format, args);
unlock();
va_end(args);
serial.lock();
char millisCstr[11]; // 10 digits + 1 for null terminator
snprintf(millisCstr, sizeof(millisCstr), "%010lu", millis());
serialQueue.push(String("[ ") + millisCstr + " ]" + String(LILKA_ERR_FORMAT) + buffer);
serialQueue.push(String("[ ") + millisCstr + " ]" + String(LILKA_ERR_FORMAT) + msgbuffer);
serial.unlock();
}
void SerialInterface::idf(const char* format, ...) {
char buffer[TX_BUFFER_SIZE];
va_list args;
va_start(args, format);
vsnprintf(buffer, sizeof(buffer), format, args);
lock();
vsnprintf(msgbuffer, sizeof(msgbuffer), format, args);
unlock();
va_end(args);
serial.lock();
char millisCstr[11]; // 10 digits + 1 for null terminator
snprintf(millisCstr, sizeof(millisCstr), "%010lu", millis());
serialQueue.push(String("[ ") + millisCstr + " ]" + String(LILKA_IDF_FORMAT) + buffer);
serialQueue.push(String("[ ") + millisCstr + " ]" + String(LILKA_IDF_FORMAT) + msgbuffer);
serial.unlock();
}

Expand Down
1 change: 1 addition & 0 deletions lib/lilka/src/lilka/serial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class SerialInterface {

// Storage and mutex for this storage
SemaphoreHandle_t serialMutex = xSemaphoreCreateMutex();
char msgbuffer[TX_BUFFER_SIZE] = {};
std::queue<String> serialQueue;
};

Expand Down
Loading