diff --git a/src/commands.cpp b/src/commands.cpp index 9399476..8a7dd09 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -140,7 +140,11 @@ namespace commands uint8_t eventNum(0); for (const auto &[name, event] : eventMap) { - response["values"][name] = event.cmd; + ArduinoJson::JsonDocument action; + action["cmd"] = event.cmd; + action["params"] = event.cmdParams; + action["status"] = cron.c_statusEnum2Str.at(event.status); + response["values"][name] = action; eventNum++; } LOG_INFO("getCronJob got [", eventNum, "] events"); @@ -159,6 +163,7 @@ namespace commands ArduinoJson::JsonDocument action; action["cmd"] = event.cmd; action["params"] = event.cmdParams; + action["status"] = cron.c_statusEnum2Str.at(event.status); response["values"]["cronExpr"] = cron::to_cronstr(event.cronExpr); response["values"]["action"] = action; LOG_INFO("getCronJob get job [", eventName.c_str(), "]"); @@ -547,11 +552,12 @@ namespace commands auto timeDiff = std::chrono::duration_cast(ntpTimePoint - rtcTimePoint); auto direction = timeDiff.count() >= 0 ? "BEYOND" : "AHEAD"; + const int32_t drift = timeDiff.count(); response["values"]["status"] = "valid"; - response["values"]["drift"] = (uint32_t)timeDiff.count(); + response["values"]["drift"] = drift; response["values"]["direction"] = "RTC is [" + std::string(direction) + "] NTP time"; - LOG_INFO("getTimeDrift -> RTC is [", (int32_t)timeDiff.count(), "] sec, [", std::string(direction).c_str(), "] NTP time"); + LOG_INFO("getTimeDrift -> RTC is [", drift, "] sec, [", direction, "] NTP time"); return response; } // GETTERS //