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

исправление вывода лога в режиме AP

Browse Source
This commit is contained in:
DmitriyTychina
2023-09-20 13:02:27 +03:00
parent d4bdcc13ff
commit fe9789fc52
5 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/WsServer.h
View File

@@ -20,4 +20,5 @@ void periodicWsSend();
void sendFileToWsByFrames(const String& filename, const String& header, const String& json, int client_id, size_t frameSize); void sendFileToWsByFrames(const String& filename, const String& header, const String& json, int client_id, size_t frameSize);
void sendStringToWs(const String& header, String& payload, int client_id); void sendStringToWs(const String& header, String& payload, int client_id);
void sendDeviceList(uint8_t num); void sendDeviceList(uint8_t num);
int getNumWSClients();

4
include/utils/WiFiUtils.h
View File

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

8
src/WsServer.cpp
View File

@@ -414,7 +414,9 @@ void sendFileToWsByFrames(const String& filename, const String& header, const St
} }
void sendStringToWs(const String& header, String& payload, int client_id) { void sendStringToWs(const String& header, String& payload, int client_id) {
if (!(WiFi.softAPgetStationNum() || isNetworkActive())) { if ((!getNumAPClients() && !isNetworkActive()) || !getNumWSClients()) {
// standWebSocket.disconnect(); // это и ниже надо сделать при -
// standWebSocket.close(); // - отключении AP И WiFi(STA), надо менять ядро WiFi. Сейчас не закрывается сессия клиента при пропаже AP И WiFi(STA)
return; return;
} }
@@ -446,3 +448,7 @@ void sendDeviceList(uint8_t num) {
SerialPrint("i", "FS", "flash list"); SerialPrint("i", "FS", "flash list");
} }
} }
int getNumWSClients() {
return standWebSocket.connectedClients(false);
}

8
src/utils/SerialPrint.cpp
View File

@@ -11,11 +11,11 @@ void SerialPrint(const String& errorLevel, const String& module, const String& m
tosend += msg; tosend += msg;
Serial.println(tosend); Serial.println(tosend);
if (isNetworkActive()) { // if (isNetworkActive()) { // все проверки происходят в sendStringToWs()
if (jsonReadInt(settingsFlashJson, F("log")) != 0) { if (jsonReadInt(settingsFlashJson, F("log")) != 0) {
sendStringToWs(F("corelg"), tosend, -1); sendStringToWs(F("corelg"), tosend, -1);
}
} }
// }
if (errorLevel == "E") { if (errorLevel == "E") {
cleanString(tosend); cleanString(tosend);

10
src/utils/WiFiUtils.cpp
View File

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