From 37fc18cdfd133461a79165512be0597b39ee2598 Mon Sep 17 00:00:00 2001 From: biver Date: Tue, 28 Feb 2023 21:58:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D1=83=D1=87=D0=BD=D0=BE=D0=B9=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0=D1=82=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=D0=B0?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=20uint8tToString=20https://github.com/IoT?= =?UTF-8?q?ManagerProject/IoTManager/commit/2b71aad6f4ac41869f55b3d4623316?= =?UTF-8?q?11790a9df4=20=D0=9A=20=D1=81=D0=BE=D0=B6=D0=B0=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8E,=20=D0=BE=D0=BA=D0=B0=D0=B7=D0=B0=D0=BB?= =?UTF-8?q?=D0=BE=D1=81=D1=8C,=20=D1=87=D1=82=D0=BE=20=D0=BD=D1=83=D0=B6?= =?UTF-8?q?=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=20=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81?= =?UTF-8?q?=D1=82=D0=B2=D1=83=D0=B5=D1=82=20=D0=B2=20Arduino=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=208266?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/DeviceList.h | 1 + src/DeviceList.cpp | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/DeviceList.h b/include/DeviceList.h index c67b5551..5f376a29 100644 --- a/include/DeviceList.h +++ b/include/DeviceList.h @@ -12,5 +12,6 @@ extern AsyncUDP asyncUdp; extern const String getThisDevice(); extern void addThisDeviceToList(); extern void asyncUdpInit(); +extern String uint8tToString(uint8_t* data, size_t len); extern void udpPacketParse(String& data); extern void jsonMergeArrays(String& existJson, String& incJson); \ No newline at end of file diff --git a/src/DeviceList.cpp b/src/DeviceList.cpp index f5761930..9a0c42b4 100644 --- a/src/DeviceList.cpp +++ b/src/DeviceList.cpp @@ -36,7 +36,9 @@ void asyncUdpInit() { // Serial.print(packet.length()); // Serial.print(", Data: "); // Serial.write(packet.data(), packet.length()); - String data = {packet.data(), packet.length()}; + + //String data = {packet.data(), packet.length()}; // для ESP32 подходит как замена uint8tToString, но 8266 не переваривает + String data = uint8tToString(packet.data(), packet.length()); String remoteWorkgroup = ""; data.replace("[", ""); data.replace("]", ""); @@ -121,4 +123,11 @@ void jsonMergeArrays(String& existJson, String& incJson) { existJson = outArr; } +String uint8tToString(uint8_t* data, size_t len) { + String ret; + while (len--) { + ret += (char)*data++; + } + return ret; +} #endif \ No newline at end of file