From 8cde47b8cecf0b6649224c3acf09c1178754adc1 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <67171972+IoTManagerProject@users.noreply.github.com>
Date: Wed, 7 Dec 2022 18:10:47 +0100
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B3?=
 =?UTF-8?q?=D0=B5=D0=B9=D1=82=D0=B0=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20bme=20bmp=20=D0=B2=201=20mb=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/exec/MySensors/MySensorsGate.cpp | 36 +++++++++++---------
 src/modules/sensors/Bme280/modinfo.json      | 16 +++++++--
 src/modules/sensors/Bmp280/modinfo.json      | 16 +++++++--
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/src/modules/exec/MySensors/MySensorsGate.cpp b/src/modules/exec/MySensors/MySensorsGate.cpp
index ba820351..32fe9c97 100644
--- a/src/modules/exec/MySensors/MySensorsGate.cpp
+++ b/src/modules/exec/MySensors/MySensorsGate.cpp
@@ -344,22 +344,24 @@ class MySensorsGate : public IoTItem {
 
 class MySensorsNode : public IoTItem {
    private:
-    String id;
-    int orange;
-    int red;
-    int offline;
+    String id = "";
+    int orange = 0;
+    int red = 0;
+    int offline = 0;
     int _minutesPassed = 0;
     String json = "{}";
     bool dataFromNode = false;
 
    public:
     MySensorsNode(String parameters) : IoTItem(parameters) {
-        SerialPrint("i", "MySensors", "Node initialized");
         jsonRead(parameters, F("id"), id);
-        orange = jsonReadInt(parameters, F("orange"));
-        red = jsonReadInt(parameters, F("red"));
-        offline = jsonReadInt(parameters, F("offline"));
+
+        jsonRead(parameters, F("orange"), orange);
+        jsonRead(parameters, F("red"), red);
+        jsonRead(parameters, F("offline"), offline);
+
         dataFromNode = false;
+        SerialPrint("i", "MySensors", "Node initialized");
     }
 
     void setValue(const IoTValue& Value, bool genEvent = true) {
@@ -393,14 +395,16 @@ class MySensorsNode : public IoTItem {
     void setNewWidgetAttributes() {
         if (dataFromNode) {
             jsonWriteStr(json, F("info"), String(_minutesPassed) + " min");
-            if (_minutesPassed < orange) {
-                jsonWriteStr(json, F("color"), "");
-            } else if (_minutesPassed >= orange) {
-                jsonWriteStr(json, F("color"), F("orange"));  //сделаем виджет оранжевым
-            } else if (_minutesPassed >= red) {
-                jsonWriteStr(json, F("color"), F("red"));  //сделаем виджет красным
-            } else if (_minutesPassed >= offline) {
-                jsonWriteStr(json, F("info"), F("offline"));
+            if (orange != 0 && red != 0 && offline != 0) {
+                if (_minutesPassed < orange) {
+                    jsonWriteStr(json, F("color"), "");
+                } else if (_minutesPassed >= orange) {
+                    jsonWriteStr(json, F("color"), F("orange"));  //сделаем виджет оранжевым
+                } else if (_minutesPassed >= red) {
+                    jsonWriteStr(json, F("color"), F("red"));  //сделаем виджет красным
+                } else if (_minutesPassed >= offline) {
+                    jsonWriteStr(json, F("info"), F("offline"));
+                }
             }
         } else {
             jsonWriteStr(json, F("info"), F("awaiting"));
diff --git a/src/modules/sensors/Bme280/modinfo.json b/src/modules/sensors/Bme280/modinfo.json
index d2b05beb..8b41b3f5 100644
--- a/src/modules/sensors/Bme280/modinfo.json
+++ b/src/modules/sensors/Bme280/modinfo.json
@@ -67,10 +67,22 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [
-            "adafruit/Adafruit BME280 Library"
+            "milesburton/DallasTemperature@^3.9.1"
         ],
         "esp8266_4mb": [
-            "adafruit/Adafruit BME280 Library"
+            "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8266_1mb": [
+            "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8266_1mb_ota": [
+            "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8285_1mb": [
+            "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8285_1mb_ota": [
+            "milesburton/DallasTemperature@^3.9.1"
         ]
     }
 }
\ No newline at end of file
diff --git a/src/modules/sensors/Bmp280/modinfo.json b/src/modules/sensors/Bmp280/modinfo.json
index 4bfb5c27..870529ae 100644
--- a/src/modules/sensors/Bmp280/modinfo.json
+++ b/src/modules/sensors/Bmp280/modinfo.json
@@ -53,10 +53,22 @@
     "defActive": true,
     "usedLibs": {
         "esp32_4mb": [
-            "adafruit/Adafruit BMP280 Library"
+            "milesburton/DallasTemperature@^3.9.1"
         ],
         "esp8266_4mb": [
-            "adafruit/Adafruit BMP280 Library"
+            "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8266_1mb": [
+            "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8266_1mb_ota": [
+            "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8285_1mb": [
+            "milesburton/DallasTemperature@^3.9.1"
+        ],
+        "esp8285_1mb_ota": [
+            "milesburton/DallasTemperature@^3.9.1"
         ]
     }
 }
\ No newline at end of file