pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-29 11:01:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.6

Browse Source
This commit is contained in:
Tom Fifield 2025-02-08 20:04:12 +08:00 committed by GitHub
commit aad9e352b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/serialization/JSONValue.cpp
View File

@ -850,18 +850,26 @@ std::string JSONValue::StringifyString(const std::string &str)
str_out += "\\r"; str_out += "\\r";
} else if (chr == '\t') { } else if (chr == '\t') {
str_out += "\\t"; str_out += "\\t";
} else if (chr < ' ' || chr > 126) { } else if (chr < 0x20 || chr == 0x7F) {
str_out += "\\u"; char buf[7];
for (int i = 0; i < 4; i++) { snprintf(buf, sizeof(buf), "\\u%04x", chr);
int value = (chr >> 12) & 0xf; str_out += buf;
if (value >= 0 && value <= 9) } else if (chr < 0x80) {
str_out += (char)('0' + value); str_out += chr;
else if (value >= 10 && value <= 15)
str_out += (char)('A' + (value - 10));
chr <<= 4;
}
} else { } else {
str_out += chr; str_out += chr;
size_t remain = str.end() - iter - 1;
if ((chr & 0xE0) == 0xC0 && remain >= 1) {
++iter;
str_out += *iter;
} else if ((chr & 0xF0) == 0xE0 && remain >= 2) {
str_out += *(++iter);
str_out += *(++iter);
} else if ((chr & 0xF8) == 0xF0 && remain >= 3) {
str_out += *(++iter);
str_out += *(++iter);
str_out += *(++iter);
}
} }
++iter; ++iter;