Several fixes:

- moved "StaticJsonDocument<JSON_BUFFER_SIZE>" to JsonDocument as StaticJsonDocument is marked depriciated.
- Fixed display_plus show()-method
- Fixed string length for drumset sounds
- Newer version of third-party libraries

MicroDexed.ino

@@ -67,7 +67,7 @@ AudioEffectModulatedDelay* modchorus[NUM_DEXED];
 AudioMixer<2>* chorus_mixer[NUM_DEXED];
 AudioMixer<2>* delay_fb_mixer[NUM_DEXED];
 #if defined(USE_DELAY_8M)
-AudioEffectDelayExternal8* delay_fx[NUM_DEXED];
+AudioEffectDelayExternal8* delay_fx[NUM_DEXED];  // APS6404L-3SQR QSPI PSRAM (1 MB)
 #else
 AudioEffectDelay* delay_fx[NUM_DEXED];
 #endif

config.h

@@ -263,7 +263,7 @@
 #define VOICE_NAME_LEN 12  // 11 (plus '\0')
 #define FILENAME_LEN BANK_NAME_LEN + VOICE_NAME_LEN
 #define CONFIG_FILENAME_LEN 50
-#define DRUM_NAME_LEN 10
+#define DRUM_NAME_LEN 16
 #define PERFORMANCE_NAME_LEN 11
 
 #define FAV_CONFIG_PATH "FAVCFG"

dexed_sd.cpp

@@ -408,7 +408,7 @@ bool load_sd_drumsettings_json(uint8_t number) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     char filename[CONFIG_FILENAME_LEN];
 
     snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s.json"), PERFORMANCE_CONFIG_PATH, number, DRUMS_CONFIG_NAME);
@@ -470,7 +470,7 @@ bool save_sd_drumsettings_json(uint8_t number) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
 
     if (check_performance_directory(number)) {
       snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s.json"), PERFORMANCE_CONFIG_PATH, number, DRUMS_CONFIG_NAME);
@@ -558,7 +558,7 @@ bool load_sd_voiceconfig_json(uint8_t vc, uint8_t instance_id) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
 
     snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s%d.json"), PERFORMANCE_CONFIG_PATH, vc, VOICE_CONFIG_NAME, instance_id + 1);
 
@@ -646,7 +646,7 @@ bool save_sd_voiceconfig_json(uint8_t vc, uint8_t instance_id) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s%d.json"), PERFORMANCE_CONFIG_PATH, vc, VOICE_CONFIG_NAME, instance_id + 1);
 
 #ifdef DEBUG
@@ -730,7 +730,7 @@ bool load_sd_fx_json(uint8_t number) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     char filename[CONFIG_FILENAME_LEN];
     snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s.json"), PERFORMANCE_CONFIG_PATH, number, FX_CONFIG_NAME);
 
@@ -818,7 +818,7 @@ bool save_sd_fx_json(uint8_t number) {
   save_sd_drumsettings_json(number);
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s.json"), PERFORMANCE_CONFIG_PATH, number, FX_CONFIG_NAME);
 
 #ifdef DEBUG
@@ -896,7 +896,7 @@ bool load_sd_epiano_json(uint8_t number) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     char filename[CONFIG_FILENAME_LEN];
     snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s.json"), PERFORMANCE_CONFIG_PATH, number, EPIANO_CONFIG_NAME);
 
@@ -970,7 +970,7 @@ bool save_sd_epiano_json(uint8_t number) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s.json"), PERFORMANCE_CONFIG_PATH, number, EPIANO_CONFIG_NAME);
 
 #ifdef DEBUG
@@ -1033,7 +1033,7 @@ bool save_sd_epiano_json(uint8_t number) {
 bool load_sd_sys_json(void) {
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     char filename[CONFIG_FILENAME_LEN];
     snprintf_P(filename, sizeof(filename), PSTR("/%s.json"), SYS_CONFIG_NAME);
 
@@ -1092,7 +1092,7 @@ bool save_sd_sys_json(void) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     snprintf_P(filename, sizeof(filename), PSTR("/%s.json"), SYS_CONFIG_NAME);
 
 #ifdef DEBUG
@@ -1170,7 +1170,7 @@ bool save_sd_performance_json(uint8_t number) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s.json"), PERFORMANCE_CONFIG_PATH, number, PERFORMANCE_CONFIG_NAME);
 #ifdef DEBUG
     Serial.print(F("Saving performance config "));
@@ -1242,7 +1242,7 @@ void get_sd_performance_name_json(uint8_t number, char* name, uint8_t len) {
   number = constrain(number, PERFORMANCE_NUM_MIN, PERFORMANCE_NUM_MAX);
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
     char filename[CONFIG_FILENAME_LEN];
 
     snprintf_P(filename, sizeof(filename), PSTR("/%s/%d/%s.json"), PERFORMANCE_CONFIG_PATH, number, PERFORMANCE_CONFIG_NAME);
@@ -1289,7 +1289,7 @@ bool load_sd_performance_json(uint8_t number) {
 
   if (sd_card > 0) {
     File json;
-    StaticJsonDocument<JSON_BUFFER_SIZE> data_json;
+    JsonDocument data_json;
 
     for (uint8_t instance_id = 0; instance_id < NUM_DEXED; instance_id++) {
 #ifdef DEBUG

disp_plus.h

@@ -37,49 +37,26 @@ public:
   using T::T;
 
   void show(uint8_t y, uint8_t x, uint8_t fs, const char *str) {
-    _show(y, x, fs, str, false, false);
+    char tmp[STRING_BUFFER_SIZE];
-  }
+    char format_str[16];
 
-  void show(uint8_t y, uint8_t x, uint8_t fs, long num) {
+    snprintf_P(format_str, sizeof(format_str), PSTR("%%-%ds"), fs);
-    char _buf10[STRING_BUFFER_SIZE];
+    snprintf(tmp, sizeof(tmp), format_str, str);
 
-    _show(y, x, fs, itoa(num, _buf10, 10), true, true);
+    this->setCursor(x, y);
+    this->print(tmp);
   }
 
-private:
+  void show(uint8_t y, uint8_t x, uint8_t fs, long num) {
-  void _show(uint8_t pos_y, uint8_t pos_x, uint8_t field_size, const char *str, bool justify_right, bool fill_zero) {
-    {
     char tmp[STRING_BUFFER_SIZE];
-      char *s = tmp;
+    char format_str[16];
-      uint8_t l = strlen(str);
-
-      memset(tmp, 0, sizeof(tmp));
-      if (fill_zero == true)
-        memset(tmp, '0', field_size);
-      else
-        memset(tmp, 0x20, field_size);  // blank
 
-      if (l > field_size)
+    snprintf_P(format_str, sizeof(format_str), PSTR("%%0%dd"), fs);
-        l = field_size;
+    snprintf(tmp, sizeof(tmp), format_str, num);
 
-      if (justify_right == true)
+    this->setCursor(x, y);
-        s += field_size - l;
-
-      strncpy(s, str, l);
-      //s[l] = '\0';
-
-      //setCursor(pos_x * getMaxCharWidth(), pos_y * getMaxCharHeight());
-      this->setCursor(pos_x, pos_y);
     this->print(tmp);
-
-#ifdef DEBUG
-      Serial.print(pos_y, DEC);
-      Serial.print(F("/"));
-      Serial.print(pos_x, DEC);
-      Serial.print(F(": ["));
-      Serial.print(tmp);
-      Serial.println(F("]"));
-#endif
-    }
   }
+
+private:
 };

third-party/ArduinoJson/ArduinoJson.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include "src/ArduinoJson.h"

third-party/ArduinoJson/CHANGELOG.md

@@ -1,854 +1,130 @@
 ArduinoJson: change log
 =======================
 
-v6.21.3 (2023-07-23)
+v7.0.3 (2024-02-05)
--------
-
-* Fix compatibility with the Blynk libary (issue #1914)
-* Fix double lookup in `to<JsonVariant>()`
-* Fix double call to `size()` in `serializeMsgPack()`
-* Include `ARDUINOJSON_SLOT_OFFSET_SIZE` in the namespace name
-* Show a link to the documentation when user passes an unsupported input type
-
-v6.21.2 (2023-04-12)
--------
-
-* Fix compatibility with the Zephyr Project (issue #1905)
-* Allow using PROGMEM outside of Arduino (issue #1903)
-* Set default for `ARDUINOJSON_ENABLE_PROGMEM` to `1` on AVR
-
-v6.21.1 (2023-03-27)
--------
-
-* Double speed of `DynamicJsonDocument::garbageCollect()`
-* Fix compatibility with GCC 5.2 (issue #1897)
-
-v6.21.0 (2023-03-14)
--------
-
-* Drop support for C++98/C++03. Minimum required is C++11.
-* Remove `ARDUINOJSON_NAMESPACE`; use `ArduinoJson` instead.
-* Make string support generic (issue #1807)
-
-v6.20.1 (2023-02-08)
--------
-
-* Remove explicit exclusion of `as<char*>()` and `as<char>()` (issue #1860)
-  If you try to call them, you'll now get the same error message as any unsupported type.
-  You could also add a custom converter for `char*` and `char`.
-
-v6.20.0 (2022-12-26)
--------
-
-* Add `JsonVariant::shallowCopy()` (issue #1343)
-* Fix `9.22337e+18 is outside the range of representable values of type 'long'`
-* Fix comparison operators for `JsonArray`, `JsonArrayConst`, `JsonObject`, and `JsonObjectConst`
-* Fix lax parsing of `true`, `false`, and `null` (issue #1781)
-* Remove undocumented `accept()` functions
-* Rename `addElement()` to `add()`
-* Remove `getElement()`, `getOrAddElement()`, `getMember()`, and `getOrAddMember()`
-* Remove undocumented `JsonDocument::data()` and `JsonDocument::memoryPool()`
-* Remove undocumented `JsonArrayIterator::internal()` and `JsonObjectIterator::internal()`
-* Rename things in `ARDUINOJSON_NAMESPACE` to match the public names
-* Add documentation to most public symbols
-* Remove support for naked `char` (was deprecated since 6.18.0)
-
-> ### BREAKING CHANGES
->
-> This release hides `JsonVariant`'s functions that were only intended for internal use.
-> If you were using them in your programs, you must replace with `operator[]` and `to<JsonVariant>()`, like so:
->
-> ```c++
-> // before
-> JsonVariant a = variant.getElement(idx);
-> JsonVariant b = variant.getOrAddElement(idx);
-> JsonVariant c = variant.getMember(key);
-> JsonVariant d = variant.getOrAddMember(key);
->
-> // after
-> JsonVariant a = variant[idx];
-> JsonVariant b = idx < variant.size() ? variant[idx] : variant[idx].to<JsonVariant>();
-> JsonVariant c = variant[key];
-> JsonVariant d = variant.containsKey(key) ? variant[key] : variant[key].to<JsonVariant>();
-> ```
-
-v6.19.4 (2022-04-05)
--------
-
-* Add `ElementProxy::memoryUsage()`
-* Add `MemberProxy::memoryUsage()` (issue #1730)
-* Add implicit conversion from `JsonDocument` to `JsonVariant`
-* Fix comparisons operators with `const JsonDocument&`
-
-v6.19.3 (2022-03-08)
--------
-
-* Fix `call of overloaded 'String(const char*, int)' is ambiguous`
-* Fix `JsonString` operator `==` and `!=` for non-zero-terminated string
-* Fix `-Wsign-conversion` on GCC 8 (issue #1715)
-* MessagePack: serialize round floats as integers (issue #1718)
-
-v6.19.2 (2022-02-14)
--------
-
-* Fix `cannot convert 'pgm_p' to 'const void*'` (issue #1707)
-
-v6.19.1 (2022-01-14)
--------
-
-* Fix crash when adding an object member in a too small `JsonDocument`
-* Fix filter not working in zero-copy mode (issue #1697)
-
-v6.19.0 (2022-01-08)
--------
-
-* Remove `ARDUINOJSON_EMBEDDED_MODE` and assume we run on an embedded platform.  
-  Dependent settings (like `ARDUINOJSON_DEFAULT_NESTING_LIMIT`) must be set individually.
-* Change the default of `ARDUINOJSON_USE_DOUBLE` to `1`
-* Change the default of `ARDUINOJSON_USE_LONG_LONG` to `1` on 32-bit platforms
-* Add `as<JsonString>()` and `is<JsonString>()`
-* Add safe bool idiom in `JsonString`
-* Add support for NUL in string values (issue #1646)
-* Add support for arbitrary array rank in `copyArray()`
-* Add support for `char[][]` in `copyArray()`
-* Remove `DeserializationError == bool` and `DeserializationError != bool`
-* Renamed undocumented function `isUndefined()` to `isUnbound()`
-* Fix `JsonVariant::memoryUsage()` for raw strings
-* Fix `call of overloaded 'swap(BasicJsonDocument&, BasicJsonDocument&)' is ambiguous` (issue #1678)
-* Fix inconsistent pool capacity between `BasicJsonDocument`'s copy and move constructors
-* Fix inconsistent pool capacity between `BasicJsonDocument`'s copy and move assignments
-* Fix return type of `StaticJsonDocument::operator=`
-* Avoid pool reallocation in `BasicJsonDocument`'s copy assignment if capacity is the same
-* Avoid including `Arduino.h` when all its features are disabled (issue #1692, PR #1693 by @paulocsanz)
-* Assume `PROGMEM` is available as soon as `ARDUINO` is defined (consequence of #1693)
-
-v6.18.5 (2021-09-28)
--------
-
-* Set `ARDUINOJSON_EMBEDDED_MODE` to `1` on Nios II (issue #1657)
-
-v6.18.4 (2021-09-06)
--------
-
-* Fixed error `'dummy' may be used uninitialized` on GCC 11
-* Fixed error `expected unqualified-id before 'const'` on GCC 11 (issue #1622)
-* Filter: exact match takes precedence over wildcard (issue #1628)
-* Fixed deserialization of `\u0000` (issue #1646)
-
-v6.18.3 (2021-07-27)
--------
-
-* Changed return type of `convertToJson()` and `Converter<T>::toJson()` to `void`
-* Added `as<std::string_view>()` and `is<std::string_view>()`
-
-v6.18.2 (2021-07-19)
--------
-
-* Removed a symlink because the Arduino Library Specification forbids it
-
-v6.18.1 (2021-07-03)
--------
-
-* Fixed support for `volatile float` and `volatile double` (issue #1557)
-* Fixed error `[Pe070]: incomplete type is not allowed` on IAR (issue #1560)
-* Fixed `serializeJson(doc, String)` when allocation fails (issue #1572)
-* Fixed clang-tidy warnings (issue #1574, PR #1577 by @armandas)
-* Added fake class `InvalidConversion<T1,T2>` to easily identify invalid conversions (issue #1585)
-* Added support for `std::string_view` (issue #1578, PR #1554 by @0xFEEDC0DE64)
-* Fixed warning `definition of implicit copy constructor for 'MsgPackDeserializer' is deprecated because it has a user-declared copy assignment operator`
-* Added `JsonArray::clear()` (issue #1597)
-* Fixed `JsonVariant::as<unsigned>()` (issue #1601)
-* Added support for ESP-IDF component build (PR #1562 by @qt1, PR #1599 by @andreaskuster)
-
-v6.18.0 (2021-05-05)
--------
-
-* Added support for custom converters (issue #687)
-* Added support for `Printable` (issue #1444)
-* Removed support for `char` values, see below (issue #1498)
-* `deserializeJson()` leaves `\uXXXX` unchanged instead of returning `NotSupported`
-* `deserializeMsgPack()` inserts `null` instead of returning `NotSupported`
-* Removed `DeserializationError::NotSupported`
-* Added `JsonVariant::is<JsonArrayConst/JsonObjectConst>()` (issue #1412)
-* Added `JsonVariant::is<JsonVariant/JsonVariantConst>()` (issue #1412)
-* Changed `JsonVariantConst::is<JsonArray/JsonObject>()` to return `false` (issue #1412)
-* Simplified `JsonVariant::as<T>()` to always return `T` (see below)
-* Updated folders list in `.mbedignore` (PR #1515 by @AGlass0fMilk)
-* Fixed member-call-on-null-pointer in `getMember()` when array is empty
-* `serializeMsgPack(doc, buffer, size)` doesn't add null-terminator anymore (issue #1545)
-* `serializeJson(doc, buffer, size)` adds null-terminator only if there is enough room
-* PlatformIO: set `build.libArchive` to `false` (PR #1550 by @askreet)
-
-> ### BREAKING CHANGES
->
-> #### Support for `char` removed
->
-> We cannot cast a `JsonVariant` to a `char` anymore, so the following will break:
-> ```c++
-> char age = doc["age"];  //  error: no matching function for call to 'variantAs(VariantData*&)'
-> ```
-> Instead, you must use another integral type, such as `int8_t`:
-> ```c++
-> int8_t age = doc["age"];  // OK
-> ```
->
-> Similarly, we cannot assign from a `char` anymore, so the following will break:
-> ```c++
-> char age;
-> doc["age"] = age;  // error: no matching function for call to 'VariantRef::set(const char&)'
-> ```
-> Instead, you must use another integral type, such as `int8_t`:
-> ```c++
-> int8_t age;
-> doc["age"] = age;  // OK
-> ```
-> A deprecation warning with the message "Support for `char` is deprecated, use `int8_t` or `uint8_t` instead" was added to allow a smooth transition.
->
-> #### `as<T>()` always returns `T`
->
-> Previously, `JsonVariant::as<T>()` could return a type different from `T`.
-> The most common example is `as<char*>()` that returned a `const char*`.
-> While this feature simplified a few use cases, it was confusing and complicated the
-> implementation of custom converters.
->
-> Starting from this version, `as<T>` doesn't try to auto-correct the return type and always return `T`,
-> which means that you cannot write this anymore:
->
-> ```c++
-> Serial.println(doc["sensor"].as<char*>());  // error: invalid conversion from 'const char*' to 'char*' [-fpermissive]
-> ```
-> 
-> Instead, you must write:
->
-> ```c++
-> Serial.println(doc["sensor"].as<const char*>());  // OK
-> ```
->
-> A deprecation warning with the message "Replace `as<char*>()` with `as<const char*>()`" was added to allow a smooth transition.
->
-> #### `DeserializationError::NotSupported` removed
->
-> On a different topic, `DeserializationError::NotSupported` has been removed.
-> Instead of returning this error:
->
-> * `deserializeJson()` leaves `\uXXXX` unchanged (only when `ARDUINOJSON_DECODE_UNICODE` is `0`)
-> * `deserializeMsgPack()` replaces unsupported values with `null`s
->
-> #### Const-aware `is<T>()`
->
-> Lastly, a very minor change concerns `JsonVariantConst::is<T>()`.
-> It used to return `true` for `JsonArray` and `JsonOject`, but now it returns `false`.
-> Instead, you must use `JsonArrayConst` and `JsonObjectConst`.
-
-v6.17.3 (2021-02-15)
--------
-
-* Made `JsonDocument`'s destructor protected (issue #1480)
-* Added missing calls to `client.stop()` in `JsonHttpClient.ino` (issue #1485)
-* Fixed error `expected ')' before 'char'` when `isdigit()` is a macro (issue #1487)
-* Fixed error `definition of implicit copy constructor is deprecated` on Clang 10
-* PlatformIO: set framework compatibility to `*` (PR #1490 by @maxgerhardt)
-
-v6.17.2 (2020-11-14)
--------
-
-* Fixed invalid conversion error in `operator|(JsonVariant, char*)` (issue #1432)
-* Changed the default value of `ARDUINOJSON_ENABLE_PROGMEM` (issue #1433).
-  It now checks that the `pgm_read_XXX` macros are defined before enabling `PROGMEM`.
-
-v6.17.1 (2020-11-07)
--------
-
-* Fixed error `ambiguous overload for 'operator|'` (issue #1411)
-* Fixed `operator|(MemberProxy, JsonObject)` (issue #1415)
-* Allowed more than 32767 values in non-embedded mode (issue #1414)
-
-v6.17.0 (2020-10-19)
--------
-
-* Added a build failure when nullptr is defined as a macro (issue #1355)
-* Added `JsonDocument::overflowed()` which tells if the memory pool was too small (issue #1358)
-* Added `DeserializationError::EmptyInput` which tells if the input was empty
-* Added `DeserializationError::f_str()` which returns a `const __FlashStringHelper*` (issue #846)
-* Added `operator|(JsonVariantConst, JsonVariantConst)`
-* Added filtering for MessagePack (issue #1298, PR #1394 by Luca Passarella)
-* Moved float convertion tables to PROGMEM
-* Fixed `JsonVariant::set((char*)0)` which returned false instead of true (issue #1368)
-* Fixed error `No such file or directory #include <WString.h>` (issue #1381)
-
-v6.16.1 (2020-08-04)
--------
-
-* Fixed `deserializeJson()` that stopped reading after `{}` (issue #1335)
-
-v6.16.0 (2020-08-01)
--------
-
-* Added comparisons (`>`, `>=`, `==`, `!=`, `<`, and `<=`) between `JsonVariant`s
-* Added string deduplication (issue #1303)
-* Added `JsonString::operator!=`
-* Added wildcard key (`*`) for filters (issue #1309)
-* Set `ARDUINOJSON_DECODE_UNICODE` to `1` by default
-* Fixed `copyArray()` not working with `String`, `ElementProxy`, and `MemberProxy`
-* Fixed error `getOrAddElement is not a member of ElementProxy` (issue #1311)
-* Fixed excessive stack usage when compiled with `-Og` (issues #1210 and #1314)
-* Fixed `Warning[Pa093]: implicit conversion from floating point to integer` on IAR compiler (PR #1328 by @stawiski)
-
-v6.15.2 (2020-05-15)
--------
-
-* CMake: don't build tests when imported in another project
-* CMake: made project arch-independent
-* Visual Studio: fixed error C2766 with flag `/Zc:__cplusplus` (issue #1250)
-* Added support for `JsonDocument` to `copyArray()` (issue #1255)
-* Added support for `enum`s in `as<T>()` and `is<T>()`  (issue #1256)
-* Added `JsonVariant` as an input type for `deserializeXxx()`  
-  For example, you can do: `deserializeJson(doc2, doc1["payload"])`
-* Break the build if using 64-bit integers with ARDUINOJSON_USE_LONG_LONG==0
-
-v6.15.1 (2020-04-08)
--------
-
-* Fixed "maybe-uninitialized" warning (issue #1217)
-* Fixed "statement is unreachable" warning on IAR (issue #1233)
-* Fixed "pointless integer comparison" warning on IAR (issue #1233)
-* Added CMake "install" target (issue #1209)
-* Disabled alignment on AVR (issue #1231)
-
-v6.15.0 (2020-03-22)
--------
-
-* Added `DeserializationOption::Filter` (issue #959)
-* Added example `JsonFilterExample.ino`
-* Changed the array subscript operator to automatically add missing elements
-* Fixed "deprecated-copy" warning on GCC 9 (fixes #1184)
-* Fixed `MemberProxy::set(char[])` not duplicating the string (issue #1191)
-* Fixed enums serialized as booleans (issue #1197)
-* Fixed incorrect string comparison on some platforms (issue #1198)
-* Added move-constructor and move-assignment to `BasicJsonDocument`
-* Added `BasicJsonDocument::garbageCollect()` (issue #1195)
-* Added `StaticJsonDocument::garbageCollect()`
-* Changed copy-constructor of `BasicJsonDocument` to preserve the capacity of the source.
-* Removed copy-constructor of `JsonDocument` (issue #1189)
-
-> ### BREAKING CHANGES
-> 
-> #### Copy-constructor of `BasicJsonDocument`
->
-> In previous versions, the copy constructor of `BasicJsonDocument` looked at the source's `memoryUsage()` to choose its capacity.
-> Now, the copy constructor of `BasicJsonDocument` uses the same capacity as the source.
->
-> Example:
->
-> ```c++
-> DynamicJsonDocument doc1(64);
-> doc1.set(String("example"));
->
-> DynamicJsonDocument doc2 = doc1;
-> Serial.print(doc2.capacity());  // 8 with ArduinoJson 6.14
->                                 // 64 with ArduinoJson 6.15
-> ```
->
-> I made this change to get consistent results between copy-constructor and move-constructor, and whether RVO applies or not.
->
-> If you use the copy-constructor to optimize your documents, you can use `garbageCollect()` or `shrinkToFit()` instead.
->
-> #### Copy-constructor of `JsonDocument`
->
-> In previous versions, it was possible to create a function that take a `JsonDocument` by value.
->
-> ```c++
-> void myFunction(JsonDocument doc) {}
-> ```
->
-> This function gives the wrong clues because it doesn't receive a copy of the `JsonDocument`, only a sliced version.
-> It worked because the copy constructor copied the internal pointers, but it was an accident.
->
-> From now, if you need to pass a `JsonDocument` to a function, you must use a reference:
->
-> ```c++
-> void myFunction(JsonDocument& doc) {}
-> ```
-
-v6.14.1 (2020-01-27)
--------
-
-* Fixed regression in UTF16 decoding (issue #1173)
-* Fixed `containsKey()` on `JsonVariantConst`
-* Added `getElement()` and `getMember()` to `JsonVariantConst`
-
-v6.14.0 (2020-01-16)
--------
-
-* Added `BasicJsonDocument::shrinkToFit()`
-* Added support of `uint8_t` for `serializeJson()`, `serializeJsonPretty()`, and `serializeMsgPack()` (issue #1142)
-* Added `ARDUINOJSON_ENABLE_COMMENTS` to enable support for comments (defaults to 0)
-* Auto enable support for `std::string` and `std::stream` on modern compilers (issue #1156)
-  (No need to define `ARDUINOJSON_ENABLE_STD_STRING` and `ARDUINOJSON_ENABLE_STD_STREAM` anymore)
-* Improved decoding of UTF-16 surrogate pairs (PR #1157 by @kaysievers)
-  (ArduinoJson now produces standard UTF-8 instead of CESU-8)
-* Added `measureJson`, `measureJsonPretty`, and `measureMsgPack` to `keywords.txt`
-  (This file is used for syntax highlighting in the Arduino IDE) 
-* Fixed `variant.is<nullptr_t>()`
-* Fixed value returned by `serializeJson()`, `serializeJsonPretty()`, and `serializeMsgPack()` when writing to a `String`
-* Improved speed of `serializeJson()`, `serializeJsonPretty()`, and `serializeMsgPack()` when writing to a `String`
-
-> ### BREAKING CHANGES
-> 
-> #### Comments
-> 
-> Support for comments in input is now optional and disabled by default.
->
-> If you need support for comments, you must defined `ARDUINOJSON_ENABLE_COMMENTS` to `1`; otherwise, you'll receive `InvalidInput` errors.
->
-> ```c++
-> #define ARDUINOJSON_ENABLE_COMMENTS 1
-> #include <ArduinoJson.h>
-> ```
-
-v6.13.0 (2019-11-01)
--------
-
-* Added support for custom writer/reader classes (issue #1088)
-* Added conversion from `JsonArray` and `JsonObject` to `bool`, to be consistent with `JsonVariant`
-* Fixed `deserializeJson()` when input contains duplicate keys (issue #1095)
-* Improved `deserializeMsgPack()` speed by reading several bytes at once
-* Added detection of Atmel AVR8/GNU C Compiler (issue #1112)
-* Fixed deserializer that stopped reading at the first `0xFF` (PR #1118 by @mikee47)
-* Fixed dangling reference in copies of `MemberProxy` and `ElementProxy` (issue #1120)
-
-v6.12.0 (2019-09-05)
--------
-
-* Use absolute instead of relative includes (issue #1072)
-* Changed `JsonVariant::as<bool>()` to return `true` for any non-null value (issue #1005)
-* Moved ancillary files to `extras/` (issue #1011)
-
-v6.11.5 (2019-08-23)
--------
-
-* Added fallback implementations of `strlen_P()`, `strncmp_P()`, `strcmp_P()`, and `memcpy_P()` (issue #1073)
-
-v6.11.4 (2019-08-12)
--------
-
-* Added `measureJson()` to the `ArduinoJson` namespace (PR #1069 by @nomis)
-* Added support for `basic_string<char, traits, allocator>` (issue #1045)
-* Fixed example `JsonConfigFile.ino` for ESP8266
-* Include `Arduino.h` if `ARDUINO` is defined (PR #1071 by @nomis)
-
-v6.11.3 (2019-07-22)
--------
-
-* Added operators `==` and `!=` for `JsonDocument`, `ElementProxy`, and `MemberProxy`
-* Fixed comparison of `JsonVariant` when one contains a linked string and the other contains an owned string (issue #1051)
-
-v6.11.2 (2019-07-08)
--------
-
-* Fixed assignment of `JsonDocument` to `JsonVariant` (issue #1023)
-* Fix invalid conversion error on Particle Argon (issue #1035)
-
-v6.11.1 (2019-06-21)
--------
-
-* Fixed `serialized()` not working with Flash strings (issue #1030)
-
-v6.11.0 (2019-05-26)
--------
-
-* Fixed `deserializeJson()` silently accepting a `Stream*` (issue #978)
-* Fixed invalid result from `operator|` (issue #981)
-* Made `deserializeJson()` more picky about trailing characters (issue #980)
-* Added `ARDUINOJSON_ENABLE_NAN` (default=0) to enable NaN in JSON (issue #973)
-* Added `ARDUINOJSON_ENABLE_INFINITY` (default=0) to enable Infinity in JSON
-* Removed implicit conversion in comparison operators (issue #998)
-* Added lexicographical comparison for `JsonVariant`
-* Added support for `nullptr` (issue #998)
-
-> ### BREAKING CHANGES
-> 
-> #### NaN and Infinity
-> 
-> The JSON specification allows neither NaN not Infinity, but previous
-> versions of ArduinoJson supported it. Now, ArduinoJson behaves like most
-> other libraries: a NaN or and Infinity in the `JsonDocument`, becomes
-> a `null` in the output JSON. Also, `deserializeJson()` returns
-> `InvalidInput` if the JSON document contains NaN or Infinity.
-> 
-> This version still supports NaN and Infinity in JSON documents, but
-> it's disabled by default to be compatible with other JSON parsers.
-> If you need the old behavior back, define `ARDUINOJSON_ENABLE_NAN` and
-> `ARDUINOJSON_ENABLE_INFINITY` to `1`;:
-> 
-> ```c++
-> #define ARDUINOJSON_ENABLE_NAN 1
-> #define ARDUINOJSON_ENABLE_INFINITY 1
-> #include <ArduinoJson.h>
-> ```
-> 
-> #### The "or" operator
-> 
-> This version slightly changes the behavior of the | operator when the 
-> variant contains a float and the user requests an integer.
->
-> Older versions returned the floating point value truncated.
-> Now, it returns the default value.
-> 
-> ```c++
-> // suppose variant contains 1.2
-> int value = variant | 3;
-> 
-> // old behavior:
-> value == 1
-> 
-> // new behavior
-> value == 3
-> ```
-> 
-> If you need the old behavior, you must add `if (variant.is<float>())`.
-
-v6.10.1 (2019-04-23)
--------
-
-* Fixed error "attributes are not allowed on a function-definition"
-* Fixed `deserializeJson()` not being picky enough (issue #969)
-* Fixed error "no matching function for call to write(uint8_t)" (issue #972)
-
-v6.10.0 (2019-03-22)
--------
-
-* Fixed an integer overflow in the JSON deserializer
-* Added overflow handling in `JsonVariant::as<T>()` and `JsonVariant::is<T>()`.
-   - `as<T>()` returns `0` if the integer `T` overflows
-   - `is<T>()` returns `false` if the integer `T` overflows
-* Added `BasicJsonDocument` to support custom allocator (issue #876)
-* Added `JsonDocument::containsKey()` (issue #938)
-* Added `JsonVariant::containsKey()`
-
-v6.9.1 (2019-03-01)
 ------
 
-* Fixed warning "unused variable" with GCC 4.4 (issue #912)
+* Improve error messages when using `char` or `char*` (issue #2043)
-* Fixed warning "cast  increases required alignment" (issue #914)
+* Reduce stack consumption (issue #2046)
-* Fixed warning "conversion may alter value" (issue #914)
+* Fix compatibility with GCC 4.8 (issue #2045)
-* Fixed naming conflict with "CAPACITY" (issue #839)
-* Muted warning "will change in GCC 7.1" (issue #914)
-* Added a clear error message for `StaticJsonBuffer` and `DynamicJsonBuffer`
-* Marked ArduinoJson.h  as a "system header"
 
-v6.9.0 (2019-02-26)
+v7.0.2 (2024-01-19)
 ------
 
-* Decode escaped Unicode characters like \u00DE (issue #304, PR #791)
+* Fix assertion `poolIndex < count_` after `JsonDocument::clear()` (issue #2034)
-  Many thanks to Daniel Schulte (aka @trilader) who implemented this feature.
-* Added option ARDUINOJSON_DECODE_UNICODE to enable it
-* Converted `JsonArray::copyFrom()/copyTo()` to free functions `copyArray()`
-* Renamed `JsonArray::copyFrom()` and `JsonObject::copyFrom()` to `set()`
-* Renamed `JsonArray::get()` to `getElement()`
-* Renamed `JsonArray::add()` (without arg) to `addElement()`
-* Renamed `JsonObject::get()` to `getMember()`
-* Renamed `JsonObject::getOrCreate()` to `getOrAddMember()`
-* Fixed `JsonVariant::isNull()` not returning `true` after `set((char*)0)`
-* Fixed segfault after `variant.set(serialized((char*)0))`
-* Detect `IncompleteInput` in `false`, `true`, and `null`
-* Added `JsonDocument::size()`
-* Added `JsonDocument::remove()`
-* Added `JsonVariant::clear()`
-* Added `JsonVariant::remove()`
-
-v6.8.0-beta (2019-01-30)
------------
-
-* Import functions in the ArduinoJson namespace to get clearer errors
-* Improved syntax highlighting in Arduino IDE
-* Removed default capacity of `DynamicJsonDocument`
-* `JsonArray::copyFrom()` accepts `JsonArrayConst`
-* `JsonVariant::set()` accepts `JsonArrayConst` and `JsonObjectConst`
-* `JsonDocument` was missing in the ArduinoJson namespace
-* Added `memoryUsage()` to `JsonArray`, `JsonObject`, and `JsonVariant`
-* Added `nesting()` to `JsonArray`, `JsonDocument`, `JsonObject`, and `JsonVariant`
-* Replaced `JsonDocument::nestingLimit` with an additional parameter
-  to `deserializeJson()` and `deserializeMsgPack()`
-* Fixed uninitialized variant in `JsonDocument`
-* Fixed `StaticJsonDocument` copy constructor and copy assignment
-* The copy constructor of `DynamicJsonDocument` chooses the capacity according to the memory usage of the source, not from the capacity of the source.
-* Added the ability to create/assign a `StaticJsonDocument`/`DynamicJsonDocument` from a `JsonArray`/`JsonObject`/`JsonVariant`
-* Added `JsonDocument::isNull()`
-* Added `JsonDocument::operator[]`
-* Added `ARDUINOJSON_TAB` to configure the indentation character
-* Reduced the size of the pretty JSON serializer
-* Added `add()`, `createNestedArray()` and `createNestedObject()` to `JsonVariant`
-* `JsonVariant` automatically promotes to `JsonObject` or `JsonArray` on write.
-  Calling `JsonVariant::to<T>()` is not required anymore.
-* `JsonDocument` now support the same operations as `JsonVariant`.
-  Calling `JsonDocument::as<T>()` is not required anymore.
-* Fixed example `JsonHttpClient.ino`
-* User can now use a `JsonString` as a key or a value
-
-> ### BREAKING CHANGES
-> 
-> #### `DynamicJsonDocument`'s constructor
-> 
-> The parameter to the constructor of `DynamicJsonDocument` is now mandatory
->
-> Old code:
->
-> ```c++
-> DynamicJsonDocument doc;
-> ```
->
-> New code:
->
-> ```c++
-> DynamicJsonDocument doc(1024);
-> ```
-> 
-> #### Nesting limit
-> 
-> `JsonDocument::nestingLimit` was replaced with a new parameter to `deserializeJson()` and `deserializeMsgPack()`.
-> 
-> Old code:
-> 
-> ```c++
-> doc.nestingLimit = 15;
-> deserializeJson(doc, input);
-> ```
-> 
-> New code: 
-> 
-> ```c++
-> deserializeJson(doc, input, DeserializationOption::NestingLimit(15));
-> ```
-
-v6.7.0-beta (2018-12-07)
------------
-
-* Removed the automatic expansion of `DynamicJsonDocument`, it now has a fixed capacity.
-* Restored the monotonic allocator because the code was getting too big
-* Reduced the memory usage
-* Reduced the code size
-* Renamed `JsonKey` to `JsonString`
-* Removed spurious files in the Particle library
-
-v6.6.0-beta (2018-11-13)
------------
-
-* Removed `JsonArray::is<T>(i)` and `JsonArray::set(i,v)`
-* Removed `JsonObject::is<T>(k)` and `JsonObject::set(k,v)`
-* Replaced `T JsonArray::get<T>(i)` with `JsonVariant JsonArray::get(i)`
-* Replaced `T JsonObject::get<T>(k)` with `JsonVariant JsonObject::get(k)`
-* Added `JSON_STRING_SIZE()`
-* ~~Replacing or removing a value now releases the memory~~
-* Added `DeserializationError::code()` to be used in switch statements (issue #846)
 
-v6.5.0-beta (2018-10-13)
+v7.0.1 (2024-01-10)
------------
+------
-
-* Added implicit conversion from `JsonArray` and `JsonObject` to `JsonVariant`
-* Allow mixed configuration in compilation units (issue #809)
-* Fixed object keys not being duplicated
-* `JsonPair::key()` now returns a `JsonKey`
-* Increased the default capacity of `DynamicJsonDocument`
-* Fixed `JsonVariant::is<String>()` (closes #763)
-* Added `JsonArrayConst`, `JsonObjectConst`, and `JsonVariantConst`
-* Added copy-constructor and copy-assignment-operator for `JsonDocument` (issue #827)
-
-v6.4.0-beta (2018-09-11)
------------
 
-* Copy `JsonArray` and `JsonObject`, instead of storing pointers (issue #780)
+* Fix "no matching function" with `JsonObjectConst::operator[]` (issue #2019)
-* Added `JsonVariant::to<JsonArray>()` and `JsonVariant::to<JsonObject>()`
+* Remove unused files in the PlatformIO package
+* Fix `volatile bool` serialized as `1` or `0` instead of `true` or `false` (issue #2029)
 
-v6.3.0-beta (2018-08-31)
+v7.0.0 (2024-01-03)
------------
+------
 
-* Implemented reference semantics for `JsonVariant`
+* Remove `BasicJsonDocument`
-* Replaced `JsonPair`'s `key` and `value` with `key()` and `value()`
+* Remove `StaticJsonDocument`
-* Fixed `serializeJson(obj[key], dst)` (issue #794)
+* Add abstract `Allocator` class
+* Merge `DynamicJsonDocument` with `JsonDocument`
+* Remove `JSON_ARRAY_SIZE()`, `JSON_OBJECT_SIZE()`, and `JSON_STRING_SIZE()`
+* Remove `ARDUINOJSON_ENABLE_STRING_DEDUPLICATION` (string deduplication cannot be disabled anymore)
+* Remove `JsonDocument::capacity()`
+* Store the strings in the heap
+* Reference-count shared strings
+* Always store `serialized("string")` by copy (#1915)
+* Remove the zero-copy mode of `deserializeJson()` and `deserializeMsgPack()`
+* Fix double lookup in `to<JsonVariant>()`
+* Fix double call to `size()` in `serializeMsgPack()`
+* Include `ARDUINOJSON_SLOT_OFFSET_SIZE` in the namespace name
+* Remove `JsonVariant::shallowCopy()`
+* `JsonDocument`'s capacity grows as needed, no need to pass it to the constructor anymore
+* `JsonDocument`'s allocator is not monotonic anymore, removed values get recycled
+* Show a link to the documentation when user passes an unsupported input type
+* Remove `JsonDocument::memoryUsage()`
+* Remove `JsonDocument::garbageCollect()`
+* Add `deserializeJson(JsonVariant, ...)` and `deserializeMsgPack(JsonVariant, ...)` (#1226)
+* Call `shrinkToFit()` in `deserializeJson()` and `deserializeMsgPack()`
+* `serializeJson()` and `serializeMsgPack()` replace the content of `std::string` and `String` instead of appending to it
+* Replace `add()` with `add<T>()` (`add(T)` is still supported)
+* Remove `createNestedArray()` and `createNestedObject()` (use `to<JsonArray>()` and `to<JsonObject>()` instead)
 
 > ### BREAKING CHANGES
 >
-> #### JsonVariant
+> As every major release, ArduinoJson 7 introduces several breaking changes.
+> I added some stubs so that most existing programs should compile, but I highty recommend you upgrade your code.
 >
-> `JsonVariant` now has a semantic similar to `JsonObject` and `JsonArray`.
+> #### `JsonDocument`
-> It's a reference to a value stored in the `JsonDocument`.
-> As a consequence, a `JsonVariant` cannot be used as a standalone variable anymore.
 > 
-> Old code:
+> In ArduinoJson 6, you could allocate the memory pool on the stack (with `StaticJsonDocument`) or in the heap (with `DynamicJsonDocument`).  
+> In ArduinoJson 7, the memory pool is always allocated in the heap, so `StaticJsonDocument` and `DynamicJsonDocument` have been merged into `JsonDocument`.
 >
-> ```c++
+> In ArduinoJson 6, `JsonDocument` had a fixed capacity; in ArduinoJson 7, it has an elastic capacity that grows as needed.
-> JsonVariant myValue = 42;
+> Therefore, you don't need to specify the capacity anymore, so the macros `JSON_ARRAY_SIZE()`, `JSON_OBJECT_SIZE()`, and `JSON_STRING_SIZE()` have been removed.
-> ```
->
-> New code:
 >
 > ```c++
-> DynamicJsonDocument doc;
+> // ArduinoJson 6
-> JsonVariant myValue = doc.to<JsonVariant>();
+> StaticJsonDocument<256> doc;
-> myValue.set(42);
+> // or
-> ```
+> DynamicJsonDocument doc(256);
 > 
-> #### JsonPair
+> // ArduinoJson 7
->
+> JsonDocument doc;
-> Old code:
->
-> ```c++
-> for(JsonPair p : myObject) {
->   Serial.println(p.key);
->   Serial.println(p.value.as<int>());
-> }
-> ```
->
-> New code:
->
-> ```c++
-> for(JsonPair p : myObject) {
->   Serial.println(p.key());
->   Serial.println(p.value().as<int>());
-> }
 > ```
 >
-> CAUTION: the key is now read only!
+> In ArduinoJson 7, `JsonDocument` reuses released memory, so `garbageCollect()` has been removed.  
-
+> `shrinkToFit()` is still available and releases the over-allocated memory.
-v6.2.3-beta (2018-07-19)
------------
-
-* Fixed exception when using Flash strings as object keys (issue #784)
-
-v6.2.2-beta (2018-07-18)
------------
-
-* Fixed `invalid application of 'sizeof' to incomplete type '__FlashStringHelper'` (issue #783)
-* Fixed `char[]` not duplicated when passed to `JsonVariant::operator[]`
-
-v6.2.1-beta (2018-07-17)
------------
-
-* Fixed `JsonObject` not inserting keys of type `String` (issue #782)
-
-v6.2.0-beta (2018-07-12)
------------
-
-* Disabled lazy number deserialization (issue #772)
-* Fixed `JsonVariant::is<int>()` that returned true for empty strings
-* Improved float serialization when `-fsingle-precision-constant` is used
-* Renamed function `RawJson()` to `serialized()`
-* `serializeMsgPack()` now supports values marked with `serialized()`
-
-> ### BREAKING CHANGES
->
-> #### Non quoted strings
->
-> Non quoted strings are now forbidden in values, but they are still allowed in keys.
-> For example, `{key:"value"}` is accepted, but `{key:value}` is not.
 >
-> #### Preformatted values
+> Due to a change in the implementation, it's not possible to store a pointer to a variant from another `JsonDocument`, so `shallowCopy()` has been removed.
 > 
-> Old code:
+> In ArduinoJson 6, the meaning of `memoryUsage()` was clear: it returned the number of bytes used in the memory pool.  
+> In ArduinoJson 7, the meaning of `memoryUsage()` would be ambiguous, so it has been removed.
 >
-> ```c++
+> #### Custom allocators
-> object["values"] = RawJson("[1,2,3,4]");
-> ```
 >
-> New code:
+> In ArduinoJson 6, you could specify a custom allocator class as a template parameter of `BasicJsonDocument`.  
+> In ArduinoJson 7, you must inherit from `ArduinoJson::Allocator` and pass a pointer to an instance of your class to the constructor of `JsonDocument`.
 >
 > ```c++
-> object["values"] = serialized("[1,2,3,4]");
+> // ArduinoJson 6
-> ```
+> class MyAllocator {
-
+>   // ...
-v6.1.0-beta (2018-07-02)
+> };
------------
+> BasicJsonDocument<MyAllocator> doc(256);
-
-* Return `JsonArray` and `JsonObject` by value instead of reference (issue #309)
-* Replaced `success()` with `isNull()`
-
-> ### BREAKING CHANGES
-> 
-> Old code:
 >
-> ```c++
+> // ArduinoJson 7
-> JsonObject& obj = doc.to<JsonObject>();
+> class MyAllocator : public ArduinoJson::Allocator {
-> JsonArray& arr = obj.createNestedArray("key");
+>   // ...
-> if (!arr.success()) {
+> };
->   Serial.println("Not enough memory");
+> MyAllocator myAllocator;
->   return;
+> JsonDocument doc(&myAllocator);
-> }
 > ```
 >
-> New code:
+> #### `createNestedArray()` and `createNestedObject()`
 >
-> ```c++
+> In ArduinoJson 6, you could create a nested array or object with `createNestedArray()` and `createNestedObject()`.  
-> JsonObject obj = doc.to<JsonObject>();
+> In ArduinoJson 7, you must use `add<T>()` or `to<T>()` instead.
-> JsonArray arr = obj.createNestedArray("key");
-> if (arr.isNull()) {
->   Serial.println("Not enough memory");
->   return;
-> }
-> ```
-
-v6.0.1-beta (2018-06-11)
------------
-
-* Fixed conflicts with `isnan()` and `isinf()` macros (issue #752)
-
-v6.0.0-beta (2018-06-07)
------------
-
-* Added `DynamicJsonDocument` and `StaticJsonDocument`
-* Added `deserializeJson()`
-* Added `serializeJson()` and `serializeJsonPretty()`
-* Added `measureJson()` and `measureJsonPretty()`
-* Added `serializeMsgPack()`, `deserializeMsgPack()` and `measureMsgPack()` (issue #358)
-* Added example `MsgPackParser.ino` (issue #358)
-* Added support for non zero-terminated strings (issue #704)
-* Removed `JsonBuffer::parseArray()`, `parseObject()` and `parse()`
-* Removed `JsonBuffer::createArray()` and `createObject()`
-* Removed `printTo()` and `prettyPrintTo()`
-* Removed `measureLength()` and `measurePrettyLength()`
-* Removed all deprecated features
-
-> ### BREAKING CHANGES
-> 
-> #### Deserialization
 >
-> Old code:
+> For example, to create `[[],{}]`, you would write:
 >
 > ```c++
-> DynamicJsonBuffer jb;
+> // ArduinoJson 6
-> JsonObject& obj = jb.parseObject(json);
+> arr.createNestedArray();
-> if (obj.success()) {
+> arr.createNestedObject();
 >
-> }
+> // ArduinoJson 7
+> arr.add<JsonArray>();
+> arr.add<JsonObject>();
 > ```
 >
-> New code:
+> And to create `{"array":[],"object":{}}`, you would write:
 >
 > ```c++
-> DynamicJsonDocument doc;
+> // ArduinoJson 6
-> DeserializationError error = deserializeJson(doc, json);
+> obj.createNestedArray("array");
-> if (error) {
+> obj.createNestedObject("object");
-> 
-> }
-> JsonObject& obj = doc.as<JsonObject>();
-> ```
 >
-> #### Serialization
+> // ArduinoJson 7
-> 
+> obj["array"].to<JsonArray>();
-> Old code:
+> obj["object"].to<JsonObject>();
-> 
-> ```c++
-> DynamicJsonBuffer jb;
-> JsonObject& obj = jb.createObject();
-> obj["key"] = "value";
-> obj.printTo(Serial);
-> ```
-> 
-> New code:
-> 
-> ```c++
-> DynamicJsonDocument obj;
-> JsonObject& obj = doc.to<JsonObject>();
-> obj["key"] = "value";
-> serializeJson(doc, Serial);
 > ```

third-party/ArduinoJson/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 cmake_minimum_required(VERSION 3.15)
@@ -10,7 +10,7 @@ if(ESP_PLATFORM)
 	return()
 endif()
 
-project(ArduinoJson VERSION 6.21.3)
+project(ArduinoJson VERSION 7.0.3)
 
 if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
 	include(CTest)

third-party/ArduinoJson/LICENSE.txt

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 ---------------------
 
-Copyright © 2014-2023, Benoit BLANCHON
+Copyright © 2014-2024, Benoit BLANCHON
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

third-party/ArduinoJson/README.md

@@ -4,13 +4,10 @@
 
 ---
 
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/bblanchon/ArduinoJson/ci.yml?branch=6.x&logo=github)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A6.x)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/bblanchon/ArduinoJson/ci.yml?branch=7.x&logo=github)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A7.x)
-[![Continuous Integration](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/6.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
+[![Continuous Integration](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/7.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arduinojson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
-[![Coveralls branch](https://img.shields.io/coveralls/github/bblanchon/ArduinoJson/6.x?logo=coveralls)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)  
+[![Coveralls branch](https://img.shields.io/coveralls/github/bblanchon/ArduinoJson/7.x?logo=coveralls)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x)  
-[![Arduino Library Manager](https://img.shields.io/static/v1?label=Arduino&message=v6.21.3&logo=arduino&logoColor=white&color=blue)](https://www.ardu-badge.com/ArduinoJson/6.21.3)
-[![PlatformIO Registry](https://badges.registry.platformio.org/packages/bblanchon/library/ArduinoJson.svg?version=6.21.3)](https://registry.platformio.org/packages/libraries/bblanchon/ArduinoJson?version=6.21.3) 
-[![ESP IDF](https://img.shields.io/static/v1?label=ESP+IDF&message=v6.21.3&logo=cpu&logoColor=white&color=blue)](https://components.espressif.com/components/bblanchon/arduinojson)  
 [![GitHub stars](https://img.shields.io/github/stars/bblanchon/ArduinoJson?style=flat&logo=github&color=orange)](https://github.com/bblanchon/ArduinoJson/stargazers)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/bblanchon?logo=github&color=orange)](https://github.com/sponsors/bblanchon)
 
@@ -18,31 +15,28 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
 
 ## Features
 
-* [JSON deserialization](https://arduinojson.org/v6/api/json/deserializejson/)
+* [JSON deserialization](https://arduinojson.org/v7/api/json/deserializejson/)
-    * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v6/api/config/decode_unicode/)
+    * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v7/api/config/decode_unicode/)
-    * [Optionally stores links to the input buffer (zero-copy)](https://arduinojson.org/v6/api/json/deserializejson/)
+    * [Optionally supports comments in the input](https://arduinojson.org/v7/api/config/enable_comments/)
-    * [Optionally supports comments in the input](https://arduinojson.org/v6/api/config/enable_comments/)
+    * [Optionally filters the input to keep only desired values](https://arduinojson.org/v7/api/json/deserializejson/#filtering)
-    * [Optionally filters the input to keep only desired values](https://arduinojson.org/v6/api/json/deserializejson/#filtering)
     * Supports single quotes as a string delimiter
     * Compatible with [NDJSON](http://ndjson.org/) and [JSON Lines](https://jsonlines.org/)
-* [JSON serialization](https://arduinojson.org/v6/api/json/serializejson/)
+* [JSON serialization](https://arduinojson.org/v7/api/json/serializejson/)
-    * [Can write to a buffer or a stream](https://arduinojson.org/v6/api/json/serializejson/)
+    * [Can write to a buffer or a stream](https://arduinojson.org/v7/api/json/serializejson/)
-    * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v6/api/json/serializejsonpretty/)
+    * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v7/api/json/serializejsonpretty/)
-* [MessagePack serialization](https://arduinojson.org/v6/api/msgpack/serializemsgpack/)
+* [MessagePack serialization](https://arduinojson.org/v7/api/msgpack/serializemsgpack/)
-* [MessagePack deserialization](https://arduinojson.org/v6/api/msgpack/deserializemsgpack/)
+* [MessagePack deserialization](https://arduinojson.org/v7/api/msgpack/deserializemsgpack/)
 * Efficient
     * [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
     * [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
     * [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
-    * [Fixed memory allocation, no heap fragmentation](https://arduinojson.org/v6/api/jsondocument/)
-    * [Optionally works without heap memory (zero malloc)](https://arduinojson.org/v6/api/staticjsondocument/)
     * [Deduplicates strings](https://arduinojson.org/news/2020/08/01/version-6-16-0/)
 * Versatile
-    * Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v6/how-to/use-external-ram-on-esp32/)
+    * Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v7/how-to/use-external-ram-on-esp32/)
-    * Supports [`String`](https://arduinojson.org/v6/api/config/enable_arduino_string/), [`std::string`](https://arduinojson.org/v6/api/config/enable_std_string/), and [`std::string_view`](https://arduinojson.org/v6/api/config/enable_string_view/)
+    * Supports [`String`](https://arduinojson.org/v7/api/config/enable_arduino_string/), [`std::string`](https://arduinojson.org/v7/api/config/enable_std_string/), and [`std::string_view`](https://arduinojson.org/v7/api/config/enable_string_view/)
-    * Supports [`Stream`](https://arduinojson.org/v6/api/config/enable_arduino_stream/) and [`std::istream`/`std::ostream`](https://arduinojson.org/v6/api/config/enable_std_stream/)
+    * Supports [`Stream`](https://arduinojson.org/v7/api/config/enable_arduino_stream/) and [`std::istream`/`std::ostream`](https://arduinojson.org/v7/api/config/enable_std_stream/)
-    * Supports [Flash strings](https://arduinojson.org/v6/api/config/enable_progmem/)
+    * Supports [Flash strings](https://arduinojson.org/v7/api/config/enable_progmem/)
-    * Supports [custom readers](https://arduinojson.org/v6/api/json/deserializejson/#custom-reader) and [custom writers](https://arduinojson.org/v6/api/json/serializejson/#custom-writer)
+    * Supports [custom readers](https://arduinojson.org/v7/api/json/deserializejson/#custom-reader) and [custom writers](https://arduinojson.org/v7/api/json/serializejson/#custom-writer)
     * Supports [custom converters](https://arduinojson.org/news/2021/05/04/version-6-18-0/)
 * Portable
     * Usable on any C++ project (not limited to Arduino)
@@ -72,29 +66,29 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
         * [Visual Micro](http://www.visualmicro.com/)
         * [Visual Studio](https://www.visualstudio.com/)
     * [Even works with online compilers like wandbox.org](https://wandbox.org/permlink/RlZSKy17DjJ6HcdN)
-    * [CMake friendly](https://arduinojson.org/v6/how-to/use-arduinojson-with-cmake/)
+    * [CMake friendly](https://arduinojson.org/v7/how-to/use-arduinojson-with-cmake/)
 * Well designed
-    * [Elegant API](http://arduinojson.org/v6/example/)
+    * [Elegant API](http://arduinojson.org/v7/example/)
     * [Thread-safe](https://en.wikipedia.org/wiki/Thread_safety)
     * Self-contained (no external dependency)
     * `const` friendly
-    * [`for` friendly](https://arduinojson.org/v6/api/jsonobject/begin_end/)
+    * [`for` friendly](https://arduinojson.org/v7/api/jsonobject/begin_end/)
     * [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming)
-    * Handles [integer overflows](https://arduinojson.org/v6/api/jsonvariant/as/#integer-overflows)
+    * Handles [integer overflows](https://arduinojson.org/v7/api/jsonvariant/as/#integer-overflows)
 * Well tested
-    * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)
+    * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x)
     * Continuously tested on
-        * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
+        * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
-        * [GCC 5, 6, 7, 8, 9, 10, 11](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
+        * [GCC 4.8, 5, 6, 7, 8, 9, 10, 11, 12](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
-        * [Clang 3.8, 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
+        * [Clang 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10, 11, 12, 13, 14, 15](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
     * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
     * Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/)
 * Well documented
-    * [Tutorials](https://arduinojson.org/v6/doc/deserialization/)
+    * [Tutorials](https://arduinojson.org/v7/doc/deserialization/)
-    * [Examples](https://arduinojson.org/v6/example/)
+    * [Examples](https://arduinojson.org/v7/example/)
-    * [How-tos](https://arduinojson.org/v6/example/)
+    * [How-tos](https://arduinojson.org/v7/example/)
-    * [FAQ](https://arduinojson.org/v6/faq/)
+    * [FAQ](https://arduinojson.org/v7/faq/)
-    * [Troubleshooter](https://arduinojson.org/v6/troubleshooter/)
+    * [Troubleshooter](https://arduinojson.org/v7/troubleshooter/)
     * [Book](https://arduinojson.org/book/)
     * [Changelog](CHANGELOG.md)
 * Vibrant user community
@@ -109,9 +103,9 @@ ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
 Here is a program that parses a JSON document with ArduinoJson.
 
 ```c++
-char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
+const char* json = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
 
-DynamicJsonDocument doc(1024);
+JsonDocument doc;
 deserializeJson(doc, json);
 
 const char* sensor = doc["sensor"];
@@ -120,14 +114,14 @@ double latitude    = doc["data"][0];
 double longitude   = doc["data"][1];
 ```
 
-See the [tutorial on arduinojson.org](https://arduinojson.org/v6/doc/deserialization/)
+See the [tutorial on arduinojson.org](https://arduinojson.org/v7/doc/deserialization/)
 
 ### Serialization
 
 Here is a program that generates a JSON document with ArduinoJson:
 
 ```c++
-DynamicJsonDocument doc(1024);
+JsonDocument doc;
 
 doc["sensor"] = "gps";
 doc["time"]   = 1351824120;
@@ -139,7 +133,7 @@ serializeJson(doc, Serial);
 // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
 ```
 
-See the [tutorial on arduinojson.org](https://arduinojson.org/v6/doc/serialization/)
+See the [tutorial on arduinojson.org](https://arduinojson.org/v7/doc/serialization/)
 
 ## Sponsors
 

third-party/ArduinoJson/appveyor.yml

@@ -1,4 +1,4 @@
-version: 6.21.3.{build}
+version: 7.0.3.{build}
 environment:
   matrix:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022

third-party/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to store your project configuration in a file.
@@ -17,18 +17,13 @@
 // * CLK  <-> pin 13
 // * CS   <-> pin 4
 //
-// https://arduinojson.org/v6/example/config/
+// https://arduinojson.org/v7/example/config/
 
 #include <ArduinoJson.h>
 #include <SD.h>
 #include <SPI.h>
 
 // Our configuration structure.
-//
-// Never use a JsonDocument to store the configuration!
-// A JsonDocument is *not* a permanent storage; it's only a temporary storage
-// used during the serialization phase. See:
-// https://arduinojson.org/v6/faq/why-must-i-create-a-separate-config-object/
 struct Config {
   char hostname[64];
   int port;
@@ -43,9 +38,7 @@ void loadConfiguration(const char *filename, Config &config) {
   File file = SD.open(filename);
 
   // Allocate a temporary JsonDocument
-  // Don't forget to change the capacity to match your requirements.
+  JsonDocument doc;
-  // Use https://arduinojson.org/v6/assistant to compute the capacity.
-  StaticJsonDocument<512> doc;
 
   // Deserialize the JSON document
   DeserializationError error = deserializeJson(doc, file);
@@ -75,9 +68,7 @@ void saveConfiguration(const char *filename, const Config &config) {
   }
 
   // Allocate a temporary JsonDocument
-  // Don't forget to change the capacity to match your requirements.
+  JsonDocument doc;
-  // Use https://arduinojson.org/assistant to compute the capacity.
-  StaticJsonDocument<256> doc;
 
   // Set the values in the document
   doc["hostname"] = config.hostname;
@@ -114,7 +105,8 @@ void printFile(const char *filename) {
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial) continue;
+  while (!Serial)
+    continue;
 
   // Initialize SD library
   const int chipSelect = 4;
@@ -144,7 +136,7 @@ void loop() {
 // ------------------
 //
 // File is an unbuffered stream, which is not optimal for ArduinoJson.
-// See: https://arduinojson.org/v6/how-to/improve-speed/
+// See: https://arduinojson.org/v7/how-to/improve-speed/
 
 // See also
 // --------

third-party/ArduinoJson/examples/JsonFilterExample/JsonFilterExample.ino

@@ -1,17 +1,18 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to use DeserializationOption::Filter
 //
-// https://arduinojson.org/v6/example/filter/
+// https://arduinojson.org/v7/example/filter/
 
 #include <ArduinoJson.h>
 
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial) continue;
+  while (!Serial)
+    continue;
 
   // The huge input: an extract from OpenWeatherMap response
   auto input_json = F(
@@ -33,12 +34,12 @@ void setup() {
       "1000000,\"timezone\":0,\"sunrise\":1581492085,\"sunset\":1581527294}}");
 
   // The filter: it contains "true" for each value we want to keep
-  StaticJsonDocument<200> filter;
+  JsonDocument filter;
   filter["list"][0]["dt"] = true;
   filter["list"][0]["main"]["temp"] = true;
 
   // Deserialize the document
-  StaticJsonDocument<400> doc;
+  JsonDocument doc;
   deserializeJson(doc, input_json, DeserializationOption::Filter(filter));
 
   // Print the result

third-party/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino

@@ -1,43 +1,32 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
 //
-// https://arduinojson.org/v6/example/generator/
+// https://arduinojson.org/v7/example/generator/
 
 #include <ArduinoJson.h>
 
 void setup() {
   // Initialize Serial port
   Serial.begin(9600);
-  while (!Serial) continue;
+  while (!Serial)
+    continue;
 
   // Allocate the JSON document
-  //
+  JsonDocument doc;
-  // Inside the brackets, 200 is the RAM allocated to this document.
-  // Don't forget to change this value to match your requirement.
-  // Use https://arduinojson.org/v6/assistant to compute the capacity.
-  StaticJsonDocument<200> doc;
-
-  // StaticJsonObject allocates memory on the stack, it can be
-  // replaced by DynamicJsonDocument which allocates in the heap.
-  //
-  // DynamicJsonDocument  doc(200);
 
   // Add values in the document
-  //
   doc["sensor"] = "gps";
   doc["time"] = 1351824120;
 
-  // Add an array.
+  // Add an array
-  //
+  JsonArray data = doc["data"].to<JsonArray>();
-  JsonArray data = doc.createNestedArray("data");
   data.add(48.756080);
   data.add(2.302038);
 
-  // Generate the minified JSON and send it to the Serial port.
+  // Generate the minified JSON and send it to the Serial port
-  //
   serializeJson(doc, Serial);
   // The above line prints:
   // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
@@ -45,8 +34,7 @@ void setup() {
   // Start a new line
   Serial.println();
 
-  // Generate the prettified JSON and send it to the Serial port.
+  // Generate the prettified JSON and send it to the Serial port
-  //
   serializeJsonPretty(doc, Serial);
   // The above line prints:
   // {

third-party/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to parse a JSON document in an HTTP response.
@@ -16,7 +16,7 @@
 //   ]
 // }
 //
-// https://arduinojson.org/v6/example/http-client/
+// https://arduinojson.org/v7/example/http-client/
 
 #include <ArduinoJson.h>
 #include <Ethernet.h>
@@ -25,7 +25,8 @@
 void setup() {
   // Initialize Serial port
   Serial.begin(9600);
-  while (!Serial) continue;
+  while (!Serial)
+    continue;
 
   // Initialize Ethernet library
   byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
@@ -77,9 +78,7 @@ void setup() {
   }
 
   // Allocate the JSON document
-  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  JsonDocument doc;
-  const size_t capacity = JSON_OBJECT_SIZE(3) + JSON_ARRAY_SIZE(2) + 60;
-  DynamicJsonDocument doc(capacity);
 
   // Parse JSON object
   DeserializationError error = deserializeJson(doc, client);
@@ -109,7 +108,7 @@ void loop() {
 // ------------------
 //
 // EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson.
-// See: https://arduinojson.org/v6/how-to/improve-speed/
+// See: https://arduinojson.org/v7/how-to/improve-speed/
 
 // See also
 // --------

third-party/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino

@@ -1,52 +1,37 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to deserialize a JSON document with ArduinoJson.
 //
-// https://arduinojson.org/v6/example/parser/
+// https://arduinojson.org/v7/example/parser/
 
 #include <ArduinoJson.h>
 
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial) continue;
+  while (!Serial)
+    continue;
 
   // Allocate the JSON document
-  //
+  JsonDocument doc;
-  // Inside the brackets, 200 is the capacity of the memory pool in bytes.
-  // Don't forget to change this value to match your JSON document.
-  // Use https://arduinojson.org/v6/assistant to compute the capacity.
-  StaticJsonDocument<200> doc;
-
-  // StaticJsonDocument<N> allocates memory on the stack, it can be
-  // replaced by DynamicJsonDocument which allocates in the heap.
-  //
-  // DynamicJsonDocument doc(200);
 
   // JSON input string.
-  //
+  const char* json =
-  // Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
-  // the minimal amount of memory because the JsonDocument stores pointers to
-  // the input buffer.
-  // If you use another type of input, ArduinoJson must copy the strings from
-  // the input to the JsonDocument, so you need to increase the capacity of the
-  // JsonDocument.
-  char json[] =
       "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
 
   // Deserialize the JSON document
   DeserializationError error = deserializeJson(doc, json);
 
-  // Test if parsing succeeds.
+  // Test if parsing succeeds
   if (error) {
     Serial.print(F("deserializeJson() failed: "));
     Serial.println(error.f_str());
     return;
   }
 
-  // Fetch values.
+  // Fetch the values
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
@@ -55,7 +40,7 @@ void setup() {
   double latitude = doc["data"][0];
   double longitude = doc["data"][1];
 
-  // Print values.
+  // Print the values
   Serial.println(sensor);
   Serial.println(time);
   Serial.println(latitude, 6);

third-party/ArduinoJson/examples/JsonServer/JsonServer.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to implement an HTTP server that sends a JSON document
@@ -13,7 +13,7 @@
 //   "digital": [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0]
 // }
 //
-// https://arduinojson.org/v6/example/http-server/
+// https://arduinojson.org/v7/example/http-server/
 
 #include <ArduinoJson.h>
 #include <Ethernet.h>
@@ -25,7 +25,8 @@ EthernetServer server(80);
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial) continue;
+  while (!Serial)
+    continue;
 
   // Initialize Ethernet libary
   if (!Ethernet.begin(mac)) {
@@ -52,14 +53,14 @@ void loop() {
   Serial.println(F("New client"));
 
   // Read the request (we ignore the content in this example)
-  while (client.available()) client.read();
+  while (client.available())
+    client.read();
 
   // Allocate a temporary JsonDocument
-  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  JsonDocument doc;
-  StaticJsonDocument<500> doc;
 
   // Create the "analog" array
-  JsonArray analogValues = doc.createNestedArray("analog");
+  JsonArray analogValues = doc["analog"].to<JsonArray>();
   for (int pin = 0; pin < 6; pin++) {
     // Read the analog input
     int value = analogRead(pin);
@@ -69,7 +70,7 @@ void loop() {
   }
 
   // Create the "digital" array
-  JsonArray digitalValues = doc.createNestedArray("digital");
+  JsonArray digitalValues = doc["digital"].to<JsonArray>();
   for (int pin = 0; pin < 14; pin++) {
     // Read the digital input
     int value = digitalRead(pin);
@@ -101,7 +102,7 @@ void loop() {
 // ------------------
 //
 // EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson.
-// See: https://arduinojson.org/v6/how-to/improve-speed/
+// See: https://arduinojson.org/v7/how-to/improve-speed/
 
 // See also
 // --------

third-party/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to send a JSON document to a UDP socket.
@@ -17,7 +17,7 @@
 // $ ncat -ulp 8888
 // See https://nmap.org/ncat/
 //
-// https://arduinojson.org/v6/example/udp-beacon/
+// https://arduinojson.org/v7/example/udp-beacon/
 
 #include <ArduinoJson.h>
 #include <Ethernet.h>
@@ -32,7 +32,8 @@ EthernetUDP udp;
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial) continue;
+  while (!Serial)
+    continue;
 
   // Initialize Ethernet libary
   if (!Ethernet.begin(mac)) {
@@ -46,11 +47,10 @@ void setup() {
 
 void loop() {
   // Allocate a temporary JsonDocument
-  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  JsonDocument doc;
-  StaticJsonDocument<500> doc;
 
   // Create the "analog" array
-  JsonArray analogValues = doc.createNestedArray("analog");
+  JsonArray analogValues = doc["analog"].to<JsonArray>();
   for (int pin = 0; pin < 6; pin++) {
     // Read the analog input
     int value = analogRead(pin);
@@ -60,7 +60,7 @@ void loop() {
   }
 
   // Create the "digital" array
-  JsonArray digitalValues = doc.createNestedArray("digital");
+  JsonArray digitalValues = doc["digital"].to<JsonArray>();
   for (int pin = 0; pin < 14; pin++) {
     // Read the digital input
     int value = digitalRead(pin);
@@ -90,7 +90,7 @@ void loop() {
 // ------------------
 //
 // EthernetUDP is an unbuffered stream, which is not optimal for ArduinoJson.
-// See: https://arduinojson.org/v6/how-to/improve-speed/
+// See: https://arduinojson.org/v7/how-to/improve-speed/
 
 // See also
 // --------

third-party/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino

@@ -1,39 +1,24 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to deserialize a MessagePack document with
 // ArduinoJson.
 //
-// https://arduinojson.org/v6/example/msgpack-parser/
+// https://arduinojson.org/v7/example/msgpack-parser/
 
 #include <ArduinoJson.h>
 
 void setup() {
   // Initialize serial port
   Serial.begin(9600);
-  while (!Serial) continue;
+  while (!Serial)
+    continue;
 
   // Allocate the JSON document
-  //
+  JsonDocument doc;
-  // Inside the brackets, 200 is the capacity of the memory pool in bytes.
-  // Don't forget to change this value to match your JSON document.
-  // Use https://arduinojson.org/v6/assistant to compute the capacity.
-  StaticJsonDocument<200> doc;
-
-  // StaticJsonObject allocates memory on the stack, it can be
-  // replaced by DynamicJsonObject which allocates in the heap.
-  //
-  // DynamicJsonObject doc(200);
 
-  // MessagePack input string.
+  // The MessagePack input string
-  //
-  // Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
-  // the minimal amount of memory because the JsonDocument stores pointers to
-  // the input buffer.
-  // If you use another type of input, ArduinoJson must copy the strings from
-  // the input to the JsonDocument, so you need to increase the capacity of the
-  // JsonDocument.
   uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115,
                      164, 116, 105, 109, 101, 206, 80,  147, 50,  248, 164, 100,
                      97,  116, 97,  146, 203, 64,  72,  96,  199, 58,  188, 148,
@@ -45,16 +30,17 @@ void setup() {
   //   "data": [48.75608, 2.302038]
   // }
 
+  // Parse the input
   DeserializationError error = deserializeMsgPack(doc, input);
 
-  // Test if parsing succeeded.
+  // Test if parsing succeeded
   if (error) {
     Serial.print("deserializeMsgPack() failed: ");
     Serial.println(error.f_str());
     return;
   }
 
-  // Fetch values.
+  // Fetch the values
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
@@ -63,7 +49,7 @@ void setup() {
   double latitude = doc["data"][0];
   double longitude = doc["data"][1];
 
-  // Print values.
+  // Print the values
   Serial.println(sensor);
   Serial.println(time);
   Serial.println(latitude, 6);

third-party/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows the different ways you can use Flash strings with
@@ -9,12 +9,12 @@
 // JsonDocument. Prefer plain old char*, as they are more efficient in term of
 // code size, speed, and memory usage.
 //
-// https://arduinojson.org/v6/example/progmem/
+// https://arduinojson.org/v7/example/progmem/
 
 #include <ArduinoJson.h>
 
 void setup() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc;
 
   // You can use a Flash String as your JSON input.
   // WARNING: the strings in the input will be duplicated in the JsonDocument.

third-party/ArduinoJson/examples/StringExample/StringExample.ino

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows the different ways you can use String with ArduinoJson.
@@ -8,12 +8,12 @@
 // JsonDocument. Prefer plain old char[], as they are more efficient in term of
 // code size, speed, and memory usage.
 //
-// https://arduinojson.org/v6/example/string/
+// https://arduinojson.org/v7/example/string/
 
 #include <ArduinoJson.h>
 
 void setup() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc;
 
   // You can use a String as your JSON input.
   // WARNING: the string in the input  will be duplicated in the JsonDocument.
@@ -55,7 +55,6 @@ void setup() {
   }
 
   // Lastly, you can print the resulting JSON to a String
-  // WARNING: it doesn't replace the content but appends to it
   String output;
   serializeJson(doc, output);
 }

third-party/ArduinoJson/extras/CompileOptions.cmake

@@ -32,8 +32,18 @@ endif()
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 	if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.8) AND(NOT ${COVERAGE}))
 		add_compile_options(-g -Og)
-	else()
+	else() # GCC 4.8
-		add_compile_options(-g -O0)
+		add_compile_options(
+			-g
+			-O0 # GCC 4.8 doesn't support -Og
+			-Wno-shadow  # allow the same name for a function parameter and a member functions
+			-Wp,-w  # Disable preprocessing warnings (see below)
+		)
+		# GCC 4.8 doesn't support __has_include, so we need to help him
+		add_definitions(
+			-DARDUINOJSON_ENABLE_STD_STRING=1
+			-DARDUINOJSON_ENABLE_STD_STREAM=1
+		)
 	endif()
 
 	add_compile_options(
@@ -64,6 +74,9 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	add_compile_options(-stdlib=libc++)
+	link_libraries(c++ m)
+
 	if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0) AND(NOT ${COVERAGE}))
 		add_compile_options(-g -Og)
 	else()

third-party/ArduinoJson/extras/ci/espidf/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 cmake_minimum_required(VERSION 3.5)

third-party/ArduinoJson/extras/ci/espidf/main/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 idf_component_register(

third-party/ArduinoJson/extras/ci/espidf/main/main.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 
 extern "C" void app_main() {
   char buffer[256];
-  StaticJsonDocument<200> doc;
+  JsonDocument doc;
 
   doc["hello"] = "world";
   serializeJson(doc, buffer);

third-party/ArduinoJson/extras/conf_test/avr.cpp

@@ -4,8 +4,7 @@ static_assert(ARDUINOJSON_ENABLE_PROGMEM == 1, "ARDUINOJSON_ENABLE_PROGMEM");
 
 static_assert(ARDUINOJSON_USE_LONG_LONG == 0, "ARDUINOJSON_USE_LONG_LONG");
 
-static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 1,
+static_assert(ARDUINOJSON_SLOT_ID_SIZE == 1, "ARDUINOJSON_SLOT_ID_SIZE");
-              "ARDUINOJSON_SLOT_OFFSET_SIZE");
 
 static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
 

third-party/ArduinoJson/extras/conf_test/esp8266.cpp

@@ -2,8 +2,7 @@
 
 static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
 
-static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 2,
+static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE");
-              "ARDUINOJSON_SLOT_OFFSET_SIZE");
 
 static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
 

third-party/ArduinoJson/extras/conf_test/x64.cpp

@@ -2,14 +2,13 @@
 
 static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
 
-static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 4,
+static_assert(ARDUINOJSON_SLOT_ID_SIZE == 4, "ARDUINOJSON_SLOT_ID_SIZE");
-              "ARDUINOJSON_SLOT_OFFSET_SIZE");
 
 static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
 
 static_assert(ARDUINOJSON_USE_DOUBLE == 1, "ARDUINOJSON_USE_DOUBLE");
 
-static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 32,
+static_assert(sizeof(ArduinoJson::detail::VariantSlot) == 24,
               "sizeof(VariantSlot)");
 
 int main() {}

third-party/ArduinoJson/extras/conf_test/x86.cpp

@@ -2,8 +2,7 @@
 
 static_assert(ARDUINOJSON_USE_LONG_LONG == 1, "ARDUINOJSON_USE_LONG_LONG");
 
-static_assert(ARDUINOJSON_SLOT_OFFSET_SIZE == 2,
+static_assert(ARDUINOJSON_SLOT_ID_SIZE == 2, "ARDUINOJSON_SLOT_ID_SIZE");
-              "ARDUINOJSON_SLOT_OFFSET_SIZE");
 
 static_assert(ARDUINOJSON_LITTLE_ENDIAN == 1, "ARDUINOJSON_LITTLE_ENDIAN");
 

third-party/ArduinoJson/extras/fuzzing/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 set(CMAKE_CXX_STANDARD 11)

third-party/ArduinoJson/extras/fuzzing/json_fuzzer.cpp

@@ -1,7 +1,7 @@
 #include <ArduinoJson.h>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
   DeserializationError error = deserializeJson(doc, data, size);
   if (!error) {
     std::string json;

third-party/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp

@@ -1,7 +1,7 @@
 #include <ArduinoJson.h>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
   DeserializationError error = deserializeMsgPack(doc, data, size);
   if (!error) {
     std::string json;

third-party/ArduinoJson/extras/fuzzing/reproducer.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 // This file is NOT use by Google's OSS fuzz

third-party/ArduinoJson/extras/scripts/get-release-page.sh

@@ -8,7 +8,7 @@ ARDUINOJSON_H="$3"
 
 cat << END
 ---
-branch: v6
+branch: v7
 version: $VERSION
 date: '$(date +'%Y-%m-%d')'
 $(extras/scripts/wandbox/publish.sh "$ARDUINOJSON_H")

third-party/ArduinoJson/extras/scripts/publish-particle-library.sh

@@ -14,5 +14,5 @@ cp -r "$SOURCE_DIR/src" "$WORK_DIR/"
 cp -r "$SOURCE_DIR/examples" "$WORK_DIR/"
 
 cd "$WORK_DIR"
-particle library upload -v
+particle library upload
-particle library publish -v
+particle library publish

third-party/ArduinoJson/extras/scripts/publish.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-which awk sed jq 7z curl perl >/dev/null
+which awk sed jq curl perl >/dev/null
 
 cd "$(dirname "$0")/../.."
 
@@ -15,6 +15,7 @@ VERSION="$1"
 DATE=$(date +%F)
 TAG="v$VERSION"
 VERSION_REGEX='[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9]+)?'
+STARS=$(curl -s https://api.github.com/repos/bblanchon/ArduinoJson | jq '.stargazers_count')
 
 update_version_in_source () {
 	IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION")
@@ -29,16 +30,25 @@ update_version_in_source () {
 	sed -i~ -bE "s/(project\\s*\\(ArduinoJson\\s+VERSION\\s+).*?\\)/\\1$MAJOR.$MINOR.$REVISION)/" CMakeLists.txt
 	rm CMakeLists.txt~
 
-	sed -i~ -bE "s/\"version\":.*$/\"version\": \"$VERSION\",/" library.json
+	sed -i~ -bE \
+		-e "s/\"version\":.*$/\"version\": \"$VERSION\",/" \
+		-e "s/[0-9]+ stars/$STARS stars/" \
+		library.json
 	rm library.json~
 
-	sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties
+	sed -i~ -bE \
+		-e "s/version=.*$/version=$VERSION/" \
+		-e "s/[0-9]+ stars/$STARS stars/" \
+		library.properties
 	rm library.properties~
 
 	sed -i~ -bE "s/version: .*$/version: $VERSION.{build}/" appveyor.yml
 	rm appveyor.yml~
 
-	sed -i~ -bE "s/^version: .*$/version: \"$VERSION\"/" idf_component.yml
+	sed -i~ -bE \
+		-e "s/^version: .*$/version: \"$VERSION\"/" \
+		-e "s/[0-9]+ stars/$STARS stars/" \
+		idf_component.yml
 	rm idf_component.yml~
 
 	sed -i~ -bE \
@@ -70,7 +80,6 @@ commit_new_version
 add_tag
 push
 
-extras/scripts/build-arduino-package.sh . "../ArduinoJson-$TAG.zip"
 extras/scripts/build-single-header.sh "src/ArduinoJson.h" "../ArduinoJson-$TAG.h"
 extras/scripts/build-single-header.sh "src/ArduinoJson.hpp" "../ArduinoJson-$TAG.hpp"
 extras/scripts/get-release-page.sh "$VERSION" "CHANGELOG.md" "../ArduinoJson-$TAG.h" > "../ArduinoJson-$TAG.md"

third-party/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
@@ -9,35 +9,18 @@
 
 int main() {
   // Allocate the JSON document
-  //
+  JsonDocument doc;
-  // Inside the brackets, 200 is the RAM allocated to this document.
-  // Don't forget to change this value to match your requirement.
-  // Use https://arduinojson.org/v6/assistant to compute the capacity.
-  StaticJsonDocument<200> doc;
-
-  // StaticJsonObject allocates memory on the stack, it can be
-  // replaced by DynamicJsonDocument which allocates in the heap.
-  //
-  // DynamicJsonDocument  doc(200);
-
-  // StaticJsonObject allocates memory on the stack, it can be
-  // replaced by DynamicJsonDocument which allocates in the heap.
-  //
-  // DynamicJsonDocument  doc(200);
 
-  // Add values in the document
+  // Add values in the document.
-  //
   doc["sensor"] = "gps";
   doc["time"] = 1351824120;
 
-  // Add an array.
+  // Add an array
-  //
+  JsonArray data = doc["data"].to<JsonArray>();
-  JsonArray data = doc.createNestedArray("data");
   data.add(48.756080);
   data.add(2.302038);
 
   // Generate the minified JSON and send it to STDOUT
-  //
   serializeJson(doc, std::cout);
   // The above line prints:
   // {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
@@ -46,7 +29,6 @@ int main() {
   std::cout << std::endl;
 
   // Generate the prettified JSON and send it to STDOUT
-  //
   serializeJsonPretty(doc, std::cout);
   // The above line prints:
   // {

third-party/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to deserialize a JSON document with ArduinoJson.
@@ -9,38 +9,22 @@
 
 int main() {
   // Allocate the JSON document
-  //
+  JsonDocument doc;
-  // Inside the brackets, 200 is the capacity of the memory pool in bytes.
-  // Don't forget to change this value to match your JSON document.
-  // Use https://arduinojson.org/v6/assistant to compute the capacity.
-  StaticJsonDocument<300> doc;
-
-  // StaticJsonDocument<N> allocates memory on the stack, it can be
-  // replaced by DynamicJsonDocument which allocates in the heap.
-  //
-  // DynamicJsonDocument doc(200);
 
-  // JSON input string.
+  // JSON input string
-  //
+  const char* json =
-  // Using a char[], as shown here, enables the "zero-copy" mode. This mode uses
-  // the minimal amount of memory because the JsonDocument stores pointers to
-  // the input buffer.
-  // If you use another type of input, ArduinoJson must copy the strings from
-  // the input to the JsonDocument, so you need to increase the capacity of the
-  // JsonDocument.
-  char json[] =
       "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
 
   // Deserialize the JSON document
   DeserializationError error = deserializeJson(doc, json);
 
-  // Test if parsing succeeds.
+  // Test if parsing succeeds
   if (error) {
     std::cerr << "deserializeJson() failed: " << error.c_str() << std::endl;
     return 1;
   }
 
-  // Fetch values.
+  // Fetch the values
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
@@ -49,7 +33,7 @@ int main() {
   double latitude = doc["data"][0];
   double longitude = doc["data"][1];
 
-  // Print values.
+  // Print the values
   std::cout << sensor << std::endl;
   std::cout << time << std::endl;
   std::cout << latitude << std::endl;

third-party/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // This example shows how to generate a JSON document with ArduinoJson.
@@ -9,22 +9,9 @@
 
 int main() {
   // Allocate the JSON document
-  //
+  JsonDocument doc;
-  // Inside the brackets, 300 is the size of the memory pool in bytes.
-  // Don't forget to change this value to match your JSON document.
-  // Use https://arduinojson.org/assistant to compute the capacity.
-  StaticJsonDocument<300> doc;
-
-  // StaticJsonObject allocates memory on the stack, it can be
-  // replaced by DynamicJsonObject which allocates in the heap.
-  //
-  // DynamicJsonObject doc(200);
 
-  // MessagePack input string.
+  // The MessagePack input string
-  //
-  // It's better to use a char[] as shown here.
-  // If you use a const char* or a String, ArduinoJson will
-  // have to make a copy of the input in the JsonBuffer.
   uint8_t input[] = {131, 166, 115, 101, 110, 115, 111, 114, 163, 103, 112, 115,
                      164, 116, 105, 109, 101, 206, 80,  147, 50,  248, 164, 100,
                      97,  116, 97,  146, 203, 64,  72,  96,  199, 58,  188, 148,
@@ -36,20 +23,16 @@ int main() {
   //   "data": [48.75608, 2.302038]
   // }
 
-  // doc of the object tree.
+  // Parse the input
-  //
-  // It's a reference to the JsonObject, the actual bytes are inside the
-  // JsonBuffer with all the other nodes of the object tree.
-  // Memory is freed when jsonBuffer goes out of scope.
   DeserializationError error = deserializeMsgPack(doc, input);
 
-  // Test if parsing succeeds.
+  // Test if parsing succeeds
   if (error) {
     std::cerr << "deserializeMsgPack() failed: " << error.c_str() << std::endl;
     return 1;
   }
 
-  // Fetch values.
+  // Fetch the values
   //
   // Most of the time, you can rely on the implicit casts.
   // In other case, you can do doc["time"].as<long>();
@@ -58,7 +41,7 @@ int main() {
   double latitude = doc["data"][0];
   double longitude = doc["data"][1];
 
-  // Print values.
+  // Print the values
   std::cout << sensor << std::endl;
   std::cout << time << std::endl;
   std::cout << latitude << std::endl;

third-party/ArduinoJson/extras/tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 set(CMAKE_CXX_STANDARD 11)
@@ -12,15 +12,19 @@ link_libraries(ArduinoJson catch)
 include_directories(Helpers)
 add_subdirectory(Cpp17)
 add_subdirectory(Cpp20)
+add_subdirectory(Deprecated)
 add_subdirectory(FailingBuilds)
 add_subdirectory(IntegrationTests)
 add_subdirectory(JsonArray)
+add_subdirectory(JsonArrayConst)
 add_subdirectory(JsonDeserializer)
 add_subdirectory(JsonDocument)
 add_subdirectory(JsonObject)
+add_subdirectory(JsonObjectConst)
 add_subdirectory(JsonSerializer)
 add_subdirectory(JsonVariant)
-add_subdirectory(MemoryPool)
+add_subdirectory(JsonVariantConst)
+add_subdirectory(ResourceManager)
 add_subdirectory(Misc)
 add_subdirectory(MixedConfiguration)
 add_subdirectory(MsgPackDeserializer)

third-party/ArduinoJson/extras/tests/Cpp17/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 if(MSVC_VERSION LESS 1910)

third-party/ArduinoJson/extras/tests/Cpp17/string_view.cpp

@@ -1,14 +1,27 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+// we expect ArduinoJson.h to include <string_view>
+// but we don't want it to included accidentally
+#undef ARDUINO
+#define ARDUINOJSON_ENABLE_STD_STREAM 0
+#define ARDUINOJSON_ENABLE_STD_STRING 0
+
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
-#include <string_view>
+#include "Allocators.hpp"
 
 #if !ARDUINOJSON_ENABLE_STRING_VIEW
 #  error ARDUINOJSON_ENABLE_STRING_VIEW must be set to 1
 #endif
 
+using ArduinoJson::detail::sizeofArray;
+
 TEST_CASE("string_view") {
-  StaticJsonDocument<256> doc;
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
   JsonVariant variant = doc.to<JsonVariant>();
 
   SECTION("deserializeJson()") {
@@ -19,7 +32,7 @@ TEST_CASE("string_view") {
 
   SECTION("JsonDocument::set()") {
     doc.set(std::string_view("123", 2));
-    REQUIRE(doc.as<std::string>() == "12");
+    REQUIRE(doc.as<std::string_view>() == "12");
   }
 
   SECTION("JsonDocument::operator[]() const") {
@@ -53,16 +66,15 @@ TEST_CASE("string_view") {
 
   SECTION("String deduplication") {
     doc.add(std::string_view("example one", 7));
-    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(1) + 8);
-
     doc.add(std::string_view("example two", 7));
-    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8);
-
     doc.add(std::string_view("example\0tree", 12));
-    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(3) + 21);
-
     doc.add(std::string_view("example\0tree and a half", 12));
-    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(4) + 21);
+
+    REQUIRE(spy.log() == AllocatorLog{
+                             Allocate(sizeofPool()),
+                             Allocate(sizeofString("example")),
+                             Allocate(sizeofString("example tree")),
+                         });
   }
 
   SECTION("as<std::string_view>()") {

third-party/ArduinoJson/extras/tests/Cpp20/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 if(MSVC_VERSION LESS 1910)

third-party/ArduinoJson/extras/tests/Cpp20/smoke_test.cpp

@@ -4,7 +4,7 @@
 #include <string>
 
 TEST_CASE("C++20 smoke test") {
-  StaticJsonDocument<128> doc;
+  JsonDocument doc;
 
   deserializeJson(doc, "{\"hello\":\"world\"}");
   REQUIRE(doc["hello"] == "world");

third-party/ArduinoJson/extras/tests/Deprecated/BasicJsonDocument.cpp

@@ -0,0 +1,69 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#include <string>
+
+using ArduinoJson::detail::is_base_of;
+
+static std::string allocatorLog;
+
+struct CustomAllocator {
+  CustomAllocator() {
+    allocatorLog = "";
+  }
+
+  void* allocate(size_t n) {
+    allocatorLog += "A";
+    return malloc(n);
+  }
+
+  void deallocate(void* p) {
+    free(p);
+    allocatorLog += "D";
+  }
+
+  void* reallocate(void* p, size_t n) {
+    allocatorLog += "R";
+    return realloc(p, n);
+  }
+};
+
+TEST_CASE("BasicJsonDocument") {
+  allocatorLog.clear();
+
+  SECTION("is a JsonDocument") {
+    REQUIRE(
+        is_base_of<JsonDocument, BasicJsonDocument<CustomAllocator>>::value ==
+        true);
+  }
+
+  SECTION("deserialize / serialize") {
+    BasicJsonDocument<CustomAllocator> doc(256);
+    deserializeJson(doc, "{\"hello\":\"world\"}");
+    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
+    doc.clear();
+    REQUIRE(allocatorLog == "ARAARDDD");
+  }
+
+  SECTION("copy") {
+    BasicJsonDocument<CustomAllocator> doc(256);
+    doc["hello"] = "world";
+    auto copy = doc;
+    REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
+    REQUIRE(allocatorLog == "AA");
+  }
+
+  SECTION("capacity") {
+    BasicJsonDocument<CustomAllocator> doc(256);
+    REQUIRE(doc.capacity() == 256);
+  }
+
+  SECTION("garbageCollect()") {
+    BasicJsonDocument<CustomAllocator> doc(256);
+    doc.garbageCollect();
+  }
+}

third-party/ArduinoJson/extras/tests/Deprecated/CMakeLists.txt

@@ -0,0 +1,34 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright © 2014-2024, Benoit BLANCHON
+# MIT License
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
+	add_compile_options(
+		-w
+	)
+endif()
+
+if(MSVC)
+	add_compile_options(
+		/wd4996
+	)
+endif()
+
+add_executable(DeprecatedTests
+	add.cpp
+	createNestedArray.cpp
+	createNestedObject.cpp
+	BasicJsonDocument.cpp
+	DynamicJsonDocument.cpp
+	macros.cpp
+	memoryUsage.cpp
+	shallowCopy.cpp
+	StaticJsonDocument.cpp
+)
+
+add_test(Deprecated DeprecatedTests)
+
+set_tests_properties(Deprecated
+	PROPERTIES
+	LABELS "Catch"
+)

third-party/ArduinoJson/extras/tests/Deprecated/DynamicJsonDocument.cpp

@@ -0,0 +1,37 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using ArduinoJson::detail::is_base_of;
+
+TEST_CASE("DynamicJsonDocument") {
+  SECTION("is a JsonDocument") {
+    REQUIRE(is_base_of<JsonDocument, DynamicJsonDocument>::value == true);
+  }
+
+  SECTION("deserialize / serialize") {
+    DynamicJsonDocument doc(256);
+    deserializeJson(doc, "{\"hello\":\"world\"}");
+    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
+  }
+
+  SECTION("copy") {
+    DynamicJsonDocument doc(256);
+    doc["hello"] = "world";
+    auto copy = doc;
+    REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
+  }
+
+  SECTION("capacity") {
+    DynamicJsonDocument doc(256);
+    REQUIRE(doc.capacity() == 256);
+  }
+
+  SECTION("garbageCollect()") {
+    DynamicJsonDocument doc(256);
+    doc.garbageCollect();
+  }
+}

third-party/ArduinoJson/extras/tests/Deprecated/StaticJsonDocument.cpp

@@ -0,0 +1,32 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using ArduinoJson::detail::is_base_of;
+
+TEST_CASE("StaticJsonDocument") {
+  SECTION("is a JsonDocument") {
+    REQUIRE(is_base_of<JsonDocument, StaticJsonDocument<256>>::value == true);
+  }
+
+  SECTION("deserialize / serialize") {
+    StaticJsonDocument<256> doc;
+    deserializeJson(doc, "{\"hello\":\"world\"}");
+    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
+  }
+
+  SECTION("copy") {
+    StaticJsonDocument<256> doc;
+    doc["hello"] = "world";
+    auto copy = doc;
+    REQUIRE(copy.as<std::string>() == "{\"hello\":\"world\"}");
+  }
+
+  SECTION("capacity") {
+    StaticJsonDocument<256> doc;
+    REQUIRE(doc.capacity() == 256);
+  }
+}

third-party/ArduinoJson/extras/tests/Deprecated/add.cpp

@@ -0,0 +1,38 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::add()") {
+  JsonDocument doc;
+  JsonArray array = doc.to<JsonArray>();
+  array.add().set(42);
+  REQUIRE(doc.as<std::string>() == "[42]");
+}
+
+TEST_CASE("JsonDocument::add()") {
+  JsonDocument doc;
+  doc.add().set(42);
+  REQUIRE(doc.as<std::string>() == "[42]");
+}
+
+TEST_CASE("ElementProxy::add()") {
+  JsonDocument doc;
+  doc[0].add().set(42);
+  REQUIRE(doc.as<std::string>() == "[[42]]");
+}
+
+TEST_CASE("MemberProxy::add()") {
+  JsonDocument doc;
+  doc["x"].add().set(42);
+  REQUIRE(doc.as<std::string>() == "{\"x\":[42]}");
+}
+
+TEST_CASE("JsonVariant::add()") {
+  JsonDocument doc;
+  JsonVariant v = doc.add();
+  v.add().set(42);
+  REQUIRE(doc.as<std::string>() == "[[42]]");
+}

third-party/ArduinoJson/extras/tests/Deprecated/createNestedArray.cpp

@@ -0,0 +1,111 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#include <string>
+
+TEST_CASE("JsonDocument::createNestedArray()") {
+  JsonDocument doc;
+
+  SECTION("createNestedArray()") {
+    JsonArray array = doc.createNestedArray();
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "[[42]]");
+  }
+
+  SECTION("createNestedArray(const char*)") {
+    JsonArray array = doc.createNestedArray("key");
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
+  }
+
+  SECTION("createNestedArray(std::string)") {
+    JsonArray array = doc.createNestedArray(std::string("key"));
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("createNestedArray(VLA)") {
+    size_t i = 16;
+    char vla[i];
+    strcpy(vla, "key");
+    JsonArray array = doc.createNestedArray(vla);
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
+  }
+#endif
+}
+
+TEST_CASE("JsonArray::createNestedArray()") {
+  JsonDocument doc;
+  JsonArray array = doc.to<JsonArray>();
+  JsonArray nestedArray = array.createNestedArray();
+  nestedArray.add(42);
+  REQUIRE(doc.as<std::string>() == "[[42]]");
+}
+
+TEST_CASE("JsonObject::createNestedArray()") {
+  JsonDocument doc;
+  JsonObject object = doc.to<JsonObject>();
+
+  SECTION("createNestedArray(const char*)") {
+    JsonArray array = object.createNestedArray("key");
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
+  }
+
+  SECTION("createNestedArray(std::string)") {
+    JsonArray array = object.createNestedArray(std::string("key"));
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("createNestedArray(VLA)") {
+    size_t i = 16;
+    char vla[i];
+    strcpy(vla, "key");
+    JsonArray array = object.createNestedArray(vla);
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
+  }
+#endif
+}
+
+TEST_CASE("JsonVariant::createNestedArray()") {
+  JsonDocument doc;
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("createNestedArray()") {
+    JsonArray array = variant.createNestedArray();
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "[[42]]");
+  }
+
+  SECTION("createNestedArray(const char*)") {
+    JsonArray array = variant.createNestedArray("key");
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
+  }
+
+  SECTION("createNestedArray(std::string)") {
+    JsonArray array = variant.createNestedArray(std::string("key"));
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("createNestedArray(VLA)") {
+    size_t i = 16;
+    char vla[i];
+    strcpy(vla, "key");
+    JsonArray array = variant.createNestedArray(vla);
+    array.add(42);
+    REQUIRE(doc.as<std::string>() == "{\"key\":[42]}");
+  }
+#endif
+}

third-party/ArduinoJson/extras/tests/Deprecated/createNestedObject.cpp

@@ -0,0 +1,111 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#include <string>
+
+TEST_CASE("JsonDocument::createNestedObject()") {
+  JsonDocument doc;
+
+  SECTION("createNestedObject()") {
+    JsonObject object = doc.createNestedObject();
+    object["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "[{\"hello\":\"world\"}]");
+  }
+
+  SECTION("createNestedObject(const char*)") {
+    JsonObject object = doc.createNestedObject("key");
+    object["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
+  }
+
+  SECTION("createNestedObject(std::string)") {
+    JsonObject object = doc.createNestedObject(std::string("key"));
+    object["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("createNestedObject(VLA)") {
+    size_t i = 16;
+    char vla[i];
+    strcpy(vla, "key");
+    JsonObject object = doc.createNestedObject(vla);
+    object["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
+  }
+#endif
+}
+
+TEST_CASE("JsonArray::createNestedObject()") {
+  JsonDocument doc;
+  JsonArray array = doc.to<JsonArray>();
+  JsonObject object = array.createNestedObject();
+  object["hello"] = "world";
+  REQUIRE(doc.as<std::string>() == "[{\"hello\":\"world\"}]");
+}
+
+TEST_CASE("JsonObject::createNestedObject()") {
+  JsonDocument doc;
+  JsonObject object = doc.to<JsonObject>();
+
+  SECTION("createNestedObject(const char*)") {
+    JsonObject nestedObject = object.createNestedObject("key");
+    nestedObject["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
+  }
+
+  SECTION("createNestedObject(std::string)") {
+    JsonObject nestedObject = object.createNestedObject(std::string("key"));
+    nestedObject["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("createNestedObject(VLA)") {
+    size_t i = 16;
+    char vla[i];
+    strcpy(vla, "key");
+    JsonObject nestedObject = object.createNestedObject(vla);
+    nestedObject["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
+  }
+#endif
+}
+
+TEST_CASE("JsonVariant::createNestedObject()") {
+  JsonDocument doc;
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("createNestedObject()") {
+    JsonObject object = variant.createNestedObject();
+    object["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "[{\"hello\":\"world\"}]");
+  }
+
+  SECTION("createNestedObject(const char*)") {
+    JsonObject object = variant.createNestedObject("key");
+    object["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
+  }
+
+  SECTION("createNestedObject(std::string)") {
+    JsonObject object = variant.createNestedObject(std::string("key"));
+    object["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("createNestedObject(VLA)") {
+    size_t i = 16;
+    char vla[i];
+    strcpy(vla, "key");
+    JsonObject object = variant.createNestedObject(vla);
+    object["hello"] = "world";
+    REQUIRE(doc.as<std::string>() == "{\"key\":{\"hello\":\"world\"}}");
+  }
+#endif
+}

third-party/ArduinoJson/extras/tests/Deprecated/macros.cpp

@@ -0,0 +1,18 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JSON_ARRAY_SIZE") {
+  REQUIRE(JSON_ARRAY_SIZE(10) == ArduinoJson::detail::sizeofArray(10));
+}
+
+TEST_CASE("JSON_OBJECT_SIZE") {
+  REQUIRE(JSON_OBJECT_SIZE(10) == ArduinoJson::detail::sizeofObject(10));
+}
+
+TEST_CASE("JSON_STRING_SIZE") {
+  REQUIRE(JSON_STRING_SIZE(10) == ArduinoJson::detail::sizeofString(10));
+}

third-party/ArduinoJson/extras/tests/Deprecated/memoryUsage.cpp

@@ -0,0 +1,51 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::memoryUsage()") {
+  JsonArray array;
+  REQUIRE(array.memoryUsage() == 0);
+}
+
+TEST_CASE("JsonArrayConst::memoryUsage()") {
+  JsonArrayConst array;
+  REQUIRE(array.memoryUsage() == 0);
+}
+
+TEST_CASE("JsonDocument::memoryUsage()") {
+  JsonDocument doc;
+  REQUIRE(doc.memoryUsage() == 0);
+}
+
+TEST_CASE("JsonObject::memoryUsage()") {
+  JsonObject array;
+  REQUIRE(array.memoryUsage() == 0);
+}
+
+TEST_CASE("JsonObjectConst::memoryUsage()") {
+  JsonObjectConst array;
+  REQUIRE(array.memoryUsage() == 0);
+}
+
+TEST_CASE("JsonVariant::memoryUsage()") {
+  JsonVariant doc;
+  REQUIRE(doc.memoryUsage() == 0);
+}
+
+TEST_CASE("JsonVariantConst::memoryUsage()") {
+  JsonVariantConst doc;
+  REQUIRE(doc.memoryUsage() == 0);
+}
+
+TEST_CASE("ElementProxy::memoryUsage()") {
+  JsonDocument doc;
+  REQUIRE(doc[0].memoryUsage() == 0);
+}
+
+TEST_CASE("MemberProxy::memoryUsage()") {
+  JsonDocument doc;
+  REQUIRE(doc["hello"].memoryUsage() == 0);
+}

third-party/ArduinoJson/extras/tests/Deprecated/shallowCopy.cpp

@@ -0,0 +1,14 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("shallowCopy()") {
+  JsonDocument doc1, doc2;
+  doc1["b"] = "c";
+  doc2["a"].shallowCopy(doc1);
+
+  REQUIRE(doc2.as<std::string>() == "{\"a\":{\"b\":\"c\"}}");
+}

third-party/ArduinoJson/extras/tests/FailingBuilds/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 macro(build_should_fail target)
@@ -23,18 +23,12 @@ endmacro()
 add_executable(Issue978 Issue978.cpp)
 build_should_fail(Issue978)
 
-add_executable(Issue1189 Issue1189.cpp)
-build_should_fail(Issue1189)
-
 add_executable(read_long_long read_long_long.cpp)
 build_should_fail(read_long_long)
 
 add_executable(write_long_long write_long_long.cpp)
 build_should_fail(write_long_long)
 
-add_executable(delete_jsondocument delete_jsondocument.cpp)
-build_should_fail(delete_jsondocument)
-
 add_executable(variant_as_char variant_as_char.cpp)
 build_should_fail(variant_as_char)
 

third-party/ArduinoJson/extras/tests/FailingBuilds/Issue978.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -8,6 +8,6 @@ struct Stream {};
 
 int main() {
   Stream* stream = 0;
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc;
   deserializeJson(doc, stream);
 }

third-party/ArduinoJson/extras/tests/FailingBuilds/assign_char.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -7,6 +7,6 @@
 // See issue #1498
 
 int main() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc;
   doc["dummy"] = 'A';
 }

third-party/ArduinoJson/extras/tests/FailingBuilds/read_long_long.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #define ARDUINOJSON_USE_LONG_LONG 0
@@ -11,6 +11,6 @@
 
 ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(long long)
 int main() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc;
   doc["dummy"].as<long long>();
 }

third-party/ArduinoJson/extras/tests/FailingBuilds/variant_as_char.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -7,6 +7,6 @@
 // See issue #1498
 
 int main() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc;
   doc["dummy"].as<char>();
 }

third-party/ArduinoJson/extras/tests/FailingBuilds/write_long_long.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #define ARDUINOJSON_USE_LONG_LONG 0
@@ -10,6 +10,6 @@
 #endif
 
 int main() {
-  DynamicJsonDocument doc(1024);
+  JsonDocument doc;
   doc["dummy"] = static_cast<long long>(42);
 }

third-party/ArduinoJson/extras/tests/Helpers/Allocators.hpp

@@ -0,0 +1,283 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/Allocator.hpp>
+#include <ArduinoJson/Memory/StringBuilder.hpp>
+#include <ArduinoJson/Memory/VariantPool.hpp>
+
+#include <sstream>
+
+struct FailingAllocator : ArduinoJson::Allocator {
+  static FailingAllocator* instance() {
+    static FailingAllocator allocator;
+    return &allocator;
+  }
+
+ private:
+  FailingAllocator() = default;
+  ~FailingAllocator() = default;
+
+  void* allocate(size_t) override {
+    return nullptr;
+  }
+
+  void deallocate(void*) override {}
+
+  void* reallocate(void*, size_t) override {
+    return nullptr;
+  }
+};
+
+class AllocatorLogEntry {
+ public:
+  AllocatorLogEntry(std::string s, size_t n = 1) : str_(s), count_(n) {}
+
+  const std::string& str() const {
+    return str_;
+  }
+
+  size_t count() const {
+    return count_;
+  }
+
+  AllocatorLogEntry operator*(size_t n) const {
+    return AllocatorLogEntry(str_, n);
+  }
+
+ private:
+  std::string str_;
+  size_t count_;
+};
+
+inline AllocatorLogEntry Allocate(size_t s) {
+  char buffer[32];
+  sprintf(buffer, "allocate(%zu)", s);
+  return AllocatorLogEntry(buffer);
+}
+
+inline AllocatorLogEntry AllocateFail(size_t s) {
+  char buffer[32];
+  sprintf(buffer, "allocate(%zu) -> nullptr", s);
+  return AllocatorLogEntry(buffer);
+}
+
+inline AllocatorLogEntry Reallocate(size_t s1, size_t s2) {
+  char buffer[32];
+  sprintf(buffer, "reallocate(%zu, %zu)", s1, s2);
+  return AllocatorLogEntry(buffer);
+}
+
+inline AllocatorLogEntry ReallocateFail(size_t s1, size_t s2) {
+  char buffer[32];
+  sprintf(buffer, "reallocate(%zu, %zu) -> nullptr", s1, s2);
+  return AllocatorLogEntry(buffer);
+}
+
+inline AllocatorLogEntry Deallocate(size_t s) {
+  char buffer[32];
+  sprintf(buffer, "deallocate(%zu)", s);
+  return AllocatorLogEntry(buffer);
+}
+
+class AllocatorLog {
+ public:
+  AllocatorLog() = default;
+  AllocatorLog(std::initializer_list<AllocatorLogEntry> list) {
+    for (auto& entry : list)
+      append(entry);
+  }
+
+  void clear() {
+    log_.str("");
+  }
+
+  void append(const AllocatorLogEntry& entry) {
+    for (size_t i = 0; i < entry.count(); i++)
+      log_ << entry.str() << "\n";
+  }
+
+  std::string str() const {
+    auto s = log_.str();
+    if (s.empty())
+      return "(empty)";
+    s.pop_back();  // remove the trailing '\n'
+    return s;
+  }
+
+  bool operator==(const AllocatorLog& other) const {
+    return str() == other.str();
+  }
+
+  friend std::ostream& operator<<(std::ostream& os, const AllocatorLog& log) {
+    os << log.str();
+    return os;
+  }
+
+ private:
+  std::ostringstream log_;
+};
+
+class SpyingAllocator : public ArduinoJson::Allocator {
+ public:
+  SpyingAllocator(
+      Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance())
+      : upstream_(upstream) {}
+  virtual ~SpyingAllocator() {}
+
+  size_t allocatedBytes() const {
+    return allocatedBytes_;
+  }
+
+  void* allocate(size_t n) override {
+    auto block = reinterpret_cast<AllocatedBlock*>(
+        upstream_->allocate(sizeof(AllocatedBlock) + n - 1));
+    if (block) {
+      log_.append(Allocate(n));
+      allocatedBytes_ += n;
+      block->size = n;
+      return block->payload;
+    } else {
+      log_.append(AllocateFail(n));
+      return nullptr;
+    }
+  }
+
+  void deallocate(void* p) override {
+    auto block = AllocatedBlock::fromPayload(p);
+    allocatedBytes_ -= block->size;
+    log_.append(Deallocate(block ? block->size : 0));
+    upstream_->deallocate(block);
+  }
+
+  void* reallocate(void* p, size_t n) override {
+    auto block = AllocatedBlock::fromPayload(p);
+    auto oldSize = block ? block->size : 0;
+    block = reinterpret_cast<AllocatedBlock*>(
+        upstream_->reallocate(block, sizeof(AllocatedBlock) + n - 1));
+    if (block) {
+      log_.append(Reallocate(oldSize, n));
+      block->size = n;
+      allocatedBytes_ += n - oldSize;
+      return block->payload;
+    } else {
+      log_.append(ReallocateFail(oldSize, n));
+      return nullptr;
+    }
+  }
+
+  void clearLog() {
+    log_.clear();
+  }
+
+  const AllocatorLog& log() const {
+    return log_;
+  }
+
+ private:
+  struct AllocatedBlock {
+    size_t size;
+    char payload[1];
+
+    static AllocatedBlock* fromPayload(void* p) {
+      if (!p)
+        return nullptr;
+      return reinterpret_cast<AllocatedBlock*>(
+          // Cast to void* to silence "cast increases required alignment of
+          // target type [-Werror=cast-align]"
+          reinterpret_cast<void*>(reinterpret_cast<char*>(p) -
+                                  offsetof(AllocatedBlock, payload)));
+    }
+  };
+
+  AllocatorLog log_;
+  Allocator* upstream_;
+  size_t allocatedBytes_ = 0;
+};
+
+class KillswitchAllocator : public ArduinoJson::Allocator {
+ public:
+  KillswitchAllocator(
+      Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance())
+      : working_(true), upstream_(upstream) {}
+  virtual ~KillswitchAllocator() {}
+
+  void* allocate(size_t n) override {
+    return working_ ? upstream_->allocate(n) : 0;
+  }
+
+  void deallocate(void* p) override {
+    upstream_->deallocate(p);
+  }
+
+  void* reallocate(void* ptr, size_t n) override {
+    return working_ ? upstream_->reallocate(ptr, n) : 0;
+  }
+
+  // Turn the killswitch on, so all allocation fail
+  void on() {
+    working_ = false;
+  }
+
+ private:
+  bool working_;
+  Allocator* upstream_;
+};
+
+class TimebombAllocator : public ArduinoJson::Allocator {
+ public:
+  TimebombAllocator(
+      size_t initialCountdown,
+      Allocator* upstream = ArduinoJson::detail::DefaultAllocator::instance())
+      : countdown_(initialCountdown), upstream_(upstream) {}
+  virtual ~TimebombAllocator() {}
+
+  void* allocate(size_t n) override {
+    if (!countdown_)
+      return nullptr;
+    countdown_--;
+    return upstream_->allocate(n);
+  }
+
+  void deallocate(void* p) override {
+    upstream_->deallocate(p);
+  }
+
+  void* reallocate(void* ptr, size_t n) override {
+    if (!countdown_)
+      return nullptr;
+    countdown_--;
+    return upstream_->reallocate(ptr, n);
+  }
+
+  void setCountdown(size_t value) {
+    countdown_ = value;
+  }
+
+ private:
+  size_t countdown_ = 0;
+  Allocator* upstream_;
+};
+
+inline size_t sizeofPoolList(size_t n = ARDUINOJSON_INITIAL_POOL_COUNT) {
+  return sizeof(ArduinoJson::detail::VariantPool) * n;
+}
+
+inline size_t sizeofPool(
+    ArduinoJson::detail::SlotCount n = ARDUINOJSON_POOL_CAPACITY) {
+  return ArduinoJson::detail::VariantPool::slotsToBytes(n);
+}
+
+inline size_t sizeofStringBuffer(size_t iteration = 1) {
+  // returns 31, 63, 127, 255, etc.
+  auto capacity = ArduinoJson::detail::StringBuilder::initialCapacity;
+  for (size_t i = 1; i < iteration; i++)
+    capacity = capacity * 2 + 1;
+  return ArduinoJson::detail::sizeofString(capacity);
+}
+
+inline size_t sizeofString(const char* s) {
+  return ArduinoJson::detail::sizeofString(strlen(s));
+}

third-party/ArduinoJson/extras/tests/Helpers/Arduino.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once

third-party/ArduinoJson/extras/tests/Helpers/CustomReader.hpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once

third-party/ArduinoJson/extras/tests/Helpers/api/Print.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once

third-party/ArduinoJson/extras/tests/Helpers/api/Stream.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once

third-party/ArduinoJson/extras/tests/Helpers/api/String.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -9,11 +9,14 @@
 // Reproduces Arduino's String class
 class String {
  public:
-  String() : _maxCapacity(1024) {}
+  String() = default;
-  explicit String(const char* s) : _str(s), _maxCapacity(1024) {}
+  String(const char* s) {
+    if (s)
+      str_.assign(s);
+  }
 
   void limitCapacityTo(size_t maxCapacity) {
-    _maxCapacity = maxCapacity;
+    maxCapacity_ = maxCapacity;
   }
 
   unsigned char concat(const char* s) {
@@ -21,45 +24,48 @@ class String {
   }
 
   size_t length() const {
-    return _str.size();
+    return str_.size();
   }
 
   const char* c_str() const {
-    return _str.c_str();
+    return str_.c_str();
   }
 
   bool operator==(const char* s) const {
-    return _str == s;
+    return str_ == s;
   }
 
   String& operator=(const char* s) {
-    _str.assign(s);
+    if (s)
+      str_.assign(s);
+    else
+      str_.clear();
     return *this;
   }
 
   char operator[](unsigned int index) const {
-    if (index >= _str.size())
+    if (index >= str_.size())
       return 0;
-    return _str[index];
+    return str_[index];
   }
 
   friend std::ostream& operator<<(std::ostream& lhs, const ::String& rhs) {
-    lhs << rhs._str;
+    lhs << rhs.str_;
     return lhs;
   }
 
  protected:
   // This function is protected in most Arduino cores
   unsigned char concat(const char* s, size_t n) {
-    if (_str.size() + n > _maxCapacity)
+    if (str_.size() + n > maxCapacity_)
       return 0;
-    _str.append(s, n);
+    str_.append(s, n);
     return 1;
   }
 
  private:
-  std::string _str;
+  std::string str_;
-  size_t _maxCapacity;
+  size_t maxCapacity_ = 1024;
 };
 
 class StringSumHelper : public ::String {};

third-party/ArduinoJson/extras/tests/Helpers/avr/pgmspace.h

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once

third-party/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 add_executable(IntegrationTests

third-party/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
 TEST_CASE("Gbathree") {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
 
   DeserializationError error = deserializeJson(
       doc,

third-party/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -8,8 +8,8 @@
 // https://github.com/bblanchon/ArduinoJson/issues/772
 
 TEST_CASE("Issue772") {
-  DynamicJsonDocument doc1(4096);
+  JsonDocument doc1;
-  DynamicJsonDocument doc2(4096);
+  JsonDocument doc2;
   DeserializationError err;
   std::string data =
       "{\"state\":{\"reported\":{\"timestamp\":\"2018-07-02T09:40:12Z\","

third-party/ArduinoJson/extras/tests/IntegrationTests/openweathermap.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -53,12 +53,12 @@ TEST_CASE("OpenWeatherMap") {
       "]}";
   // clang-format on
 
-  StaticJsonDocument<512> filter;
+  JsonDocument filter;
   filter["list"][0]["dt"] = true;
   filter["list"][0]["main"]["temp"] = true;
   filter["list"][0]["weather"][0]["description"] = true;
 
-  DynamicJsonDocument doc(16384);
+  JsonDocument doc;
 
   REQUIRE(
       deserializeJson(doc, input_json, DeserializationOption::Filter(filter)) ==

third-party/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
 void check(std::string originalJson) {
-  DynamicJsonDocument doc(16384);
+  JsonDocument doc;
 
   std::string prettyJson;
   deserializeJson(doc, originalJson);

third-party/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt

@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 add_executable(JsonArrayTests
@@ -7,11 +7,9 @@ add_executable(JsonArrayTests
 	clear.cpp
 	compare.cpp
 	copyArray.cpp
-	createNested.cpp
 	equals.cpp
 	isNull.cpp
 	iterator.cpp
-	memoryUsage.cpp
 	nesting.cpp
 	remove.cpp
 	size.cpp

third-party/ArduinoJson/extras/tests/JsonArray/add.cpp

@@ -1,12 +1,17 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
-TEST_CASE("JsonArray::add()") {
+#include "Allocators.hpp"
-  DynamicJsonDocument doc(4096);
+
+using ArduinoJson::detail::sizeofArray;
+
+TEST_CASE("JsonArray::add(T)") {
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
   JsonArray array = doc.to<JsonArray>();
 
   SECTION("int") {
@@ -51,7 +56,7 @@ TEST_CASE("JsonArray::add()") {
 #endif
 
   SECTION("nested array") {
-    DynamicJsonDocument doc2(4096);
+    JsonDocument doc2;
     JsonArray arr = doc2.to<JsonArray>();
 
     array.add(arr);
@@ -62,7 +67,7 @@ TEST_CASE("JsonArray::add()") {
   }
 
   SECTION("nested object") {
-    DynamicJsonDocument doc2(4096);
+    JsonDocument doc2;
     JsonObject obj = doc2.to<JsonObject>();
 
     array.add(obj);
@@ -74,7 +79,7 @@ TEST_CASE("JsonArray::add()") {
 
   SECTION("array subscript") {
     const char* str = "hello";
-    DynamicJsonDocument doc2(4096);
+    JsonDocument doc2;
     JsonArray arr = doc2.to<JsonArray>();
     arr.add(str);
 
@@ -85,7 +90,7 @@ TEST_CASE("JsonArray::add()") {
 
   SECTION("object subscript") {
     const char* str = "hello";
-    DynamicJsonDocument doc2(4096);
+    JsonDocument doc2;
     JsonObject obj = doc2.to<JsonObject>();
     obj["x"] = str;
 
@@ -96,43 +101,81 @@ TEST_CASE("JsonArray::add()") {
 
   SECTION("should not duplicate const char*") {
     array.add("world");
-    const size_t expectedSize = JSON_ARRAY_SIZE(1);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                         });
   }
 
   SECTION("should duplicate char*") {
     array.add(const_cast<char*>("world"));
-    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                             Allocate(sizeofString("world")),
+                         });
   }
 
   SECTION("should duplicate std::string") {
     array.add(std::string("world"));
-    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                             Allocate(sizeofString("world")),
+                         });
   }
 
-  SECTION("should not duplicate serialized(const char*)") {
+  SECTION("should duplicate serialized(const char*)") {
     array.add(serialized("{}"));
-    const size_t expectedSize = JSON_ARRAY_SIZE(1);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                             Allocate(sizeofString("{}")),
+                         });
   }
 
   SECTION("should duplicate serialized(char*)") {
     array.add(serialized(const_cast<char*>("{}")));
-    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(2);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                             Allocate(sizeofString("{}")),
+                         });
   }
 
   SECTION("should duplicate serialized(std::string)") {
     array.add(serialized(std::string("{}")));
-    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(2);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                             Allocate(sizeofString("{}")),
+                         });
   }
 
   SECTION("should duplicate serialized(std::string)") {
     array.add(serialized(std::string("\0XX", 3)));
-    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(3);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                             Allocate(sizeofString(" XX")),
+                         });
+  }
+}
+
+TEST_CASE("JsonArray::add<T>()") {
+  JsonDocument doc;
+  JsonArray array = doc.to<JsonArray>();
+
+  SECTION("add<JsonArray>()") {
+    JsonArray nestedArray = array.add<JsonArray>();
+    nestedArray.add(1);
+    nestedArray.add(2);
+    REQUIRE(doc.as<std::string>() == "[[1,2]]");
+  }
+
+  SECTION("add<JsonObject>()") {
+    JsonObject nestedObject = array.add<JsonObject>();
+    nestedObject["a"] = 1;
+    nestedObject["b"] = 2;
+    REQUIRE(doc.as<std::string>() == "[{\"a\":1,\"b\":2}]");
+  }
+
+  SECTION("add<JsonVariant>()") {
+    JsonVariant nestedVariant = array.add<JsonVariant>();
+    nestedVariant.set(42);
+    REQUIRE(doc.as<std::string>() == "[42]");
   }
 }

third-party/ArduinoJson/extras/tests/JsonArray/clear.cpp

@@ -1,10 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
+#include "Allocators.hpp"
+
 TEST_CASE("JsonArray::clear()") {
   SECTION("No-op on null JsonArray") {
     JsonArray array;
@@ -14,7 +16,7 @@ TEST_CASE("JsonArray::clear()") {
   }
 
   SECTION("Removes all elements") {
-    StaticJsonDocument<64> doc;
+    JsonDocument doc;
     JsonArray array = doc.to<JsonArray>();
     array.add(1);
     array.add(2);
@@ -22,4 +24,23 @@ TEST_CASE("JsonArray::clear()") {
     REQUIRE(array.size() == 0);
     REQUIRE(array.isNull() == false);
   }
+
+  SECTION("Removed elements are recycled") {
+    SpyingAllocator spy;
+    JsonDocument doc(&spy);
+    JsonArray array = doc.to<JsonArray>();
+
+    // fill the pool entirely
+    for (int i = 0; i < ARDUINOJSON_POOL_CAPACITY; i++)
+      array.add(i);
+
+    // clear and fill again
+    array.clear();
+    for (int i = 0; i < ARDUINOJSON_POOL_CAPACITY; i++)
+      array.add(i);
+
+    REQUIRE(spy.log() == AllocatorLog{
+                             Allocate(sizeofPool()),
+                         });
+  }
 }

third-party/ArduinoJson/extras/tests/JsonArray/compare.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
 TEST_CASE("Compare JsonArray with JsonArray") {
-  StaticJsonDocument<256> doc;
+  JsonDocument doc;
 
   SECTION("Compare with unbound") {
     JsonArray array = doc.to<JsonArray>();
@@ -43,15 +43,15 @@ TEST_CASE("Compare JsonArray with JsonArray") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array1 = doc.createNestedArray();
+    JsonArray array1 = doc.add<JsonArray>();
     array1.add(1);
     array1.add("hello");
-    array1.createNestedObject();
+    array1.add<JsonObject>();
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
 
     CHECK(array1 == array2);
     CHECK(array1 <= array2);
@@ -62,15 +62,15 @@ TEST_CASE("Compare JsonArray with JsonArray") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array1 = doc.createNestedArray();
+    JsonArray array1 = doc.add<JsonArray>();
     array1.add(1);
     array1.add("hello1");
-    array1.createNestedObject();
+    array1.add<JsonObject>();
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello2");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
 
     CHECK(array1 != array2);
     CHECK_FALSE(array1 == array2);
@@ -82,7 +82,7 @@ TEST_CASE("Compare JsonArray with JsonArray") {
 }
 
 TEST_CASE("Compare JsonArray with JsonVariant") {
-  StaticJsonDocument<256> doc;
+  JsonDocument doc;
 
   SECTION("Compare with self") {
     JsonArray array = doc.to<JsonArray>();
@@ -107,15 +107,15 @@ TEST_CASE("Compare JsonArray with JsonVariant") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array = doc.createNestedArray();
+    JsonArray array = doc.add<JsonArray>();
     array.add(1);
     array.add("hello");
-    array.createNestedObject();
+    array.add<JsonObject>();
 
-    JsonVariant variant = doc.createNestedArray();
+    JsonVariant variant = doc.add<JsonArray>();
     variant.add(1);
     variant.add("hello");
-    variant.createNestedObject();
+    variant.add<JsonObject>();
 
     CHECK(array == variant);
     CHECK(array <= variant);
@@ -133,15 +133,15 @@ TEST_CASE("Compare JsonArray with JsonVariant") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array = doc.createNestedArray();
+    JsonArray array = doc.add<JsonArray>();
     array.add(1);
     array.add("hello1");
-    array.createNestedObject();
+    array.add<JsonObject>();
 
-    JsonVariant variant = doc.createNestedArray();
+    JsonVariant variant = doc.add<JsonArray>();
     variant.add(1);
     variant.add("hello2");
-    variant.createNestedObject();
+    variant.add<JsonObject>();
 
     CHECK(array != variant);
     CHECK_FALSE(array == variant);
@@ -153,7 +153,7 @@ TEST_CASE("Compare JsonArray with JsonVariant") {
 }
 
 TEST_CASE("Compare JsonArray with JsonVariantConst") {
-  StaticJsonDocument<256> doc;
+  JsonDocument doc;
 
   SECTION("Compare with unbound") {
     JsonArray array = doc.to<JsonArray>();
@@ -199,15 +199,15 @@ TEST_CASE("Compare JsonArray with JsonVariantConst") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array = doc.createNestedArray();
+    JsonArray array = doc.add<JsonArray>();
     array.add(1);
     array.add("hello");
-    array.createNestedObject();
+    array.add<JsonObject>();
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
     JsonVariantConst variant = array2;
 
     CHECK(array == variant);
@@ -226,15 +226,15 @@ TEST_CASE("Compare JsonArray with JsonVariantConst") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array = doc.createNestedArray();
+    JsonArray array = doc.add<JsonArray>();
     array.add(1);
     array.add("hello1");
-    array.createNestedObject();
+    array.add<JsonObject>();
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello2");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
     JsonVariantConst variant = array2;
 
     CHECK(array != variant);
@@ -247,7 +247,7 @@ TEST_CASE("Compare JsonArray with JsonVariantConst") {
 }
 
 TEST_CASE("Compare JsonArray with JsonArrayConst") {
-  StaticJsonDocument<256> doc;
+  JsonDocument doc;
 
   SECTION("Compare with unbound") {
     JsonArray array = doc.to<JsonArray>();
@@ -292,15 +292,15 @@ TEST_CASE("Compare JsonArray with JsonArrayConst") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array1 = doc.createNestedArray();
+    JsonArray array1 = doc.add<JsonArray>();
     array1.add(1);
     array1.add("hello");
-    array1.createNestedObject();
+    array1.add<JsonObject>();
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
     JsonArrayConst carray2 = array2;
 
     CHECK(array1 == carray2);
@@ -319,15 +319,15 @@ TEST_CASE("Compare JsonArray with JsonArrayConst") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array1 = doc.createNestedArray();
+    JsonArray array1 = doc.add<JsonArray>();
     array1.add(1);
     array1.add("hello1");
-    array1.createNestedObject();
+    array1.add<JsonObject>();
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello2");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
     JsonArrayConst carray2 = array2;
 
     CHECK(array1 != carray2);
@@ -347,7 +347,7 @@ TEST_CASE("Compare JsonArray with JsonArrayConst") {
 }
 
 TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
-  StaticJsonDocument<256> doc;
+  JsonDocument doc;
 
   SECTION("Compare with unbound") {
     JsonArray array = doc.to<JsonArray>();
@@ -387,16 +387,16 @@ TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array1 = doc.createNestedArray();
+    JsonArray array1 = doc.add<JsonArray>();
     array1.add(1);
     array1.add("hello");
-    array1.createNestedObject();
+    array1.add<JsonObject>();
     JsonArrayConst carray1 = array1;
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
     JsonArrayConst carray2 = array2;
 
     CHECK(carray1 == carray2);
@@ -408,16 +408,16 @@ TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array1 = doc.createNestedArray();
+    JsonArray array1 = doc.add<JsonArray>();
     array1.add(1);
     array1.add("hello1");
-    array1.createNestedObject();
+    array1.add<JsonObject>();
     JsonArrayConst carray1 = array1;
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello2");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
     JsonArrayConst carray2 = array2;
 
     CHECK(carray1 != carray2);
@@ -430,7 +430,7 @@ TEST_CASE("Compare JsonArrayConst with JsonArrayConst") {
 }
 
 TEST_CASE("Compare JsonArrayConst with JsonVariant") {
-  StaticJsonDocument<256> doc;
+  JsonDocument doc;
 
   SECTION("Compare with self") {
     JsonArray array = doc.to<JsonArray>();
@@ -455,16 +455,16 @@ TEST_CASE("Compare JsonArrayConst with JsonVariant") {
   }
 
   SECTION("Compare with identical array") {
-    JsonArray array1 = doc.createNestedArray();
+    JsonArray array1 = doc.add<JsonArray>();
     array1.add(1);
     array1.add("hello");
-    array1.createNestedObject();
+    array1.add<JsonObject>();
     JsonArrayConst carray1 = array1;
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
     JsonVariant variant2 = array2;
 
     CHECK(carray1 == variant2);
@@ -483,16 +483,16 @@ TEST_CASE("Compare JsonArrayConst with JsonVariant") {
   }
 
   SECTION("Compare with different array") {
-    JsonArray array1 = doc.createNestedArray();
+    JsonArray array1 = doc.add<JsonArray>();
     array1.add(1);
     array1.add("hello1");
-    array1.createNestedObject();
+    array1.add<JsonObject>();
     JsonArrayConst carray1 = array1;
 
-    JsonArray array2 = doc.createNestedArray();
+    JsonArray array2 = doc.add<JsonArray>();
     array2.add(1);
     array2.add("hello2");
-    array2.createNestedObject();
+    array2.add<JsonObject>();
     JsonVariant variant2 = array2;
 
     CHECK(carray1 != variant2);

third-party/ArduinoJson/extras/tests/JsonArray/copyArray.cpp

@@ -1,13 +1,15 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
+#include "Allocators.hpp"
+
 TEST_CASE("copyArray()") {
   SECTION("int[] -> JsonArray") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     JsonArray array = doc.to<JsonArray>();
     char json[32];
     int source[] = {1, 2, 3};
@@ -20,7 +22,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("std::string[] -> JsonArray") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     JsonArray array = doc.to<JsonArray>();
     char json[32];
     std::string source[] = {"a", "b", "c"};
@@ -33,7 +35,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("const char*[] -> JsonArray") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     JsonArray array = doc.to<JsonArray>();
     char json[32];
     const char* source[] = {"a", "b", "c"};
@@ -46,7 +48,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("const char[][] -> JsonArray") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     JsonArray array = doc.to<JsonArray>();
     char json[32];
     char source[][2] = {"a", "b", "c"};
@@ -59,7 +61,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("const char[][] -> JsonDocument") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[32];
     char source[][2] = {"a", "b", "c"};
 
@@ -71,7 +73,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("const char[][] -> MemberProxy") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[32];
     char source[][2] = {"a", "b", "c"};
 
@@ -83,7 +85,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("int[] -> JsonDocument") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[32];
     int source[] = {1, 2, 3};
 
@@ -95,7 +97,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("int[] -> MemberProxy") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[32];
     int source[] = {1, 2, 3};
 
@@ -107,21 +109,16 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("int[] -> JsonArray, but not enough memory") {
-    const size_t SIZE = JSON_ARRAY_SIZE(2);
+    JsonDocument doc(FailingAllocator::instance());
-    StaticJsonDocument<SIZE> doc;
     JsonArray array = doc.to<JsonArray>();
-    char json[32];
     int source[] = {1, 2, 3};
 
     bool ok = copyArray(source, array);
     REQUIRE_FALSE(ok);
-
-    serializeJson(array, json);
-    CHECK(std::string("[1,2]") == json);
   }
 
   SECTION("int[][] -> JsonArray") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     JsonArray array = doc.to<JsonArray>();
     char json[32];
     int source[][3] = {{1, 2, 3}, {4, 5, 6}};
@@ -134,7 +131,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("int[][] -> MemberProxy") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[32];
     int source[][3] = {{1, 2, 3}, {4, 5, 6}};
 
@@ -146,7 +143,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("int[][] -> JsonDocument") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[32];
     int source[][3] = {{1, 2, 3}, {4, 5, 6}};
 
@@ -158,25 +155,16 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("int[][] -> JsonArray, but not enough memory") {
-    const size_t SIZE =
+    JsonDocument doc(FailingAllocator::instance());
-        JSON_ARRAY_SIZE(2) + JSON_ARRAY_SIZE(3) + JSON_ARRAY_SIZE(2);
-    StaticJsonDocument<SIZE> doc;
     JsonArray array = doc.to<JsonArray>();
-    char json[32] = "";
     int source[][3] = {{1, 2, 3}, {4, 5, 6}};
 
-    CAPTURE(SIZE);
-
     bool ok = copyArray(source, array);
-    CAPTURE(doc.memoryUsage());
+    REQUIRE(ok == false);
-    CHECK_FALSE(ok);
-
-    serializeJson(array, json);
-    CHECK(std::string("[[1,2,3],[4,5]]") == json);
   }
 
   SECTION("JsonArray -> int[], with more space than needed") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "[1,2,3]";
     DeserializationError err = deserializeJson(doc, json);
     CHECK(err == DeserializationError::Ok);
@@ -193,7 +181,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("JsonArray -> int[], without enough space") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "[1,2,3]";
     DeserializationError err = deserializeJson(doc, json);
     CHECK(err == DeserializationError::Ok);
@@ -208,7 +196,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("JsonArray -> std::string[]") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "[\"a\",\"b\",\"c\"]";
     DeserializationError err = deserializeJson(doc, json);
     CHECK(err == DeserializationError::Ok);
@@ -225,7 +213,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("JsonArray -> char[N][]") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "[\"a12345\",\"b123456\",\"c1234567\"]";
     DeserializationError err = deserializeJson(doc, json);
     CHECK(err == DeserializationError::Ok);
@@ -242,7 +230,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("JsonDocument -> int[]") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "[1,2,3]";
     DeserializationError err = deserializeJson(doc, json);
     CHECK(err == DeserializationError::Ok);
@@ -258,7 +246,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("MemberProxy -> int[]") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "{\"data\":[1,2,3]}";
     DeserializationError err = deserializeJson(doc, json);
     CHECK(err == DeserializationError::Ok);
@@ -274,7 +262,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("ElementProxy -> int[]") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "[[1,2,3]]";
     DeserializationError err = deserializeJson(doc, json);
     CHECK(err == DeserializationError::Ok);
@@ -290,7 +278,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("JsonArray -> int[][]") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "[[1,2],[3],[4]]";
 
     DeserializationError err = deserializeJson(doc, json);
@@ -309,7 +297,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("JsonDocument -> int[][]") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "[[1,2],[3],[4]]";
 
     DeserializationError err = deserializeJson(doc, json);
@@ -327,7 +315,7 @@ TEST_CASE("copyArray()") {
   }
 
   SECTION("MemberProxy -> int[][]") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     char json[] = "{\"data\":[[1,2],[3],[4]]}";
 
     DeserializationError err = deserializeJson(doc, json);

third-party/ArduinoJson/extras/tests/JsonArray/equals.cpp

@@ -1,25 +1,22 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
 TEST_CASE("JsonArray::operator==()") {
-  DynamicJsonDocument doc1(4096);
+  JsonDocument doc1;
   JsonArray array1 = doc1.to<JsonArray>();
-  JsonArrayConst array1c = array1;
 
-  DynamicJsonDocument doc2(4096);
+  JsonDocument doc2;
   JsonArray array2 = doc2.to<JsonArray>();
-  JsonArrayConst array2c = array2;
 
   SECTION("should return false when arrays differ") {
     array1.add("coucou");
     array2.add(1);
 
     REQUIRE_FALSE(array1 == array2);
-    REQUIRE_FALSE(array1c == array2c);
   }
 
   SECTION("should return false when LHS has more elements") {
@@ -28,7 +25,6 @@ TEST_CASE("JsonArray::operator==()") {
     array2.add(1);
 
     REQUIRE_FALSE(array1 == array2);
-    REQUIRE_FALSE(array1c == array2c);
   }
 
   SECTION("should return false when RHS has more elements") {
@@ -37,7 +33,6 @@ TEST_CASE("JsonArray::operator==()") {
     array2.add(2);
 
     REQUIRE_FALSE(array1 == array2);
-    REQUIRE_FALSE(array1c == array2c);
   }
 
   SECTION("should return true when arrays equal") {
@@ -45,7 +40,6 @@ TEST_CASE("JsonArray::operator==()") {
     array2.add("coucou");
 
     REQUIRE(array1 == array2);
-    REQUIRE(array1c == array2c);
   }
 
   SECTION("should return false when RHS is null") {

third-party/ArduinoJson/extras/tests/JsonArray/isNull.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -12,25 +12,12 @@ TEST_CASE("JsonArray::isNull()") {
   }
 
   SECTION("returns false") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     JsonArray arr = doc.to<JsonArray>();
     REQUIRE(arr.isNull() == false);
   }
 }
 
-TEST_CASE("JsonArrayConst::isNull()") {
-  SECTION("returns true") {
-    JsonArrayConst arr;
-    REQUIRE(arr.isNull() == true);
-  }
-
-  SECTION("returns false") {
-    DynamicJsonDocument doc(4096);
-    JsonArrayConst arr = doc.to<JsonArray>();
-    REQUIRE(arr.isNull() == false);
-  }
-}
-
 TEST_CASE("JsonArray::operator bool()") {
   SECTION("returns false") {
     JsonArray arr;
@@ -38,21 +25,8 @@ TEST_CASE("JsonArray::operator bool()") {
   }
 
   SECTION("returns true") {
-    DynamicJsonDocument doc(4096);
+    JsonDocument doc;
     JsonArray arr = doc.to<JsonArray>();
     REQUIRE(static_cast<bool>(arr) == true);
   }
 }
-
-TEST_CASE("JsonArrayConst::operator bool()") {
-  SECTION("returns false") {
-    JsonArrayConst arr;
-    REQUIRE(static_cast<bool>(arr) == false);
-  }
-
-  SECTION("returns true") {
-    DynamicJsonDocument doc(4096);
-    JsonArrayConst arr = doc.to<JsonArray>();
-    REQUIRE(static_cast<bool>(arr) == true);
-  }
-}

third-party/ArduinoJson/extras/tests/JsonArray/iterator.cpp

@@ -1,52 +1,34 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
-template <typename TArray>
+TEST_CASE("JsonArray::begin()/end()") {
-static void run_iterator_test() {
+  SECTION("Non null JsonArray") {
-  StaticJsonDocument<JSON_ARRAY_SIZE(2)> doc;
+    JsonDocument doc;
-  JsonArray tmp = doc.to<JsonArray>();
+    JsonArray array = doc.to<JsonArray>();
-  tmp.add(12);
+    array.add(12);
-  tmp.add(34);
+    array.add(34);
 
-  TArray array = tmp;
+    auto it = array.begin();
-  typename TArray::iterator it = array.begin();
+    auto end = array.end();
-  typename TArray::iterator end = array.end();
 
     REQUIRE(end != it);
-  REQUIRE(12 == it->template as<int>());
+    REQUIRE(12 == it->as<int>());
     REQUIRE(12 == static_cast<int>(*it));
     ++it;
     REQUIRE(end != it);
-  REQUIRE(34 == it->template as<int>());
+    REQUIRE(34 == it->as<int>());
     REQUIRE(34 == static_cast<int>(*it));
     ++it;
     REQUIRE(end == it);
   }
 
-TEST_CASE("JsonArray::begin()/end()") {
-  SECTION("Non null JsonArray") {
-    run_iterator_test<JsonArray>();
-  }
-
   SECTION("Null JsonArray") {
     JsonArray array;
 
     REQUIRE(array.begin() == array.end());
   }
 }
-
-TEST_CASE("JsonArrayConst::begin()/end()") {
-  SECTION("Non null JsonArrayConst") {
-    run_iterator_test<JsonArrayConst>();
-  }
-
-  SECTION("Null JsonArrayConst") {
-    JsonArrayConst array;
-
-    REQUIRE(array.begin() == array.end());
-  }
-}

third-party/ArduinoJson/extras/tests/JsonArray/nesting.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
 TEST_CASE("JsonArray::nesting()") {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
   JsonArray arr = doc.to<JsonArray>();
 
   SECTION("return 0 if uninitialized") {
@@ -24,12 +24,12 @@ TEST_CASE("JsonArray::nesting()") {
   }
 
   SECTION("returns 2 with nested array") {
-    arr.createNestedArray();
+    arr.add<JsonArray>();
     REQUIRE(arr.nesting() == 2);
   }
 
   SECTION("returns 2 with nested object") {
-    arr.createNestedObject();
+    arr.add<JsonObject>();
     REQUIRE(arr.nesting() == 2);
   }
 }

third-party/ArduinoJson/extras/tests/JsonArray/remove.cpp

@@ -1,12 +1,14 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
+#include "Allocators.hpp"
+
 TEST_CASE("JsonArray::remove()") {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
   JsonArray array = doc.to<JsonArray>();
   array.add(1);
   array.add(2);
@@ -87,3 +89,23 @@ TEST_CASE("JsonArray::remove()") {
     unboundArray.remove(unboundArray.begin());
   }
 }
+
+TEST_CASE("Removed elements are recycled") {
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
+  JsonArray array = doc.to<JsonArray>();
+
+  // fill the pool entirely
+  for (int i = 0; i < ARDUINOJSON_POOL_CAPACITY; i++)
+    array.add(i);
+
+  // free one slot in the pool
+  array.remove(0);
+
+  // add one element; it should use the free slot
+  array.add(42);
+
+  REQUIRE(spy.log() == AllocatorLog{
+                           Allocate(sizeofPool()),  // only one pool
+                       });
+}

third-party/ArduinoJson/extras/tests/JsonArray/size.cpp

@@ -1,12 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
 TEST_CASE("JsonArray::size()") {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
   JsonArray array = doc.to<JsonArray>();
 
   SECTION("returns 0 is empty") {

third-party/ArduinoJson/extras/tests/JsonArray/std_string.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -12,7 +12,7 @@ static void eraseString(std::string& str) {
 }
 
 TEST_CASE("std::string") {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
   JsonArray array = doc.to<JsonArray>();
 
   SECTION("add()") {

third-party/ArduinoJson/extras/tests/JsonArray/subscript.cpp

@@ -1,13 +1,16 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <stdint.h>
 #include <catch.hpp>
 
+#include "Allocators.hpp"
+
 TEST_CASE("JsonArray::operator[]") {
-  DynamicJsonDocument doc(4096);
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
   JsonArray array = doc.to<JsonArray>();
 
   SECTION("Pad with null") {
@@ -65,7 +68,7 @@ TEST_CASE("JsonArray::operator[]") {
   }
 
   SECTION("nested array") {
-    DynamicJsonDocument doc2(4096);
+    JsonDocument doc2;
     JsonArray arr2 = doc2.to<JsonArray>();
 
     array[0] = arr2;
@@ -76,7 +79,7 @@ TEST_CASE("JsonArray::operator[]") {
   }
 
   SECTION("nested object") {
-    DynamicJsonDocument doc2(4096);
+    JsonDocument doc2;
     JsonObject obj = doc2.to<JsonObject>();
 
     array[0] = obj;
@@ -87,7 +90,7 @@ TEST_CASE("JsonArray::operator[]") {
   }
 
   SECTION("array subscript") {
-    DynamicJsonDocument doc2(4096);
+    JsonDocument doc2;
     JsonArray arr2 = doc2.to<JsonArray>();
     const char* str = "hello";
 
@@ -100,7 +103,7 @@ TEST_CASE("JsonArray::operator[]") {
 
   SECTION("object subscript") {
     const char* str = "hello";
-    DynamicJsonDocument doc2(4096);
+    JsonDocument doc2;
     JsonObject obj = doc2.to<JsonObject>();
 
     obj["x"] = str;
@@ -112,20 +115,25 @@ TEST_CASE("JsonArray::operator[]") {
 
   SECTION("should not duplicate const char*") {
     array[0] = "world";
-    const size_t expectedSize = JSON_ARRAY_SIZE(1);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                         });
   }
 
   SECTION("should duplicate char*") {
     array[0] = const_cast<char*>("world");
-    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                             Allocate(sizeofString("world")),
+                         });
   }
 
   SECTION("should duplicate std::string") {
     array[0] = std::string("world");
-    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(spy.log() == AllocatorLog{
-    REQUIRE(expectedSize == doc.memoryUsage());
+                             Allocate(sizeofPool()),
+                             Allocate(sizeofString("world")),
+                         });
   }
 
   SECTION("array[0].to<JsonObject>()") {
@@ -157,18 +165,3 @@ TEST_CASE("JsonArray::operator[]") {
   }
 #endif
 }
-
-TEST_CASE("JsonArrayConst::operator[]") {
-  DynamicJsonDocument doc(4096);
-  JsonArray array = doc.to<JsonArray>();
-  array.add(0);
-
-  SECTION("int") {
-    array[0] = 123;
-    JsonArrayConst carr = array;
-
-    REQUIRE(123 == carr[0].as<int>());
-    REQUIRE(true == carr[0].is<int>());
-    REQUIRE(false == carr[0].is<bool>());
-  }
-}

third-party/ArduinoJson/extras/tests/JsonArray/unbound.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -19,14 +19,6 @@ TEST_CASE("Unbound JsonArray") {
     REQUIRE(0 == array.size());
   }
 
-  SECTION("CreateNestedArrayFails") {
-    REQUIRE(array.createNestedArray().isNull());
-  }
-
-  SECTION("CreateNestedObjectFails") {
-    REQUIRE(array.createNestedObject().isNull());
-  }
-
   SECTION("PrintToWritesBrackets") {
     char buffer[32];
     serializeJson(array, buffer, sizeof(buffer));

third-party/ArduinoJson/extras/tests/JsonArrayConst/CMakeLists.txt

@@ -0,0 +1,19 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright © 2014-2024, Benoit BLANCHON
+# MIT License
+
+add_executable(JsonArrayConstTests
+	equals.cpp
+	isNull.cpp
+	iterator.cpp
+	nesting.cpp
+	size.cpp
+	subscript.cpp
+)
+
+add_test(JsonArrayConst JsonArrayConstTests)
+
+set_tests_properties(JsonArrayConst
+	PROPERTIES
+		LABELS "Catch"
+)

third-party/ArduinoJson/extras/tests/JsonArrayConst/equals.cpp

@@ -0,0 +1,63 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArrayConst::operator==()") {
+  JsonDocument doc1;
+  JsonArrayConst array1 = doc1.to<JsonArray>();
+
+  JsonDocument doc2;
+  JsonArrayConst array2 = doc2.to<JsonArray>();
+
+  SECTION("should return false when arrays differ") {
+    doc1.add("coucou");
+    doc2.add(1);
+
+    REQUIRE_FALSE(array1 == array2);
+  }
+
+  SECTION("should return false when LHS has more elements") {
+    doc1.add(1);
+    doc1.add(2);
+    doc2.add(1);
+
+    REQUIRE_FALSE(array1 == array2);
+  }
+
+  SECTION("should return false when RHS has more elements") {
+    doc1.add(1);
+    doc2.add(1);
+    doc2.add(2);
+
+    REQUIRE_FALSE(array1 == array2);
+  }
+
+  SECTION("should return true when arrays equal") {
+    doc1.add("coucou");
+    doc2.add("coucou");
+
+    REQUIRE(array1 == array2);
+  }
+
+  SECTION("should return false when RHS is null") {
+    JsonArrayConst null;
+
+    REQUIRE_FALSE(array1 == null);
+  }
+
+  SECTION("should return false when LHS is null") {
+    JsonArrayConst null;
+
+    REQUIRE_FALSE(null == array1);
+  }
+
+  SECTION("should return true when both are null") {
+    JsonArrayConst null1;
+    JsonArrayConst null2;
+
+    REQUIRE(null1 == null2);
+  }
+}

third-party/ArduinoJson/extras/tests/JsonArrayConst/isNull.cpp

@@ -0,0 +1,32 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArrayConst::isNull()") {
+  SECTION("returns true") {
+    JsonArrayConst arr;
+    REQUIRE(arr.isNull() == true);
+  }
+
+  SECTION("returns false") {
+    JsonDocument doc;
+    JsonArrayConst arr = doc.to<JsonArray>();
+    REQUIRE(arr.isNull() == false);
+  }
+}
+
+TEST_CASE("JsonArrayConst::operator bool()") {
+  SECTION("returns false") {
+    JsonArrayConst arr;
+    REQUIRE(static_cast<bool>(arr) == false);
+  }
+
+  SECTION("returns true") {
+    JsonDocument doc;
+    JsonArrayConst arr = doc.to<JsonArray>();
+    REQUIRE(static_cast<bool>(arr) == true);
+  }
+}

third-party/ArduinoJson/extras/tests/JsonArrayConst/iterator.cpp

@@ -0,0 +1,34 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArrayConst::begin()/end()") {
+  SECTION("Non null JsonArrayConst") {
+    JsonDocument doc;
+    JsonArrayConst array = doc.to<JsonArray>();
+    doc.add(12);
+    doc.add(34);
+
+    auto it = array.begin();
+    auto end = array.end();
+
+    REQUIRE(end != it);
+    REQUIRE(12 == it->as<int>());
+    REQUIRE(12 == static_cast<int>(*it));
+    ++it;
+    REQUIRE(end != it);
+    REQUIRE(34 == it->as<int>());
+    REQUIRE(34 == static_cast<int>(*it));
+    ++it;
+    REQUIRE(end == it);
+  }
+
+  SECTION("Null JsonArrayConst") {
+    JsonArrayConst array;
+
+    REQUIRE(array.begin() == array.end());
+  }
+}

third-party/ArduinoJson/extras/tests/JsonArrayConst/nesting.cpp

@@ -0,0 +1,35 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArrayConst::nesting()") {
+  JsonDocument doc;
+  JsonArrayConst arr = doc.to<JsonArray>();
+
+  SECTION("return 0 if unbound") {
+    JsonArrayConst unbound;
+    REQUIRE(unbound.nesting() == 0);
+  }
+
+  SECTION("returns 1 for empty array") {
+    REQUIRE(arr.nesting() == 1);
+  }
+
+  SECTION("returns 1 for flat array") {
+    doc.add("hello");
+    REQUIRE(arr.nesting() == 1);
+  }
+
+  SECTION("returns 2 with nested array") {
+    doc.add<JsonArray>();
+    REQUIRE(arr.nesting() == 2);
+  }
+
+  SECTION("returns 2 with nested object") {
+    doc.add<JsonObject>();
+    REQUIRE(arr.nesting() == 2);
+  }
+}

third-party/ArduinoJson/extras/tests/JsonArrayConst/size.cpp

@@ -0,0 +1,27 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArrayConst::size()") {
+  JsonDocument doc;
+  JsonArrayConst array = doc.to<JsonArray>();
+
+  SECTION("returns 0 if unbound") {
+    JsonArrayConst unbound;
+    REQUIRE(0U == unbound.size());
+  }
+
+  SECTION("returns 0 is empty") {
+    REQUIRE(0U == array.size());
+  }
+
+  SECTION("return number of elements") {
+    doc.add("hello");
+    doc.add("world");
+
+    REQUIRE(2U == array.size());
+  }
+}

third-party/ArduinoJson/extras/tests/JsonArrayConst/subscript.cpp

@@ -0,0 +1,20 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArrayConst::operator[]") {
+  JsonDocument doc;
+  JsonArrayConst arr = doc.to<JsonArray>();
+  doc.add(1);
+  doc.add(2);
+  doc.add(3);
+
+  REQUIRE(1 == arr[0].as<int>());
+  REQUIRE(2 == arr[1].as<int>());
+  REQUIRE(3 == arr[2].as<int>());
+  REQUIRE(0 == arr[3].as<int>());
+}

third-party/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt

@@ -1,20 +1,18 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 add_executable(JsonDeserializerTests
 	array.cpp
-	array_static.cpp
 	DeserializationError.cpp
+	destination_types.cpp
+	errors.cpp
 	filter.cpp
-	incomplete_input.cpp
 	input_types.cpp
-	invalid_input.cpp
 	misc.cpp
 	nestingLimit.cpp
 	number.cpp
 	object.cpp
-	object_static.cpp
 	string.cpp
 )
 

third-party/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>

third-party/ArduinoJson/extras/tests/JsonDeserializer/array.cpp

@@ -1,12 +1,17 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
+#include "Allocators.hpp"
+
+using ArduinoJson::detail::sizeofArray;
+
 TEST_CASE("deserialize JSON array") {
-  DynamicJsonDocument doc(4096);
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
 
   SECTION("An empty array") {
     DeserializationError err = deserializeJson(doc, "[]");
@@ -244,10 +249,71 @@ TEST_CASE("deserialize JSON array") {
 
   SECTION("Should clear the JsonArray") {
     deserializeJson(doc, "[1,2,3,4]");
+    spy.clearLog();
+
     deserializeJson(doc, "[]");
-    JsonArray arr = doc.as<JsonArray>();
 
+    JsonArray arr = doc.as<JsonArray>();
     REQUIRE(arr.size() == 0);
-    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0));
+    REQUIRE(spy.log() == AllocatorLog{
+                             Deallocate(sizeofArray(4)),
+                         });
+  }
+}
+
+TEST_CASE("deserialize JSON array under memory constraints") {
+  TimebombAllocator timebomb(100);
+  SpyingAllocator spy(&timebomb);
+  JsonDocument doc(&spy);
+
+  SECTION("empty array requires no allocation") {
+    timebomb.setCountdown(0);
+    char input[] = "[]";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("allocation of pool list fails") {
+    timebomb.setCountdown(0);
+    char input[] = "[1]";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::NoMemory);
+    REQUIRE(doc.as<std::string>() == "[]");
+  }
+
+  SECTION("allocation of pool fails") {
+    timebomb.setCountdown(0);
+    char input[] = "[1]";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::NoMemory);
+    REQUIRE(doc.as<std::string>() == "[]");
+  }
+
+  SECTION("allocation of string fails in array") {
+    timebomb.setCountdown(1);
+    char input[] = "[0,\"hi!\"]";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::NoMemory);
+    REQUIRE(doc.as<std::string>() == "[0,null]");
+  }
+
+  SECTION("don't store space characters") {
+    deserializeJson(doc, "  [ \"1234567\" ] ");
+
+    REQUIRE(spy.log() ==
+            AllocatorLog{
+                Allocate(sizeofPool()),
+                Allocate(sizeofStringBuffer()),
+                Reallocate(sizeofStringBuffer(), sizeofString("1234567")),
+                Reallocate(sizeofPool(), sizeofArray(1)),
+            });
   }
 }

third-party/ArduinoJson/extras/tests/JsonDeserializer/destination_types.cpp

@@ -0,0 +1,108 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+#include <string>
+
+#include "Allocators.hpp"
+
+using ArduinoJson::detail::sizeofArray;
+using ArduinoJson::detail::sizeofObject;
+
+TEST_CASE("deserializeJson(JsonDocument&)") {
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
+  doc.add(std::string("hello"));
+  spy.clearLog();
+
+  auto err = deserializeJson(doc, "[42]");
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc.as<std::string>() == "[42]");
+  REQUIRE(spy.log() == AllocatorLog{
+                           Deallocate(sizeofPool()),
+                           Deallocate(sizeofString("hello")),
+                           Allocate(sizeofPool()),
+                           Reallocate(sizeofPool(), sizeofArray(1)),
+                       });
+}
+
+TEST_CASE("deserializeJson(JsonVariant)") {
+  SECTION("variant is bound") {
+    SpyingAllocator spy;
+    JsonDocument doc(&spy);
+    doc.add(std::string("hello"));
+    spy.clearLog();
+
+    JsonVariant variant = doc[0];
+
+    auto err = deserializeJson(variant, "[42]");
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.as<std::string>() == "[[42]]");
+    REQUIRE(spy.log() == AllocatorLog{
+                             Deallocate(sizeofString("hello")),
+                         });
+  }
+
+  SECTION("variant is unbound") {
+    JsonVariant variant;
+
+    auto err = deserializeJson(variant, "[42]");
+
+    REQUIRE(err == DeserializationError::NoMemory);
+  }
+}
+
+TEST_CASE("deserializeJson(ElementProxy)") {
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
+  doc.add(std::string("hello"));
+  spy.clearLog();
+
+  SECTION("element already exists") {
+    auto err = deserializeJson(doc[0], "[42]");
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.as<std::string>() == "[[42]]");
+    REQUIRE(spy.log() == AllocatorLog{
+                             Deallocate(sizeofString("hello")),
+                         });
+  }
+
+  SECTION("element must be created") {
+    auto err = deserializeJson(doc[1], "[42]");
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.as<std::string>() == "[\"hello\",[42]]");
+    REQUIRE(spy.log() == AllocatorLog{});
+  }
+}
+
+TEST_CASE("deserializeJson(MemberProxy)") {
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
+  doc[std::string("hello")] = std::string("world");
+  spy.clearLog();
+
+  SECTION("member already exists") {
+    auto err = deserializeJson(doc["hello"], "[42]");
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.as<std::string>() == "{\"hello\":[42]}");
+    REQUIRE(spy.log() == AllocatorLog{
+                             Deallocate(sizeofString("world")),
+                         });
+  }
+
+  SECTION("member must be created exists") {
+    auto err = deserializeJson(doc["value"], "[42]");
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\",\"value\":[42]}");
+    REQUIRE(spy.log() == AllocatorLog{});
+  }
+}

third-party/ArduinoJson/extras/tests/JsonDeserializer/errors.cpp

@@ -0,0 +1,120 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#define ARDUINOJSON_DECODE_UNICODE 1
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserializeJson() returns IncompleteInput") {
+  const char* testCases[] = {
+      // strings
+      "\"\\",
+      "\"hello",
+      "\'hello",
+      // unicode
+      "'\\u",
+      "'\\u00",
+      "'\\u000",
+      // false
+      "f",
+      "fa",
+      "fal",
+      "fals",
+      // true
+      "t",
+      "tr",
+      "tru",
+      // null
+      "n",
+      "nu",
+      "nul",
+      // object
+      "{",
+      "{a",
+      "{a:",
+      "{a:1",
+      "{a:1,",
+      "{a:1,b",
+      "{a:1,b:",
+  };
+
+  for (auto input : testCases) {
+    SECTION(input) {
+      JsonDocument doc;
+      REQUIRE(deserializeJson(doc, input) ==
+              DeserializationError::IncompleteInput);
+    }
+  }
+}
+
+TEST_CASE("deserializeJson() returns InvalidInput") {
+  const char* testCases[] = {
+      // unicode
+      "'\\u'", "'\\u000g'", "'\\u000'", "'\\u000G'", "'\\u000/'", "\\x1234",
+      // numbers
+      "6a9", "1,", "2]", "3}",
+      // constants
+      "nulL", "tru3", "fals3",
+      // garbage
+      "%*$£¤"};
+
+  for (auto input : testCases) {
+    SECTION(input) {
+      JsonDocument doc;
+      REQUIRE(deserializeJson(doc, input) ==
+              DeserializationError::InvalidInput);
+    }
+  }
+}
+
+TEST_CASE("deserializeJson() oversees some edge cases") {
+  const char* testCases[] = {
+      "'\\ud83d'",         // leading surrogate without a trailing surrogate
+      "'\\udda4'",         // trailing surrogate without a leading surrogate
+      "'\\ud83d\\ud83d'",  // two leading surrogates
+  };
+
+  for (auto input : testCases) {
+    SECTION(input) {
+      JsonDocument doc;
+      REQUIRE(deserializeJson(doc, input) == DeserializationError::Ok);
+    }
+  }
+}
+
+TEST_CASE("deserializeJson() returns EmptyInput") {
+  JsonDocument doc;
+
+  SECTION("null") {
+    auto err = deserializeJson(doc, static_cast<const char*>(0));
+    REQUIRE(err == DeserializationError::EmptyInput);
+  }
+
+  SECTION("Empty string") {
+    auto err = deserializeJson(doc, "");
+    REQUIRE(err == DeserializationError::EmptyInput);
+  }
+
+  SECTION("Only spaces") {
+    auto err = deserializeJson(doc, "  \t\n\r");
+    REQUIRE(err == DeserializationError::EmptyInput);
+  }
+}
+
+TEST_CASE("deserializeJson() returns NoMemory if string length overflows") {
+  JsonDocument doc;
+  auto maxLength = ArduinoJson::detail::StringNode::maxLength;
+
+  SECTION("max length should succeed") {
+    auto err = deserializeJson(doc, "\"" + std::string(maxLength, 'a') + "\"");
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("one above max length should fail") {
+    auto err =
+        deserializeJson(doc, "\"" + std::string(maxLength + 1, 'a') + "\"");
+    REQUIRE(err == DeserializationError::NoMemory);
+  }
+}

third-party/ArduinoJson/extras/tests/JsonDeserializer/filter.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #define ARDUINOJSON_ENABLE_COMMENTS 1
@@ -9,8 +9,14 @@
 #include <sstream>
 #include <string>
 
+#include "Allocators.hpp"
+
+using ArduinoJson::detail::sizeofArray;
+using ArduinoJson::detail::sizeofObject;
+
 TEST_CASE("Filtering") {
   struct TestCase {
+    const char* description;
     const char* input;
     const char* filter;
     uint8_t nestingLimit;
@@ -19,707 +25,699 @@ TEST_CASE("Filtering") {
     size_t memoryUsage;
   };
 
-  // clang-format off
   TestCase testCases[] = {
       {
-      "{\"hello\":\"world\"}",   // 1. input
+          "Input is object, filter is null",  // description
-      "null",                    // 2. filter
+          "{\"hello\":\"world\"}",            // input
-      10,                        // 3. nestingLimit
+          "null",                             // filter
-      DeserializationError::Ok,  // 4. error
+          10,                                 // nestingLimit
-      "null",                    // 5. output
+          DeserializationError::Ok,           // error
-      0                          // 6. memoryUsage
+          "null",                             // output
+          0,                                  // memoryUsage
       },
       {
+          "Input is object, filter is false",
           "{\"hello\":\"world\"}",
           "false",
           10,
           DeserializationError::Ok,
           "null",
-      0
+          0,
       },
       {
+          "Input is object, filter is true",
           "{\"abcdefg\":\"hijklmn\"}",
           "true",
           10,
           DeserializationError::Ok,
           "{\"abcdefg\":\"hijklmn\"}",
-      JSON_OBJECT_SIZE(1) + 16
+          sizeofObject(1) + sizeofString("abcdefg") + sizeofString("hijklmn"),
       },
       {
+          "Input is object, filter is empty object",
           "{\"hello\":\"world\"}",
           "{}",
           10,
           DeserializationError::Ok,
           "{}",
-      JSON_OBJECT_SIZE(0)
+          sizeofObject(0),
       },
       {
-      // Input in an object, but filter wants an array
+          "Input in an object, but filter wants an array",
           "{\"hello\":\"world\"}",
           "[]",
           10,
           DeserializationError::Ok,
           "null",
-      0
+          0,
       },
       {
-      // Member is a string, but filter wants an array
+          "Member is a string, but filter wants an array",
           "{\"example\":\"example\"}",
           "{\"example\":[true]}",
           10,
           DeserializationError::Ok,
           "{\"example\":null}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // Member is a number, but filter wants an array
+          "Member is a number, but filter wants an array",
           "{\"example\":42}",
           "{\"example\":[true]}",
           10,
           DeserializationError::Ok,
           "{\"example\":null}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // Input is an array, but filter wants an object
+          "Input is an array, but filter wants an object",
           "[\"hello\",\"world\"]",
           "{}",
           10,
           DeserializationError::Ok,
           "null",
-      0
+          0,
       },
       {
-      // Input is a bool, but filter wants an object
+          "Input is a bool, but filter wants an object",
           "true",
           "{}",
           10,
           DeserializationError::Ok,
           "null",
-      0
+          0,
       },
       {
-      // Input is a string, but filter wants an object
+          "Input is a string, but filter wants an object",
           "\"hello\"",
           "{}",
           10,
           DeserializationError::Ok,
           "null",
-      0
+          0,
       },
       {
-      // skip an integer
+          "Skip an integer",
           "{\"an_integer\":666,example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // skip a float
+          "Skip a float",
           "{\"a_float\":12.34e-6,example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // skip false
+          "Skip false",
           "{\"a_bool\":false,example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // skip true
+          "Skip true",
           "{\"a_bool\":true,example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // skip null
+          "Skip null",
           "{\"a_bool\":null,example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // can skip a double-quoted string
+          "Skip a double-quoted string",
           "{\"a_double_quoted_string\":\"hello\",example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // can skip a single-quoted string
+          "Skip a single-quoted string",
           "{\"a_single_quoted_string\":'hello',example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // can skip an empty array
+          "Skip an empty array",
           "{\"an_empty_array\":[],example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // can skip an empty array with spaces in it
+          "Skip an empty array with spaces in it",
           "{\"an_empty_array\":[\t],example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // can skip an array
+          "Skip an array",
           "{\"an_array\":[1,2,3],example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // can skip an array with spaces in it
+          "Skip an array with spaces in it",
           "{\"an_array\": [ 1 , 2 , 3 ] ,example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // can skip an empty object
+          "Skip an empty nested object",
           "{\"an_empty_object\":{},example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // can skip an empty object with spaces in it
+          "Skip an empty nested object with spaces in it",
           "{\"an_empty_object\":{    },example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // can skip an object
+          "Skip a nested object",
           "{\"an_object\":{a:1,'b':2,\"c\":3},example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // skip an object with spaces in it
+          "Skip an object with spaces in it",
           "{\"an_object\" : { a : 1 , 'b' : 2 , \"c\" : 3 } ,example:42}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{\"example\":42}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
+          "Skip a string in a nested object",
           "{\"an_integer\": 0,\"example\":{\"type\":\"int\",\"outcome\":42}}",
           "{\"example\":{\"outcome\":true}}",
           10,
           DeserializationError::Ok,
           "{\"example\":{\"outcome\":42}}",
-      2 * JSON_OBJECT_SIZE(1) + 16
+          2 * sizeofObject(1) + 2 * sizeofString("example"),
       },
       {
-      // wildcard
+          "wildcard",
           "{\"example\":{\"type\":\"int\",\"outcome\":42}}",
           "{\"*\":{\"outcome\":true}}",
           10,
           DeserializationError::Ok,
           "{\"example\":{\"outcome\":42}}",
-      2 * JSON_OBJECT_SIZE(1) + 16
+          2 * sizeofObject(1) + 2 * sizeofString("example"),
       },
       {
-      // exclusion filter (issue #1628)
+          "exclusion filter (issue #1628)",
           "{\"example\":1,\"ignored\":2}",
           "{\"*\":true,\"ignored\":false}",
           10,
           DeserializationError::Ok,
           "{\"example\":1}",
-      JSON_OBJECT_SIZE(1) + 8
+          sizeofObject(1) + sizeofString("example"),
       },
       {
-      // only the first element of array counts
+          "only the first element of array counts",
           "[1,2,3]",
           "[true, false]",
           10,
           DeserializationError::Ok,
           "[1,2,3]",
-      JSON_ARRAY_SIZE(3)
+          sizeofArray(3),
       },
       {
-      // only the first element of array counts
+          "only the first element of array counts",
           "[1,2,3]",
           "[false, true]",
           10,
           DeserializationError::Ok,
           "[]",
-      JSON_ARRAY_SIZE(0)
+          sizeofArray(0),
       },
       {
-      // filter members of object in array
+          "filter members of object in array",
           "[{\"example\":1,\"ignore\":2},{\"example\":3,\"ignore\":4}]",
           "[{\"example\":true}]",
           10,
           DeserializationError::Ok,
           "[{\"example\":1},{\"example\":3}]",
-      JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8
+          sizeofArray(2) + 2 * sizeofObject(1) + sizeofString("example"),
       },
       {
+          "Unclosed single quote in skipped element",
           "[',2,3]",
           "[false,true]",
           10,
           DeserializationError::IncompleteInput,
           "[]",
-      JSON_ARRAY_SIZE(0)
+          sizeofArray(0),
       },
       {
+          "Unclosed double quote in skipped element",
           "[\",2,3]",
           "[false,true]",
           10,
           DeserializationError::IncompleteInput,
           "[]",
-      JSON_ARRAY_SIZE(0)
+          sizeofArray(0),
       },
       {
-      // detect errors in skipped value
+          "Detect errors in skipped value",
           "[!,2,\\]",
           "[false]",
           10,
           DeserializationError::InvalidInput,
           "[]",
-      JSON_ARRAY_SIZE(0)
+          sizeofArray(0),
       },
       {
-      // detect incomplete string event if it's skipped
+          "Detect incomplete string event if it's skipped",
           "\"ABC",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // detect incomplete string event if it's skipped
+          "Detect incomplete string event if it's skipped",
           "'ABC",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // handle escaped quotes
+          "Handle escaped quotes",
           "'A\\'BC'",
           "false",
           10,
           DeserializationError::Ok,
           "null",
-      0
+          0,
       },
       {
-      // handle escaped quotes
+          "Handle escaped quotes",
           "\"A\\\"BC\"",
           "false",
           10,
           DeserializationError::Ok,
           "null",
-      0
+          0,
       },
       {
-      // detect incomplete string in presence of escaped quotes
+          "Detect incomplete string in presence of escaped quotes",
           "'A\\'BC",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // detect incomplete string in presence of escaped quotes
+          "Detect incomplete string in presence of escaped quotes",
           "\"A\\\"BC",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // skip empty array
+          "skip empty array",
           "[]",
           "false",
           10,
           DeserializationError::Ok,
           "null",
-      0
+          0,
       },
       {
-      // skip empty array with spaces
+          "Skip empty array with spaces",
           " [ ] ",
           "false",
           10,
           DeserializationError::Ok,
           "null",
-      0
+          0,
       },
       {
-      // bubble up element error even if array is skipped
+          "Bubble up element error even if array is skipped",
           "[1,'2,3]",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // bubble up member error even if object is skipped
+          "Bubble up member error even if object is skipped",
           "{'hello':'worl}",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // bubble up colon error even if object is skipped
+          "Bubble up colon error even if object is skipped",
           "{'hello','world'}",
           "false",
           10,
           DeserializationError::InvalidInput,
           "null",
-      0
+          0,
       },
       {
-      // bubble up key error even if object is skipped
+          "Bubble up key error even if object is skipped",
           "{'hello:1}",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // detect invalid value in skipped object
+          "Detect invalid value in skipped object",
           "{'hello':!}",
           "false",
           10,
           DeserializationError::InvalidInput,
           "null",
-      0
+          0,
       },
       {
-      // ignore invalid value in skipped object
+          "Ignore invalid value in skipped object",
           "{'hello':\\}",
           "false",
           10,
           DeserializationError::InvalidInput,
           "null",
-      0
+          0,
       },
       {
-      // check nesting limit even for ignored objects
+          "Check nesting limit even for ignored objects",
           "{}",
           "false",
           0,
           DeserializationError::TooDeep,
           "null",
-      0
+          0,
       },
       {
-      // check nesting limit even for ignored objects
+          "Check nesting limit even for ignored objects",
           "{'hello':{}}",
           "false",
           1,
           DeserializationError::TooDeep,
           "null",
-      0
+          0,
       },
       {
-      // check nesting limit even for ignored values in objects
+          "Check nesting limit even for ignored values in objects",
           "{'hello':{}}",
           "{}",
           1,
           DeserializationError::TooDeep,
           "{}",
-      JSON_OBJECT_SIZE(0)
+          sizeofObject(0),
       },
       {
-      // check nesting limit even for ignored arrays
+          "Check nesting limit even for ignored arrays",
           "[]",
           "false",
           0,
           DeserializationError::TooDeep,
           "null",
-      0
+          0,
       },
       {
-      // check nesting limit even for ignored arrays
+          "Check nesting limit even for ignored arrays",
           "[[]]",
           "false",
           1,
           DeserializationError::TooDeep,
           "null",
-      0
+          0,
       },
       {
-      // check nesting limit even for ignored values in arrays
+          "Check nesting limit even for ignored values in arrays",
           "[[]]",
           "[]",
           1,
           DeserializationError::TooDeep,
           "[]",
-      JSON_ARRAY_SIZE(0)
+          sizeofArray(0),
       },
       {
-      // supports back-slash at the end of skipped string
+          "Supports back-slash at the end of skipped string",
           "\"hell\\",
           "false",
           1,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // invalid comment at after an element in a skipped array
+          "Invalid comment at after an element in a skipped array",
           "[1/]",
           "false",
           10,
           DeserializationError::InvalidInput,
           "null",
-      0
+          0,
       },
       {
-      // incomplete comment at after an element in a skipped array
+          "Incomplete comment at after an element in a skipped array",
           "[1/*]",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // missing comma in a skipped array
+          "Missing comma in a skipped array",
           "[1 2]",
           "false",
           10,
           DeserializationError::InvalidInput,
           "null",
-      0
+          0,
       },
       {
-      // invalid comment at the beginning of array
+          "Invalid comment at the beginning of array",
           "[/1]",
           "[false]",
           10,
           DeserializationError::InvalidInput,
           "[]",
-      JSON_ARRAY_SIZE(0)
+          sizeofArray(0),
       },
       {
-      // incomplete comment at the begining of an array
+          "Incomplete comment at the begining of an array",
           "[/*]",
           "[false]",
           10,
           DeserializationError::IncompleteInput,
           "[]",
-      JSON_ARRAY_SIZE(0)
+          sizeofArray(0),
       },
       {
-      // invalid comment before key
+          "Invalid comment before key",
           "{/1:2}",
           "{}",
           10,
           DeserializationError::InvalidInput,
           "{}",
-      JSON_OBJECT_SIZE(0)
+          sizeofObject(0),
       },
       {
-      // incomplete comment before key
+          "Incomplete comment before key",
           "{/*:2}",
           "{}",
           10,
           DeserializationError::IncompleteInput,
           "{}",
-      JSON_OBJECT_SIZE(0)
+          sizeofObject(0),
       },
       {
-      // invalid comment after key
+          "Invalid comment after key",
           "{\"example\"/1:2}",
           "{}",
           10,
           DeserializationError::InvalidInput,
           "{}",
-      JSON_OBJECT_SIZE(0)
+          sizeofObject(0),
       },
       {
-      // incomplete comment after key
+          "Incomplete comment after key",
           "{\"example\"/*:2}",
           "{}",
           10,
           DeserializationError::IncompleteInput,
           "{}",
-      JSON_OBJECT_SIZE(0)
+          sizeofObject(0),
       },
       {
-      // invalid comment after colon
+          "Invalid comment after colon",
           "{\"example\":/12}",
           "{}",
           10,
           DeserializationError::InvalidInput,
           "{}",
-      JSON_OBJECT_SIZE(0)
+          sizeofObject(0),
       },
       {
-      // incomplete comment after colon
+          "Incomplete comment after colon",
           "{\"example\":/*2}",
           "{}",
           10,
           DeserializationError::IncompleteInput,
           "{}",
-      JSON_OBJECT_SIZE(0)
+          sizeofObject(0),
       },
       {
-      // comment next to an integer
+          "Comment next to an integer",
           "{\"ignore\":1//,\"example\":2\n}",
           "{\"example\":true}",
           10,
           DeserializationError::Ok,
           "{}",
-      JSON_OBJECT_SIZE(0)
+          sizeofObject(0),
       },
       {
-      // invalid comment after opening brace of a skipped object
+          "Invalid comment after opening brace of a skipped object",
           "{/1:2}",
           "false",
           10,
           DeserializationError::InvalidInput,
           "null",
-      0
+          0,
       },
       {
-      // incomplete after opening brace of a skipped object
+          "Incomplete after opening brace of a skipped object",
           "{/*:2}",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // invalid comment after key of a skipped object
+          "Invalid comment after key of a skipped object",
           "{\"example\"/:2}",
           "false",
           10,
           DeserializationError::InvalidInput,
           "null",
-      0
+          0,
       },
       {
-      // incomplete comment after key of a skipped object
+          "Incomplete comment after key of a skipped object",
           "{\"example\"/*:2}",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // invalid comment after value in a skipped object
+          "Invalid comment after value in a skipped object",
           "{\"example\":2/}",
           "false",
           10,
           DeserializationError::InvalidInput,
           "null",
-      0
+          0,
       },
       {
-      // incomplete comment after value of a skipped object
+          "Incomplete comment after value of a skipped object",
           "{\"example\":2/*}",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
       {
-      // incomplete comment after comma in skipped object
+          "Incomplete comment after comma in skipped object",
           "{\"example\":2,/*}",
           "false",
           10,
           DeserializationError::IncompleteInput,
           "null",
-      0
+          0,
       },
-  };  // clang-format on
+  };
-
-  for (size_t i = 0; i < sizeof(testCases) / sizeof(testCases[0]); i++) {
-    CAPTURE(i);
 
-    DynamicJsonDocument filter(256);
+  for (auto& tc : testCases) {
-    DynamicJsonDocument doc(256);
+    SECTION(tc.description) {
-    TestCase& tc = testCases[i];
+      SpyingAllocator spy;
+      JsonDocument filter;
+      JsonDocument doc(&spy);
 
-    CAPTURE(tc.filter);
       REQUIRE(deserializeJson(filter, tc.filter) == DeserializationError::Ok);
 
-    CAPTURE(tc.input);
+      CHECK(deserializeJson(
-    CAPTURE(tc.nestingLimit);
+                doc, tc.input, DeserializationOption::Filter(filter),
-    CHECK(deserializeJson(doc, tc.input, DeserializationOption::Filter(filter),
+                DeserializationOption::NestingLimit(tc.nestingLimit)) ==
-                          DeserializationOption::NestingLimit(
+            tc.error);
-                              tc.nestingLimit)) == tc.error);
 
       CHECK(doc.as<std::string>() == tc.output);
-    CHECK(doc.memoryUsage() == tc.memoryUsage);
+
+      doc.shrinkToFit();
+      CHECK(spy.allocatedBytes() == tc.memoryUsage);
     }
   }
-
-TEST_CASE("Zero-copy mode") {  // issue #1697
-  char input[] = "{\"include\":42,\"exclude\":666}";
-
-  StaticJsonDocument<256> filter;
-  filter["include"] = true;
-
-  StaticJsonDocument<256> doc;
-  DeserializationError err =
-      deserializeJson(doc, input, DeserializationOption::Filter(filter));
-
-  REQUIRE(err == DeserializationError::Ok);
-  CHECK(doc.as<std::string>() == "{\"include\":42}");
 }
 
 TEST_CASE("Overloads") {
-  StaticJsonDocument<256> doc;
+  JsonDocument doc;
-  StaticJsonDocument<256> filter;
+  JsonDocument filter;
 
   using namespace DeserializationOption;
 
@@ -807,3 +805,17 @@ TEST_CASE("Overloads") {
   }
 #endif
 }
+
+TEST_CASE("shrink filter") {
+  JsonDocument doc;
+  SpyingAllocator spy;
+  JsonDocument filter(&spy);
+  filter["a"] = true;
+  spy.clearLog();
+
+  deserializeJson(doc, "{}", DeserializationOption::Filter(filter));
+
+  REQUIRE(spy.log() == AllocatorLog{
+                           Reallocate(sizeofPool(), sizeofObject(1)),
+                       });
+}

third-party/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp

@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
@@ -7,25 +7,34 @@
 #include <catch.hpp>
 #include <sstream>
 
+#include "Allocators.hpp"
 #include "CustomReader.hpp"
 
+using ArduinoJson::detail::sizeofObject;
+
 TEST_CASE("deserializeJson(char*)") {
-  StaticJsonDocument<1024> doc;
+  SpyingAllocator spy;
+  JsonDocument doc(&spy);
 
-  SECTION("should not duplicate strings") {
   char input[] = "{\"hello\":\"world\"}";
 
   DeserializationError err = deserializeJson(doc, input);
 
   REQUIRE(err == DeserializationError::Ok);
-    CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1));
+
-    CHECK(doc.as<JsonVariant>().memoryUsage() ==
+  REQUIRE(spy.log() ==
-          JSON_OBJECT_SIZE(1));  // issue #1318
+          AllocatorLog{
-  }
+              Allocate(sizeofStringBuffer()),
+              Reallocate(sizeofStringBuffer(), sizeofString("hello")),
+              Allocate(sizeofPool()),
+              Allocate(sizeofStringBuffer()),
+              Reallocate(sizeofStringBuffer(), sizeofString("world")),
+              Reallocate(sizeofPool(), sizeofObject(1)),
+          });
 }
 
 TEST_CASE("deserializeJson(unsigned char*, unsigned int)") {  // issue #1897
-  StaticJsonDocument<1024> doc;
+  JsonDocument doc;
 
   unsigned char input[] = "{\"hello\":\"world\"}";
   unsigned char* input_ptr = input;
@@ -37,7 +46,7 @@ TEST_CASE("deserializeJson(unsigned char*, unsigned int)") {  // issue #1897
 }
 
 TEST_CASE("deserializeJson(uint8_t*, size_t)") {  // issue #1898
-  StaticJsonDocument<1024> doc;
+  JsonDocument doc;
 
   uint8_t input[] = "{\"hello\":\"world\"}";
   uint8_t* input_ptr = input;
@@ -49,7 +58,7 @@ TEST_CASE("deserializeJson(uint8_t*, size_t)") {  // issue #1898
 }
 
 TEST_CASE("deserializeJson(const std::string&)") {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
 
   SECTION("should accept const string") {
     const std::string input("[42]");
@@ -78,7 +87,7 @@ TEST_CASE("deserializeJson(const std::string&)") {
 }
 
 TEST_CASE("deserializeJson(std::istream&)") {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
 
   SECTION("array") {
     std::istringstream json(" [ 42 ] ");
@@ -149,7 +158,7 @@ TEST_CASE("deserializeJson(VLA)") {
   char vla[i];
   strcpy(vla, "{\"a\":42}");
 
-  StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
+  JsonDocument doc;
   DeserializationError err = deserializeJson(doc, vla);
 
   REQUIRE(err == DeserializationError::Ok);
@@ -157,7 +166,7 @@ TEST_CASE("deserializeJson(VLA)") {
 #endif
 
 TEST_CASE("deserializeJson(CustomReader)") {
-  DynamicJsonDocument doc(4096);
+  JsonDocument doc;
   CustomReader reader("[4,2]");
   DeserializationError err = deserializeJson(doc, reader);
 
@@ -168,10 +177,10 @@ TEST_CASE("deserializeJson(CustomReader)") {
 }
 
 TEST_CASE("deserializeJson(JsonDocument&, MemberProxy)") {
-  DynamicJsonDocument doc1(4096);
+  JsonDocument doc1;
   doc1["payload"] = "[4,2]";
 
-  DynamicJsonDocument doc2(4096);
+  JsonDocument doc2;
   DeserializationError err = deserializeJson(doc2, doc1["payload"]);
 
   REQUIRE(err == DeserializationError::Ok);
@@ -181,10 +190,10 @@ TEST_CASE("deserializeJson(JsonDocument&, MemberProxy)") {
 }
 
 TEST_CASE("deserializeJson(JsonDocument&, JsonVariant)") {
-  DynamicJsonDocument doc1(4096);
+  JsonDocument doc1;
   doc1["payload"] = "[4,2]";
 
-  DynamicJsonDocument doc2(4096);
+  JsonDocument doc2;
   DeserializationError err =
       deserializeJson(doc2, doc1["payload"].as<JsonVariant>());
 
@@ -195,10 +204,10 @@ TEST_CASE("deserializeJson(JsonDocument&, JsonVariant)") {
 }
 
 TEST_CASE("deserializeJson(JsonDocument&, JsonVariantConst)") {
-  DynamicJsonDocument doc1(4096);
+  JsonDocument doc1;
   doc1["payload"] = "[4,2]";
 
-  DynamicJsonDocument doc2(4096);
+  JsonDocument doc2;
   DeserializationError err =
       deserializeJson(doc2, doc1["payload"].as<JsonVariantConst>());
 
@@ -209,10 +218,10 @@ TEST_CASE("deserializeJson(JsonDocument&, JsonVariantConst)") {
 }
 
 TEST_CASE("deserializeJson(JsonDocument&, ElementProxy)") {
-  DynamicJsonDocument doc1(4096);
+  JsonDocument doc1;
   doc1[0] = "[4,2]";
 
-  DynamicJsonDocument doc2(4096);
+  JsonDocument doc2;
   DeserializationError err = deserializeJson(doc2, doc1[0]);
 
   REQUIRE(err == DeserializationError::Ok);

third-party/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp

@@ -1,56 +1,25 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include <ArduinoJson.h>
 #include <catch.hpp>
 
-using namespace Catch::Matchers;
+#include "Allocators.hpp"
 
-TEST_CASE("deserializeJson(DynamicJsonDocument&)") {
+using ArduinoJson::detail::sizeofArray;
-  DynamicJsonDocument doc(4096);
 
-  SECTION("Edge cases") {
+TEST_CASE("deserializeJson() misc cases") {
-    SECTION("null char*") {
+  SpyingAllocator spy;
-      DeserializationError err = deserializeJson(doc, static_cast<char*>(0));
+  JsonDocument doc(&spy);
 
-      REQUIRE(err != DeserializationError::Ok);
+  SECTION("null") {
-    }
-
-    SECTION("null const char*") {
-      DeserializationError err =
-          deserializeJson(doc, static_cast<const char*>(0));
-
-      REQUIRE(err != DeserializationError::Ok);
-    }
-
-    SECTION("Empty input") {
-      DeserializationError err = deserializeJson(doc, "");
-
-      REQUIRE(err == DeserializationError::EmptyInput);
-    }
-
-    SECTION("Only spaces") {
-      DeserializationError err = deserializeJson(doc, "  \t\n\r");
-
-      REQUIRE(err == DeserializationError::EmptyInput);
-    }
-
-    SECTION("issue #628") {
     DeserializationError err = deserializeJson(doc, "null");
     REQUIRE(err == DeserializationError::Ok);
     REQUIRE(doc.is<float>() == false);
   }
 
-    SECTION("Garbage") {
+  SECTION("true") {
-      DeserializationError err = deserializeJson(doc, "%*$£¤");
-
-      REQUIRE(err == DeserializationError::InvalidInput);
-    }
-  }
-
-  SECTION("Booleans") {
-    SECTION("True") {
     DeserializationError err = deserializeJson(doc, "true");
 
     REQUIRE(err == DeserializationError::Ok);
@@ -58,60 +27,23 @@ TEST_CASE("deserializeJson(DynamicJsonDocument&)") {
     REQUIRE(doc.as<bool>() == true);
   }
 
-    SECTION("False") {
+  SECTION("false") {
     DeserializationError err = deserializeJson(doc, "false");
 
     REQUIRE(err == DeserializationError::Ok);
     REQUIRE(doc.is<bool>());
     REQUIRE(doc.as<bool>() == false);
   }
-  }
-
-  SECTION("Premature null-terminator") {
-    SECTION("In escape sequence") {
-      DeserializationError err = deserializeJson(doc, "\"\\");
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
-    SECTION("In double quoted string") {
-      DeserializationError err = deserializeJson(doc, "\"hello");
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
-    SECTION("In single quoted string") {
-      DeserializationError err = deserializeJson(doc, "'hello");
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-  }
-
-  SECTION("Premature end of input") {
-    SECTION("In escape sequence") {
-      DeserializationError err = deserializeJson(doc, "\"\\n\"", 2);
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
-    SECTION("In double quoted string") {
-      DeserializationError err = deserializeJson(doc, "\"hello\"", 6);
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-
-    SECTION("In single quoted string") {
-      DeserializationError err = deserializeJson(doc, "'hello'", 6);
-
-      REQUIRE(err == DeserializationError::IncompleteInput);
-    }
-  }
 
   SECTION("Should clear the JsonVariant") {
     deserializeJson(doc, "[1,2,3]");
+    spy.clearLog();
+
     deserializeJson(doc, "{}");
 
     REQUIRE(doc.is<JsonObject>());
-    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+    REQUIRE(spy.log() == AllocatorLog{
+                             Deallocate(sizeofArray(3)),
+                         });
   }
 }