shade/MeshCoreTel-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: improve stats archive rotation and satellites trend handling

Browse Source
This commit is contained in:
Jared Dohrman
2026-04-21 19:14:17 +10:00
parent 2ad3b134f2
commit 63e9368c84
6 changed files with 231 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/helpers/StatsHistory.cpp
+124 -22
View File
@@ -2,6 +2,7 @@
#include <stdio.h>
#include <string.h>
#include <RTClib.h>
#if defined(ESP32)
#include <esp_heap_caps.h>
@@ -32,6 +33,11 @@ constexpr uint32_t kBootAutoCapturePsramMinBytes = 2000000UL;
constexpr size_t kLiveOnlySampleCapacity = 24;
constexpr size_t kLiveOnlyEventCapacity = 8;
constexpr const char* kSummaryLatestPath = "/stats/summary.latest";
constexpr const char* kSummaryLegacyLogPath = "/stats/summary.log";
constexpr const char* kEventsLatestPath = "/stats/events.latest";
constexpr const char* kEventsLegacyLogPath = "/stats/events.log";
struct HistoryCapacityBucket {
size_t sample_capacity;
size_t event_capacity;
@@ -187,6 +193,19 @@ File openArchiveWriteWithRecovery(ArchiveStorage* archive, const char* filename)
return fs != nullptr ? openArchiveWrite(fs, filename) : File();
}
bool buildUtcDailyLogPath(const char* prefix, uint32_t epoch_secs, char* path, size_t path_size) {
if (prefix == nullptr || path == nullptr || path_size == 0) {
return false;
}
if (epoch_secs == 0) {
snprintf(path, path_size, "/stats/%s-unknown.log", prefix);
return true;
}
const DateTime dt(epoch_secs);
snprintf(path, path_size, "/stats/%s-%04d-%02d-%02d.log", prefix, dt.year(), dt.month(), dt.day());
return true;
}
bool buildPointValue(const HistorySample& sample, const HistorySample* previous, const char* series, int& value) {
if (strcmp(series, "battery") == 0) {
value = static_cast<int>(sample.battery_mv);
@@ -752,17 +771,59 @@ bool StatsHistory::restoreSummaryLog() {
}
FILESYSTEM* fs = _archive->getFS();
if (fs == nullptr || !fs->exists("/stats/summary.log")) {
return false;
}
File file = openArchiveReadWithRecovery(_archive, "/stats/summary.log");
if (!file) {
ARCHIVE_LOG("summary restore open failed path=%s", "/stats/summary.log");
if (fs == nullptr) {
return false;
}
_restored_sample_count = 0;
if (fs->exists(kSummaryLatestPath)) {
File latest_file = openArchiveReadWithRecovery(_archive, kSummaryLatestPath);
if (latest_file) {
char line[384];
size_t line_len = 0;
while (latest_file.available()) {
const int raw = latest_file.read();
if (raw < 0) {
break;
}
const char ch = static_cast<char>(raw);
if (ch == '\r') {
continue;
}
if (ch == '\n') {
break;
}
if (line_len + 1 < sizeof(line)) {
line[line_len++] = ch;
}
}
line[line_len] = 0;
latest_file.close();
HistorySample latest_sample{};
if (line_len > 0 && parseSummaryLine(line, latest_sample)) {
storeSample(latest_sample, false);
_restored_sample_count = 1;
return true;
}
} else {
ARCHIVE_LOG("summary restore open failed path=%s", kSummaryLatestPath);
}
}
const char* summary_restore_path = nullptr;
if (fs->exists(kSummaryLegacyLogPath)) {
summary_restore_path = kSummaryLegacyLogPath;
} else {
return false;
}
File file = openArchiveReadWithRecovery(_archive, summary_restore_path);
if (!file) {
ARCHIVE_LOG("summary restore open failed path=%s", summary_restore_path);
return false;
}
const size_t size = static_cast<size_t>(file.size());
const size_t start = (size > kSummaryRestoreWindowBytes) ? (size - kSummaryRestoreWindowBytes) : 0;
if (start > 0 && !file.seek(start)) {
@@ -851,17 +912,28 @@ bool StatsHistory::restoreEventsLog() {
}
FILESYSTEM* fs = _archive->getFS();
if (fs == nullptr || !fs->exists("/stats/events.log")) {
if (fs == nullptr) {
return false;
}
File file = openArchiveRead(fs, "/stats/events.log");
const char* events_restore_path = nullptr;
if (fs->exists(kEventsLatestPath)) {
events_restore_path = kEventsLatestPath;
} else if (fs->exists(kEventsLegacyLogPath)) {
events_restore_path = kEventsLegacyLogPath;
} else {
return false;
}
File file = openArchiveReadWithRecovery(_archive, events_restore_path);
if (!file) {
return false;
}
const size_t size = static_cast<size_t>(file.size());
const size_t start = (size > kEventsRestoreWindowBytes) ? (size - kEventsRestoreWindowBytes) : 0;
const size_t start = (strcmp(events_restore_path, kEventsLatestPath) == 0)
? 0
: ((size > kEventsRestoreWindowBytes) ? (size - kEventsRestoreWindowBytes) : 0);
if (start > 0 && !file.seek(start)) {
file.close();
return false;
@@ -994,12 +1066,6 @@ void StatsHistory::flushSummaryLog() {
return;
}
File file = openArchiveAppendWithRecovery(_archive, "/stats/summary.log");
if (!file) {
ARCHIVE_LOG("summary open failed path=%s", "/stats/summary.log");
return;
}
char line[384];
snprintf(line, sizeof(line),
"%lu,%lu,%u,%u,%d,%d,%d,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%d,%d,%u,%u,%d,%d,%ld,%ld,%u,%u\n",
@@ -1031,11 +1097,31 @@ void StatsHistory::flushSummaryLog() {
static_cast<long>(latest.gps_lon_e6),
static_cast<unsigned>(latest.sensor_flags),
static_cast<unsigned>(latest.gps_satellites));
File latest_file = openArchiveWriteWithRecovery(_archive, kSummaryLatestPath);
if (!latest_file) {
ARCHIVE_LOG("summary latest open failed path=%s", kSummaryLatestPath);
return;
}
const size_t latest_written = latest_file.print(line);
latest_file.flush();
latest_file.close();
char daily_path[48];
buildUtcDailyLogPath("summary", latest.epoch_secs, daily_path, sizeof(daily_path));
File file = openArchiveAppendWithRecovery(_archive, daily_path);
if (!file) {
ARCHIVE_LOG("summary open failed path=%s", daily_path);
return;
}
const size_t written = file.print(line);
file.flush();
file.close();
ARCHIVE_LOG("summary flushed path=%s bytes=%u sample_count=%u",
"/stats/summary.log",
ARCHIVE_LOG("summary flushed latest=%s bytes=%u log=%s log_bytes=%u sample_count=%u",
kSummaryLatestPath,
static_cast<unsigned>(latest_written),
daily_path,
static_cast<unsigned>(written),
static_cast<unsigned>(_sample_count));
writeMetaFile();
@@ -1051,13 +1137,24 @@ void StatsHistory::flushEventsLog() {
return;
}
File file = openArchiveAppendWithRecovery(_archive, "/stats/events.log");
File latest_file = openArchiveWriteWithRecovery(_archive, kEventsLatestPath);
if (!latest_file) {
ARCHIVE_LOG("events latest open failed path=%s", kEventsLatestPath);
return;
}
char latest_epoch_path[48];
uint32_t latest_epoch_secs = _pending_events[_pending_event_count - 1].epoch_secs;
buildUtcDailyLogPath("events", latest_epoch_secs, latest_epoch_path, sizeof(latest_epoch_path));
File file = openArchiveAppendWithRecovery(_archive, latest_epoch_path);
if (!file) {
ARCHIVE_LOG("events open failed path=%s", "/stats/events.log");
latest_file.close();
ARCHIVE_LOG("events open failed path=%s", latest_epoch_path);
return;
}
size_t total_written = 0;
size_t latest_written = 0;
for (size_t i = 0; i < _pending_event_count; ++i) {
const HistoryEvent& event = _pending_events[i];
char line[160];
@@ -1068,11 +1165,16 @@ void StatsHistory::flushEventsLog() {
getEventTypeName(event.type),
static_cast<int>(event.value));
total_written += file.print(line);
latest_written += latest_file.print(line);
}
latest_file.flush();
latest_file.close();
file.flush();
file.close();
ARCHIVE_LOG("events flushed path=%s bytes=%u count=%u",
"/stats/events.log",
ARCHIVE_LOG("events flushed latest=%s bytes=%u log=%s log_bytes=%u count=%u",
kEventsLatestPath,
static_cast<unsigned>(latest_written),
latest_epoch_path,
static_cast<unsigned>(total_written),
static_cast<unsigned>(_pending_event_count));
_pending_event_count = 0;
src/helpers/web/WebPanelServer.cpp
+10 -3
View File
@@ -1780,6 +1780,7 @@ const char kWebPanelAppHtml[] PROGMEM = R"HTML(
}
function sparkStrokeColor(key, points) {
if (key === "packets") return "#d97706";
if (key === "gps_satellites") return "#2f8f4e";
if (key === "signal") return "#3b82f6";
if (key === "noise_floor") return "#94a3b8";
if (key === "memory") {
@@ -1791,6 +1792,11 @@ const char kWebPanelAppHtml[] PROGMEM = R"HTML(
}
return "#2f8f4e";
}
function sparkHoverColor(key, baseColor) {
if (key === "packets") return "#f59e0b";
if (key === "gps_satellites") return "#48b267";
return baseColor || "#2f8f4e";
}
function sparkValueRange(key, values) {
if (key === "signal") {
return { min:(-125 * 4), max:(-30 * 4) };
@@ -1880,14 +1886,15 @@ const char kWebPanelAppHtml[] PROGMEM = R"HTML(
y: scaleY(point[1])
}));
const strokeColor = sparkStrokeColor(key, points);
if (key === "packets") {
if (key === "packets" || key === "gps_satellites") {
const slotWidth = (plotRight - plotLeft) / Math.max(points.length, 1);
const barWidth = Math.max(3, Math.min(18, slotWidth * 0.68));
const hoverColor = sparkHoverColor(key, strokeColor);
coords.forEach((point, index) => {
const left = clamp(point.x - (barWidth / 2), plotLeft, plotRight - barWidth);
const top = point.y;
const barHeight = Math.max(1, plotBottom - top);
ctx.fillStyle = Number.isInteger(hoverIndex) && hoverIndex === index ? "#f59e0b" : strokeColor;
ctx.fillStyle = Number.isInteger(hoverIndex) && hoverIndex === index ? hoverColor : strokeColor;
ctx.fillRect(left, top, barWidth, barHeight);
});
return;
@@ -1993,7 +2000,7 @@ const char kWebPanelAppHtml[] PROGMEM = R"HTML(
if (gpsEnabled) {
order.push("gps_satellites");
}
return order.concat(["voltage", "sensor_temp", "humidity", "pressure", "pressure_altitude", "mcu_temp", "gps_altitude"]);
return order;
}
function initTrendCards(seriesOrder) {
const trendsEl = document.getElementById("statsTrends");