diff --git a/include/utils/WiFiUtils.h b/include/utils/WiFiUtils.h index 404cee06..89bec1f4 100644 --- a/include/utils/WiFiUtils.h +++ b/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); diff --git a/src/modules/exec/Buzzer/modinfo.json b/src/modules/exec/Buzzer/modinfo.json index 35f193a2..d3ec13f4 100644 --- a/src/modules/exec/Buzzer/modinfo.json +++ b/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": [] + } } diff --git a/src/modules/exec/Multitouch/modinfo.json b/src/modules/exec/Multitouch/modinfo.json index d596113e..a9e103d7 100644 --- a/src/modules/exec/Multitouch/modinfo.json +++ b/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": [] } } diff --git a/src/modules/sensors/Bmp280/modinfo.json b/src/modules/sensors/Bmp280/modinfo.json index 4ce96b66..ddbf7079 100644 --- a/src/modules/sensors/Bmp280/modinfo.json +++ b/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" ], diff --git a/src/utils/WiFiUtils.cpp b/src/utils/WiFiUtils.cpp index af23f900..681d2c8a 100644 --- a/src/utils/WiFiUtils.cpp +++ b/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;