Fix missed JSON sensors

Fix missed JSON sensors in DisplayMode > 0
This commit is contained in:
Theo Arends 2019-01-09 14:56:16 +01:00
parent b69f173706
commit 24fd7653eb

View File

@ -470,7 +470,7 @@ void DisplayText(void)
break;
}
}
}
}
}
exit:
// now draw buffer
@ -790,19 +790,22 @@ void DisplayAnalyzeJson(char *topic, char *json)
if (value2.is<JsonObject>()) {
JsonObject& Object3 = value2;
for (JsonObject::iterator it3 = Object3.begin(); it3 != Object3.end(); ++it3) {
if (it3->value != NULL) { // "DHT11":{"Temperature":null,"Humidity":null} - ignore as it will raise exception 28
DisplayJsonValue(topic, it->key, it3->key, it3->value.as<const char*>()); // Sensor 56%
const char* value = it3->value;
if (value != nullptr) { // "DHT11":{"Temperature":null,"Humidity":null} - ignore null as it will raise exception 28
DisplayJsonValue(topic, it->key, it3->key, value); // Sensor 56%
}
}
} else {
if (it2->value != NULL) { // "DHT11":{"Temperature":null,"Humidity":null} - ignore as it will raise exception 28
DisplayJsonValue(topic, it->key, it2->key, it2->value.as<const char*>()); // Sensor 56%
const char* value = it2->value;
if (value != nullptr) {
DisplayJsonValue(topic, it->key, it2->key, value); // Sensor 56%
}
}
}
} else {
if (it->value != NULL) { // "DHT11":{"Temperature":null,"Humidity":null} - ignore as it will raise exception 28
DisplayJsonValue(topic, it->key, it->key, it->value.as<const char*>()); // Topic 56%
const char* value = it->value;
if (value != nullptr) {
DisplayJsonValue(topic, it->key, it->key, value); // Topic 56%
}
}
}