Merge pull request #284 from DmitriyTychina/ver4dev

Ver4dev

include/utils/WiFiUtils.h

@@ -3,7 +3,8 @@
 #include "Global.h"
 #include "MqttClient.h"
 
-boolean isNetworkActive();
+// boolean isNetworkActive();
+inline boolean isNetworkActive() {return WiFi.status() == WL_CONNECTED;};
 void routerConnect();
 bool startAPMode();
 boolean RouterFind(String ssid);

src/modules/exec/Buzzer/modinfo.json

@@ -91,6 +91,8 @@
         "esp8266_1mb": [],
         "esp8266_1mb_ota": [],
         "esp8285_1mb": [],
-        "esp8285_1mb_ota": []
-    }
+        "esp8285_1mb_ota": [],
+        "esp8266_2mb": [],
+        "esp8266_2mb_ota": []
+        }
 }

src/modules/exec/Multitouch/modinfo.json

@@ -9,7 +9,7 @@
       "id": "impulse",
       "widget": "anydataDef",
       "page": "Кнопки",
-      "descr": "Количество нажаний",
+      "descr": "Количество нажатий",
       "needSave": 0,
       "int": 300,
       "inv": 1,
@@ -48,6 +48,8 @@
     "esp8266_1mb": [],
     "esp8266_1mb_ota": [],
     "esp8285_1mb": [],
-    "esp8285_1mb_ota": []
+    "esp8285_1mb_ota": [],
+    "esp8266_2mb": [],
+    "esp8266_2mb_ota": []
   }
 }

src/modules/sensors/Bmp280/modinfo.json

@@ -64,9 +64,6 @@
         "esp8266_1mb_ota": [
             "adafruit/Adafruit BMP280 Library"
         ],
-        "esp8266_2mb": [
-            "adafruit/Adafruit BMP280 Library"
-        ], 
         "esp8285_1mb": [
             "adafruit/Adafruit BMP280 Library"
         ],

src/utils/WiFiUtils.cpp

@@ -115,9 +115,9 @@ boolean RouterFind(String ssid) {
     return res;
 }
 
-boolean isNetworkActive() {
-    return WiFi.status() == WL_CONNECTED;
-}
+// boolean isNetworkActive() {
+//     return WiFi.status() == WL_CONNECTED;
+// }
 
 uint8_t RSSIquality() {
     uint8_t res = 0;