Repository navigation
Expand file tree
/
Copy pathMultiLogger.cpp
More file actions
253 lines (210 loc) · 7.5 KB
/
Copy pathMultiLogger.cpp
File metadata and controls
253 lines (210 loc) · 7.5 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
#include "MultiLogger.hpp"
#include "GeneralTimeConverter.hpp"
// External time converter
extern GeneralTimeConverter* timeConverter;
// Global instance declaration
MultiLogger Log;
// External reference to serialMutex from Panelclock.ino
extern SemaphoreHandle_t serialMutex;
MultiLogger::MultiLogger(size_t bufferSize)
: _bufferSize(bufferSize), _writeIndex(0), _readIndex(0), _bufferFull(false), _debugFileEnabled(false) {
// Pre-allocate ring buffer in PSRAM
_ringBuffer.reserve(bufferSize);
for (size_t i = 0; i < bufferSize; i++) {
_ringBuffer.push_back(PsramString());
}
// Create mutex for thread safety
_mutex = xSemaphoreCreateMutex();
if (!_mutex) {
Serial.println("[MultiLogger] FATAL: Failed to create mutex!");
}
}
MultiLogger::~MultiLogger() {
if (_debugFile) {
_debugFile.close();
}
if (_mutex) {
vSemaphoreDelete(_mutex);
}
}
size_t MultiLogger::write(uint8_t c) {
// Forward to Serial immediately (for debugging)
if (serialMutex) {
if (xSemaphoreTake(serialMutex, portMAX_DELAY) == pdTRUE) {
Serial.write(c);
xSemaphoreGive(serialMutex);
}
} else {
// Fallback: write directly if mutex not available (early startup)
Serial.write(c);
}
// Lock for thread safety to update ring buffer
if (_mutex && xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) {
// Add to current line buffer
if (c == '\n') {
_finalizeLine();
} else if (c != '\r') { // Skip carriage returns
_currentLine += (char)c;
}
xSemaphoreGive(_mutex);
}
return 1;
}
size_t MultiLogger::write(const uint8_t* buffer, size_t size) {
if (!buffer || size == 0) return 0;
// Forward to Serial immediately (for debugging)
if (serialMutex) {
if (xSemaphoreTake(serialMutex, portMAX_DELAY) == pdTRUE) {
Serial.write(buffer, size);
xSemaphoreGive(serialMutex);
}
} else {
// Fallback: write directly if mutex not available (early startup)
Serial.write(buffer, size);
}
// Lock for thread safety to update ring buffer
if (_mutex && xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) {
// Process buffer character by character
for (size_t i = 0; i < size; i++) {
uint8_t c = buffer[i];
if (c == '\n') {
_finalizeLine();
} else if (c != '\r') { // Skip carriage returns
_currentLine += (char)c;
}
}
xSemaphoreGive(_mutex);
}
return size;
}
void MultiLogger::_finalizeLine() {
// Add timestamp (real time if available, otherwise millis)
char timeStr[32];
if (timeConverter && timeConverter->isSuccessfullyParsed()) {
time_t now = time(nullptr);
time_t localTime = timeConverter->toLocal(now);
struct tm timeinfo;
gmtime_r(&localTime, &timeinfo);
snprintf(timeStr, sizeof(timeStr), "[%02d:%02d:%02d] ",
timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec);
} else {
unsigned long timestamp = millis();
snprintf(timeStr, sizeof(timeStr), "[%lu] ", timestamp);
}
PsramString finalLine = PsramString(timeStr) + _currentLine;
// Write to debug file if enabled
_writeToDebugFile(finalLine);
// Add to ring buffer
_ringBuffer[_writeIndex] = finalLine;
// Update write index
_writeIndex = (_writeIndex + 1) % _bufferSize;
// Check if buffer is full
if (_writeIndex == _readIndex) {
_bufferFull = true;
// Move read index forward to maintain ring buffer behavior
_readIndex = (_readIndex + 1) % _bufferSize;
}
// Clear current line for next message
_currentLine.clear();
}
bool MultiLogger::hasNewLines() {
bool result = false;
if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) {
result = (_writeIndex != _readIndex) || _bufferFull;
xSemaphoreGive(_mutex);
}
return result;
}
size_t MultiLogger::getNewLines(PsramVector<PsramString>& outLines) {
size_t count = 0;
if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) {
// Read from readIndex to writeIndex
while (_readIndex != _writeIndex || _bufferFull) {
if (!_ringBuffer[_readIndex].empty()) {
outLines.push_back(_ringBuffer[_readIndex]);
count++;
}
_readIndex = (_readIndex + 1) % _bufferSize;
_bufferFull = false; // Once we start reading, it's no longer full
}
xSemaphoreGive(_mutex);
}
return count;
}
size_t MultiLogger::getAllLines(PsramVector<PsramString>& outLines) {
size_t count = 0;
if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) {
size_t index = _bufferFull ? _writeIndex : 0;
size_t endIndex = _writeIndex;
do {
if (!_ringBuffer[index].empty()) {
outLines.push_back(_ringBuffer[index]);
count++;
}
index = (index + 1) % _bufferSize;
} while (index != endIndex && (_bufferFull || index < _writeIndex));
xSemaphoreGive(_mutex);
}
return count;
}
void MultiLogger::clearBuffer() {
if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) {
for (auto& line : _ringBuffer) {
line.clear();
}
_writeIndex = 0;
_readIndex = 0;
_bufferFull = false;
_currentLine.clear();
xSemaphoreGive(_mutex);
}
}
void MultiLogger::setDebugFileEnabled(bool enabled) {
if (xSemaphoreTake(_mutex, portMAX_DELAY) == pdTRUE) {
if (enabled && !_debugFileEnabled) {
// Enable debug file logging
_debugFileEnabled = true;
// Open/create file in append mode
_debugFile = LittleFS.open(DEBUG_FILE_PATH, "a");
if (_debugFile) {
Serial.println("[MultiLogger] Debug file logging enabled");
_debugFile.println("\n=== Debug logging started ===");
_debugFile.flush();
} else {
Serial.println("[MultiLogger] ERROR: Failed to open debug file");
_debugFileEnabled = false;
}
} else if (!enabled && _debugFileEnabled) {
// Disable debug file logging
_debugFileEnabled = false;
if (_debugFile) {
_debugFile.println("=== Debug logging stopped ===\n");
_debugFile.close();
Serial.println("[MultiLogger] Debug file logging disabled");
}
// Delete the file to clear it
if (LittleFS.exists(DEBUG_FILE_PATH)) {
LittleFS.remove(DEBUG_FILE_PATH);
}
}
xSemaphoreGive(_mutex);
}
}
void MultiLogger::_writeToDebugFile(const PsramString& line) {
if (!_debugFileEnabled || !_debugFile) {
return;
}
// Check file size and truncate if needed
if (_debugFile.size() > MAX_DEBUG_FILE_SIZE) {
_debugFile.close();
LittleFS.remove(DEBUG_FILE_PATH);
_debugFile = LittleFS.open(DEBUG_FILE_PATH, "a");
if (_debugFile) {
_debugFile.println("=== Log file truncated (size limit reached) ===");
}
}
if (_debugFile) {
_debugFile.println(line.c_str());
_debugFile.flush(); // Ensure data is written immediately
}
}