From bc5a9bd9de9e4012c5521d25f74dcbb725257a11 Mon Sep 17 00:00:00 2001 From: chromoxdor <33860956+chromoxdor@users.noreply.github.com> Date: Mon, 27 Jan 2025 16:44:16 +0100 Subject: [PATCH 1/4] add cheatcode, fix one typo --- src/src/Commands/UDP.cpp | 3 +++ src/src/Helpers/StringConverter.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/src/Commands/UDP.cpp b/src/src/Commands/UDP.cpp index 56ec260b9..84d803551 100644 --- a/src/src/Commands/UDP.cpp +++ b/src/src/Commands/UDP.cpp @@ -41,6 +41,9 @@ const __FlashStringHelper * Command_UPD_SendTo(struct EventStruct *event, const if ((destUnit > 0) && (destUnit < 255)) { String eventName = tolerantParseStringKeepCase(Line, 3); + if (eventName.indexOf('|') != -1) { + eventName.replace('|', '['); + } SendUDPCommand(destUnit, eventName.c_str(), eventName.length()); } return return_command_success_flashstr(); diff --git a/src/src/Helpers/StringConverter.cpp b/src/src/Helpers/StringConverter.cpp index 7f312beaf..19b36d042 100644 --- a/src/src/Helpers/StringConverter.cpp +++ b/src/src/Helpers/StringConverter.cpp @@ -1568,7 +1568,7 @@ bool GetArgvBeginEnd(const char *string, const unsigned int argc, int& pos_begin if (!parenthesis && (((c == ' ') && (d == ' ')) || ((c == separator) && (d == ' ')))) { - // Consider multiple consequitive spaces as one. + // Consider multiple consecutive spaces as one. } else if (!parenthesis && ((d == ' ') && (e == separator))) { // Skip the space. From 83243a99ad74cfd10055d514665e6cf3f7406250 Mon Sep 17 00:00:00 2001 From: chromoxdor <33860956+chromoxdor@users.noreply.github.com> Date: Mon, 27 Jan 2025 20:04:55 +0100 Subject: [PATCH 2/4] Update UDP.cpp --- src/src/Commands/UDP.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/src/Commands/UDP.cpp b/src/src/Commands/UDP.cpp index 84d803551..1adeeaa2a 100644 --- a/src/src/Commands/UDP.cpp +++ b/src/src/Commands/UDP.cpp @@ -41,9 +41,7 @@ const __FlashStringHelper * Command_UPD_SendTo(struct EventStruct *event, const if ((destUnit > 0) && (destUnit < 255)) { String eventName = tolerantParseStringKeepCase(Line, 3); - if (eventName.indexOf('|') != -1) { - eventName.replace('|', '['); - } + stripEscapeCharacters(eventName); SendUDPCommand(destUnit, eventName.c_str(), eventName.length()); } return return_command_success_flashstr(); From 4c2f73a9f2e6b66f9475413941493f36ace1fc1b Mon Sep 17 00:00:00 2001 From: chromoxdor <33860956+chromoxdor@users.noreply.github.com> Date: Tue, 29 Apr 2025 16:18:27 +0200 Subject: [PATCH 3/4] Update StringParser.cpp --- src/src/Helpers/StringParser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/Helpers/StringParser.cpp b/src/src/Helpers/StringParser.cpp index 755c58fd5..8dc0df684 100644 --- a/src/src/Helpers/StringParser.cpp +++ b/src/src/Helpers/StringParser.cpp @@ -38,8 +38,8 @@ void stripEscapeCharacters(String& str) constexpr uint8_t nrbraces = NR_ELEMENTS(braces); for (uint8_t i = 0; i < nrbraces; ++i) { - const String s(concat(F("\\"), braces[i])); - str.replace(s, s.substring(1)); + const char s[] = { '\\', braces[i], '\0'}; + str.replace(s, s + 1); } } From 12056d792fd66c457214817acf011fa8442a5515 Mon Sep 17 00:00:00 2001 From: chromoxdor <33860956+chromoxdor@users.noreply.github.com> Date: Tue, 29 Apr 2025 18:00:21 +0200 Subject: [PATCH 4/4] Update StringParser.cpp revert function --- src/src/Helpers/StringParser.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/src/Helpers/StringParser.cpp b/src/src/Helpers/StringParser.cpp index 8dc0df684..755c58fd5 100644 --- a/src/src/Helpers/StringParser.cpp +++ b/src/src/Helpers/StringParser.cpp @@ -38,8 +38,8 @@ void stripEscapeCharacters(String& str) constexpr uint8_t nrbraces = NR_ELEMENTS(braces); for (uint8_t i = 0; i < nrbraces; ++i) { - const char s[] = { '\\', braces[i], '\0'}; - str.replace(s, s + 1); + const String s(concat(F("\\"), braces[i])); + str.replace(s, s.substring(1)); } }