patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix order in json

Browse Source
This commit is contained in:
helgeerbe 2022-08-17 13:41:19 +02:00
parent 0d08c6a136
commit 82c5fbcf46
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/WebApi_ws_vedirect_live.cpp
View File

@ -65,6 +65,9 @@ void WebApiWsVedirectLiveClass::loop()
void WebApiWsVedirectLiveClass::generateJsonResponse(JsonVariant& root) void WebApiWsVedirectLiveClass::generateJsonResponse(JsonVariant& root)
{ {
root[F("data_age")] = (millis() - VeDirect.getLastUpdate() ) / 1000;
root[F("age_critical")] = ((millis() - VeDirect.getLastUpdate()) / 1000) > Configuration.get().Vedirect_PollInterval * 5;
for ( int i = 0; i < VeDirect.veEnd; i++ ) { for ( int i = 0; i < VeDirect.veEnd; i++ ) {
if(strcmp(VeDirect.veName[i], "PID") == 0) { if(strcmp(VeDirect.veName[i], "PID") == 0) {
root[F(VeDirect.veName[i])] = VeDirect.getPidAsString(VeDirect.veValue[i]); root[F(VeDirect.veName[i])] = VeDirect.getPidAsString(VeDirect.veValue[i]);
@ -105,9 +108,6 @@ void WebApiWsVedirectLiveClass::generateJsonResponse(JsonVariant& root)
root[F(VeDirect.veName[i])] = VeDirect.veValue[i]; root[F(VeDirect.veName[i])] = VeDirect.veValue[i];
} }
} }
root[F("data_age")] = (millis() - VeDirect.getLastUpdate() ) / 1000;
root[F("age_critical")] = ((millis() - VeDirect.getLastUpdate()) / 1000) > Configuration.get().Vedirect_PollInterval * 5;
root[F("poll_intervall")] = Configuration.get().Vedirect_PollInterval;
if (VeDirect.getLastUpdate() > _newestVedirectTimestamp) { if (VeDirect.getLastUpdate() > _newestVedirectTimestamp) {
_newestVedirectTimestamp = VeDirect.getLastUpdate(); _newestVedirectTimestamp = VeDirect.getLastUpdate();