iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-26 14:12:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #398 from Mit4el/ver4dev

Browse Source 
upd Async Wifi
This commit is contained in:
Mit4el
2025-03-16 12:19:34 +03:00
committed by GitHub
parent 8925239e46 f254fbe7aa
commit 9beb86d775
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Main.cpp
View File

@@ -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();

9
src/WsServer.cpp
View File

@@ -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
}
//----------------------------------------------------------------------//

2
src/classes/IoTItem.cpp
View File

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

5
src/utils/WiFiUtils.cpp
View File

@@ -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"));
@@ -119,7 +120,7 @@ void handleScanResults()
connectNumNet = i;
}
}
sendStringToWs("ssidli", ssidListHeapJson, -1);
// if
}
SerialPrint("i", "WIFI", "Scan Found: " + ssidListHeapJson);
@@ -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"));