accumulator/btclock_v3
1
0
Fork 0
forked from btclock/btclock_v3
Code Pull requests Activity

chore: update dependencies and make eventsource use static jsondocument

Browse source
This commit is contained in:
Djuri 2025-01-20 12:05:48 +01:00
parent 678a4ba099
commit 3265eec308
Signed by: djuri
GPG key ID: 61B9B2DDE5AA3AC1
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/lib/webserver.cpp
View file

@ -30,7 +30,8 @@ TaskHandle_t eventSourceTaskHandle;
void setupWebserver()
{
events.onConnect([](AsyncEventSourceClient *client)
{ client->send("welcome", NULL, millis(), 1000); });
{ client->send("welcome", NULL, millis(), 1000);
});
server.addHandler(&events);
AsyncStaticWebHandler &staticHandler = server.serveStatic("/", LittleFS, "/").setDefaultFile("index.html");
@ -306,14 +307,18 @@ JsonDocument getLedStatusObject()
void eventSourceUpdate() {
if (!events.count()) return;
JsonDocument doc = getStatusObject();
doc["leds"] = getLedStatusObject()["data"];
static JsonDocument doc;
doc.clear();
JsonDocument root = getStatusObject();
root["leds"] = getLedStatusObject()["data"];
// Get current EPD content directly as array
std::array<String, NUM_SCREENS> epdContent = EPDManager::getInstance().getCurrentContent();
// Add EPD content arrays
JsonArray data = doc["data"].to<JsonArray>();
JsonArray data = root["data"].to<JsonArray>();
// Copy array elements directly
for(const auto& content : epdContent) {
@ -321,7 +326,7 @@ void eventSourceUpdate() {
}
String buffer;
serializeJson(doc, buffer);
serializeJson(root, buffer);
events.send(buffer.c_str(), "status");
}