Obbart/ETcontroller_PRO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix timeDrift values and return for getCronJobs all

Browse Source
This commit is contained in:
Emanuele Trabattoni
2025-08-31 10:16:10 +02:00
parent 145698d3b9
commit df66a9d076
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/commands.cpp
View File

@@ -140,7 +140,11 @@ namespace commands
uint8_t eventNum(0); uint8_t eventNum(0);
for (const auto &[name, event] : eventMap) 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++; eventNum++;
} }
LOG_INFO("getCronJob got [", eventNum, "] events"); LOG_INFO("getCronJob got [", eventNum, "] events");
@@ -159,6 +163,7 @@ namespace commands
ArduinoJson::JsonDocument action; ArduinoJson::JsonDocument action;
action["cmd"] = event.cmd; action["cmd"] = event.cmd;
action["params"] = event.cmdParams; action["params"] = event.cmdParams;
action["status"] = cron.c_statusEnum2Str.at(event.status);
response["values"]["cronExpr"] = cron::to_cronstr(event.cronExpr); response["values"]["cronExpr"] = cron::to_cronstr(event.cronExpr);
response["values"]["action"] = action; response["values"]["action"] = action;
LOG_INFO("getCronJob get job [", eventName.c_str(), "]"); LOG_INFO("getCronJob get job [", eventName.c_str(), "]");
@@ -547,11 +552,12 @@ namespace commands
auto timeDiff = std::chrono::duration_cast<std::chrono::seconds>(ntpTimePoint - rtcTimePoint); auto timeDiff = std::chrono::duration_cast<std::chrono::seconds>(ntpTimePoint - rtcTimePoint);
auto direction = timeDiff.count() >= 0 ? "BEYOND" : "AHEAD"; auto direction = timeDiff.count() >= 0 ? "BEYOND" : "AHEAD";
const int32_t drift = timeDiff.count();
response["values"]["status"] = "valid"; 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"; 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; return response;
} }
// GETTERS // // GETTERS //