From 35ba1fe376ae23b68ce46af212875c77779da312 Mon Sep 17 00:00:00 2001
From: DmitriyTychina <dmitriy.tychina@gmail.com>
Date: Mon, 26 Jun 2023 22:51:20 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B2=D0=BE=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/sensors/Bmp280/modinfo.json | 3 ---
 1 file changed, 3 deletions(-)

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"
         ],

From aaee76b96940f8753f0b38587c3b63a02adc8b06 Mon Sep 17 00:00:00 2001
From: DmitriyTychina <dmitriy.tychina@gmail.com>
Date: Mon, 26 Jun 2023 23:00:28 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=B2=20modinfo.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/exec/Buzzer/modinfo.json     | 6 ++++--
 src/modules/exec/Multitouch/modinfo.json | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

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": []
   }
 }

From 9ab59334609cb2a5314461da2eae27f054d065ab Mon Sep 17 00:00:00 2001
From: DmitriyTychina <dmitriy.tychina@gmail.com>
Date: Tue, 27 Jun 2023 00:01:48 +0300
Subject: [PATCH 3/3] =?UTF-8?q?=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D1=8D=D0=BA=D0=BE=D0=BD=D0=BE=D0=BC=D0=B8=D1=8F?=
 =?UTF-8?q?=20flash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/utils/WiFiUtils.h | 3 ++-
 src/utils/WiFiUtils.cpp   | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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/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;