From 7627874766bf18196b2a2867cf79d700d9e5913b Mon Sep 17 00:00:00 2001
From: Mit4el <mit4bmw@gmail.com>
Date: Thu, 13 Mar 2025 20:01:57 +0300
Subject: [PATCH 1/2] event onWifi

---
 src/classes/IoTItem.cpp | 2 +-
 src/utils/WiFiUtils.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp
index 33984eda..f3ccfc10 100644
--- a/src/classes/IoTItem.cpp
+++ b/src/classes/IoTItem.cpp
@@ -178,7 +178,7 @@ void IoTItem::checkIntFromNet() {
     if (_intFromNet >= 0) {
         // если время жизни истекло, то удаляем элемент чуть позже на следующем такте loop
         // если это было уведомление не об ошибке или начале работы, то сообщаем, что сетевое событие давно не приходило
-        if (_intFromNet == 0 && _id.indexOf("onError") == -1 && _id.indexOf("onStart") == -1 && _id.indexOf("onInit") == -1) {
+        if (_intFromNet == 0 && _id.indexOf("onError") == -1 && _id.indexOf("onStart") == -1 && _id.indexOf("onInit") == -1 && _id.indexOf("onWifi") == -1) {
             SerialPrint("E", _id, "The new data did not come from the network. The level of trust is low.", _id);
         }
         _intFromNet--;
diff --git a/src/utils/WiFiUtils.cpp b/src/utils/WiFiUtils.cpp
index 7b2c2441..4c3d8ff6 100644
--- a/src/utils/WiFiUtils.cpp
+++ b/src/utils/WiFiUtils.cpp
@@ -46,6 +46,7 @@ void WiFiEvent(arduino_event_t *event)
     SerialPrint("i", "WIFI", "http://" + WiFi.localIP().toString());
     jsonWriteStr(settingsFlashJson, "ip", WiFi.localIP().toString());
 #endif
+    createItemFromNet("onWifi", "1", 1);
     // запускаем MQTT
     mqttInit();
     SerialPrint("i", F("WIFI"), F("Network Init"));
@@ -380,7 +381,7 @@ void routerConnect()
     SerialPrint("i", "WIFI", "http://" + WiFi.localIP().toString());
     jsonWriteStr(settingsFlashJson, "ip", WiFi.localIP().toString());
 #endif
-
+    createItemFromNet("onWifi", "1", 1);
     mqttInit();
   }
   SerialPrint("i", F("WIFI"), F("Network Init"));

From f254fbe7aa475782c0ab481df02d932bbd55efd6 Mon Sep 17 00:00:00 2001
From: Mit4el <mit4bmw@gmail.com>
Date: Sun, 16 Mar 2025 12:16:34 +0300
Subject: [PATCH 2/2] =?UTF-8?q?=D0=B0=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=81=D0=BA=D0=B0=D0=BD=20=D1=81?=
 =?UTF-8?q?=D0=B5=D1=82=D0=B8=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=81=D1=83=20=D0=B2=D0=B5=D0=B1=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Main.cpp            | 1 +
 src/WsServer.cpp        | 9 ++++++++-
 src/utils/WiFiUtils.cpp | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Main.cpp b/src/Main.cpp
index 91102283..48c82c0b 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -146,6 +146,7 @@ void setup() {
     jsonRead(settingsFlashJson, "pinSDA", pinSDA, false);
     jsonRead(settingsFlashJson, "i2cFreq", i2cFreq, false);
     jsonRead(settingsFlashJson, "i2c", i2c, false);
+    jsonWriteStr_(ssidListHeapJson, "0", "Scaning...");
     if (i2c != 0) {
 #ifdef ESP32
         Wire.end();
diff --git a/src/WsServer.cpp b/src/WsServer.cpp
index a711a3ce..4d9edf27 100644
--- a/src/WsServer.cpp
+++ b/src/WsServer.cpp
@@ -177,8 +177,15 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t* payload, size_t length)
                 jsonReadArray(settingsFlashJson, "routerssid", jArray);
 #ifdef ESP8266
                 RouterFind(jArray);
-#endif
                 sendStringToWs("ssidli", ssidListHeapJson, num);
+#else
+                //String ssidScan = "{Scaning...}";
+                ssidListHeapJson = "{}";
+                jsonWriteStr_(ssidListHeapJson, "0", "Scaning...");
+                sendStringToWs("ssidli", ssidListHeapJson, num);
+                ScanAsync();
+#endif
+
             }
 
             //----------------------------------------------------------------------//
diff --git a/src/utils/WiFiUtils.cpp b/src/utils/WiFiUtils.cpp
index 4c3d8ff6..b6a18d56 100644
--- a/src/utils/WiFiUtils.cpp
+++ b/src/utils/WiFiUtils.cpp
@@ -120,7 +120,7 @@ void handleScanResults()
           connectNumNet = i;
       }
     }
-
+    sendStringToWs("ssidli", ssidListHeapJson, -1);
     // if
   }
   SerialPrint("i", "WIFI", "Scan Found: " + ssidListHeapJson);