andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

ArduinoJson 7.4.1 and updated AsyncWS libs

Browse Source
This commit is contained in:
proddy
2025-04-22 16:06:41 +02:00
parent 7e963529c4
commit a749ecb298
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib_standalone/ArduinoJson.h
View File

@@ -239,11 +239,11 @@
#define ARDUINOJSON_BIN2ALPHA_1111() P #define ARDUINOJSON_BIN2ALPHA_1111() P
#define ARDUINOJSON_BIN2ALPHA_(A, B, C, D) ARDUINOJSON_BIN2ALPHA_##A##B##C##D() #define ARDUINOJSON_BIN2ALPHA_(A, B, C, D) ARDUINOJSON_BIN2ALPHA_##A##B##C##D()
#define ARDUINOJSON_BIN2ALPHA(A, B, C, D) ARDUINOJSON_BIN2ALPHA_(A, B, C, D) #define ARDUINOJSON_BIN2ALPHA(A, B, C, D) ARDUINOJSON_BIN2ALPHA_(A, B, C, D)
#define ARDUINOJSON_VERSION "7.4.0" #define ARDUINOJSON_VERSION "7.4.1"
#define ARDUINOJSON_VERSION_MAJOR 7 #define ARDUINOJSON_VERSION_MAJOR 7
#define ARDUINOJSON_VERSION_MINOR 4 #define ARDUINOJSON_VERSION_MINOR 4
#define ARDUINOJSON_VERSION_REVISION 0 #define ARDUINOJSON_VERSION_REVISION 1
#define ARDUINOJSON_VERSION_MACRO V740 #define ARDUINOJSON_VERSION_MACRO V741
#ifndef ARDUINOJSON_VERSION_NAMESPACE #ifndef ARDUINOJSON_VERSION_NAMESPACE
# define ARDUINOJSON_VERSION_NAMESPACE \ # define ARDUINOJSON_VERSION_NAMESPACE \
ARDUINOJSON_CONCAT5( \ ARDUINOJSON_CONCAT5( \
@@ -2549,12 +2549,17 @@ class VariantData {
type_ = VariantType::LinkedString; type_ = VariantType::LinkedString;
content_.asLinkedString = s; content_.asLinkedString = s;
} }
void setTinyString(const char* s, uint8_t n) { template <typename TAdaptedString>
void setTinyString(const TAdaptedString& s) {
ARDUINOJSON_ASSERT(type_ == VariantType::Null); // must call clear() first ARDUINOJSON_ASSERT(type_ == VariantType::Null); // must call clear() first
ARDUINOJSON_ASSERT(s); ARDUINOJSON_ASSERT(s.size() <= tinyStringMaxLength);
type_ = VariantType::TinyString; type_ = VariantType::TinyString;
for (uint8_t i = 0; i < n; i++) auto n = uint8_t(s.size());
content_.asTinyString[i] = s[i]; for (uint8_t i = 0; i < n; i++) {
char c = s[i];
ARDUINOJSON_ASSERT(c != 0); // no NUL in tiny string
content_.asTinyString[i] = c;
}
content_.asTinyString[n] = 0; content_.asTinyString[n] = 0;
} }
void setOwnedString(StringNode* s) { void setOwnedString(StringNode* s) {
@@ -5423,7 +5428,7 @@ class StringBuilder {
ARDUINOJSON_ASSERT(node_ != nullptr); ARDUINOJSON_ASSERT(node_ != nullptr);
char* p = node_->data; char* p = node_->data;
if (isTinyString(p, size_)) { if (isTinyString(p, size_)) {
variant->setTinyString(p, static_cast<uint8_t>(size_)); variant->setTinyString(adaptString(p, size_));
return; return;
} }
p[size_] = 0; p[size_] = 0;
@@ -5829,7 +5834,7 @@ inline bool VariantData::setString(TAdaptedString value,
return true; return true;
} }
if (isTinyString(value, value.size())) { if (isTinyString(value, value.size())) {
setTinyString(value.data(), uint8_t(value.size())); setTinyString(value);
return true; return true;
} }
auto dup = resources->saveString(value); auto dup = resources->saveString(value);
@@ -7490,7 +7495,7 @@ class StringBuffer {
ARDUINOJSON_ASSERT(node_ != nullptr); ARDUINOJSON_ASSERT(node_ != nullptr);
const char* s = node_->data; const char* s = node_->data;
if (isTinyString(s, size_)) if (isTinyString(s, size_))
data->setTinyString(s, static_cast<uint8_t>(size_)); data->setTinyString(adaptString(s, size_));
else else
data->setOwnedString(commitStringNode()); data->setOwnedString(commitStringNode());
} }

11
pio_local.ini_example
View File

@@ -51,11 +51,12 @@ custom_password = admin
; custom_emsesp_ip = 10.10.10.93 ; custom_emsesp_ip = 10.10.10.93
; example override for lib_deps and using locally built modules ; example override for lib_deps and using locally built modules
lib_deps = ; lib_deps =
bblanchon/ArduinoJson ; bblanchon/ArduinoJson @ 7.4.1
ESP32Async/AsyncTCP ; ESP32Async/AsyncTCP @ 3.4.0
ESP32Async/ESPAsyncWebServer ; ESP32Async/ESPAsyncWebServer @ 3.7.7
file://${PROJECT_DIR}/../modules/EMS-ESP-Modules ; file://${PROJECT_DIR}/../modules/EMS-ESP-Modules
; ; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.7
; ** debug settings ** ; ** debug settings **
; to be used with esp-prog/JTAG hardware device like https://docs.espressif.com/projects/esp-dev-kits/en/latest/other/esp-prog/user_guide.html ; to be used with esp-prog/JTAG hardware device like https://docs.espressif.com/projects/esp-dev-kits/en/latest/other/esp-prog/user_guide.html

8
platformio.ini
View File

@@ -100,10 +100,10 @@ monitor_filters = direct
build_type = release build_type = release
board_build.filesystem = littlefs board_build.filesystem = littlefs
lib_deps = lib_deps =
bblanchon/ArduinoJson @ 7.4.0 bblanchon/ArduinoJson @ 7.4.1
ESP32Async/AsyncTCP @ 3.3.8 ESP32Async/AsyncTCP @ 3.4.0
ESP32Async/ESPAsyncWebServer @ 3.7.6 ESP32Async/ESPAsyncWebServer @ 3.7.7
https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.6 https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.7
; ;
; Builds for different board types ; Builds for different board types