move voltage under diagnostic

This commit is contained in:
Nicu Hodos 2022-10-15 12:07:19 +02:00
parent 0e92f31c4b
commit d1fd249397

View File

@ -46,13 +46,13 @@ void loop() {
bool buildSensorJson(JsonDocument& jsonDoc, unsigned long value) { bool buildSensorJson(JsonDocument& jsonDoc, unsigned long value) {
jsonDoc["id"] = ID(value); jsonDoc["id"] = ID(value);
JsonObject sensor = jsonDoc.createNestedObject("sensor");
float voltage = (float)GET_VCC(value) / 1000; float voltage = (float)GET_VCC(value) / 1000;
if (voltage != 0) { if (voltage != 0) {
sensor["voltage"] = voltage; JsonObject diagnostic = jsonDoc.createNestedObject("diagnostic");
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);