put back id inside sensor block

This commit is contained in:
Nicu Hodos 2022-10-25 21:33:56 +02:00
parent f1e67a80d4
commit 640368af42

View File

@ -44,15 +44,15 @@ void loop() {
} }
bool buildSensorJson(JsonDocument& jsonDoc, unsigned long value) { bool buildSensorJson(JsonDocument& jsonDoc, unsigned long value) {
jsonDoc["id"] = ID(value); JsonObject sensor = jsonDoc.createNestedObject("sensor");
sensor["id"] = ID(value);
float voltage = (float)GET_VCC(value) / 1000; float voltage = (float)GET_VCC(value) / 1000;
if (voltage != 0) { if (voltage != 0) {
JsonObject diagnostic = jsonDoc.createNestedObject("diagnostic"); JsonObject diagnostic = sensor.createNestedObject("diagnostic");
diagnostic["voltage"] = voltage; diagnostic["voltage"] = voltage;
} }
JsonObject sensor = jsonDoc.createNestedObject("sensor");
switch (GET_TYPE(value)) { switch (GET_TYPE(value)) {
case SensorType::GENERIC: case SensorType::GENERIC:
sensor["value"] = GET_VALUE(value); sensor["value"] = GET_VALUE(value);