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

запустил общение устройств по udp

Browse Source
This commit is contained in:
Dmitry Borisenko
2022-02-13 16:13:51 +01:00
parent ed78401762
commit caa2102eff
10 changed files with 143 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/JsonUtils.cpp
View File

@@ -163,10 +163,10 @@ void writeUint8tValueToJsonString(uint8_t* payload, size_t length, size_t header
for (size_t i = headerLenth; i < length; i++) {
payloadStr += (char)payload[i];
}
jsonMerge(json, payloadStr);
jsonMergeObjects(json, payloadStr);
}
bool jsonMerge(String& json1, String& json2) {
bool jsonMergeObjects(String& json1, String& json2) {
bool ret = true;
DynamicJsonDocument doc1(JSON_BUFFER_SIZE);
DeserializationError error1 = deserializeJson(doc1, json1);
@@ -174,7 +174,7 @@ bool jsonMerge(String& json1, String& json2) {
DeserializationError error2 = deserializeJson(doc2, json2);
jsonMergeDocs(doc1.as<JsonObject>(), doc2.as<JsonObject>());
if (error1 || error2) {
SerialPrint("EE", F("json"), "jsonMerge error");
SerialPrint("EE", F("json"), "jsonMergeObjects error");
jsonErrorDetected();
ret = false;
}

30
src/utils/WiFiUtils.cpp
View File

@@ -138,33 +138,3 @@ uint8_t RSSIquality() {
}
return res;
}
// void wifiSignalInit() {
// ts.add(
// SYGNAL, 1000 * 60, [&](void*) {
// switch (RSSIquality()) {
// case 0:
// jsonWriteStr(settingsFlashJson, F("signal"), F("не подключено к роутеру"));
// break;
// case 1:
// jsonWriteStr(settingsFlashJson, F("signal"), F("нет сигнала"));
// break;
// case 2:
// jsonWriteStr(settingsFlashJson, F("signal"), F("очень низкий"));
// break;
// case 3:
// jsonWriteStr(settingsFlashJson, F("signal"), F("низкий"));
// break;
// case 4:
// jsonWriteStr(settingsFlashJson, F("signal"), F("хороший"));
// break;
// case 5:
// jsonWriteStr(settingsFlashJson, F("signal"), F("очень хороший"));
// break;
// case 6:
// jsonWriteStr(settingsFlashJson, F("signal"), F("отличный"));
// break;
// }
// },
// nullptr, true);
// }