From c2a7f487f11daae5d49b7fca878af13772b9c75a Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Sat, 9 Jul 2022 11:34:44 +0200 Subject: [PATCH] Updated structure of eventlog json --- src/WebApi_eventlog.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/WebApi_eventlog.cpp b/src/WebApi_eventlog.cpp index 5321121..30fe5a1 100644 --- a/src/WebApi_eventlog.cpp +++ b/src/WebApi_eventlog.cpp @@ -33,15 +33,18 @@ void WebApiEventlogClass::onEventlogStatus(AsyncWebServerRequest* request) uint8_t logEntryCount = inv->EventLog()->getEntryCount(); root[buffer]["count"] = logEntryCount; + JsonArray eventsArray = root[buffer].createNestedArray(F("events")); for (uint8_t logEntry = 0; logEntry < logEntryCount; logEntry++) { + JsonObject eventsObject = eventsArray.createNestedObject(); + AlarmLogEntry_t entry; inv->EventLog()->getLogEntry(logEntry, &entry); - root[buffer][String(logEntry)][F("message_id")] = entry.MessageId; - root[buffer][String(logEntry)][F("message")] = entry.Message; - root[buffer][String(logEntry)][F("start_time")] = entry.StartTime; - root[buffer][String(logEntry)][F("end_time")] = entry.EndTime; + eventsObject[F("message_id")] = entry.MessageId; + eventsObject[F("message")] = entry.Message; + eventsObject[F("start_time")] = entry.StartTime; + eventsObject[F("end_time")] = entry.EndTime; } }