From 2b71aad6f4ac41869f55b3d462331611790a9df4 Mon Sep 17 00:00:00 2001 From: biver Date: Sun, 26 Feb 2023 16:52:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?= =?UTF-8?q?=D0=B8=D1=80=D1=83=D0=B5=D0=BC=20uint8tToString=20=D0=B4=D0=BE?= =?UTF-8?q?=20=D0=BD=D1=83=D0=BB=D1=8F...=20=D0=A1=D0=BF=D0=B0=D1=81=D0=B8?= =?UTF-8?q?=D0=B1=D0=BE=20=D0=AE=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/DeviceList.h | 1 - src/DeviceList.cpp | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/DeviceList.h b/include/DeviceList.h index 5f376a29..c67b5551 100644 --- a/include/DeviceList.h +++ b/include/DeviceList.h @@ -12,6 +12,5 @@ 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 2040e669..f5761930 100644 --- a/src/DeviceList.cpp +++ b/src/DeviceList.cpp @@ -36,7 +36,7 @@ void asyncUdpInit() { // Serial.print(packet.length()); // Serial.print(", Data: "); // Serial.write(packet.data(), packet.length()); - String data = uint8tToString(packet.data(), packet.length()); + String data = {packet.data(), packet.length()}; String remoteWorkgroup = ""; data.replace("[", ""); data.replace("]", ""); @@ -121,11 +121,4 @@ 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