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

Оптимизируем работу со строками в файлах SerialPrint и StringUtils

Browse Source
This commit is contained in:
biver
2022-10-28 17:16:53 +03:00
parent dfd24dc1f6
commit a292f17285
4 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/utils/SerialPrint.cpp
View File

@@ -1,23 +1,16 @@
#include "utils/SerialPrint.h"
void SerialPrint(String errorLevel, String module, String msg, String itemId) {
void SerialPrint(const String& errorLevel, const String& module, const String& msg, const String& itemId) {
String tosend = prettyMillis(millis());
tosend = tosend + " [" + errorLevel + "] [" + module + "] " + msg;
tosend += " [";
tosend += errorLevel;
tosend += "] [";
tosend += module;
tosend += "] ";
tosend += msg;
Serial.println(tosend);
if (errorLevel == "E") {
msg = cleanString(msg);
// создаем событие об ошибке для возможной реакции в сценарии
if (itemId != "") {
IoTItems.push_back((IoTItem *)new externalVariable("{\"id\":\"" + itemId + "_onError\",\"val\":\"" + msg + "\",\"int\":1}"));
generateEvent(itemId + "_onError", "1");
} else {
IoTItems.push_back((IoTItem *)new externalVariable("{\"id\":\"onError\",\"val\":\"" + module + " " + msg + "\",\"int\":1}"));
generateEvent("onError", "1");
}
}
if (isNetworkActive()) {
if (jsonReadInt(settingsFlashJson, F("log")) != 0) {
// String pl = "/log|" + tosend;
@@ -25,4 +18,18 @@ void SerialPrint(String errorLevel, String module, String msg, String itemId) {
sendStringToWs("corelg", tosend, -1);
}
}
if (errorLevel == "E") {
cleanString(tosend);
// создаем событие об ошибке для возможной реакции в сценарии
if (itemId != "") {
IoTItems.push_back((IoTItem *)new externalVariable("{\"id\":\"" + itemId + "_onError\",\"val\":\"" + tosend + "\",\"int\":1}"));
generateEvent(itemId + "_onError", "1");
} else {
IoTItems.push_back((IoTItem *)new externalVariable("{\"id\":\"onError\",\"val\":\"" + module + " " + tosend + "\",\"int\":1}"));
generateEvent("onError", "1");
}
}
}