measurement toString

Tested on I-9PSL monitor
Update OneOpenAir post and mqtt to use new measurement toString
This commit is contained in:
samuelbles07 committed 2024-10-17 00:53:49 +07:00
1 parent 2082a2fa93
commit ed344d3e1a
4 files changed
+383 -7

No files matched your search

+2 -3
View File
@@ -64,9 +64,8 @@ void LocalServer::_GET_metrics(void) {
}
void LocalServer::_GET_measure(void) {
server.send(
200, "application/json",
measure.toString(true, fwMode, wifiConnector.RSSI(), ag, &config));
String toSend = measure.toStringX(true, fwMode, wifiConnector.RSSI(), *ag, config);
server.send(200, "application/json", toSend);
}
void LocalServer::setFwMode(AgFirmwareMode fwMode) { this->fwMode = fwMode; }
+3 -4
View File
@@ -373,8 +373,8 @@ static void createMqttTask(void) {
/** Send data */
if (mqttClient.isConnected()) {
String payload = measurements.toString(
true, fwMode, wifiConnector.RSSI(), ag, &configuration);
String payload =
measurements.toStringX(true, fwMode, wifiConnector.RSSI(), *ag, configuration);
String topic = "airgradient/readings/" + ag->deviceId();
if (mqttClient.publish(topic.c_str(), payload.c_str(),
@@ -1146,8 +1146,7 @@ static void sendDataToServer(void) {
return;
}
String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(),
ag, &configuration);
String syncData = measurements.toStringX(false, fwMode, wifiConnector.RSSI(), *ag, configuration);
if (apiClient.postToServer(syncData)) {
Serial.println();
Serial.println(