From 24fd7653eb3930e61e4000a2727fc1408731fab7 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 9 Jan 2019 14:56:16 +0100 Subject: [PATCH] Fix missed JSON sensors Fix missed JSON sensors in DisplayMode > 0 --- sonoff/xdrv_13_display.ino | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sonoff/xdrv_13_display.ino b/sonoff/xdrv_13_display.ino index b15fed5e5..b5545e256 100644 --- a/sonoff/xdrv_13_display.ino +++ b/sonoff/xdrv_13_display.ino @@ -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& 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()); // 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()); // 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()); // Topic 56% + const char* value = it->value; + if (value != nullptr) { + DisplayJsonValue(topic, it->key, it->key, value); // Topic 56% } } }