diff --git a/examples/ONE_I-9PSL/ONE_I-9PSL.ino b/examples/ONE_I-9PSL/ONE_I-9PSL.ino index 55cf742..220a09f 100644 --- a/examples/ONE_I-9PSL/ONE_I-9PSL.ino +++ b/examples/ONE_I-9PSL/ONE_I-9PSL.ino @@ -592,7 +592,7 @@ static void tempHumPoll(void); static void co2Poll(void); static void showNr(void); static void webServerInit(void); -static String getServerSyncData(void); +static String getServerSyncData(bool localServer); /** Init schedule */ bool hasSensorS8 = true; @@ -786,7 +786,7 @@ static void co2Poll(void) { static void showNr(void) { Serial.println("Serial nr: " + getDevId()); } void webServerMeasureCurrentGet(void) { - webServer.send(200, "application/json", getServerSyncData()); + webServer.send(200, "application/json", getServerSyncData(true)); } void webServerHandler(void *param) { @@ -806,9 +806,12 @@ static void webServerInit(void) { Serial.println("Webserver init"); } -static String getServerSyncData(void) { +static String getServerSyncData(bool localServer) { JSONVar root; root["wifi"] = WiFi.RSSI(); + if (localServer) { + root["serialno"] = getDevId(); + } if (hasSensorS8) { if (co2Ppm >= 0) { root["rco2"] = co2Ppm; @@ -1711,7 +1714,7 @@ static void pmPoll(void) { * */ static void sendDataToServer(void) { - String syncData = getServerSyncData(); + String syncData = getServerSyncData(false); if (agServer.postToServer(getDevId(), syncData)) { resetWatchdog(); } diff --git a/examples/Open_Air/Open_Air.ino b/examples/Open_Air/Open_Air.ino index 0533038..6e70c71 100644 --- a/examples/Open_Air/Open_Air.ino +++ b/examples/Open_Air/Open_Air.ino @@ -575,7 +575,7 @@ static void serverConfigPoll(void); static const char *getFwMode(int mode); static void showNr(void); static void webServerInit(void); -static String getServerSyncData(void); +static String getServerSyncData(bool localServer); bool hasSensorS8 = true; bool hasSensorPMS1 = true; @@ -652,7 +652,7 @@ void sendPing() { } static void sendDataToServer(void) { - String syncData = getServerSyncData(); + String syncData = getServerSyncData(false); if (agServer.postToServer(getDevId(), syncData)) { resetWatchdog(); } @@ -1155,7 +1155,7 @@ static const char *getFwMode(int mode) { static void showNr(void) { Serial.println("Serial nr: " + getDevId()); } void webServerMeasureCurrentGet(void) { - webServer.send(200, "application/json", getServerSyncData()); + webServer.send(200, "application/json", getServerSyncData(true)); } void webServerHandler(void *param) { @@ -1175,10 +1175,13 @@ static void webServerInit(void) { Serial.println("Webserver init"); } -static String getServerSyncData(void) { +static String getServerSyncData(bool localServer) { JSONVar root; root["wifi"] = WiFi.RSSI(); root["boot"] = loopCount; + if (localServer) { + root["serialno"] = getDevId(); + } if (fw_mode == FW_MODE_PST) { if (hasSensorS8) {