diff --git a/dexed_sd.cpp b/dexed_sd.cpp
index 8891a40..e3373bd 100644
--- a/dexed_sd.cpp
+++ b/dexed_sd.cpp
@@ -27,6 +27,7 @@
 #include "config.h"
 #include <Wire.h>
 #include <SD.h>
+#include <ArduinoJson.h>
 #include "synth_dexed.h"
 #include "dexed_sd.h"
 
@@ -717,6 +718,16 @@ bool save_sd_performance(uint8_t p)
 /******************************************************************************
    HELPER FUNCTIONS
  ******************************************************************************/
+bool get_sd_data_json(File sysex, uint8_t* conf)
+{
+  return(false);
+}
+
+bool write_sd_data_json(File sysex, uint16_t len)
+{
+  return(false);
+}
+
 bool get_sd_data(File sysex, uint8_t format, uint8_t* conf)
 {
   uint16_t n;
diff --git a/dexed_sd.h b/dexed_sd.h
index 33f4a5e..c7924ca 100644
--- a/dexed_sd.h
+++ b/dexed_sd.h
@@ -63,6 +63,8 @@ bool save_sd_fx(uint8_t fx);
 bool load_sd_performance(int8_t p);
 bool save_sd_performance(uint8_t p);
 
+bool get_sd_data_json(File sysex, uint8_t* conf);
+bool write_sd_data_json(File sysex, uint8_t* data, uint16_t len);
 bool get_sd_data(File sysex, uint8_t format, uint8_t* conf);
 bool write_sd_data(File sysex, uint8_t format, uint8_t* data, uint16_t len);
 uint8_t calc_checksum(uint8_t* data, uint16_t len);
diff --git a/third-party/ArduinoJson/ArduinoJson.h b/third-party/ArduinoJson/ArduinoJson.h
new file mode 100644
index 0000000..ba79dc8
--- /dev/null
+++ b/third-party/ArduinoJson/ArduinoJson.h
@@ -0,0 +1,5 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include "src/ArduinoJson.h"
diff --git a/third-party/ArduinoJson/CHANGELOG.md b/third-party/ArduinoJson/CHANGELOG.md
new file mode 100644
index 0000000..6e1997a
--- /dev/null
+++ b/third-party/ArduinoJson/CHANGELOG.md
@@ -0,0 +1,1134 @@
+ArduinoJson: change log
+=======================
+
+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)
+* Fixed warning "cast  increases required alignment" (issue #914)
+* Fixed warning "conversion may alter value" (issue #914)
+* 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)
+------
+
+* Decode escaped Unicode characters like \u00DE (issue #304, PR #791)
+  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)
+-----------
+
+* 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)
+* Added `JsonVariant::to<JsonArray>()` and `JsonVariant::to<JsonObject>()`
+
+v6.3.0-beta (2018-08-31)
+-----------
+
+* Implemented reference semantics for `JsonVariant`
+* Replaced `JsonPair`'s `key` and `value` with `key()` and `value()`
+* Fixed `serializeJson(obj[key], dst)` (issue #794)
+
+> ### BREAKING CHANGES
+>
+> #### JsonVariant
+> 
+> `JsonVariant` now has a semantic similar to `JsonObject` and `JsonArray`.
+> 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:
+>
+> ```c++
+> JsonVariant myValue = 42;
+> ```
+>
+> New code:
+>
+> ```c++
+> DynamicJsonDocument doc;
+> JsonVariant myValue = doc.to<JsonVariant>();
+> myValue.set(42);
+> ```
+>
+> #### JsonPair
+>
+> 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!
+
+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
+>
+> Old code:
+>
+> ```c++
+> object["values"] = RawJson("[1,2,3,4]");
+> ```
+> 
+> New code:
+> 
+> ```c++
+> object["values"] = serialized("[1,2,3,4]");
+> ```
+
+v6.1.0-beta (2018-07-02)
+-----------
+
+* Return `JsonArray` and `JsonObject` by value instead of reference (issue #309)
+* Replaced `success()` with `isNull()`
+
+> ### BREAKING CHANGES
+> 
+> Old code:
+>
+> ```c++
+> JsonObject& obj = doc.to<JsonObject>();
+> JsonArray& arr = obj.createNestedArray("key");
+> if (!arr.success()) {
+>   Serial.println("Not enough memory");
+>   return;
+> }
+> ```
+> 
+> New code:
+> 
+> ```c++
+> JsonObject obj = doc.to<JsonObject>();
+> 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:
+> 
+> ```c++
+> DynamicJsonBuffer jb;
+> JsonObject& obj = jb.parseObject(json);
+> if (obj.success()) {
+> 
+> }
+> ```
+> 
+> New code:
+> 
+> ```c++
+> DynamicJsonDocument doc;
+> DeserializationError error = deserializeJson(doc, json);
+> if (error) {
+> 
+> }
+> JsonObject& obj = doc.as<JsonObject>();
+> ```
+> 
+> #### Serialization
+> 
+> Old code:
+> 
+> ```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);
+> ```
+
+v5.13.2
+-------
+
+* Fixed `JsonBuffer::parse()` not respecting nesting limit correctly (issue #693)
+* Fixed inconsistencies in nesting level counting (PR #695 from Zhenyu Wu)
+* Fixed null values that could be pass to `strcmp()` (PR #745 from Mike Karlesky)
+* Added macros `ARDUINOJSON_VERSION`, `ARDUINOJSON_VERSION_MAJOR`...
+
+v5.13.1
+-------
+
+* Fixed `JsonVariant::operator|(int)` that returned the default value if the variant contained a double (issue #675)
+* Allowed non-quoted key to contain underscores (issue #665)
+
+v5.13.0
+-------
+
+* Changed the rules of string duplication (issue #658)
+* `RawJson()` accepts any kind of string and obeys to the same rules for duplication
+* Changed the return type of `strdup()` to `const char*` to prevent double duplication
+* Marked `strdup()` as deprecated
+
+> ### New rules for string duplication
+>
+> | type                       | duplication |
+> |:---------------------------|:------------|
+> | const char*                | no          |
+> | char*                      | ~~no~~ yes  |
+> | String                     | yes         |
+> | std::string                | yes         |
+> | const __FlashStringHelper* | yes         |
+>
+> These new rules make `JsonBuffer::strdup()` useless.
+
+v5.12.0
+-------
+
+* Added `JsonVariant::operator|` to return a default value (see below)
+* Added a clear error message when compiled as C instead of C++ (issue #629)
+* Added detection of MPLAB XC compiler (issue #629)
+* Added detection of Keil ARM Compiler (issue #629)
+* Added an example that shows how to save and load a configuration file
+* Reworked all other examples
+
+> ### How to use the new feature?
+>
+> If you have a block like this:
+>
+> ```c++
+> const char* ssid = root["ssid"];
+> if (!ssid)
+>   ssid = "default ssid";
+> ```
+>
+> You can simplify like that:
+>
+> ```c++
+> const char* ssid = root["ssid"] | "default ssid";
+> ```
+
+v5.11.2
+-------
+
+* Fixed `DynamicJsonBuffer::clear()` not resetting allocation size (issue #561)
+* Fixed incorrect rounding for float values (issue #588)
+
+v5.11.1
+-------
+
+* Removed dependency on `PGM_P` as Particle 0.6.2 doesn't define it (issue #546)
+* Fixed warning "dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]"
+* Fixed warning "floating constant exceeds range of 'float' [-Woverflow]" (issue #544)
+* Fixed warning "this statement may fall through" [-Wimplicit-fallthrough=] (issue #539)
+* Removed `ARDUINOJSON_DOUBLE_IS_64BITS` as it became useless.
+* Fixed too many decimals places in float serialization (issue #543)
+
+v5.11.0
+-------
+
+* Made `JsonBuffer` non-copyable (PR #524 by @luisrayas3)
+* Added `StaticJsonBuffer::clear()`
+* Added `DynamicJsonBuffer::clear()`
+
+v5.10.1
+-------
+
+* Fixed IntelliSense errors in Visual Micro (issue #483)
+* Fixed compilation in IAR Embedded Workbench (issue #515)
+* Fixed reading "true" as a float (issue #516)
+* Added `ARDUINOJSON_DOUBLE_IS_64BITS`
+* Added `ARDUINOJSON_EMBEDDED_MODE`
+
+v5.10.0
+-------
+
+* Removed configurable number of decimal places (issues #288, #427 and #506)
+* Changed exponentiation thresholds to `1e7` and `1e-5` (issues #288, #427 and #506)
+* `JsonVariant::is<double>()` now returns `true` for integers
+* Fixed error `IsBaseOf is not a member of ArduinoJson::TypeTraits` (issue #495)
+* Fixed error `forming reference to reference` (issue #495)
+
+> ### BREAKING CHANGES :warning:
+>
+> | Old syntax                      | New syntax          |
+> |:--------------------------------|:--------------------|
+> | `double_with_n_digits(3.14, 2)` | `3.14`              |
+> | `float_with_n_digits(3.14, 2)`  | `3.14f`             |
+> | `obj.set("key", 3.14, 2)`       | `obj["key"] = 3.14` |
+> | `arr.add(3.14, 2)`              | `arr.add(3.14)`     |
+>
+> | Input     | Old output | New output |
+> |:----------|:-----------|:-----------|
+> | `3.14159` | `3.14`     | `3.14159`  |
+> | `42.0`    | `42.00`    | `42`       |
+> | `0.0`     | `0.00`     | `0`        |
+>
+> | Expression                     | Old result | New result |
+> |:-------------------------------|:-----------|:-----------|
+> | `JsonVariant(42).is<int>()`    | `true`     | `true`     |
+> | `JsonVariant(42).is<float>()`  | `false`    | `true`     |
+> | `JsonVariant(42).is<double>()` | `false`    | `true`     |
+
+v5.9.0
+------
+
+* Added `JsonArray::remove(iterator)` (issue #479)
+* Added `JsonObject::remove(iterator)`
+* Renamed `JsonArray::removeAt(size_t)` into `remove(size_t)`
+* Renamed folder `include/` to `src/`
+* Fixed warnings `floating constant exceeds range of float`and `floating constant truncated to zero` (issue #483)
+* Removed `Print` class and converted `printTo()` to a template method (issue #276)
+* Removed example `IndentedPrintExample.ino`
+* Now compatible with Particle 0.6.1, thanks to Jacob Nite (issue #294 and PR #461 by @foodbag)
+
+v5.8.4
+------
+
+* Added custom implementation of `strtod()` (issue #453)
+* Added custom implementation of `strtol()` (issue #465)
+* `char` is now treated as an integral type (issue #337, #370)
+
+v5.8.3
+------
+
+* Fixed an access violation in `DynamicJsonBuffer` when memory allocation fails (issue #433)
+* Added operators `==` and `!=` for two `JsonVariant`s (issue #436)
+* Fixed `JsonVariant::operator[const FlashStringHelper*]` (issue #441)
+
+v5.8.2
+------
+
+* Fixed parsing of comments (issue #421)
+* Fixed ignored `Stream` timeout (issue #422)
+* Made sure we don't read more that necessary (issue #422)
+* Fixed error when the key of a `JsonObject` is a `char[]` (issue #423)
+* Reduced code size when using `const` references
+* Fixed error with string of type `unsigned char*` (issue #428)
+* Added `deprecated` attribute on `asArray()`, `asObject()` and `asString()` (issue #420)
+
+v5.8.1
+------
+
+* Fixed error when assigning a `volatile int` to a `JsonVariant` (issue #415)
+* Fixed errors with Variable Length Arrays (issue #416)
+* Fixed error when both `ARDUINOJSON_ENABLE_STD_STREAM` and `ARDUINOJSON_ENABLE_ARDUINO_STREAM` are set to `1`
+* Fixed error "Stream does not name a type" (issue #412)
+
+v5.8.0
+------
+
+* Added operator `==` to compare `JsonVariant` and strings (issue #402)
+* Added support for `Stream` (issue #300)
+* Reduced memory consumption by not duplicating spaces and comments
+
+> ### BREAKING CHANGES :warning:
+>
+> `JsonBuffer::parseObject()` and  `JsonBuffer::parseArray()` have been pulled down to the derived classes `DynamicJsonBuffer` and `StaticJsonBufferBase`.
+>
+> This means that if you have code like:
+>
+> ```c++
+> void myFunction(JsonBuffer& jsonBuffer);
+> ```
+>
+> you need to replace it with one of the following:
+>
+> ```c++
+> void myFunction(DynamicJsonBuffer& jsonBuffer);
+> void myFunction(StaticJsonBufferBase& jsonBuffer);
+> template<typename TJsonBuffer> void myFunction(TJsonBuffer& jsonBuffer);
+> ```
+
+v5.7.3
+------
+
+* Added an `printTo(char[N])` and `prettyPrintTo(char[N])` (issue #292)
+* Added ability to set a nested value like this: `root["A"]["B"] = "C"` (issue #352)
+* Renamed `*.ipp` to `*Impl.hpp` because they were ignored by Arduino IDE (issue #396)
+
+v5.7.2
+------
+
+* Made PROGMEM available on more platforms (issue #381)
+* Fixed PROGMEM causing an exception on ESP8266 (issue #383)
+
+v5.7.1
+------
+
+* Added support for PROGMEM (issue #76)
+* Fixed compilation error when index is not an `int` (issue #381)
+
+v5.7.0
+------
+
+* Templatized all functions using `String` or `std::string`
+* Removed `ArduinoJson::String`
+* Removed `JsonVariant::defaultValue<T>()`
+* Removed non-template `JsonObject::get()` and `JsonArray.get()`
+* Fixed support for `StringSumHelper` (issue #184)
+* Replaced `ARDUINOJSON_USE_ARDUINO_STRING` by `ARDUINOJSON_ENABLE_STD_STRING` and `ARDUINOJSON_ENABLE_ARDUINO_STRING` (issue #378)
+* Added example `StringExample.ino` to show where `String` can be used
+* Increased default nesting limit to 50 when compiled for a computer (issue #349)
+
+> ### BREAKING CHANGES :warning:
+>
+> The non-template functions `JsonObject::get()` and `JsonArray.get()` have been removed. This means that you need to explicitely tell the type you expect in return.
+>
+> Old code:
+>
+> ```c++
+> #define ARDUINOJSON_USE_ARDUINO_STRING 0
+> JsonVariant value1 = myObject.get("myKey");
+> JsonVariant value2 = myArray.get(0);
+> ```
+>
+> New code:
+>
+> ```c++
+> #define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
+> #define ARDUINOJSON_ENABLE_STD_STRING 1
+> JsonVariant value1 = myObject.get<JsonVariant>("myKey");
+> JsonVariant value2 = myArray.get<JsonVariant>(0);
+> ```
+
+v5.6.7
+------
+
+* Fixed `array[idx].as<JsonVariant>()` and `object[key].as<JsonVariant>()`
+* Fixed return value of `JsonObject::set()` (issue #350)
+* Fixed undefined behavior in `Prettyfier` and `Print` (issue #354)
+* Fixed parser that incorrectly rejected floats containing a `+` (issue #349)
+
+v5.6.6
+------
+
+* Fixed `-Wparentheses` warning introduced in v5.6.5 (PR #335 by @nuket)
+* Added `.mbedignore` for ARM mbdeb (PR #334 by @nuket)
+* Fixed  `JsonVariant::success()` which didn't propagate `JsonArray::success()` nor `JsonObject::success()` (issue #342).
+
+v5.6.5
+------
+
+* `as<char*>()` now returns `true` when input is `null` (issue #330)
+
+v5.6.4
+------
+
+* Fixed error in float serialization (issue #324)
+
+v5.6.3
+------
+
+* Improved speed of float serialization (about twice faster)
+* Added `as<JsonArray>()` as a synonym for `as<JsonArray&>()`... (issue #291)
+* Fixed `call of overloaded isinf(double&) is ambiguous` (issue #284)
+
+v5.6.2
+------
+
+* Fixed build when another lib does `#undef isnan` (issue #284)
+
+v5.6.1
+------
+
+* Added missing `#pragma once` (issue #310)
+
+v5.6.0
+------
+
+* ArduinoJson is now a header-only library (issue #199)
+
+v5.5.1
+------
+
+* Fixed compilation error with Intel Galileo (issue #299)
+
+v5.5.0
+------
+
+* Added `JsonVariant::success()` (issue #279)
+* Renamed `JsonVariant::invalid<T>()` to `JsonVariant::defaultValue<T>()`
+
+v5.4.0
+------
+
+* Changed `::String` to `ArduinoJson::String` (issue #275)
+* Changed `::Print` to `ArduinoJson::Print` too
+
+v5.3.0
+------
+
+* Added custom implementation of `ftoa` (issues #266, #267, #269 and #270)
+* Added `JsonVariant JsonBuffer::parse()` (issue #265)
+* Fixed `unsigned long` printed as `signed long` (issue #170)
+
+v5.2.0
+------
+
+* Added `JsonVariant::as<char*>()` as a synonym for `JsonVariant::as<const char*>()` (issue #257)
+* Added example `JsonHttpClient` (issue #256)
+* Added `JsonArray::copyTo()` and `JsonArray::copyFrom()` (issue #254)
+* Added `RawJson()` to insert pregenerated JSON portions (issue #259)
+
+v5.1.1
+------
+
+* Removed `String` duplication when one replaces a value in a `JsonObject` (PR #232 by @ulion)
+
+v5.1.0
+------
+
+* Added support of `long long` (issue #171)
+* Moved all build settings to `ArduinoJson/Configuration.hpp`
+
+> ### BREAKING CHANGE :warning:
+>
+> If you defined `ARDUINOJSON_ENABLE_STD_STREAM`, you now need to define it to `1`.
+
+v5.0.8
+------
+
+* Made the library compatible with [PlatformIO](http://platformio.org/) (issue #181)
+* Fixed `JsonVariant::is<bool>()` that was incorrectly returning false (issue #214)
+
+v5.0.7
+------
+
+* Made library easier to use from a CMake project: simply `add_subdirectory(ArduinoJson/src)`
+* Changed `String` to be a `typedef` of `std::string` (issues #142 and #161)
+
+> ### BREAKING CHANGES :warning:
+>
+> - `JsonVariant(true).as<String>()` now returns `"true"` instead of `"1"`
+> - `JsonVariant(false).as<String>()` now returns `"false"` instead of `"0"`
+
+v5.0.6
+------
+
+* Added parameter to `DynamicJsonBuffer` constructor to set initial size (issue #152)
+* Fixed warning about library category in Arduino 1.6.6 (issue #147)
+* Examples: Added a loop to wait for serial port to be ready (issue #156)
+
+v5.0.5
+------
+
+* Added overload `JsonObjectSuscript::set(value, decimals)` (issue #143)
+* Use `float` instead of `double` to reduce the size of `JsonVariant` (issue #134)
+
+v5.0.4
+------
+
+* Fixed ambiguous overload with `JsonArraySubscript` and `JsonObjectSubscript` (issue #122)
+
+v5.0.3
+------
+
+* Fixed `printTo(String)` which wrote numbers instead of strings (issue #120)
+* Fixed return type of `JsonArray::is<T>()` and some others (issue #121)
+
+v5.0.2
+------
+
+* Fixed segmentation fault in `parseObject(String)` and `parseArray(String)`, when the
+  `StaticJsonBuffer` is too small to hold a copy of the string
+* Fixed Clang warning "register specifier is deprecated" (issue #102)
+* Fixed GCC warning "declaration shadows a member" (issue #103)
+* Fixed memory alignment, which made ESP8266 crash (issue #104)
+* Fixed compilation on Visual Studio 2010 and 2012 (issue #107)
+
+v5.0.1
+------
+
+* Fixed compilation with Arduino 1.0.6 (issue #99)
+
+v5.0.0
+------
+
+* Added support of `String` class (issues #55, #56, #70, #77)
+* Added `JsonBuffer::strdup()` to make a copy of a string (issues #10, #57)
+* Implicitly call `strdup()` for `String` but not for `char*` (issues #84, #87)
+* Added support of non standard JSON input (issue #44)
+* Added support of comments in JSON input (issue #88)
+* Added implicit cast between numerical types (issues #64, #69, #93)
+* Added ability to read number values as string (issue #90)
+* Redesigned `JsonVariant` to leverage converting constructors instead of assignment operators (issue #66)
+* Switched to new the library layout (requires Arduino 1.0.6 or above)
+
+> ### BREAKING CHANGES :warning:
+>
+> - `JsonObject::add()` was renamed to `set()`
+> - `JsonArray::at()` and `JsonObject::at()` were renamed to `get()`
+> - Number of digits of floating point value are now set with `double_with_n_digits()`
+
+**Personal note about the `String` class**:
+Support of the `String` class has been added to the library because many people use it in their programs.
+However, you should not see this as an invitation to use the `String` class.
+The `String` class is **bad** because it uses dynamic memory allocation.
+Compared to static allocation, it compiles to a bigger, slower program, and is less predictable.
+You certainly don't want that in an embedded environment!
diff --git a/third-party/ArduinoJson/CMakeLists.txt b/third-party/ArduinoJson/CMakeLists.txt
new file mode 100644
index 0000000..ef91e23
--- /dev/null
+++ b/third-party/ArduinoJson/CMakeLists.txt
@@ -0,0 +1,26 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+cmake_minimum_required(VERSION 3.3)
+
+if(ESP_PLATFORM)
+   # Build ArduinoJson as an ESP-IDF component
+   idf_component_register(INCLUDE_DIRS src)
+   target_compile_definitions(${COMPONENT_LIB} INTERFACE ARDUINOJSON_EMBEDDED_MODE=1)
+   return()
+endif()
+
+project(ArduinoJson VERSION 6.18.2)
+
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+    include(CTest)
+endif()
+
+add_subdirectory(src)
+
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+	include(extras/CompileOptions.cmake)
+	add_subdirectory(extras/tests)
+	add_subdirectory(extras/fuzzing)
+endif()
diff --git a/third-party/ArduinoJson/CONTRIBUTING.md b/third-party/ArduinoJson/CONTRIBUTING.md
new file mode 100644
index 0000000..d32a04f
--- /dev/null
+++ b/third-party/ArduinoJson/CONTRIBUTING.md
@@ -0,0 +1,10 @@
+# Contribution to ArduinoJson
+
+First, thank you for taking the time to contribute to this project.
+
+You can submit changes via GitHub Pull Requests.
+
+Please:
+
+1. Update the test suite for any change of behavior
+2. Use clang-format in "file" mode to format the code
diff --git a/third-party/ArduinoJson/LICENSE.md b/third-party/ArduinoJson/LICENSE.md
new file mode 100644
index 0000000..901bbb1
--- /dev/null
+++ b/third-party/ArduinoJson/LICENSE.md
@@ -0,0 +1,10 @@
+The MIT License (MIT)
+---------------------
+
+Copyright © 2014-2021 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:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/third-party/ArduinoJson/README.md b/third-party/ArduinoJson/README.md
new file mode 100644
index 0000000..319469b
--- /dev/null
+++ b/third-party/ArduinoJson/README.md
@@ -0,0 +1,144 @@
+![ArduinoJson](banner.svg)
+
+---
+
+[![arduino-library-badge](https://www.ardu-badge.com/badge/ArduinoJson.svg?version=6.18.2)](https://www.ardu-badge.com/ArduinoJson/6.18.2)
+[![Continuous Integration](https://github.com/bblanchon/ArduinoJson/workflows/Continuous%20Integration/badge.svg?branch=6.x)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A6.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)
+[![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)
+[![Coverage Status](https://coveralls.io/repos/github/bblanchon/ArduinoJson/badge.svg?branch=6.x)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)
+[![GitHub stars](https://img.shields.io/github/stars/bblanchon/ArduinoJson?style=flat)](https://github.com/bblanchon/ArduinoJson/stargazers)
+
+ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
+
+## Features
+
+* [JSON deserialization](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme)
+    * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v6/api/config/decode_unicode/?utm_source=github&utm_medium=readme)
+    * [Optionally stores links to the input buffer (zero-copy)](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme)
+    * [Optionally supports comments in the input](https://arduinojson.org/v6/api/config/enable_comments/?utm_source=github&utm_medium=readme)
+    * [Optionally filters the input to keep only desired values](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme#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/?utm_source=github&utm_medium=readme)
+    * [Can write to a buffer or a stream](https://arduinojson.org/v6/api/json/serializejson/?utm_source=github&utm_medium=readme)
+    * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v6/api/json/serializejsonpretty/?utm_source=github&utm_medium=readme)
+* [MessagePack serialization](https://arduinojson.org/v6/api/msgpack/serializemsgpack/?utm_source=github&utm_medium=readme)
+* [MessagePack deserialization](https://arduinojson.org/v6/api/msgpack/deserializemsgpack/?utm_source=github&utm_medium=readme)
+* Efficient
+    * [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/?utm_source=github&utm_medium=readme)
+    * [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/?utm_source=github&utm_medium=readme)
+    * [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/?utm_source=github&utm_medium=readme)
+    * [Fixed memory allocation, no heap fragmentation](https://arduinojson.org/v6/api/jsondocument/?utm_source=github&utm_medium=readme)
+    * [Optionally works without heap memory (zero malloc)](https://arduinojson.org/v6/api/staticjsondocument/?utm_source=github&utm_medium=readme)
+    * Deduplicates strings
+* Versatile
+    * Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v6/how-to/use-external-ram-on-esp32/?utm_source=github&utm_medium=readme)
+    * Supports [`String`](https://arduinojson.org/v6/api/config/enable_arduino_string/?utm_source=github&utm_medium=readme), [`std::string`](https://arduinojson.org/v6/api/config/enable_std_string/?utm_source=github&utm_medium=readme) and [`std::string_view`](https://arduinojson.org/v6/api/config/enable_string_view/?utm_source=github&utm_medium=readme)
+    * Supports [`Stream`](https://arduinojson.org/v6/api/config/enable_arduino_stream/?utm_source=github&utm_medium=readme) and [`std::istream`/`std::ostream`](https://arduinojson.org/v6/api/config/enable_std_stream/?utm_source=github&utm_medium=readme)
+    * Supports [Flash strings](https://arduinojson.org/v6/api/config/enable_progmem/?utm_source=github&utm_medium=readme)
+    * Supports [custom readers](https://arduinojson.org/v6/api/json/deserializejson/?utm_source=github&utm_medium=readme#custom-reader) and [custom writers](https://arduinojson.org/v6/api/json/serializejson/?utm_source=github&utm_medium=readme#custom-writer)
+    * Supports [custom converters](https://arduinojson.org/news/2021/05/04/version-6-18-0/?utm_source=github&utm_medium=readme)
+* Portable
+    * Usable on any C++ project (not limited to Arduino)
+    * Compatible with C++98, C++11, C++14 and C++17
+    * Zero warnings with `-Wall -Wextra -pedantic` and `/W4`
+    * [Header-only library](https://en.wikipedia.org/wiki/Header-only)
+    * Works with virtually any board
+        * Arduino boards: [Uno](https://amzn.to/38aL2ik), [Due](https://amzn.to/36YkWi2), [Micro](https://amzn.to/35WkdwG), [Nano](https://amzn.to/2QTvwRX), [Mega](https://amzn.to/36XWhuf), [Yun](https://amzn.to/30odURc), [Leonardo](https://amzn.to/36XWjlR)...
+        * Espressif chips: [ESP8266](https://amzn.to/36YluV8), [ESP32](https://amzn.to/2G4pRCB)
+        * Lolin (WeMos) boards: [D1 mini](https://amzn.to/2QUpz7q), [D1 Mini Pro](https://amzn.to/36UsGSs)...
+        * Teensy boards: [4.0](https://amzn.to/30ljXGq), [3.2](https://amzn.to/2FT0EuC), [2.0](https://amzn.to/2QXUMXj) 
+        * Particle boards: [Argon](https://amzn.to/2FQHa9X), [Boron](https://amzn.to/36WgLUd), [Electron](https://amzn.to/30vEc4k), [Photon](https://amzn.to/387F9Cd)...
+        * Texas Instruments boards: [MSP430](https://amzn.to/30nJWgg)...
+    * Tested on all major development environments
+        * [Arduino IDE](https://www.arduino.cc/en/Main/Software)
+        * [Atmel Studio](http://www.atmel.com/microsite/atmel-studio/)
+        * [Atollic TrueSTUDIO](https://atollic.com/truestudio/)
+        * [Energia](http://energia.nu/)
+        * [IAR Embedded Workbench](https://www.iar.com/iar-embedded-workbench/)
+        * [Keil uVision](http://www.keil.com/)
+        * [MPLAB X IDE](http://www.microchip.com/mplab/mplab-x-ide)
+        * [Particle](https://www.particle.io/)
+        * [PlatformIO](http://platformio.org/)
+        * [Sloeber plugin for Eclipse](https://eclipse.baeyens.it/)
+        * [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/?utm_source=github&utm_medium=readme)
+* Well designed
+    * [Elegant API](http://arduinojson.org/v6/example/?utm_source=github&utm_medium=readme)
+    * [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/?utm_source=github&utm_medium=readme)
+    * [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming)
+    * Handles [integer overflows](https://arduinojson.org/v6/api/jsonvariant/as/?utm_source=github&utm_medium=readme#integer-overflows)
+* Well tested
+    * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)
+    * Continuously tested on
+        * [Visual Studio 2010, 2012, 2013, 2015, 2017, 2019](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
+        * [GCC 4.4, 4.6, 4.7, 4.8, 4.9, 5, 6, 7, 8, 9, 10](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
+        * [Clang 3.5, 3.6, 3.7, 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)
+    * [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/?utm_source=github&utm_medium=readme)
+    * [Examples](https://arduinojson.org/v6/example/?utm_source=github&utm_medium=readme)
+    * [How-tos](https://arduinojson.org/v6/example/?utm_source=github&utm_medium=readme)
+    * [FAQ](https://arduinojson.org/v6/faq/?utm_source=github&utm_medium=readme)
+    * [Troubleshooter](https://arduinojson.org/v6/troubleshooter/?utm_source=github&utm_medium=readme)
+    * [Book](https://arduinojson.org/book/?utm_source=github&utm_medium=readme)
+    * [Changelog](CHANGELOG.md)
+* Vibrant user community
+    * Most popular of all Arduino libraries on [GitHub](https://github.com/search?o=desc&q=arduino+library&s=stars&type=Repositories)
+    * [Used in hundreds of projects](https://www.hackster.io/search?i=projects&q=arduinojson)
+    * [Responsive support](https://github.com/bblanchon/ArduinoJson/issues?q=is%3Aissue+is%3Aclosed)
+
+## Quickstart
+
+### Deserialization
+
+Here is a program that parses a JSON document with ArduinoJson.
+
+```c++
+char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
+
+DynamicJsonDocument doc(1024);
+deserializeJson(doc, json);
+
+const char* sensor = doc["sensor"];
+long time          = doc["time"];
+double latitude    = doc["data"][0];
+double longitude   = doc["data"][1];
+```
+
+See the [tutorial on arduinojson.org](https://arduinojson.org/doc/decoding/?utm_source=github&utm_medium=readme)
+
+### Serialization
+
+Here is a program that generates a JSON document with ArduinoJson:
+
+```c++
+DynamicJsonDocument doc(1024);
+
+doc["sensor"] = "gps";
+doc["time"]   = 1351824120;
+doc["data"][0] = 48.756080;
+doc["data"][1] = 2.302038;
+
+serializeJson(doc, Serial);
+// This prints:
+// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
+```
+
+See the [tutorial on arduinojson.org](https://arduinojson.org/doc/encoding/?utm_source=github&utm_medium=readme)
+
+## Support the project ❤️
+
+Do you like this library?  
+Please [star this project on GitHub](https://github.com/bblanchon/ArduinoJson/stargazers)!
+
+What? You don't like it but you *love* it?  
+You can support the project by [purchasing my book](https://arduinojson.org/book/?utm_source=github&utm_medium=readme).
+Alternatively, you can make a recurring donation via [GitHub Sponsors](https://github.com/sponsors/bblanchon).  
diff --git a/third-party/ArduinoJson/SUPPORT.md b/third-party/ArduinoJson/SUPPORT.md
new file mode 100644
index 0000000..c47e1b1
--- /dev/null
+++ b/third-party/ArduinoJson/SUPPORT.md
@@ -0,0 +1,27 @@
+# ArduinoJson Support
+
+First off, thank you very much for using ArduinoJson.
+
+We'll be very happy to help you, but first please read the following.
+
+## Before asking for help
+
+1. Read the [FAQ](https://arduinojson.org/faq/?utm_source=github&utm_medium=support)
+2. Search in the [API Reference](https://arduinojson.org/api/?utm_source=github&utm_medium=support)
+
+If you did not find the answer, please create a [new issue on GitHub](https://github.com/bblanchon/ArduinoJson/issues/new).
+
+It is OK to add a comment to a currently opened issue, but please avoid adding comments to a closed issue.
+
+## Before hitting the Submit button
+
+Please provide all the relevant information:
+
+* Good title
+* Short description of the problem
+* Target platform
+* Compiler model and version
+* [MVCE](https://stackoverflow.com/help/mcve)
+* Compiler output
+
+Good questions get fast answers!
diff --git a/third-party/ArduinoJson/appveyor.yml b/third-party/ArduinoJson/appveyor.yml
new file mode 100644
index 0000000..6ff755a
--- /dev/null
+++ b/third-party/ArduinoJson/appveyor.yml
@@ -0,0 +1,22 @@
+version: 6.18.2.{build}
+environment:
+  matrix:
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    CMAKE_GENERATOR: Visual Studio 16 2019
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    CMAKE_GENERATOR: Visual Studio 15 2017
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    CMAKE_GENERATOR: Visual Studio 14 2015
+  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+    CMAKE_GENERATOR: Visual Studio 12 2013
+  - CMAKE_GENERATOR: Visual Studio 11 2012
+  - CMAKE_GENERATOR: Visual Studio 10 2010
+  - CMAKE_GENERATOR: MinGW Makefiles
+configuration: Debug
+before_build:
+- set PATH=C:\MinGW\bin;%PATH:C:\Program Files\Git\usr\bin;=% # Workaround for CMake not wanting sh.exe on PATH for MinGW
+- cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -G "%CMAKE_GENERATOR%" .
+build_script:
+- cmake --build . --config %CONFIGURATION%
+test_script:
+- ctest -C %CONFIGURATION% --output-on-failure .
diff --git a/third-party/ArduinoJson/banner.svg b/third-party/ArduinoJson/banner.svg
new file mode 100644
index 0000000..5176096
--- /dev/null
+++ b/third-party/ArduinoJson/banner.svg
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1001"
+   height="250"
+   viewBox="0 0 264.84791 66.145837"
+   version="1.1"
+   id="svg8"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="logo.svg">
+  <defs
+     id="defs2">
+    <clipPath
+       id="clipPath831"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path829"
+         d="M 0,638 H 1000 V 0 H 0 Z" />
+    </clipPath>
+    <clipPath
+       id="clipPath839"
+       clipPathUnits="userSpaceOnUse">
+      <path
+         inkscape:connector-curvature="0"
+         id="path837"
+         d="M 0,638 H 1000 V 0 H 0 Z" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="399.91304"
+     inkscape:cy="242.52487"
+     inkscape:document-units="mm"
+     inkscape:current-layer="g823"
+     showgrid="false"
+     fit-margin-top="5"
+     fit-margin-bottom="5"
+     fit-margin-right="5"
+     fit-margin-left="5"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1.2883269,-86.047553)">
+    <g
+       transform="matrix(0.35277777,0,0,-0.35277777,-137.80575,256.55859)"
+       inkscape:label="logo (2)"
+       id="g823">
+      <g
+         id="g825"
+         transform="matrix(0.44331091,0,0,0.44331091,559.35527,248.127)">
+        <g
+           clip-path="url(#clipPath831)"
+           id="g827">
+          <g
+             transform="translate(246.9092,120.1406)"
+             id="g847">
+            <path
+               inkscape:connector-curvature="0"
+               id="path849"
+               style="fill:#00868e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 20.015,58.057 H 39.896 L 59.909,0 H 44.138 L 41.22,10.34 H 18.82 L 15.772,0 Z m 22.135,21.605 h 15.771 l -5.83,19.219 c -0.265,0.53 -0.53,1.457 -0.797,2.787 -0.398,1.323 -0.795,3.043 -1.192,5.034 -0.398,-1.461 -0.662,-2.784 -1.062,-4.11 -0.397,-1.322 -0.662,-2.519 -1.059,-3.711 z" />
+          </g>
+          <g
+             transform="translate(311.457,120.1406)"
+             id="g851">
+            <path
+               inkscape:connector-curvature="0"
+               id="path853"
+               style="fill:#00868e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 v 40.029 h 13.387 v -9.41 c 1.326,3.447 3.182,5.965 5.566,7.69 2.387,1.72 5.304,2.648 8.616,2.648 0.661,0 1.192,-0.133 1.723,-0.133 0.53,0 1.192,-0.135 1.722,-0.135 L 29.689,27.836 c -0.928,0.266 -1.723,0.533 -2.517,0.664 -0.795,0.133 -1.592,0.133 -2.386,0.133 -3.446,0 -6.098,-1.065 -7.953,-3.182 C 14.978,23.332 14.05,20.414 14.05,16.568 V 0 Z" />
+          </g>
+          <g
+             transform="translate(390.7183,181.6387)"
+             id="g855">
+            <path
+               inkscape:connector-curvature="0"
+               id="path857"
+               style="fill:#00868e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 v -61.498 h -12.989 v 6.494 c -1.724,-2.648 -3.844,-4.769 -5.966,-6.096 -2.253,-1.322 -4.771,-1.984 -7.554,-1.984 -5.567,0 -10.073,1.984 -13.387,5.83 -3.314,3.977 -5.036,9.147 -5.036,15.772 0,6.359 1.722,11.531 5.036,15.375 3.314,3.976 7.556,5.962 12.856,5.962 3.446,0 6.229,-0.664 8.35,-1.853 2.121,-1.191 3.977,-3.314 5.701,-6.098 -0.265,0.928 -0.265,1.989 -0.397,3.182 -0.135,1.193 -0.135,2.519 -0.135,3.975 V 0 Z m -12.459,-41.482 c 0,3.05 -0.795,5.566 -2.519,7.287 -1.591,1.859 -3.845,2.787 -6.76,2.787 -2.783,0 -5.036,-0.928 -6.761,-2.787 -1.588,-1.721 -2.385,-4.237 -2.385,-7.287 0,-3.182 0.797,-5.698 2.385,-7.426 1.725,-1.852 3.978,-2.647 6.761,-2.647 2.915,0 5.169,0.795 6.76,2.647 1.724,1.859 2.519,4.244 2.519,7.426" />
+          </g>
+          <g
+             transform="translate(442.2769,160.1699)"
+             id="g859">
+            <path
+               inkscape:connector-curvature="0"
+               id="path861"
+               style="fill:#00868e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 v -20.412 c 0,-4.506 -0.265,-7.953 -1.061,-10.072 -0.663,-2.254 -1.989,-4.11 -3.71,-5.83 -1.724,-1.727 -3.978,-3.051 -6.496,-3.979 -2.65,-0.793 -5.831,-1.322 -9.41,-1.322 -3.578,0 -6.626,0.529 -9.277,1.322 -2.651,0.928 -4.771,2.252 -6.628,3.979 -1.724,1.587 -3.048,3.576 -3.712,5.83 -0.663,2.119 -1.06,5.566 -1.06,10.072 V 0 h 13.519 v -21.336 c 0,-3.316 0.532,-5.836 1.591,-7.293 1.195,-1.457 2.916,-2.252 5.434,-2.252 2.518,0 4.375,0.795 5.435,2.252 1.06,1.457 1.59,3.842 1.59,7.293 V 0 Z" />
+          </g>
+          <path
+             inkscape:connector-curvature="0"
+             id="path863"
+             style="fill:#00868e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 452.88,160.17 h 14.05 v -40.029 h -14.05 z m -0.795,12.461 c 0,2.119 0.795,3.974 2.386,5.435 1.457,1.588 3.313,2.25 5.434,2.25 2.254,0 4.108,-0.662 5.567,-2.119 1.458,-1.592 2.254,-3.316 2.254,-5.566 0,-2.123 -0.796,-3.977 -2.254,-5.57 -1.592,-1.457 -3.447,-2.25 -5.567,-2.25 -2.121,0 -3.977,0.793 -5.434,2.25 -1.591,1.593 -2.386,3.447 -2.386,5.57" />
+          <g
+             transform="translate(477.7983,120.1406)"
+             id="g865">
+            <path
+               inkscape:connector-curvature="0"
+               id="path867"
+               style="fill:#00868e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 v 40.029 h 12.856 v -8.088 c 1.988,3.186 4.109,5.567 6.496,7.163 2.517,1.455 5.434,2.25 8.881,2.25 2.648,0 4.904,-0.53 6.891,-1.325 1.99,-0.795 3.712,-1.984 4.903,-3.58 1.059,-1.322 1.854,-2.912 2.256,-4.902 0.529,-1.986 0.662,-4.774 0.662,-8.613 V 0 h -14.05 v 21.473 c 0,3.181 -0.53,5.433 -1.59,6.896 -1.062,1.455 -2.651,2.25 -5.035,2.25 -2.918,0 -5.04,-1.058 -6.365,-3.316 C 14.58,25.184 13.918,21.605 13.918,16.834 V 0 Z" />
+          </g>
+          <g
+             transform="translate(573.2275,140.0254)"
+             id="g869">
+            <path
+               inkscape:connector-curvature="0"
+               id="path871"
+               style="fill:#00868e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c 0,-2.918 -0.529,-5.566 -1.721,-8.221 -1.059,-2.515 -2.653,-4.904 -4.905,-6.89 -2.118,-2.125 -4.507,-3.711 -7.287,-4.774 -2.653,-1.056 -5.439,-1.586 -8.484,-1.586 -3.05,0 -5.963,0.53 -8.617,1.586 -2.653,1.063 -5.037,2.649 -7.155,4.774 -2.124,1.986 -3.845,4.242 -4.904,6.89 -1.064,2.522 -1.594,5.303 -1.594,8.221 0,2.918 0.53,5.697 1.594,8.35 1.059,2.515 2.648,4.904 4.904,6.892 1.986,2.117 4.37,3.578 7.155,4.639 2.654,1.058 5.567,1.588 8.617,1.588 3.045,0 5.962,-0.53 8.612,-1.588 2.652,-1.061 5.041,-2.522 7.159,-4.639 2.252,-2.119 3.846,-4.377 4.905,-7.025 C -0.529,5.697 0,2.918 0,0 m -14.05,0 c 0,3.049 -0.795,5.299 -2.252,7.021 -1.457,1.727 -3.579,2.655 -6.095,2.655 -2.654,0 -4.639,-0.928 -6.096,-2.655 -1.461,-1.722 -2.256,-3.972 -2.256,-7.021 0,-2.918 0.795,-5.303 2.256,-7.027 1.457,-1.725 3.442,-2.518 6.096,-2.518 2.516,0 4.638,0.793 6.095,2.518 1.457,1.724 2.252,4.109 2.252,7.027" />
+          </g>
+          <g
+             transform="translate(593.7715,178.1973)"
+             id="g873">
+            <path
+               inkscape:connector-curvature="0"
+               id="path875"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 h 15.776 v -37.643 c 0,-4.109 -0.264,-7.287 -0.799,-9.545 -0.53,-2.117 -1.457,-4.109 -2.649,-5.832 -1.589,-2.115 -3.58,-3.843 -5.964,-4.902 -2.387,-1.191 -4.903,-1.721 -7.821,-1.721 -3.712,0 -7.022,0.793 -9.808,2.383 -2.914,1.588 -5.301,3.846 -7.289,6.889 l 9.676,8.75 c 0.133,-1.723 0.796,-3.045 1.589,-3.977 0.928,-0.927 1.987,-1.326 3.316,-1.326 1.456,0 2.516,0.797 3.178,2.524 0.529,1.586 0.795,5.83 0.795,12.455 z" />
+          </g>
+          <g
+             transform="translate(616.4375,123.457)"
+             id="g877">
+            <path
+               inkscape:connector-curvature="0"
+               id="path879"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 3.051,10.734 C 5.036,9.01 7.288,7.553 9.809,6.627 c 2.519,-0.928 4.903,-1.459 7.424,-1.459 1.854,0 3.178,0.268 4.105,0.928 0.933,0.531 1.329,1.326 1.329,2.384 0,1.86 -1.858,3.182 -5.571,3.979 -1.192,0.264 -2.251,0.529 -2.913,0.793 -4.242,1.191 -7.292,2.652 -9.279,4.639 -1.853,1.859 -2.786,4.244 -2.786,7.293 0,3.839 1.462,7.021 4.375,9.277 2.917,2.385 6.895,3.576 11.8,3.576 2.648,0 5.168,-0.396 7.816,-0.928 2.654,-0.66 5.434,-1.588 8.22,-2.785 l -2.918,-9.67 c -1.853,1.192 -3.841,2.25 -5.698,2.912 -1.986,0.664 -3.846,0.928 -5.831,0.928 -1.589,0 -2.786,-0.264 -3.713,-0.793 -0.794,-0.533 -1.192,-1.193 -1.192,-2.119 0,-1.463 1.855,-2.654 5.566,-3.582 0.928,-0.264 1.457,-0.396 1.859,-0.529 4.904,-1.455 8.348,-3.051 10.205,-4.903 1.987,-1.988 2.914,-4.507 2.914,-7.691 0,-4.104 -1.589,-7.42 -4.771,-9.939 -3.047,-2.518 -7.289,-3.84 -12.457,-3.84 -3.448,0 -6.763,0.396 -9.809,1.191 C 5.566,-2.918 2.653,-1.592 0,0" />
+          </g>
+          <g
+             transform="translate(701.9268,140.0254)"
+             id="g881">
+            <path
+               inkscape:connector-curvature="0"
+               id="path883"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c 0,-2.918 -0.53,-5.566 -1.723,-8.221 -1.057,-2.515 -2.651,-4.904 -4.77,-6.89 -2.252,-2.125 -4.64,-3.711 -7.288,-4.774 -2.785,-1.056 -5.571,-1.586 -8.616,-1.586 -3.051,0 -5.964,0.53 -8.618,1.586 -2.647,1.063 -5.036,2.649 -7.155,4.774 -2.123,1.986 -3.712,4.242 -4.903,6.89 -1.065,2.522 -1.594,5.303 -1.594,8.221 0,2.918 0.529,5.697 1.594,8.35 1.191,2.515 2.78,4.904 4.903,6.892 2.119,2.117 4.508,3.578 7.155,4.639 2.654,1.058 5.567,1.588 8.618,1.588 3.177,0 5.962,-0.53 8.616,-1.588 C -11,18.82 -8.612,17.359 -6.493,15.242 -4.374,13.123 -2.78,10.865 -1.589,8.217 -0.53,5.697 0,2.918 0,0 m -14.05,0 c 0,3.049 -0.663,5.299 -2.252,7.021 -1.457,1.727 -3.447,2.655 -6.095,2.655 -2.521,0 -4.64,-0.928 -6.097,-2.655 -1.461,-1.722 -2.255,-3.972 -2.255,-7.021 0,-2.918 0.794,-5.303 2.255,-7.027 1.457,-1.725 3.576,-2.518 6.097,-2.518 2.648,0 4.638,0.793 6.095,2.518 1.589,1.724 2.252,4.109 2.252,7.027" />
+          </g>
+          <g
+             transform="translate(710.0127,120.1406)"
+             id="g885">
+            <path
+               inkscape:connector-curvature="0"
+               id="path887"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 v 40.029 h 12.992 v -8.088 c 1.854,3.186 3.973,5.567 6.492,7.163 2.516,1.455 5.434,2.25 8.882,2.25 2.516,0 4.904,-0.53 6.89,-1.325 1.986,-0.795 3.58,-1.984 4.904,-3.58 1.06,-1.322 1.854,-2.912 2.257,-4.902 0.396,-1.986 0.661,-4.774 0.661,-8.613 V 0 h -14.05 v 21.473 c 0,3.181 -0.529,5.433 -1.589,6.896 -1.064,1.455 -2.786,2.25 -5.042,2.25 -2.913,0 -5.036,-1.058 -6.492,-3.316 -1.324,-2.119 -1.987,-5.698 -1.987,-10.469 L 13.918,0 Z" />
+          </g>
+          <g
+             transform="translate(703.3916,417.1084)"
+             id="g889">
+            <path
+               inkscape:connector-curvature="0"
+               id="path891"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 -8.81,-3.271 c 5.363,-15.116 8.291,-31.384 8.291,-48.338 0,-4.616 -0.226,-9.177 -0.648,-13.683 l 9.375,-0.627 c 0.434,4.712 0.667,9.484 0.667,14.31 C 8.875,-33.505 5.739,-16.134 0,0" />
+          </g>
+          <g
+             transform="translate(558.3203,220.9473)"
+             id="g893">
+            <path
+               inkscape:connector-curvature="0"
+               id="path895"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c -15.705,0 -30.819,2.516 -44.978,7.146 -3.751,-1.978 -7.583,-3.82 -11.51,-5.49 -0.144,-0.06 -0.29,-0.117 -0.434,-0.177 C -39.313,-5.533 -20.108,-9.395 0,-9.395 c 48.132,0 91.098,22.094 119.328,56.688 l -8.571,4.381 C 84.24,20.088 44.469,0 0,0" />
+          </g>
+          <g
+             transform="translate(441.6821,219.5352)"
+             id="g897">
+            <path
+               inkscape:connector-curvature="0"
+               id="path899"
+               style="fill:#e47128;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 C -21.463,0 -41.833,4.674 -60.154,13.053 L -64.849,5.168 C -45.139,-4.002 -23.17,-9.131 0,-9.131 c 21.177,0 41.352,4.283 59.716,12.022 C 55.719,4.482 51.807,6.24 47.983,8.148 32.965,2.875 16.819,0 0,0" />
+          </g>
+          <g
+             transform="translate(552.4727,271.1309)"
+             id="g901">
+            <path
+               inkscape:connector-curvature="0"
+               id="path903"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 C 0.009,0 0.017,-0.004 0.023,-0.004 0.017,-0.004 0.009,0 0,0" />
+          </g>
+          <g
+             transform="translate(554.5205,271.0293)"
+             id="g905">
+            <path
+               inkscape:connector-curvature="0"
+               id="path907"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 C 1.26,-0.057 2.524,-0.098 3.8,-0.098 5.079,-0.098 6.349,-0.057 7.614,0 6.347,-0.051 5.076,-0.096 3.796,-0.096 2.523,-0.096 1.262,-0.051 0,0" />
+          </g>
+          <g
+             transform="translate(554.3145,459.9658)"
+             id="g909">
+            <path
+               inkscape:connector-curvature="0"
+               id="path911"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 C 1.311,0.054 2.624,0.099 3.947,0.1 2.624,0.099 1.31,0.062 0,0" />
+          </g>
+          <g
+             transform="translate(550.6484,459.731)"
+             id="g913">
+            <path
+               inkscape:connector-curvature="0"
+               id="path915"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 V 0 C 0.003,0 0.004,0 0.006,0 0.004,0 0.003,0 0,0" />
+          </g>
+          <g
+             transform="translate(564.1133,271.125)"
+             id="g917">
+            <path
+               inkscape:connector-curvature="0"
+               id="path919"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 C 0.021,0.002 0.04,0.002 0.061,0.006 H 0.062 C 0.041,0.006 0.021,0.002 0,0" />
+          </g>
+          <g
+             transform="translate(562.3379,459.9663)"
+             id="g921">
+            <path
+               inkscape:connector-curvature="0"
+               id="path923"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 C -1.334,0.056 -2.67,0.101 -4.018,0.101 H -4.02 c 1.349,0 2.686,-0.046 4.021,-0.102 C 0,0 0,0 0,0" />
+          </g>
+          <g
+             transform="translate(595.6299,364.3545)"
+             id="g925">
+            <path
+               inkscape:connector-curvature="0"
+               id="path927"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c 0,33.746 -10.866,64.951 -29.28,90.321 -2.649,0.236 -5.324,0.377 -8.033,0.377 -1.23,0 -2.45,-0.044 -3.667,-0.093 C -21.057,65.797 -9.131,34.293 -9.131,0 c 0,-33.273 -11.235,-63.909 -30.102,-88.358 0.64,-0.014 1.276,-0.049 1.92,-0.049 3.298,0 6.55,0.191 9.755,0.539 C -10.197,-62.95 0,-32.672 0,0" />
+          </g>
+          <g
+             transform="translate(672.6201,365.4995)"
+             id="g929">
+            <path
+               inkscape:connector-curvature="0"
+               id="path931"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c 0,63.125 -51.175,114.299 -114.3,114.299 -4.692,0 -9.316,-0.289 -13.861,-0.839 -3.962,-0.48 -7.86,-1.156 -11.687,-2.03 3.089,-2.502 6.077,-5.122 8.947,-7.866 3.831,0.61 7.731,1.013 11.688,1.195 1.629,0.076 3.266,0.119 4.913,0.119 57.922,0 104.878,-46.956 104.878,-104.878 0,-3.787 -0.206,-7.525 -0.597,-11.208 l 9.292,-1.675 C -0.253,-8.653 0,-4.357 0,0" />
+          </g>
+          <g
+             transform="translate(383.3794,235.6973)"
+             id="g933">
+            <path
+               inkscape:connector-curvature="0"
+               id="path935"
+               style="fill:#62aeb2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 2.881,4.838 c -47.274,21.193 -80.206,68.66 -80.206,123.819 0,8.489 0.321,14.111 1.814,22.167 l -18.228,2.079 c -1.249,-7.899 -1.907,-15.995 -1.907,-24.246 0,-61.852 36.484,-115.178 89.1,-139.651 l 4.695,7.885 z" />
+          </g>
+          <g
+             transform="translate(475.9927,495.5977)"
+             id="g937">
+            <path
+               inkscape:connector-curvature="0"
+               id="path939"
+               style="fill:#62aeb2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c 4.099,-1.069 8.124,-2.323 12.062,-3.756 2.162,1.206 4.357,2.358 6.585,3.453 1.45,0.713 2.909,1.406 4.384,2.071 3.797,1.711 7.685,3.255 11.648,4.638 14.921,5.208 30.952,8.047 47.649,8.047 50.216,0 94.445,-25.61 120.356,-64.478 l 7.703,5.385 C 182.777,-3.349 135.73,23.848 82.328,23.848 61.15,23.848 40.972,19.57 22.608,11.833 18.644,10.163 14.768,8.325 10.98,6.34 9.503,5.566 8.039,4.77 6.59,3.949 -6.357,7.861 -20.087,9.974 -34.311,9.974 c -3.094,0 -6.163,-0.111 -9.207,-0.307 l -0.323,-5.623 c 3.149,0.219 6.326,0.339 9.53,0.339 C -22.457,4.383 -10.959,2.857 0,0" />
+          </g>
+          <g
+             transform="translate(342.8081,347.3779)"
+             id="g941">
+            <path
+               inkscape:connector-curvature="0"
+               id="path943"
+               style="fill:#62aeb2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 4.169,2.559 c -0.711,4.703 -1.083,9.516 -1.083,14.418 0,51.248 40.26,93.047 90.872,95.611 1.237,1.59 2.509,3.154 3.806,4.693 1.986,2.356 4.035,4.656 6.155,6.887 -1.673,0.08 -3.352,0.136 -5.045,0.136 -59.276,0 -107.328,-48.053 -107.328,-107.327 0,-57.863 45.79,-105.023 103.111,-107.238 l -5.896,7.424 C 43.744,-78.327 7.513,-44.065 0,0" />
+          </g>
+          <g
+             transform="translate(454.5591,264.8711)"
+             id="g945">
+            <path
+               inkscape:connector-curvature="0"
+               id="path947"
+               style="fill:#62aeb2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c -1.312,1.354 -2.598,2.729 -3.857,4.131 -5.416,6.037 -10.324,12.535 -14.674,19.422 l -10.18,-1.379 c 3.833,-6.455 8.123,-12.606 12.825,-18.408 1.262,-1.559 2.553,-3.09 3.872,-4.596 2.034,-2.32 4.137,-4.578 6.305,-6.772 2.299,-2.324 4.68,-4.566 7.121,-6.742 l 10.99,2.959 C 10.322,-9.689 8.29,-7.939 6.311,-6.131 4.144,-4.154 2.042,-2.105 0,0" />
+          </g>
+          <g
+             transform="translate(420.0469,407.7637)"
+             id="g949">
+            <path
+               inkscape:connector-curvature="0"
+               id="path951"
+               style="fill:#62aeb2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 -9.694,0.332 c -3.889,-13.529 -5.979,-27.818 -5.979,-42.596 0,-20.788 4.126,-40.609 11.596,-58.699 H 6.143 C -1.84,-83.025 -6.279,-63.164 -6.279,-42.264 -6.279,-27.56 -4.082,-13.369 0,0" />
+          </g>
+          <g
+             transform="translate(458.4263,365.4995)"
+             id="g953">
+            <path
+               inkscape:connector-curvature="0"
+               id="path955"
+               style="fill:#62aeb2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c 0,-17.657 4.593,-34.231 12.636,-48.619 l 4.824,2.261 c -0.085,0.15 -0.164,0.305 -0.247,0.456 -0.309,0.553 -0.611,1.11 -0.909,1.671 -0.37,0.698 -0.728,1.404 -1.082,2.114 -0.377,0.757 -0.743,1.519 -1.101,2.286 -0.322,0.692 -0.638,1.387 -0.944,2.088 -0.239,0.55 -0.476,1.1 -0.706,1.654 -0.434,1.049 -0.854,2.106 -1.251,3.173 -0.178,0.479 -0.342,0.965 -0.512,1.449 -0.281,0.795 -0.552,1.595 -0.813,2.401 -0.16,0.498 -0.323,0.994 -0.476,1.496 -0.35,1.149 -0.68,2.307 -0.986,3.474 -0.119,0.448 -0.225,0.9 -0.337,1.351 -0.232,0.939 -0.45,1.884 -0.654,2.834 -0.087,0.408 -0.181,0.812 -0.263,1.222 -0.251,1.249 -0.473,2.509 -0.674,3.776 -0.067,0.418 -0.126,0.838 -0.186,1.258 -0.161,1.109 -0.303,2.223 -0.425,3.343 -0.031,0.282 -0.069,0.562 -0.097,0.844 -0.133,1.337 -0.23,2.684 -0.307,4.037 -0.023,0.4 -0.041,0.801 -0.059,1.202 -0.058,1.316 -0.097,2.637 -0.1,3.965 0,0.088 -0.007,0.175 -0.007,0.264 0,0.173 0.012,0.344 0.013,0.517 0.007,1.306 0.039,2.606 0.099,3.898 0.025,0.564 0.069,1.123 0.105,1.685 0.058,0.914 0.124,1.826 0.208,2.733 0.058,0.626 0.125,1.249 0.195,1.872 0.094,0.837 0.202,1.671 0.318,2.502 0.089,0.638 0.178,1.276 0.28,1.91 0.132,0.823 0.284,1.64 0.438,2.456 0.116,0.616 0.222,1.236 0.349,1.848 0.271,1.292 0.566,2.576 0.888,3.849 0.192,0.756 0.41,1.501 0.62,2.251 0.166,0.593 0.328,1.188 0.505,1.777 0.243,0.808 0.505,1.608 0.77,2.407 0.164,0.498 0.33,0.995 0.503,1.489 0.297,0.848 0.604,1.692 0.924,2.531 0.146,0.38 0.298,0.759 0.449,1.138 0.369,0.93 0.743,1.856 1.14,2.771 0.007,0.016 0.015,0.032 0.022,0.048 1.999,4.596 4.359,8.995 7.034,13.177 0.004,0.009 0.01,0.017 0.015,0.025 1.34,2.093 2.745,4.138 4.24,6.115 l -5.094,2.048 C 7.191,42.509 0,22.1 0,0" />
+          </g>
+          <g
+             transform="translate(581.1611,243.5664)"
+             id="g957">
+            <path
+               inkscape:connector-curvature="0"
+               id="path959"
+               style="fill:#00868e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 -2.615,9.418 -2.535,9.131 c 45.885,7.797 81.619,45.39 86.59,92.177 0.391,3.682 0.597,7.42 0.597,11.207 0,57.922 -46.956,104.878 -104.878,104.878 -1.647,0 -3.284,-0.043 -4.913,-0.119 -3.957,-0.182 -7.857,-0.585 -11.688,-1.194 -1.485,-0.237 -2.96,-0.499 -4.422,-0.797 -2.233,-0.454 -4.436,-0.984 -6.613,-1.578 -2.298,-0.625 -4.565,-1.328 -6.796,-2.103 -3.646,-1.267 -7.203,-2.727 -10.653,-4.372 -4.115,-1.962 -8.082,-4.187 -11.881,-6.648 -2.119,-1.375 -4.185,-2.822 -6.195,-4.34 -2.869,1.81 -5.835,3.481 -8.89,4.998 2.008,1.632 4.07,3.201 6.187,4.695 3.793,2.68 7.758,5.133 11.873,7.343 3.445,1.849 6.998,3.525 10.644,5.02 2.225,0.913 4.484,1.764 6.778,2.54 2.179,0.735 4.39,1.399 6.626,2.004 1.455,0.394 2.919,0.766 4.395,1.103 3.826,0.874 7.725,1.551 11.687,2.031 4.545,0.549 9.169,0.838 13.861,0.838 63.125,0 114.3,-51.173 114.3,-114.299 0,-4.357 -0.253,-8.653 -0.727,-12.883 l 9.607,-1.732 C 93.994,53.27 52.901,9.85 0,0 m -22.841,27.365 c -1.275,0 -2.54,0.041 -3.8,0.098 -0.676,0.025 -1.35,0.058 -2.024,0.098 -0.007,0 -0.015,0.003 -0.023,0.003 -19.058,1.165 -36.591,7.956 -50.95,18.756 -1.006,0.758 -1.994,1.537 -2.969,2.332 -0.391,0.323 -0.775,0.651 -1.161,0.975 -0.656,0.555 -1.306,1.115 -1.947,1.686 -0.425,0.38 -0.849,0.761 -1.269,1.148 -0.604,0.56 -1.197,1.131 -1.786,1.705 -0.4,0.389 -0.807,0.772 -1.2,1.168 -0.863,0.869 -1.708,1.756 -2.536,2.66 -0.474,0.516 -0.932,1.047 -1.394,1.574 -0.414,0.471 -0.827,0.942 -1.231,1.418 -0.487,0.58 -0.966,1.162 -1.439,1.752 -0.354,0.442 -0.701,0.885 -1.048,1.332 -0.48,0.621 -0.96,1.241 -1.424,1.869 -0.029,0.041 -0.06,0.079 -0.089,0.118 l -4.694,-2.575 -4.419,-2.419 c -12.258,17.162 -19.475,38.172 -19.475,60.87 0,25.55 9.142,48.961 24.325,67.153 l 4.675,-2.22 4.99,-2.369 c 7.854,8.892 17.353,16.287 28.026,21.725 0.266,0.137 0.532,0.277 0.803,0.411 0.77,0.384 1.547,0.755 2.33,1.118 0.419,0.194 0.841,0.382 1.263,0.571 9.537,4.253 19.904,6.968 30.794,7.843 0.003,0 0.004,0 0.006,0 1.216,0.097 2.434,0.183 3.66,0.234 1.31,0.062 2.624,0.099 3.948,0.101 0.018,0 0.036,0 0.054,0 h 0.002 0.002 c 1.348,0 2.684,-0.044 4.018,-0.1 0.008,-0.001 0.015,-0.001 0.024,-0.002 1.471,-0.062 2.93,-0.163 4.382,-0.292 0.116,-0.009 0.234,-0.015 0.352,-0.026 1.395,-0.128 2.778,-0.294 4.156,-0.483 0.171,-0.023 0.344,-0.041 0.514,-0.065 1.33,-0.189 2.645,-0.414 3.956,-0.657 0.213,-0.041 0.431,-0.075 0.646,-0.116 1.267,-0.245 2.521,-0.522 3.769,-0.817 0.252,-0.06 0.505,-0.113 0.756,-0.175 1.208,-0.295 2.404,-0.621 3.593,-0.963 0.283,-0.082 0.571,-0.158 0.853,-0.243 1.152,-0.343 2.293,-0.713 3.426,-1.099 0.31,-0.106 0.623,-0.207 0.933,-0.316 1.1,-0.387 2.186,-0.798 3.267,-1.225 0.332,-0.13 0.666,-0.257 0.997,-0.392 1.047,-0.427 2.082,-0.877 3.11,-1.339 0.354,-0.159 0.708,-0.315 1.059,-0.479 0.995,-0.462 1.978,-0.945 2.954,-1.441 0.371,-0.189 0.742,-0.376 1.109,-0.569 0.945,-0.495 1.876,-1.009 2.801,-1.535 0.387,-0.219 0.771,-0.439 1.154,-0.664 0.893,-0.524 1.775,-1.065 2.648,-1.617 0.399,-0.253 0.796,-0.506 1.192,-0.764 0.841,-0.55 1.672,-1.114 2.493,-1.69 0.411,-0.286 0.819,-0.577 1.224,-0.869 0.792,-0.573 1.573,-1.158 2.346,-1.754 0.417,-0.323 0.831,-0.648 1.242,-0.977 0.742,-0.593 1.473,-1.194 2.196,-1.808 0.424,-0.36 0.843,-0.725 1.261,-1.092 0.691,-0.608 1.375,-1.224 2.048,-1.852 0.426,-0.397 0.846,-0.802 1.267,-1.207 0.642,-0.622 1.279,-1.25 1.904,-1.89 0.426,-0.437 0.845,-0.881 1.263,-1.326 0.595,-0.633 1.184,-1.27 1.761,-1.918 0.425,-0.478 0.84,-0.964 1.255,-1.449 0.547,-0.641 1.091,-1.284 1.621,-1.939 0.419,-0.518 0.826,-1.045 1.235,-1.572 0.501,-0.647 1,-1.295 1.485,-1.954 0.41,-0.559 0.806,-1.128 1.205,-1.696 0.455,-0.649 0.91,-1.3 1.35,-1.962 0.4,-0.601 0.783,-1.212 1.168,-1.822 0.412,-0.652 0.825,-1.301 1.22,-1.963 0.384,-0.643 0.752,-1.297 1.121,-1.95 0.368,-0.65 0.738,-1.297 1.092,-1.956 0.367,-0.687 0.715,-1.386 1.065,-2.083 0.326,-0.644 0.655,-1.286 0.965,-1.939 0.348,-0.731 0.673,-1.474 1.002,-2.216 0.283,-0.637 0.573,-1.272 0.842,-1.917 0.324,-0.778 0.624,-1.567 0.929,-2.354 0.242,-0.627 0.493,-1.25 0.722,-1.883 0.299,-0.828 0.571,-1.668 0.848,-2.506 0.201,-0.61 0.413,-1.215 0.602,-1.83 0.272,-0.884 0.513,-1.781 0.759,-2.676 0.162,-0.585 0.335,-1.164 0.486,-1.753 0.242,-0.952 0.451,-1.916 0.665,-2.879 0.12,-0.546 0.256,-1.087 0.367,-1.638 0.211,-1.038 0.384,-2.089 0.56,-3.138 0.082,-0.488 0.18,-0.97 0.255,-1.461 0.178,-1.174 0.316,-2.361 0.451,-3.549 0.042,-0.376 0.1,-0.747 0.139,-1.124 0.148,-1.468 0.256,-2.947 0.337,-4.434 0.005,-0.103 0.018,-0.205 0.023,-0.307 0.082,-1.609 0.125,-3.227 0.125,-4.855 0,-1.619 -0.044,-3.227 -0.124,-4.826 -0.013,-0.244 -0.04,-0.484 -0.054,-0.728 -0.077,-1.336 -0.171,-2.667 -0.304,-3.987 -0.045,-0.459 -0.114,-0.911 -0.167,-1.368 -0.125,-1.096 -0.253,-2.193 -0.416,-3.278 -0.083,-0.549 -0.189,-1.089 -0.28,-1.634 -0.167,-0.983 -0.329,-1.966 -0.526,-2.937 -0.119,-0.594 -0.261,-1.179 -0.391,-1.769 -0.203,-0.911 -0.402,-1.823 -0.629,-2.724 -0.157,-0.62 -0.335,-1.231 -0.505,-1.847 -0.234,-0.855 -0.467,-1.711 -0.726,-2.557 -0.195,-0.639 -0.41,-1.267 -0.617,-1.901 -0.265,-0.806 -0.53,-1.613 -0.816,-2.411 -0.234,-0.65 -0.484,-1.291 -0.732,-1.933 -0.294,-0.764 -0.586,-1.527 -0.899,-2.28 -0.272,-0.658 -0.561,-1.307 -0.849,-1.957 -0.317,-0.721 -0.636,-1.441 -0.971,-2.152 -0.314,-0.663 -0.641,-1.317 -0.968,-1.972 -0.34,-0.679 -0.682,-1.356 -1.038,-2.026 -0.354,-0.666 -0.72,-1.324 -1.089,-1.98 -0.359,-0.639 -0.722,-1.273 -1.095,-1.902 -0.395,-0.668 -0.802,-1.328 -1.213,-1.985 -0.375,-0.595 -0.753,-1.189 -1.14,-1.779 -0.44,-0.664 -0.888,-1.324 -1.343,-1.979 -0.387,-0.556 -0.777,-1.107 -1.176,-1.656 -0.484,-0.664 -0.975,-1.322 -1.476,-1.972 -0.395,-0.514 -0.794,-1.022 -1.2,-1.526 -0.531,-0.664 -1.068,-1.32 -1.617,-1.969 -0.396,-0.468 -0.799,-0.929 -1.204,-1.39 -0.583,-0.66 -1.171,-1.317 -1.77,-1.963 -0.394,-0.422 -0.793,-0.836 -1.194,-1.25 -0.636,-0.66 -1.277,-1.315 -1.932,-1.955 -0.383,-0.375 -0.775,-0.74 -1.164,-1.111 -0.694,-0.655 -1.391,-1.307 -2.105,-1.942 -0.366,-0.324 -0.739,-0.641 -1.11,-0.961 -0.759,-0.654 -1.523,-1.305 -2.303,-1.937 -0.334,-0.27 -0.676,-0.53 -1.014,-0.797 -0.834,-0.654 -1.673,-1.307 -2.53,-1.934 -0.289,-0.213 -0.586,-0.416 -0.879,-0.625 -0.92,-0.66 -1.848,-1.314 -2.792,-1.941 C 29.148,42.947 28.922,42.809 28.7,42.664 27.67,41.994 26.633,41.334 25.576,40.703 25.463,40.635 25.347,40.572 25.234,40.506 12.77,33.131 -1.529,28.541 -16.819,27.578 c -0.056,-0.006 -0.113,-0.012 -0.168,-0.014 -0.021,-0.003 -0.04,-0.003 -0.061,-0.005 -0.657,-0.039 -1.316,-0.071 -1.978,-0.096 -1.266,-0.057 -2.536,-0.098 -3.815,-0.098 M -108.238,5.303 c -3.926,-1.059 -7.932,-1.924 -12.006,-2.582 -6.262,-1.014 -12.685,-1.549 -19.235,-1.549 -66.062,0 -119.615,53.557 -119.615,119.616 0,66.06 53.553,119.613 119.615,119.613 5.743,0 11.389,-0.413 16.916,-1.196 4.087,-0.579 8.108,-1.362 12.052,-2.343 3.042,-0.757 6.038,-1.628 8.984,-2.611 -4.136,-2.904 -8.102,-6.029 -11.885,-9.36 -2.126,-1.871 -4.197,-3.802 -6.202,-5.799 -1.277,-1.272 -2.524,-2.572 -3.749,-3.893 -22.715,-24.472 -36.612,-57.243 -36.612,-93.266 0,-36.992 14.653,-70.558 38.464,-95.226 1.261,-1.305 2.544,-2.59 3.856,-3.846 2.041,-1.955 4.148,-3.84 6.308,-5.668 3.836,-3.244 7.848,-6.289 12.028,-9.103 -2.922,-1.039 -5.897,-1.971 -8.919,-2.787 m 221.269,98.007 c 0.244,1.801 0.455,3.614 0.63,5.437 0.413,4.34 0.633,8.737 0.633,13.186 0,16.046 -2.766,31.444 -7.829,45.756 -0.55,1.554 -1.119,3.099 -1.724,4.626 l 6.893,2.746 8.729,3.476 c -3.067,7.752 -6.75,15.191 -10.98,22.267 l -7.722,-5.398 -6.098,-4.262 c -1.315,2.244 -2.692,4.45 -4.129,6.611 -24.569,36.953 -66.575,61.311 -114.275,61.311 -13.423,0 -26.389,-1.937 -38.65,-5.531 -3.959,-1.162 -7.849,-2.487 -11.651,-3.988 -1.476,-0.582 -2.935,-1.198 -4.386,-1.829 -2.231,-0.972 -4.43,-2 -6.597,-3.084 -2.298,-1.15 -4.563,-2.357 -6.785,-3.63 -2.941,1.19 -5.935,2.273 -8.978,3.248 -3.943,1.264 -7.968,2.342 -12.066,3.228 -8.871,1.919 -18.079,2.939 -27.525,2.939 -5.952,0 -11.807,-0.41 -17.545,-1.186 v 6.053 5.634 c -47.353,-5.868 -87.438,-35.177 -108.28,-75.958 -1.506,-2.943 0.317,1.31 -0.982,-1.749 l -12.972,2.059 c -4.076,-8.46 -7.828,-18.427 -10.767,-32.195 l 24.257,-2.727 c -0.699,-2.652 -0.383,-1.799 -0.915,-4.514 -1.588,-8.106 -2.428,-16.479 -2.428,-25.048 0,-71.595 58.038,-129.634 129.632,-129.634 10.329,0 20.368,1.233 30,3.516 4.071,0.965 8.063,2.127 11.975,3.465 0.891,0.304 1.789,0.594 2.672,0.916 2.115,0.775 4.194,1.625 6.256,2.506 2.248,-1.229 4.536,-2.399 6.859,-3.504 2.182,-1.039 4.398,-2.02 6.641,-2.946 1.471,-0.603 2.952,-1.189 4.447,-1.744 3.829,-1.424 7.742,-2.679 11.726,-3.763 11.492,-3.123 23.581,-4.801 36.062,-4.801 64.248,0 118.17,44.185 133.053,103.826 l 7.379,-1.056 C 112.708,67.543 103.657,49.154 91.403,33.371 l 8.534,-4.31 c 15.737,20.773 26.325,45.657 29.862,72.763 l -9.37,0.83 z" />
+          </g>
+          <g
+             transform="translate(554.6494,454.96)"
+             id="g961">
+            <path
+               inkscape:connector-curvature="0"
+               id="path963"
+               style="fill:#00868e;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="m 0,0 c -10.023,-0.405 -19.616,-2.459 -28.527,-5.896 21.724,-21.656 35.173,-51.611 35.173,-84.709 0,-13.873 -2.363,-27.191 -6.707,-39.58 l -12.005,2.938 c 4.153,11.435 6.425,23.771 6.425,36.642 0,31.303 -13.42,59.455 -34.8,79.071 -3.475,-1.972 -6.812,-4.159 -9.978,-6.562 20.346,-17.563 33.238,-43.523 33.238,-72.509 0,-28.309 -12.292,-53.734 -31.815,-71.269 14.298,-10.416 31.794,-16.689 50.743,-17.09 18.867,24.449 30.103,55.086 30.103,88.359 C 31.85,-56.312 19.924,-24.808 0,0" />
+          </g>
+          <g
+             transform="translate(393.1943,500.7769)"
+             id="g965">
+            <path
+               inkscape:connector-curvature="0"
+               id="path967"
+               style="fill:#e5ad23;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               d="M 0,0 -2.466,8.942 C -39.654,-4.079 -70.318,-30.977 -88.254,-65.542 l 9.666,-1.535 C -61.654,-36.083 -33.706,-11.967 0,0" />
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/third-party/ArduinoJson/component.mk b/third-party/ArduinoJson/component.mk
new file mode 100644
index 0000000..dc25d1c
--- /dev/null
+++ b/third-party/ArduinoJson/component.mk
@@ -0,0 +1 @@
+COMPONENT_ADD_INCLUDEDIRS := src
diff --git a/third-party/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino b/third-party/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino
new file mode 100644
index 0000000..88d3f13
--- /dev/null
+++ b/third-party/ArduinoJson/examples/JsonConfigFile/JsonConfigFile.ino
@@ -0,0 +1,160 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to store your project configuration in a file.
+// It uses the SD library but can be easily modified for any other file-system.
+//
+// The file contains a JSON document with the following content:
+// {
+//   "hostname": "examples.com",
+//   "port": 2731
+// }
+//
+// To run this program, you need an SD card connected to the SPI bus as follows:
+// * MOSI <-> pin 11
+// * MISO <-> pin 12
+// * CLK  <-> pin 13
+// * CS   <-> pin 4
+//
+// https://arduinojson.org/v6/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;
+};
+
+const char *filename = "/config.txt";  // <- SD library uses 8.3 filenames
+Config config;                         // <- global configuration object
+
+// Loads the configuration from a file
+void loadConfiguration(const char *filename, Config &config) {
+  // Open file for reading
+  File file = SD.open(filename);
+
+  // Allocate a temporary JsonDocument
+  // Don't forget to change the capacity to match your requirements.
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<512> doc;
+
+  // Deserialize the JSON document
+  DeserializationError error = deserializeJson(doc, file);
+  if (error)
+    Serial.println(F("Failed to read file, using default configuration"));
+
+  // Copy values from the JsonDocument to the Config
+  config.port = doc["port"] | 2731;
+  strlcpy(config.hostname,                  // <- destination
+          doc["hostname"] | "example.com",  // <- source
+          sizeof(config.hostname));         // <- destination's capacity
+
+  // Close the file (Curiously, File's destructor doesn't close the file)
+  file.close();
+}
+
+// Saves the configuration to a file
+void saveConfiguration(const char *filename, const Config &config) {
+  // Delete existing file, otherwise the configuration is appended to the file
+  SD.remove(filename);
+
+  // Open file for writing
+  File file = SD.open(filename, FILE_WRITE);
+  if (!file) {
+    Serial.println(F("Failed to create file"));
+    return;
+  }
+
+  // Allocate a temporary JsonDocument
+  // Don't forget to change the capacity to match your requirements.
+  // Use https://arduinojson.org/assistant to compute the capacity.
+  StaticJsonDocument<256> doc;
+
+  // Set the values in the document
+  doc["hostname"] = config.hostname;
+  doc["port"] = config.port;
+
+  // Serialize JSON to file
+  if (serializeJson(doc, file) == 0) {
+    Serial.println(F("Failed to write to file"));
+  }
+
+  // Close the file
+  file.close();
+}
+
+// Prints the content of a file to the Serial
+void printFile(const char *filename) {
+  // Open file for reading
+  File file = SD.open(filename);
+  if (!file) {
+    Serial.println(F("Failed to read file"));
+    return;
+  }
+
+  // Extract each characters by one by one
+  while (file.available()) {
+    Serial.print((char)file.read());
+  }
+  Serial.println();
+
+  // Close the file
+  file.close();
+}
+
+void setup() {
+  // Initialize serial port
+  Serial.begin(9600);
+  while (!Serial) continue;
+
+  // Initialize SD library
+  const int chipSelect = 4;
+  while (!SD.begin(chipSelect)) {
+    Serial.println(F("Failed to initialize SD library"));
+    delay(1000);
+  }
+
+  // Should load default config if run for the first time
+  Serial.println(F("Loading configuration..."));
+  loadConfiguration(filename, config);
+
+  // Create configuration file
+  Serial.println(F("Saving configuration..."));
+  saveConfiguration(filename, config);
+
+  // Dump config file
+  Serial.println(F("Print config file..."));
+  printFile(filename);
+}
+
+void loop() {
+  // not used in this example
+}
+
+// Performance issue?
+// ------------------
+//
+// File is an unbuffered stream, which is not optimal for ArduinoJson.
+// See: https://arduinojson.org/v6/how-to/improve-speed/
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any
+// serialization or deserialization problem.
+//
+// The book "Mastering ArduinoJson" contains a case study of a project that has
+// a complex configuration with nested members.
+// Contrary to this example, the project in the book uses the SPIFFS filesystem.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
diff --git a/third-party/ArduinoJson/examples/JsonFilterExample/JsonFilterExample.ino b/third-party/ArduinoJson/examples/JsonFilterExample/JsonFilterExample.ino
new file mode 100644
index 0000000..927a628
--- /dev/null
+++ b/third-party/ArduinoJson/examples/JsonFilterExample/JsonFilterExample.ino
@@ -0,0 +1,63 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to use DeserializationOpion::Filter
+//
+// https://arduinojson.org/v6/example/filter/
+
+#include <ArduinoJson.h>
+
+void setup() {
+  // Initialize serial port
+  Serial.begin(9600);
+  while (!Serial) continue;
+
+  // The huge input: an extract from OpenWeatherMap response
+  const __FlashStringHelper* input_json = F(
+      "{\"cod\":\"200\",\"message\":0,\"list\":[{\"dt\":1581498000,\"main\":{"
+      "\"temp\":3.23,\"feels_like\":-3.63,\"temp_min\":3.23,\"temp_max\":4.62,"
+      "\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":"
+      "58,\"temp_kf\":-1.39},\"weather\":[{\"id\":800,\"main\":\"Clear\","
+      "\"description\":\"clear "
+      "sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":0},\"wind\":{\"speed\":6."
+      "19,\"deg\":266},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 "
+      "09:00:00\"},{\"dt\":1581508800,\"main\":{\"temp\":6.09,\"feels_like\":-"
+      "1.07,\"temp_min\":6.09,\"temp_max\":7.13,\"pressure\":1015,\"sea_"
+      "level\":1015,\"grnd_level\":1011,\"humidity\":48,\"temp_kf\":-1.04},"
+      "\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear "
+      "sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":9},\"wind\":{\"speed\":6."
+      "64,\"deg\":268},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 "
+      "12:00:00\"}],\"city\":{\"id\":2643743,\"name\":\"London\",\"coord\":{"
+      "\"lat\":51.5085,\"lon\":-0.1257},\"country\":\"GB\",\"population\":"
+      "1000000,\"timezone\":0,\"sunrise\":1581492085,\"sunset\":1581527294}}");
+
+  // The filter: it contains "true" for each value we want to keep
+  StaticJsonDocument<200> filter;
+  filter["list"][0]["dt"] = true;
+  filter["list"][0]["main"]["temp"] = true;
+
+  // Deserialize the document
+  StaticJsonDocument<400> doc;
+  deserializeJson(doc, input_json, DeserializationOption::Filter(filter));
+
+  // Print the result
+  serializeJsonPretty(doc, Serial);
+}
+
+void loop() {
+  // not used in this example
+}
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any
+// deserialization problem.
+//
+// The book "Mastering ArduinoJson" contains a tutorial on deserialization.
+// It begins with a simple example, like the one above, and then adds more
+// features like deserializing directly from a file or an HTTP request.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
diff --git a/third-party/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino b/third-party/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino
new file mode 100644
index 0000000..b924e65
--- /dev/null
+++ b/third-party/ArduinoJson/examples/JsonGeneratorExample/JsonGeneratorExample.ino
@@ -0,0 +1,77 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to generate a JSON document with ArduinoJson.
+//
+// https://arduinojson.org/v6/example/generator/
+
+#include <ArduinoJson.h>
+
+void setup() {
+  // Initialize Serial port
+  Serial.begin(9600);
+  while (!Serial) continue;
+
+  // Allocate the JSON document
+  //
+  // 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.
+  //
+  JsonArray data = doc.createNestedArray("data");
+  data.add(48.756080);
+  data.add(2.302038);
+
+  // 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]}
+
+  // Start a new line
+  Serial.println();
+
+  // Generate the prettified JSON and send it to the Serial port.
+  //
+  serializeJsonPretty(doc, Serial);
+  // The above line prints:
+  // {
+  //   "sensor": "gps",
+  //   "time": 1351824120,
+  //   "data": [
+  //     48.756080,
+  //     2.302038
+  //   ]
+  // }
+}
+
+void loop() {
+  // not used in this example
+}
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any
+// serialization problem.
+//
+// The book "Mastering ArduinoJson" contains a tutorial on serialization.
+// It begins with a simple example, like the one above, and then adds more
+// features like serializing directly to a file or an HTTP request.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
diff --git a/third-party/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino b/third-party/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino
new file mode 100644
index 0000000..032e3c5
--- /dev/null
+++ b/third-party/ArduinoJson/examples/JsonHttpClient/JsonHttpClient.ino
@@ -0,0 +1,126 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to parse a JSON document in an HTTP response.
+// It uses the Ethernet library, but can be easily adapted for Wifi.
+//
+// It performs a GET resquest on https://arduinojson.org/example.json
+// Here is the expected response:
+// {
+//   "sensor": "gps",
+//   "time": 1351824120,
+//   "data": [
+//     48.756080,
+//     2.302038
+//   ]
+// }
+//
+// https://arduinojson.org/v6/example/http-client/
+
+#include <ArduinoJson.h>
+#include <Ethernet.h>
+#include <SPI.h>
+
+void setup() {
+  // Initialize Serial port
+  Serial.begin(9600);
+  while (!Serial) continue;
+
+  // Initialize Ethernet library
+  byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
+  if (!Ethernet.begin(mac)) {
+    Serial.println(F("Failed to configure Ethernet"));
+    return;
+  }
+  delay(1000);
+
+  Serial.println(F("Connecting..."));
+
+  // Connect to HTTP server
+  EthernetClient client;
+  client.setTimeout(10000);
+  if (!client.connect("arduinojson.org", 80)) {
+    Serial.println(F("Connection failed"));
+    return;
+  }
+
+  Serial.println(F("Connected!"));
+
+  // Send HTTP request
+  client.println(F("GET /example.json HTTP/1.0"));
+  client.println(F("Host: arduinojson.org"));
+  client.println(F("Connection: close"));
+  if (client.println() == 0) {
+    Serial.println(F("Failed to send request"));
+    client.stop();
+    return;
+  }
+
+  // Check HTTP status
+  char status[32] = {0};
+  client.readBytesUntil('\r', status, sizeof(status));
+  // It should be "HTTP/1.0 200 OK" or "HTTP/1.1 200 OK"
+  if (strcmp(status + 9, "200 OK") != 0) {
+    Serial.print(F("Unexpected response: "));
+    Serial.println(status);
+    client.stop();
+    return;
+  }
+
+  // Skip HTTP headers
+  char endOfHeaders[] = "\r\n\r\n";
+  if (!client.find(endOfHeaders)) {
+    Serial.println(F("Invalid response"));
+    client.stop();
+    return;
+  }
+
+  // Allocate the JSON document
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  const size_t capacity = JSON_OBJECT_SIZE(3) + JSON_ARRAY_SIZE(2) + 60;
+  DynamicJsonDocument doc(capacity);
+
+  // Parse JSON object
+  DeserializationError error = deserializeJson(doc, client);
+  if (error) {
+    Serial.print(F("deserializeJson() failed: "));
+    Serial.println(error.f_str());
+    client.stop();
+    return;
+  }
+
+  // Extract values
+  Serial.println(F("Response:"));
+  Serial.println(doc["sensor"].as<const char*>());
+  Serial.println(doc["time"].as<long>());
+  Serial.println(doc["data"][0].as<float>(), 6);
+  Serial.println(doc["data"][1].as<float>(), 6);
+
+  // Disconnect
+  client.stop();
+}
+
+void loop() {
+  // not used in this example
+}
+
+// Performance issue?
+// ------------------
+//
+// EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson.
+// See: https://arduinojson.org/v6/how-to/improve-speed/
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any
+// serialization  problem.
+//
+// The book "Mastering ArduinoJson" contains a tutorial on deserialization
+// showing how to parse the response from GitHub's API. In the last chapter,
+// it shows how to parse the huge documents from OpenWeatherMap
+// and Reddit.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
diff --git a/third-party/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino b/third-party/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino
new file mode 100644
index 0000000..c2a44d2
--- /dev/null
+++ b/third-party/ArduinoJson/examples/JsonParserExample/JsonParserExample.ino
@@ -0,0 +1,80 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to deserialize a JSON document with ArduinoJson.
+//
+// https://arduinojson.org/v6/example/parser/
+
+#include <ArduinoJson.h>
+
+void setup() {
+  // Initialize serial port
+  Serial.begin(9600);
+  while (!Serial) continue;
+
+  // Allocate the JSON document
+  //
+  // 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.
+  //
+  // 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.
+  if (error) {
+    Serial.print(F("deserializeJson() failed: "));
+    Serial.println(error.f_str());
+    return;
+  }
+
+  // Fetch values.
+  //
+  // Most of the time, you can rely on the implicit casts.
+  // In other case, you can do doc["time"].as<long>();
+  const char* sensor = doc["sensor"];
+  long time = doc["time"];
+  double latitude = doc["data"][0];
+  double longitude = doc["data"][1];
+
+  // Print values.
+  Serial.println(sensor);
+  Serial.println(time);
+  Serial.println(latitude, 6);
+  Serial.println(longitude, 6);
+}
+
+void loop() {
+  // not used in this example
+}
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any
+// deserialization problem.
+//
+// The book "Mastering ArduinoJson" contains a tutorial on deserialization.
+// It begins with a simple example, like the one above, and then adds more
+// features like deserializing directly from a file or an HTTP request.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
diff --git a/third-party/ArduinoJson/examples/JsonServer/JsonServer.ino b/third-party/ArduinoJson/examples/JsonServer/JsonServer.ino
new file mode 100644
index 0000000..2c46dd5
--- /dev/null
+++ b/third-party/ArduinoJson/examples/JsonServer/JsonServer.ino
@@ -0,0 +1,117 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to implement an HTTP server that sends a JSON document
+// in the response.
+// It uses the Ethernet library but can be easily adapted for Wifi.
+//
+// The JSON document contains the values of the analog and digital pins.
+// It looks like that:
+// {
+//   "analog": [0, 76, 123, 158, 192, 205],
+//   "digital": [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0]
+// }
+//
+// https://arduinojson.org/v6/example/http-server/
+
+#include <ArduinoJson.h>
+#include <Ethernet.h>
+#include <SPI.h>
+
+byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
+EthernetServer server(80);
+
+void setup() {
+  // Initialize serial port
+  Serial.begin(9600);
+  while (!Serial) continue;
+
+  // Initialize Ethernet libary
+  if (!Ethernet.begin(mac)) {
+    Serial.println(F("Failed to initialize Ethernet library"));
+    return;
+  }
+
+  // Start to listen
+  server.begin();
+
+  Serial.println(F("Server is ready."));
+  Serial.print(F("Please connect to http://"));
+  Serial.println(Ethernet.localIP());
+}
+
+void loop() {
+  // Wait for an incomming connection
+  EthernetClient client = server.available();
+
+  // Do we have a client?
+  if (!client)
+    return;
+
+  Serial.println(F("New client"));
+
+  // Read the request (we ignore the content in this example)
+  while (client.available()) client.read();
+
+  // Allocate a temporary JsonDocument
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<500> doc;
+
+  // Create the "analog" array
+  JsonArray analogValues = doc.createNestedArray("analog");
+  for (int pin = 0; pin < 6; pin++) {
+    // Read the analog input
+    int value = analogRead(pin);
+
+    // Add the value at the end of the array
+    analogValues.add(value);
+  }
+
+  // Create the "digital" array
+  JsonArray digitalValues = doc.createNestedArray("digital");
+  for (int pin = 0; pin < 14; pin++) {
+    // Read the digital input
+    int value = digitalRead(pin);
+
+    // Add the value at the end of the array
+    digitalValues.add(value);
+  }
+
+  Serial.print(F("Sending: "));
+  serializeJson(doc, Serial);
+  Serial.println();
+
+  // Write response headers
+  client.println(F("HTTP/1.0 200 OK"));
+  client.println(F("Content-Type: application/json"));
+  client.println(F("Connection: close"));
+  client.print(F("Content-Length: "));
+  client.println(measureJsonPretty(doc));
+  client.println();
+
+  // Write JSON document
+  serializeJsonPretty(doc, client);
+
+  // Disconnect
+  client.stop();
+}
+
+// Performance issue?
+// ------------------
+//
+// EthernetClient is an unbuffered stream, which is not optimal for ArduinoJson.
+// See: https://arduinojson.org/v6/how-to/improve-speed/
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any
+// serialization problem.
+//
+// The book "Mastering ArduinoJson" contains a tutorial on serialization.
+// It begins with a simple example, then adds more features like serializing
+// directly to a file or an HTTP client.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
diff --git a/third-party/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino b/third-party/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino
new file mode 100644
index 0000000..ffa8414
--- /dev/null
+++ b/third-party/ArduinoJson/examples/JsonUdpBeacon/JsonUdpBeacon.ino
@@ -0,0 +1,106 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to send a JSON document to a UDP socket.
+// At regular interval, it sends a UDP packet that contains the status of
+// analog and digital pins.
+// It looks like that:
+// {
+//   "analog": [0, 76, 123, 158, 192, 205],
+//   "digital": [1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0]
+// }
+//
+// If you want to test this program, you need to be able to receive the UDP
+// packets.
+// For example, you can run netcat on your computer
+// $ ncat -ulp 8888
+// See https://nmap.org/ncat/
+//
+// https://arduinojson.org/v6/example/udp-beacon/
+
+#include <ArduinoJson.h>
+#include <Ethernet.h>
+#include <SPI.h>
+
+byte mac[] = {0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED};
+IPAddress remoteIp(192, 168, 0, 108);  // <- EDIT!!!!
+unsigned short remotePort = 8888;
+unsigned short localPort = 8888;
+EthernetUDP udp;
+
+void setup() {
+  // Initialize serial port
+  Serial.begin(9600);
+  while (!Serial) continue;
+
+  // Initialize Ethernet libary
+  if (!Ethernet.begin(mac)) {
+    Serial.println(F("Failed to initialize Ethernet library"));
+    return;
+  }
+
+  // Enable UDP
+  udp.begin(localPort);
+}
+
+void loop() {
+  // Allocate a temporary JsonDocument
+  // Use https://arduinojson.org/v6/assistant to compute the capacity.
+  StaticJsonDocument<500> doc;
+
+  // Create the "analog" array
+  JsonArray analogValues = doc.createNestedArray("analog");
+  for (int pin = 0; pin < 6; pin++) {
+    // Read the analog input
+    int value = analogRead(pin);
+
+    // Add the value at the end of the array
+    analogValues.add(value);
+  }
+
+  // Create the "digital" array
+  JsonArray digitalValues = doc.createNestedArray("digital");
+  for (int pin = 0; pin < 14; pin++) {
+    // Read the digital input
+    int value = digitalRead(pin);
+
+    // Add the value at the end of the array
+    digitalValues.add(value);
+  }
+
+  // Log
+  Serial.print(F("Sending to "));
+  Serial.print(remoteIp);
+  Serial.print(F(" on port "));
+  Serial.println(remotePort);
+  serializeJson(doc, Serial);
+
+  // Send UDP packet
+  udp.beginPacket(remoteIp, remotePort);
+  serializeJson(doc, udp);
+  udp.println();
+  udp.endPacket();
+
+  // Wait
+  delay(10000);
+}
+
+// Performance issue?
+// ------------------
+//
+// EthernetUDP is an unbuffered stream, which is not optimal for ArduinoJson.
+// See: https://arduinojson.org/v6/how-to/improve-speed/
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any
+// serialization problem.
+//
+// The book "Mastering ArduinoJson" contains a tutorial on serialization.
+// It begins with a simple example, then adds more features like serializing
+// directly to a file or any stream.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
diff --git a/third-party/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino b/third-party/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino
new file mode 100644
index 0000000..e7da098
--- /dev/null
+++ b/third-party/ArduinoJson/examples/MsgPackParser/MsgPackParser.ino
@@ -0,0 +1,75 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to deserialize a MessagePack document with
+// ArduinoJson.
+//
+// https://arduinojson.org/v6/example/msgpack-parser/
+
+#include <ArduinoJson.h>
+
+void setup() {
+  // Initialize serial port
+  Serial.begin(9600);
+  while (!Serial) continue;
+
+  // Allocate the JSON document
+  //
+  // 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.
+  //
+  // 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,
+                     112, 203, 64,  2,   106, 146, 230, 33,  49,  169};
+  // This MessagePack document contains:
+  // {
+  //   "sensor": "gps",
+  //   "time": 1351824120,
+  //   "data": [48.75608, 2.302038]
+  // }
+
+  DeserializationError error = deserializeMsgPack(doc, input);
+
+  // Test if parsing succeeded.
+  if (error) {
+    Serial.print("deserializeMsgPack() failed: ");
+    Serial.println(error.f_str());
+    return;
+  }
+
+  // Fetch values.
+  //
+  // Most of the time, you can rely on the implicit casts.
+  // In other case, you can do doc["time"].as<long>();
+  const char* sensor = doc["sensor"];
+  long time = doc["time"];
+  double latitude = doc["data"][0];
+  double longitude = doc["data"][1];
+
+  // Print values.
+  Serial.println(sensor);
+  Serial.println(time);
+  Serial.println(latitude, 6);
+  Serial.println(longitude, 6);
+}
+
+void loop() {
+  // not used in this example
+}
diff --git a/third-party/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino b/third-party/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino
new file mode 100644
index 0000000..203c888
--- /dev/null
+++ b/third-party/ArduinoJson/examples/ProgmemExample/ProgmemExample.ino
@@ -0,0 +1,72 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows the different ways you can use Flash strings with
+// ArduinoJson.
+//
+// Use Flash strings sparingly, because ArduinoJson duplicates them in the
+// 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/
+
+#include <ArduinoJson.h>
+
+void setup() {
+#ifdef PROGMEM  // <- check that Flash strings are supported
+
+  DynamicJsonDocument doc(1024);
+
+  // You can use a Flash String as your JSON input.
+  // WARNING: the strings in the input will be duplicated in the JsonDocument.
+  deserializeJson(doc, F("{\"sensor\":\"gps\",\"time\":1351824120,"
+                         "\"data\":[48.756080,2.302038]}"));
+  JsonObject obj = doc.as<JsonObject>();
+
+  // You can use a Flash String to get an element of a JsonObject
+  // No duplication is done.
+  long time = obj[F("time")];
+
+  // You can use a Flash String to set an element of a JsonObject
+  // WARNING: the content of the Flash String will be duplicated in the
+  // JsonDocument.
+  obj[F("time")] = time;
+
+  // You can set a Flash String to a JsonObject or JsonArray:
+  // WARNING: the content of the Flash String will be duplicated in the
+  // JsonDocument.
+  obj["sensor"] = F("gps");
+
+  // It works with serialized() too:
+  obj["sensor"] = serialized(F("\"gps\""));
+  obj["sensor"] = serialized(F("\xA3gps"), 3);
+
+  // You can compare the content of a JsonVariant to a Flash String
+  if (obj["sensor"] == F("gps")) {
+    // ...
+  }
+
+#else
+
+#warning PROGMEM is not supported on this platform
+
+#endif
+}
+
+void loop() {
+  // not used in this example
+}
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any memory
+// problem.
+//
+// The book "Mastering ArduinoJson" contains a quick C++ course that explains
+// how your microcontroller stores strings in memory. It also tells why you
+// should not abuse Flash strings with ArduinoJson.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
diff --git a/third-party/ArduinoJson/examples/StringExample/StringExample.ino b/third-party/ArduinoJson/examples/StringExample/StringExample.ino
new file mode 100644
index 0000000..22330f5
--- /dev/null
+++ b/third-party/ArduinoJson/examples/StringExample/StringExample.ino
@@ -0,0 +1,77 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows the different ways you can use String with ArduinoJson.
+//
+// Use String objects sparingly, because ArduinoJson duplicates them in the
+// 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/
+
+#include <ArduinoJson.h>
+
+void setup() {
+  DynamicJsonDocument doc(1024);
+
+  // You can use a String as your JSON input.
+  // WARNING: the string in the input  will be duplicated in the JsonDocument.
+  String input =
+      "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
+  deserializeJson(doc, input);
+  JsonObject obj = doc.as<JsonObject>();
+
+  // You can use a String to get an element of a JsonObject
+  // No duplication is done.
+  long time = obj[String("time")];
+
+  // You can use a String to set an element of a JsonObject
+  // WARNING: the content of the String will be duplicated in the JsonDocument.
+  obj[String("time")] = time;
+
+  // You can get a String from a JsonObject or JsonArray:
+  // No duplication is done, at least not in the JsonDocument.
+  String sensor = obj["sensor"];
+
+  // Unfortunately, the following doesn't work (issue #118):
+  // sensor = obj["sensor"]; // <-  error "ambiguous overload for 'operator='"
+  // As a workaround, you need to replace by:
+  sensor = obj["sensor"].as<String>();
+
+  // You can set a String to a JsonObject or JsonArray:
+  // WARNING: the content of the String will be duplicated in the JsonDocument.
+  obj["sensor"] = sensor;
+
+  // It works with serialized() too:
+  obj["sensor"] = serialized(sensor);
+
+  // You can also concatenate strings
+  // WARNING: the content of the String will be duplicated in the JsonDocument.
+  obj[String("sen") + "sor"] = String("gp") + "s";
+
+  // You can compare the content of a JsonObject with a String
+  if (obj["sensor"] == sensor) {
+    // ...
+  }
+
+  // Lastly, you can print the resulting JSON to a String
+  String output;
+  serializeJson(doc, output);
+}
+
+void loop() {
+  // not used in this example
+}
+
+// See also
+// --------
+//
+// https://arduinojson.org/ contains the documentation for all the functions
+// used above. It also includes an FAQ that will help you solve any problem.
+//
+// The book "Mastering ArduinoJson" contains a quick C++ course that explains
+// how your microcontroller stores strings in memory. On several occasions, it
+// shows how you can avoid String in your program.
+// Learn more at https://arduinojson.org/book/
+// Use the coupon code TWENTY for a 20% discount ❤❤❤❤❤
diff --git a/third-party/ArduinoJson/extras/ArduinoJsonConfig.cmake.in b/third-party/ArduinoJson/extras/ArduinoJsonConfig.cmake.in
new file mode 100644
index 0000000..9c15f36
--- /dev/null
+++ b/third-party/ArduinoJson/extras/ArduinoJsonConfig.cmake.in
@@ -0,0 +1,4 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
+check_required_components("@PROJECT_NAME@")
diff --git a/third-party/ArduinoJson/extras/CompileOptions.cmake b/third-party/ArduinoJson/extras/CompileOptions.cmake
new file mode 100644
index 0000000..3421ba0
--- /dev/null
+++ b/third-party/ArduinoJson/extras/CompileOptions.cmake
@@ -0,0 +1,94 @@
+if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
+	add_compile_options(
+		-pedantic
+		-Wall
+		-Wcast-align
+		-Wcast-qual
+		-Wconversion
+		-Wctor-dtor-privacy
+		-Wdisabled-optimization
+		-Werror
+		-Wextra
+		-Wformat=2
+		-Winit-self
+		-Wmissing-include-dirs
+		-Wnon-virtual-dtor
+		-Wold-style-cast
+		-Woverloaded-virtual
+		-Wparentheses
+		-Wredundant-decls
+		-Wshadow
+		-Wsign-promo
+		-Wstrict-aliasing
+		-Wundef
+	)
+
+	if(${COVERAGE})
+		set(CMAKE_CXX_FLAGS "-fprofile-arcs -ftest-coverage")
+	endif()
+
+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()
+		add_compile_options(-g -O0)
+	endif()
+
+	add_compile_options(
+		-Wstrict-null-sentinel
+		-Wno-vla # Allow VLA in tests
+	)
+	add_definitions(-DHAS_VARIABLE_LENGTH_ARRAY)
+
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.5)
+		add_compile_options(-Wlogical-op) # the flag exists in 4.4 but is buggy
+	endif()
+
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6)
+		add_compile_options(-Wnoexcept)
+	endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	add_compile_options(
+		-Wc++11-compat
+		-Wdeprecated-register
+		-Wno-vla-extension # Allow VLA in tests
+	)
+	add_definitions(
+		-DHAS_VARIABLE_LENGTH_ARRAY
+		-DSUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR
+	)
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0) AND (NOT ${COVERAGE}))
+		add_compile_options(-g -Og)
+	else()
+		add_compile_options(-g -O0)
+	endif()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+	if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0) AND (NOT ${COVERAGE}))
+		add_compile_options(-g -Og)
+	else()
+		add_compile_options(-g -O0)
+	endif()
+endif()
+
+if(MSVC)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+	add_compile_options(
+		/W4 # Set warning level
+		/WX # Treats all compiler warnings as errors.
+	)
+
+	if (NOT MSVC_VERSION LESS  1910) #  >= Visual Studio 2017
+		add_compile_options(
+			/Zc:__cplusplus  # Enable updated __cplusplus macro
+		)
+	endif()
+endif()
diff --git a/third-party/ArduinoJson/extras/ci/arduino.sh b/third-party/ArduinoJson/extras/ci/arduino.sh
new file mode 100644
index 0000000..f4c168a
--- /dev/null
+++ b/third-party/ArduinoJson/extras/ci/arduino.sh
@@ -0,0 +1,20 @@
+#!/bin/bash -eux
+
+/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16
+sleep 3
+export DISPLAY=:1.0
+
+mkdir -p /tmp/arduino
+curl -sS http://downloads.arduino.cc/arduino-$VERSION-linux64.tar.xz | tar xJ -C /tmp/arduino --strip 1 ||
+curl -sS http://downloads.arduino.cc/arduino-$VERSION-linux64.tgz | tar xz -C /tmp/arduino --strip 1
+export PATH=$PATH:/tmp/arduino/
+
+if [[ "$BOARD" =~ "arduino:samd:" ]]; then
+  arduino --install-boards arduino:samd
+fi
+
+ln -s $PWD /tmp/arduino/libraries/ArduinoJson
+
+for EXAMPLE in $PWD/examples/*/*.ino; do
+	arduino --verify --board $BOARD $EXAMPLE
+done
diff --git a/third-party/ArduinoJson/extras/ci/espidf/CMakeLists.txt b/third-party/ArduinoJson/extras/ci/espidf/CMakeLists.txt
new file mode 100644
index 0000000..3932d3b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/ci/espidf/CMakeLists.txt
@@ -0,0 +1,8 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+cmake_minimum_required(VERSION 3.5)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(example)
diff --git a/third-party/ArduinoJson/extras/ci/espidf/main/CMakeLists.txt b/third-party/ArduinoJson/extras/ci/espidf/main/CMakeLists.txt
new file mode 100644
index 0000000..e501acd
--- /dev/null
+++ b/third-party/ArduinoJson/extras/ci/espidf/main/CMakeLists.txt
@@ -0,0 +1,6 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+idf_component_register(SRCS "main.cpp"
+                       INCLUDE_DIRS "")
diff --git a/third-party/ArduinoJson/extras/ci/espidf/main/component.mk b/third-party/ArduinoJson/extras/ci/espidf/main/component.mk
new file mode 100644
index 0000000..a98f634
--- /dev/null
+++ b/third-party/ArduinoJson/extras/ci/espidf/main/component.mk
@@ -0,0 +1,4 @@
+#
+# "main" pseudo-component makefile.
+#
+# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
diff --git a/third-party/ArduinoJson/extras/ci/espidf/main/main.cpp b/third-party/ArduinoJson/extras/ci/espidf/main/main.cpp
new file mode 100644
index 0000000..f3ec000
--- /dev/null
+++ b/third-party/ArduinoJson/extras/ci/espidf/main/main.cpp
@@ -0,0 +1,16 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+
+extern "C" void app_main() {
+  char buffer[256];
+  StaticJsonDocument<200> doc;
+
+  doc["hello"] = "world";
+  serializeJson(doc, buffer);
+  deserializeJson(doc, buffer);
+  serializeMsgPack(doc, buffer);
+  deserializeMsgPack(doc, buffer);
+}
diff --git a/third-party/ArduinoJson/extras/ci/particle.sh b/third-party/ArduinoJson/extras/ci/particle.sh
new file mode 100644
index 0000000..5566353
--- /dev/null
+++ b/third-party/ArduinoJson/extras/ci/particle.sh
@@ -0,0 +1,10 @@
+#!/bin/sh -ex
+
+BOARD=$1
+
+cd "$(dirname "$0")/../../"
+
+cp extras/particle/src/smocktest.ino src/
+cp extras/particle/project.properties ./
+
+particle compile "$BOARD"
diff --git a/third-party/ArduinoJson/extras/fuzzing/CMakeLists.txt b/third-party/ArduinoJson/extras/fuzzing/CMakeLists.txt
new file mode 100644
index 0000000..53f4880
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/CMakeLists.txt
@@ -0,0 +1,59 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+if(MSVC)
+	add_compile_options(-D_CRT_SECURE_NO_WARNINGS)
+endif()
+
+add_executable(msgpack_reproducer
+	msgpack_fuzzer.cpp
+	reproducer.cpp
+)
+target_link_libraries(msgpack_reproducer
+	ArduinoJson
+)
+
+add_executable(json_reproducer
+	json_fuzzer.cpp
+	reproducer.cpp
+)
+target_link_libraries(json_reproducer
+	ArduinoJson
+)
+
+macro(add_fuzzer name)	
+	set(FUZZER "${name}_fuzzer")
+	set(CORPUS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${name}_corpus")
+	set(SEED_CORPUS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${name}_seed_corpus")
+	add_executable("${FUZZER}"
+		"${name}_fuzzer.cpp"
+	)
+	target_link_libraries("${FUZZER}"
+		ArduinoJson
+	)
+	set_target_properties("${FUZZER}"
+		PROPERTIES 
+			COMPILE_FLAGS  
+				"-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all"
+			LINK_FLAGS
+				"-fprofile-instr-generate -fcoverage-mapping -fsanitize=fuzzer -fno-sanitize-recover=all"
+	)
+
+	add_test(
+		NAME
+			"${FUZZER}"
+		COMMAND
+			"${FUZZER}" "${CORPUS_DIR}" "${SEED_CORPUS_DIR}" -max_total_time=5 -timeout=1
+	)
+
+	set_tests_properties("${FUZZER}"
+		PROPERTIES
+			LABELS 		"Fuzzing"
+	)
+endmacro()
+
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6)
+	add_fuzzer(json)
+	add_fuzzer(msgpack)
+endif()
diff --git a/third-party/ArduinoJson/extras/fuzzing/Makefile b/third-party/ArduinoJson/extras/fuzzing/Makefile
new file mode 100644
index 0000000..d3c574e
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/Makefile
@@ -0,0 +1,22 @@
+# CAUTION: this file is invoked by https://github.com/google/oss-fuzz
+
+CXXFLAGS += -I../../src -DARDUINOJSON_DEBUG=1
+
+all: \
+	$(OUT)/json_fuzzer \
+	$(OUT)/json_fuzzer_seed_corpus.zip \
+	$(OUT)/json_fuzzer.options \
+	$(OUT)/msgpack_fuzzer \
+	$(OUT)/msgpack_fuzzer_seed_corpus.zip \
+	$(OUT)/msgpack_fuzzer.options
+
+$(OUT)/%_fuzzer: %_fuzzer.cpp $(shell find ../../src -type f)
+	$(CXX) $(CXXFLAGS) $< -o$@ $(LIB_FUZZING_ENGINE)
+
+$(OUT)/%_fuzzer_seed_corpus.zip: %_seed_corpus/*
+	zip -j $@ $?
+
+$(OUT)/%_fuzzer.options:
+	@echo "[libfuzzer]" > $@
+	@echo "max_len = 256" >> $@
+	@echo "timeout = 10" >> $@
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_fuzzer.cpp b/third-party/ArduinoJson/extras/fuzzing/json_fuzzer.cpp
new file mode 100644
index 0000000..db9a3d6
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_fuzzer.cpp
@@ -0,0 +1,11 @@
+#include <ArduinoJson.h>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+  DynamicJsonDocument doc(4096);
+  DeserializationError error = deserializeJson(doc, data, size);
+  if (!error) {
+    std::string json;
+    serializeJson(doc, json);
+  }
+  return 0;
+}
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json
new file mode 100644
index 0000000..bcc4cec
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/Comments.json
@@ -0,0 +1,10 @@
+//comment
+/*comment*/
+[ //comment
+/*comment*/"comment"/*comment*/,//comment
+/*comment*/{//comment
+/* comment*/"key"//comment
+: //comment
+"value"//comment
+}/*comment*/
+]//comment
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json
new file mode 100644
index 0000000..0637a08
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyArray.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/EmptyObject.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json
new file mode 100644
index 0000000..9285019
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/ExcessiveNesting.json
@@ -0,0 +1 @@
+[1,[2,[3,[4,[5,[6,[7,[8,[9,[10,[11,[12,[13,[14,[15,[16,[17,[18,[19,[20,[21,[22,[23,[24,[25,[26,[27,[28,[29,[30,[31,[32,[33,[34,[35,[36,[37,[38,[39,[40,[41,[42,[43,[44,[45,[46,[47,[48,[49,[50,[51,[52,[53,[54,[55,[56,[57,[58,[59,[60,[61,[62,[63,[64,[65,[66,[67,[68,[69,[70,[71,[72,[73,[74,[75,[76,[77,[78,[79,[80,[81,[82,[83,[84,[85,[86,[87,[88,[89,[90,[91,[92,[93,[94,[95,[96,[97,[98,[99,[100,[101,[102,[103,[104,[105,[106,[107,[108,[109,[110,[111,[112,[113,[114,[115,[116,[117,[118,[119,[120]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json
new file mode 100644
index 0000000..3a33cb8
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/IntegerOverflow.json
@@ -0,0 +1 @@
+9720730739393920739
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json
new file mode 100644
index 0000000..f6b9419
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/Numbers.json
@@ -0,0 +1,24 @@
+[
+  123,
+  -123,
+  123.456,
+  -123.456,
+  12e34,
+  12e-34,
+  12e+34,
+  12E34,
+  12E-34,
+  12E+34,
+  12.34e56,
+  12.34e-56,
+  12.34e+56,
+  12.34E56,
+  12.34E-56,
+  12.34E+56,
+  NaN,
+  -NaN,
+  +NaN,
+  Infinity,
+  +Infinity,
+  -Infinity
+]
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json
new file mode 100644
index 0000000..27d6baf
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/OpenWeatherMap.json
@@ -0,0 +1,53 @@
+{
+  "coord": {
+    "lon": -0.13,
+    "lat": 51.51
+  },
+  "weather": [
+    {
+      "id": 301,
+      "main": "Drizzle",
+      "description": "drizzle",
+      "icon": "09n"
+    },
+    {
+      "id": 701,
+      "main": "Mist",
+      "description": "mist",
+      "icon": "50n"
+    },
+    {
+      "id": 741,
+      "main": "Fog",
+      "description": "fog",
+      "icon": "50n"
+    }
+  ],
+  "base": "stations",
+  "main": {
+    "temp": 281.87,
+    "pressure": 1032,
+    "humidity": 100,
+    "temp_min": 281.15,
+    "temp_max": 283.15
+  },
+  "visibility": 2900,
+  "wind": {
+    "speed": 1.5
+  },
+  "clouds": {
+    "all": 90
+  },
+  "dt": 1483820400,
+  "sys": {
+    "type": 1,
+    "id": 5091,
+    "message": 0.0226,
+    "country": "GB",
+    "sunrise": 1483776245,
+    "sunset": 1483805443
+  },
+  "id": 2643743,
+  "name": "London",
+  "cod": 200
+}
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json
new file mode 100644
index 0000000..3ffa235
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/Strings.json
@@ -0,0 +1,8 @@
+[
+  "hello",
+  'hello',
+  hello,
+  {"hello":"world"},
+  {'hello':'world'},
+  {hello:world}
+]
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json
new file mode 100644
index 0000000..d53ce00
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/json_seed_corpus/WeatherUnderground.json
@@ -0,0 +1,90 @@
+{
+  "response": {
+    "version": "0.1",
+    "termsofService": "http://www.wunderground.com/weather/api/d/terms.html",
+    "features": {
+      "conditions": 1
+    }
+  },
+  "current_observation": {
+    "image": {
+      "url": "http://icons-ak.wxug.com/graphics/wu2/logo_130x80.png",
+      "title": "Weather Underground",
+      "link": "http://www.wunderground.com"
+    },
+    "display_location": {
+      "full": "San Francisco, CA",
+      "city": "San Francisco",
+      "state": "CA",
+      "state_name": "California",
+      "country": "US",
+      "country_iso3166": "US",
+      "zip": "94101",
+      "latitude": "37.77500916",
+      "longitude": "-122.41825867",
+      "elevation": "47.00000000"
+    },
+    "observation_location": {
+      "full": "SOMA - Near Van Ness, San Francisco, California",
+      "city": "SOMA - Near Van Ness, San Francisco",
+      "state": "California",
+      "country": "US",
+      "country_iso3166": "US",
+      "latitude": "37.773285",
+      "longitude": "-122.417725",
+      "elevation": "49 ft"
+    },
+    "estimated": {},
+    "station_id": "KCASANFR58",
+    "observation_time": "Last Updated on June 27, 5:27 PM PDT",
+    "observation_time_rfc822": "Wed, 27 Jun 2012 17:27:13 -0700",
+    "observation_epoch": "1340843233",
+    "local_time_rfc822": "Wed, 27 Jun 2012 17:27:14 -0700",
+    "local_epoch": "1340843234",
+    "local_tz_short": "PDT",
+    "local_tz_long": "America/Los_Angeles",
+    "local_tz_offset": "-0700",
+    "weather": "Partly Cloudy",
+    "temperature_string": "66.3 F (19.1 C)",
+    "temp_f": 66.3,
+    "temp_c": 19.1,
+    "relative_humidity": "65%",
+    "wind_string": "From the NNW at 22.0 MPH Gusting to 28.0 MPH",
+    "wind_dir": "NNW",
+    "wind_degrees": 346,
+    "wind_mph": 22,
+    "wind_gust_mph": "28.0",
+    "wind_kph": 35.4,
+    "wind_gust_kph": "45.1",
+    "pressure_mb": "1013",
+    "pressure_in": "29.93",
+    "pressure_trend": "+",
+    "dewpoint_string": "54 F (12 C)",
+    "dewpoint_f": 54,
+    "dewpoint_c": 12,
+    "heat_index_string": "NA",
+    "heat_index_f": "NA",
+    "heat_index_c": "NA",
+    "windchill_string": "NA",
+    "windchill_f": "NA",
+    "windchill_c": "NA",
+    "feelslike_string": "66.3 F (19.1 C)",
+    "feelslike_f": "66.3",
+    "feelslike_c": "19.1",
+    "visibility_mi": "10.0",
+    "visibility_km": "16.1",
+    "solarradiation": "",
+    "UV": "5",
+    "precip_1hr_string": "0.00 in ( 0 mm)",
+    "precip_1hr_in": "0.00",
+    "precip_1hr_metric": " 0",
+    "precip_today_string": "0.00 in (0 mm)",
+    "precip_today_in": "0.00",
+    "precip_today_metric": "0",
+    "icon": "partlycloudy",
+    "icon_url": "http://icons-ak.wxug.com/i/c/k/partlycloudy.gif",
+    "forecast_url": "http://www.wunderground.com/US/CA/San_Francisco.html",
+    "history_url": "http://www.wunderground.com/history/airport/KCASANFR58/2012/6/27/DailyHistory.html",
+    "ob_url": "http://www.wunderground.com/cgi-bin/findweather/getForecast?query=37.773285,-122.417725"
+  }
+}
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp b/third-party/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp
new file mode 100644
index 0000000..e623591
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_fuzzer.cpp
@@ -0,0 +1,11 @@
+#include <ArduinoJson.h>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+  DynamicJsonDocument doc(4096);
+  DeserializationError error = deserializeMsgPack(doc, data, size);
+  if (!error) {
+    std::string json;
+    serializeMsgPack(doc, json);
+  }
+  return 0;
+}
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16
new file mode 100644
index 0000000..714ba99
Binary files /dev/null and b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array16 differ
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32
new file mode 100644
index 0000000..6e3ed7b
Binary files /dev/null and b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/array32 differ
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/false b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/false
new file mode 100644
index 0000000..5277188
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/false
@@ -0,0 +1 @@
+�
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixarray b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixarray
new file mode 100644
index 0000000..95d54b1
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixarray
@@ -0,0 +1 @@
+��hello�world
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_negative b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_negative
new file mode 100644
index 0000000..eda5949
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_negative
@@ -0,0 +1 @@
+�
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_positive b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_positive
new file mode 100644
index 0000000..16e0e90
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixint_positive
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixmap b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixmap
new file mode 100644
index 0000000..df26118
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixmap
@@ -0,0 +1 @@
+��one
�two
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixstr b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixstr
new file mode 100644
index 0000000..2ff7b3f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/fixstr
@@ -0,0 +1 @@
+�hello world
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float32 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float32
new file mode 100644
index 0000000..a574220
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float32
@@ -0,0 +1 @@
+�@H��
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float64 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float64
new file mode 100644
index 0000000..36088bc
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/float64
@@ -0,0 +1 @@
+�@	!���o
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int16 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int16
new file mode 100644
index 0000000..9ffc705
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int16
@@ -0,0 +1 @@
+���
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int32 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int32
new file mode 100644
index 0000000..d735e21
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int32
@@ -0,0 +1 @@
+Ҷi�.
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int64 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int64
new file mode 100644
index 0000000..9d2cd3b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int64
@@ -0,0 +1 @@
+�4Vx����
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int8 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int8
new file mode 100644
index 0000000..ae2ca9c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/int8
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map16 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map16
new file mode 100644
index 0000000..836a718
Binary files /dev/null and b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map16 differ
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map32 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map32
new file mode 100644
index 0000000..97ab162
Binary files /dev/null and b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/map32 differ
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/nil b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/nil
new file mode 100644
index 0000000..e7754ca
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/nil
@@ -0,0 +1 @@
+�
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str16 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str16
new file mode 100644
index 0000000..91c1396
Binary files /dev/null and b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str16 differ
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str32 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str32
new file mode 100644
index 0000000..50cac52
Binary files /dev/null and b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str32 differ
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str8 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str8
new file mode 100644
index 0000000..ff5a2c0
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/str8
@@ -0,0 +1 @@
+�hello
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/true b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/true
new file mode 100644
index 0000000..6b10f95
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/true
@@ -0,0 +1 @@
+�
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint16 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint16
new file mode 100644
index 0000000..7f4c2e8
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint16
@@ -0,0 +1 @@
+�09
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint32 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint32
new file mode 100644
index 0000000..864826f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint32
@@ -0,0 +1 @@
+�4Vx
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint64 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint64
new file mode 100644
index 0000000..20ede75
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint64
@@ -0,0 +1 @@
+�4Vx����
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint8 b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint8
new file mode 100644
index 0000000..6a96120
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/msgpack_seed_corpus/uint8
@@ -0,0 +1 @@
+��
\ No newline at end of file
diff --git a/third-party/ArduinoJson/extras/fuzzing/reproducer.cpp b/third-party/ArduinoJson/extras/fuzzing/reproducer.cpp
new file mode 100644
index 0000000..21e218e
--- /dev/null
+++ b/third-party/ArduinoJson/extras/fuzzing/reproducer.cpp
@@ -0,0 +1,50 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+// This file is NOT use by Google's OSS fuzz
+// I only use it to reproduce the bugs found
+
+#include <stdint.h>  // size_t
+#include <stdio.h>   // fopen et al.
+#include <stdlib.h>  // exit
+#include <iostream>
+#include <vector>
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size);
+
+std::vector<uint8_t> read(const char* path) {
+  FILE* f = fopen(path, "rb");
+  if (!f) {
+    std::cerr << "Failed to open " << path << std::endl;
+    exit(1);
+  }
+
+  fseek(f, 0, SEEK_END);
+  size_t size = static_cast<size_t>(ftell(f));
+  fseek(f, 0, SEEK_SET);
+
+  std::vector<uint8_t> buffer(size);
+  if (fread(buffer.data(), 1, size, f) != size) {
+    fclose(f);
+    std::cerr << "Failed to read " << path << std::endl;
+    exit(1);
+  }
+
+  fclose(f);
+  return buffer;
+}
+
+int main(int argc, const char* argv[]) {
+  if (argc < 2) {
+    std::cerr << "Usage: msgpack_fuzzer files" << std::endl;
+    return 1;
+  }
+
+  for (int i = 1; i < argc; i++) {
+    std::cout << "Loading " << argv[i] << std::endl;
+    std::vector<uint8_t> buffer = read(argv[i]);
+    LLVMFuzzerTestOneInput(buffer.data(), buffer.size());
+  }
+  return 0;
+}
diff --git a/third-party/ArduinoJson/extras/particle/project.properties b/third-party/ArduinoJson/extras/particle/project.properties
new file mode 100644
index 0000000..d39555a
--- /dev/null
+++ b/third-party/ArduinoJson/extras/particle/project.properties
@@ -0,0 +1 @@
+name=ArduinoJsonCI
diff --git a/third-party/ArduinoJson/extras/particle/src/smocktest.ino b/third-party/ArduinoJson/extras/particle/src/smocktest.ino
new file mode 100644
index 0000000..ca17189
--- /dev/null
+++ b/third-party/ArduinoJson/extras/particle/src/smocktest.ino
@@ -0,0 +1,5 @@
+#include "ArduinoJson.h"
+
+void setup() {}
+
+void loop() {}
diff --git a/third-party/ArduinoJson/extras/scripts/build-arduino-package.sh b/third-party/ArduinoJson/extras/scripts/build-arduino-package.sh
new file mode 100644
index 0000000..339db2f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/build-arduino-package.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -eu
+
+INPUT=$1
+OUTPUT=$2
+
+cd "$INPUT"
+
+# remove existing file
+rm -f "$OUTPUT"
+
+# create zip
+7z a "$OUTPUT" \
+	-xr!.vs \
+	CHANGELOG.md \
+	examples \
+	src \
+	keywords.txt \
+	library.properties \
+	LICENSE.md \
+	README.md \
+	ArduinoJson.h
diff --git a/third-party/ArduinoJson/extras/scripts/build-single-header.sh b/third-party/ArduinoJson/extras/scripts/build-single-header.sh
new file mode 100644
index 0000000..09d91d4
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/build-single-header.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+set -e
+
+RE_RELATIVE_INCLUDE='^#[[:space:]]*include[[:space:]]*"(.*)"'
+RE_ABSOLUTE_INCLUDE='^#[[:space:]]*include[[:space:]]*<(ArduinoJson/.*)>'
+RE_SYSTEM_INCLUDE='^#[[:space:]]*include[[:space:]]*<(.*)>'
+RE_EMPTY='^(#[[:space:]]*pragma[[:space:]]+once)?[[:space:]]*(//.*)?$'
+SRC_DIRECTORY="$(realpath "$(dirname $0)/../../src")"
+
+
+declare -A INCLUDED
+
+process()
+{
+	local PARENT=$1
+	local FOLDER=$(dirname $1)
+	local SHOW_COMMENT=$2
+	while IFS= read -r LINE; do
+		if [[ $LINE =~ $RE_ABSOLUTE_INCLUDE ]]; then
+			local CHILD=${BASH_REMATCH[1]}
+			local CHILD_PATH
+			CHILD_PATH=$(realpath "$SRC_DIRECTORY/$CHILD")
+			echo "$PARENT -> $CHILD" >&2
+			if [[ ! ${INCLUDED[$CHILD_PATH]} ]]; then
+				INCLUDED[$CHILD_PATH]=true
+				process "$CHILD" false
+			fi
+		elif [[ $LINE =~ $RE_RELATIVE_INCLUDE ]]; then
+			local CHILD=${BASH_REMATCH[1]}
+			pushd "$FOLDER" > /dev/null
+			local CHILD_PATH
+			CHILD_PATH=$(realpath "$CHILD")
+			echo "$PARENT -> $CHILD" >&2
+			if [[ ! ${INCLUDED[$CHILD_PATH]} ]]; then
+				INCLUDED[$CHILD_PATH]=true
+				process "$CHILD" false
+			fi
+			popd > /dev/null
+		elif [[ $LINE =~ $RE_SYSTEM_INCLUDE ]]; then
+			local CHILD=${BASH_REMATCH[1]}
+			echo "$PARENT -> <$CHILD>" >&2
+			if [[ ! ${INCLUDED[$CHILD]} ]]; then
+				echo "#include <$CHILD>"
+				INCLUDED[$CHILD]=true
+			fi
+		elif [[ "${SHOW_COMMENT}" = "true" ]] ; then
+			echo "$LINE"
+		elif [[ ! $LINE =~ $RE_EMPTY ]]; then
+			echo "$LINE"
+		fi
+	done < $PARENT
+}
+
+simplify_namespaces() {
+	perl -p0i -e 's|\}  // namespace ARDUINOJSON_NAMESPACE\r?\nnamespace ARDUINOJSON_NAMESPACE \{\r?\n||igs' "$1"
+	rm -f "$1.bak"
+}
+
+INCLUDED=()
+INPUT=$1
+OUTPUT=$2
+process "$INPUT" true > "$OUTPUT"
+simplify_namespaces "$OUTPUT"
diff --git a/third-party/ArduinoJson/extras/scripts/get-release-body.sh b/third-party/ArduinoJson/extras/scripts/get-release-body.sh
new file mode 100644
index 0000000..1514ecd
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/get-release-body.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -eu
+
+TAG="$1"
+CHANGELOG="$2"
+
+cat << END
+## Changes
+
+$(awk '/\* /{ FOUND=1; print; next } { if (FOUND) exit}' "$CHANGELOG")
+
+[View version history](https://github.com/bblanchon/ArduinoJson/blob/$TAG/CHANGELOG.md)
+END
diff --git a/third-party/ArduinoJson/extras/scripts/get-release-page.sh b/third-party/ArduinoJson/extras/scripts/get-release-page.sh
new file mode 100644
index 0000000..73d073b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/get-release-page.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -eu
+
+TAG="$1"
+CHANGELOG="$2"
+FRONTMATTER="$3"
+
+cat << END
+---
+branch: v6
+version: $TAG
+date: '$(date +'%Y-%m-%d')'
+$(cat "$FRONTMATTER")
+---
+
+$(awk '/\* /{ FOUND=1; print; next } { if (FOUND) exit}' "$CHANGELOG")
+END
diff --git a/third-party/ArduinoJson/extras/scripts/publish-particle-library.sh b/third-party/ArduinoJson/extras/scripts/publish-particle-library.sh
new file mode 100644
index 0000000..62c3140
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/publish-particle-library.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -eu
+
+SOURCE_DIR="$(dirname "$0")/../.."
+WORK_DIR=$(mktemp -d)
+trap 'rm -rf "$WORK_DIR"' EXIT
+
+cp "$SOURCE_DIR/README.md" "$WORK_DIR/README.md"
+cp "$SOURCE_DIR/CHANGELOG.md" "$WORK_DIR/CHANGELOG.md"
+cp "$SOURCE_DIR/library.properties" "$WORK_DIR/library.properties"
+cp "$SOURCE_DIR/LICENSE.md" "$WORK_DIR/LICENSE.txt"
+cp -r "$SOURCE_DIR/src" "$WORK_DIR/"
+cp -r "$SOURCE_DIR/examples" "$WORK_DIR/"
+
+cd "$WORK_DIR"
+particle library upload
+particle library publish
diff --git a/third-party/ArduinoJson/extras/scripts/publish.sh b/third-party/ArduinoJson/extras/scripts/publish.sh
new file mode 100644
index 0000000..9d9ec8c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/publish.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+set -eu
+
+cd "$(dirname "$0")/../.."
+
+VERSION="$1"
+DATE=$(date +%F)
+TAG="v$VERSION"
+VERSION_REGEX="[0-9a-z\\.\\-]+"
+
+update_version_in_source () {
+	IFS=".-" read MAJOR MINOR REVISION EXTRA < <(echo "$VERSION")
+	UNDERLINE=$(printf -- '-%.0s' $(seq 1 ${#TAG}))
+
+	sed -i~ -bE "s/version=$VERSION_REGEX/version=$VERSION/; s|ardu-badge.com/ArduinoJson/$VERSION_REGEX|ardu-badge.com/ArduinoJson/$VERSION|; " README.md
+	rm README.md~
+
+	sed -i~ -bE "4s/HEAD/$TAG ($DATE)/; 5s/-+/$UNDERLINE/" CHANGELOG.md
+	rm CHANGELOG.md~
+
+	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
+	rm library.json~
+
+	sed -i~ -bE "s/version=.*$/version=$VERSION/" library.properties
+	rm library.properties~
+
+	sed -i~ -bE "s/version: .*$/version: $VERSION.{build}/" appveyor.yml
+	rm appveyor.yml~
+
+	sed -i~ -bE \
+		-e "s/ARDUINOJSON_VERSION .*$/ARDUINOJSON_VERSION \"$VERSION\"/" \
+		-e "s/ARDUINOJSON_VERSION_MAJOR .*$/ARDUINOJSON_VERSION_MAJOR $MAJOR/" \
+		-e "s/ARDUINOJSON_VERSION_MINOR .*$/ARDUINOJSON_VERSION_MINOR $MINOR/" \
+		-e "s/ARDUINOJSON_VERSION_REVISION .*$/ARDUINOJSON_VERSION_REVISION $REVISION/" \
+		src/ArduinoJson/version.hpp
+	rm src/ArduinoJson/version.hpp*~
+}
+
+commit_new_version () {
+	git add src/ArduinoJson/version.hpp README.md CHANGELOG.md library.json library.properties appveyor.yml CMakeLists.txt
+	git commit -m "Set version to $VERSION"
+}
+
+add_tag () {
+	CHANGES=$(awk '/\* /{ FOUND=1; print; next } { if (FOUND) exit}' CHANGELOG.md)
+	git tag -m "ArduinoJson $VERSION"$'\n'"$CHANGES" "$TAG"
+}
+
+push () {
+	git push --follow-tags
+}
+
+update_version_in_source
+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/wandbox/publish.sh "../ArduinoJson-$TAG.h" > "../ArduinoJson-$TAG-wandbox.txt"
+extras/scripts/get-release-page.sh "$TAG" "CHANGELOG.md" "../ArduinoJson-$TAG-wandbox.txt" > "../ArduinoJson-$TAG.md"
+
+echo "You can now copy ../ArduinoJson-$TAG.md into arduinojson.org/collections/_versions/$VERSION.md"
diff --git a/third-party/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp b/third-party/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp
new file mode 100644
index 0000000..ffa0762
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/wandbox/JsonGeneratorExample.cpp
@@ -0,0 +1,60 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to generate a JSON document with ArduinoJson.
+
+#include <iostream>
+#include "ArduinoJson.h"
+
+int main() {
+  // Allocate the JSON document
+  //
+  // 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
+  //
+  doc["sensor"] = "gps";
+  doc["time"] = 1351824120;
+
+  // Add an array.
+  //
+  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]}
+
+  // Start a new line
+  std::cout << std::endl;
+
+  // Generate the prettified JSON and send it to STDOUT
+  //
+  serializeJsonPretty(doc, std::cout);
+  // The above line prints:
+  // {
+  //   "sensor": "gps",
+  //   "time": 1351824120,
+  //   "data": [
+  //     48.756080,
+  //     2.302038
+  //   ]
+  // }
+}
diff --git a/third-party/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp b/third-party/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp
new file mode 100644
index 0000000..15fe7e4
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/wandbox/JsonParserExample.cpp
@@ -0,0 +1,59 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to deserialize a JSON document with ArduinoJson.
+
+#include <iostream>
+#include "ArduinoJson.h"
+
+int main() {
+  // Allocate the JSON document
+  //
+  // 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.
+  //
+  // 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.
+  if (error) {
+    std::cerr << "deserializeJson() failed: " << error.c_str() << std::endl;
+    return 1;
+  }
+
+  // Fetch values.
+  //
+  // Most of the time, you can rely on the implicit casts.
+  // In other case, you can do doc["time"].as<long>();
+  const char* sensor = doc["sensor"];
+  long time = doc["time"];
+  double latitude = doc["data"][0];
+  double longitude = doc["data"][1];
+
+  // Print values.
+  std::cout << sensor << std::endl;
+  std::cout << time << std::endl;
+  std::cout << latitude << std::endl;
+  std::cout << longitude << std::endl;
+
+  return 0;
+}
diff --git a/third-party/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp b/third-party/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp
new file mode 100644
index 0000000..32ac47d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/wandbox/MsgPackParserExample.cpp
@@ -0,0 +1,68 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// This example shows how to generate a JSON document with ArduinoJson.
+
+#include <iostream>
+#include "ArduinoJson.h"
+
+int main() {
+  // Allocate the JSON document
+  //
+  // 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.
+  //
+  // 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,
+                     112, 203, 64,  2,   106, 146, 230, 33,  49,  169};
+  // This MessagePack document contains:
+  // {
+  //   "sensor": "gps",
+  //   "time": 1351824120,
+  //   "data": [48.75608, 2.302038]
+  // }
+
+  // doc of the object tree.
+  //
+  // 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.
+  if (error) {
+    std::cerr << "deserializeMsgPack() failed: " << error.c_str() << std::endl;
+    return 1;
+  }
+
+  // Fetch values.
+  //
+  // Most of the time, you can rely on the implicit casts.
+  // In other case, you can do doc["time"].as<long>();
+  const char* sensor = doc["sensor"];
+  long time = doc["time"];
+  double latitude = doc["data"][0];
+  double longitude = doc["data"][1];
+
+  // Print values.
+  std::cout << sensor << std::endl;
+  std::cout << time << std::endl;
+  std::cout << latitude << std::endl;
+  std::cout << longitude << std::endl;
+
+  return 0;
+}
diff --git a/third-party/ArduinoJson/extras/scripts/wandbox/publish.sh b/third-party/ArduinoJson/extras/scripts/wandbox/publish.sh
new file mode 100644
index 0000000..2884363
--- /dev/null
+++ b/third-party/ArduinoJson/extras/scripts/wandbox/publish.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -eu
+
+ARDUINOJSON_H="$1"
+
+read_string() {
+	jq --slurp --raw-input '.' "$1"
+}
+
+compile() {
+	FILE_PATH="$(dirname $0)/$1.cpp"
+	cat >parameters.json <<END
+{
+  "code":$(read_string "$FILE_PATH"),
+  "codes": [{"file":"ArduinoJson.h","code":$(read_string "$ARDUINOJSON_H")}],
+  "options": "warning",
+  "compiler": "gcc-4.9.3",
+  "save": true
+}
+END
+	URL=$(curl -sS -H "Content-type: application/json" -d @parameters.json  https://wandbox.org/api/compile.json | jq --raw-output .url)
+	rm parameters.json
+	echo "$1: $URL"
+}
+
+compile "JsonGeneratorExample"
+compile "JsonParserExample"
+compile "MsgPackParserExample"
diff --git a/third-party/ArduinoJson/extras/tests/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/CMakeLists.txt
new file mode 100644
index 0000000..c88d300
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/CMakeLists.txt
@@ -0,0 +1,29 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+set(CMAKE_CXX_STANDARD 98)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_subdirectory(catch)
+
+link_libraries(ArduinoJson catch)
+
+include_directories(Helpers)
+add_subdirectory(Cpp11)
+add_subdirectory(Cpp17)
+add_subdirectory(FailingBuilds)
+add_subdirectory(IntegrationTests)
+add_subdirectory(JsonArray)
+add_subdirectory(JsonDeserializer)
+add_subdirectory(JsonDocument)
+add_subdirectory(JsonObject)
+add_subdirectory(JsonSerializer)
+add_subdirectory(JsonVariant)
+add_subdirectory(MemoryPool)
+add_subdirectory(Misc)
+add_subdirectory(MixedConfiguration)
+add_subdirectory(MsgPackDeserializer)
+add_subdirectory(MsgPackSerializer)
+add_subdirectory(Numbers)
+add_subdirectory(TextFormatter)
diff --git a/third-party/ArduinoJson/extras/tests/Cpp11/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/Cpp11/CMakeLists.txt
new file mode 100644
index 0000000..bae9fa9
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Cpp11/CMakeLists.txt
@@ -0,0 +1,32 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+if("cxx_nullptr" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+	list(APPEND SOURCES nullptr.cpp)
+	add_definitions(-DARDUINOJSON_HAS_NULLPTR=1)
+endif()
+
+if("cxx_auto_type" IN_LIST CMAKE_CXX_COMPILE_FEATURES AND "cxx_constexpr" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+	list(APPEND SOURCES issue1120.cpp)
+endif()
+
+if("cxx_long_long_type" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+	list(APPEND SOURCES use_long_long_0.cpp use_long_long_1.cpp)
+endif()
+
+if(NOT SOURCES)
+	return()
+endif()
+
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_executable(Cpp11Tests ${SOURCES})
+
+add_test(Cpp11 Cpp11Tests)
+
+set_tests_properties(Cpp11
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/Cpp11/issue1120.cpp b/third-party/ArduinoJson/extras/tests/Cpp11/issue1120.cpp
new file mode 100644
index 0000000..fbee477
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Cpp11/issue1120.cpp
@@ -0,0 +1,58 @@
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("Issue #1120") {
+  StaticJsonDocument<500> doc;
+  constexpr char str[] =
+      "{\"contents\":[{\"module\":\"Packet\"},{\"module\":\"Analog\"}]}";
+  deserializeJson(doc, str);
+
+  SECTION("MemberProxy<std::string>::isNull()") {
+    SECTION("returns false") {
+      auto value = doc[std::string("contents")];
+      CHECK(value.isNull() == false);
+    }
+
+    SECTION("returns true") {
+      auto value = doc[std::string("zontents")];
+      CHECK(value.isNull() == true);
+    }
+  }
+
+  SECTION("ElementProxy<MemberProxy<const char*> >::isNull()") {
+    SECTION("returns false") {  // Issue #1120
+      auto value = doc["contents"][1];
+      CHECK(value.isNull() == false);
+    }
+
+    SECTION("returns true") {
+      auto value = doc["contents"][2];
+      CHECK(value.isNull() == true);
+    }
+  }
+
+  SECTION("MemberProxy<ElementProxy<MemberProxy>, const char*>::isNull()") {
+    SECTION("returns false") {
+      auto value = doc["contents"][1]["module"];
+      CHECK(value.isNull() == false);
+    }
+
+    SECTION("returns true") {
+      auto value = doc["contents"][1]["zodule"];
+      CHECK(value.isNull() == true);
+    }
+  }
+
+  SECTION("MemberProxy<ElementProxy<MemberProxy>, std::string>::isNull()") {
+    SECTION("returns false") {
+      auto value = doc["contents"][1][std::string("module")];
+      CHECK(value.isNull() == false);
+    }
+
+    SECTION("returns true") {
+      auto value = doc["contents"][1][std::string("zodule")];
+      CHECK(value.isNull() == true);
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Cpp11/nullptr.cpp b/third-party/ArduinoJson/extras/tests/Cpp11/nullptr.cpp
new file mode 100644
index 0000000..cb3ba0f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Cpp11/nullptr.cpp
@@ -0,0 +1,39 @@
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+#if !ARDUINOJSON_HAS_NULLPTR
+#  error ARDUINOJSON_HAS_NULLPTR must be set to 1
+#endif
+
+TEST_CASE("nullptr") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("JsonVariant == nullptr") {
+    REQUIRE((variant == nullptr));
+    REQUIRE_FALSE((variant != nullptr));
+  }
+
+  SECTION("JsonVariant != nullptr") {
+    variant.set(42);
+
+    REQUIRE_FALSE((variant == nullptr));
+    REQUIRE((variant != nullptr));
+  }
+
+  SECTION("JsonVariant.set(nullptr)") {
+    variant.set(42);
+    variant.set(nullptr);
+
+    REQUIRE(variant.isNull());
+  }
+
+  SECTION("JsonVariant.is<nullptr_t>()") {
+    variant.set(42);
+    REQUIRE(variant.is<std::nullptr_t>() == false);
+
+    variant.clear();
+    REQUIRE(variant.is<std::nullptr_t>() == true);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Cpp11/use_long_long_0.cpp b/third-party/ArduinoJson/extras/tests/Cpp11/use_long_long_0.cpp
new file mode 100644
index 0000000..f467aab
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Cpp11/use_long_long_0.cpp
@@ -0,0 +1,16 @@
+#define ARDUINOJSON_USE_LONG_LONG 0
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 0") {
+  DynamicJsonDocument doc(4096);
+
+  doc["A"] = 42;
+  doc["B"] = 84;
+
+  std::string json;
+  serializeJson(doc, json);
+
+  REQUIRE(json == "{\"A\":42,\"B\":84}");
+}
diff --git a/third-party/ArduinoJson/extras/tests/Cpp11/use_long_long_1.cpp b/third-party/ArduinoJson/extras/tests/Cpp11/use_long_long_1.cpp
new file mode 100644
index 0000000..5127a55
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Cpp11/use_long_long_1.cpp
@@ -0,0 +1,17 @@
+#define ARDUINOJSON_USE_LONG_LONG 1
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_USE_LONG_LONG == 1") {
+  DynamicJsonDocument doc(4096);
+  JsonObject root = doc.to<JsonObject>();
+
+  root["A"] = 123456789123456789;
+  root["B"] = 987654321987654321;
+
+  std::string json;
+  serializeJson(doc, json);
+
+  REQUIRE(json == "{\"A\":123456789123456789,\"B\":987654321987654321}");
+}
diff --git a/third-party/ArduinoJson/extras/tests/Cpp17/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/Cpp17/CMakeLists.txt
new file mode 100644
index 0000000..80bf97b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Cpp17/CMakeLists.txt
@@ -0,0 +1,29 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+if(MSVC_VERSION LESS 1910)
+	return()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5)
+	return()
+endif()
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7)
+	return()
+endif()
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+add_executable(Cpp17Tests
+	string_view.cpp
+)
+
+add_test(Cpp17 Cpp17Tests)
+
+set_tests_properties(Cpp17
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/Cpp17/string_view.cpp b/third-party/ArduinoJson/extras/tests/Cpp17/string_view.cpp
new file mode 100644
index 0000000..7c00a4f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Cpp17/string_view.cpp
@@ -0,0 +1,79 @@
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+#include <string_view>
+
+#if !ARDUINOJSON_ENABLE_STRING_VIEW
+#  error ARDUINOJSON_ENABLE_STRING_VIEW must be set to 1
+#endif
+
+TEST_CASE("string_view") {
+  StaticJsonDocument<128> doc;
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("deserializeJson()") {
+    auto err = deserializeJson(doc, std::string_view("123", 2));
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.as<int>() == 12);
+  }
+
+  SECTION("JsonDocument::set()") {
+    doc.set(std::string_view("123", 2));
+    REQUIRE(doc.as<std::string>() == "12");
+  }
+
+  SECTION("JsonDocument::operator[]() const") {
+    doc["ab"] = "Yes";
+    doc["abc"] = "No";
+    REQUIRE(doc[std::string_view("abc", 2)] == "Yes");
+  }
+
+  SECTION("JsonDocument::operator[]()") {
+    doc[std::string_view("abc", 2)] = "Yes";
+    REQUIRE(doc["ab"] == "Yes");
+  }
+
+  SECTION("JsonVariant::operator==()") {
+    variant.set("A");
+    REQUIRE(variant == std::string_view("AX", 1));
+    REQUIRE_FALSE(variant == std::string_view("BX", 1));
+  }
+
+  SECTION("JsonVariant::operator>()") {
+    variant.set("B");
+    REQUIRE(variant > std::string_view("AX", 1));
+    REQUIRE_FALSE(variant > std::string_view("CX", 1));
+  }
+
+  SECTION("JsonVariant::operator<()") {
+    variant.set("B");
+    REQUIRE(variant < std::string_view("CX", 1));
+    REQUIRE_FALSE(variant < std::string_view("AX", 1));
+  }
+
+  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);
+  }
+}
+
+using ARDUINOJSON_NAMESPACE::adaptString;
+
+TEST_CASE("StringViewAdapter") {
+  std::string_view str("bravoXXX", 5);
+  auto adapter = adaptString(str);
+
+  CHECK(adapter.compare(NULL) > 0);
+  CHECK(adapter.compare("alpha") > 0);
+  CHECK(adapter.compare("bravo") == 0);
+  CHECK(adapter.compare("charlie") < 0);
+
+  CHECK(adapter.equals("bravo"));
+  CHECK_FALSE(adapter.equals("charlie"));
+  CHECK_FALSE(adapter.equals(NULL));
+
+  CHECK(adapter.size() == 5);
+}
diff --git a/third-party/ArduinoJson/extras/tests/FailingBuilds/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/FailingBuilds/CMakeLists.txt
new file mode 100644
index 0000000..10bda9c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/FailingBuilds/CMakeLists.txt
@@ -0,0 +1,48 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+macro(build_should_fail target)
+	set_target_properties(${target}
+		PROPERTIES
+	    	EXCLUDE_FROM_ALL TRUE
+	        EXCLUDE_FROM_DEFAULT_BUILD TRUE
+	)
+	add_test(
+		NAME
+			${target}
+	    COMMAND
+	    	${CMAKE_COMMAND} --build . --target ${target} --config $<CONFIGURATION>
+	    WORKING_DIRECTORY
+	    	${CMAKE_BINARY_DIR}
+	)
+	set_tests_properties(${target} 
+		PROPERTIES
+			WILL_FAIL	TRUE
+			LABELS 		"WillFail;Catch"
+	)
+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)
+set_property(TARGET read_long_long PROPERTY CXX_STANDARD 11)
+build_should_fail(read_long_long)
+
+add_executable(write_long_long write_long_long.cpp)
+set_property(TARGET write_long_long PROPERTY CXX_STANDARD 11)
+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)
+
+add_executable(assign_char assign_char.cpp)
+build_should_fail(assign_char)
diff --git a/third-party/ArduinoJson/extras/tests/FailingBuilds/Issue1189.cpp b/third-party/ArduinoJson/extras/tests/FailingBuilds/Issue1189.cpp
new file mode 100644
index 0000000..baf82f7
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/FailingBuilds/Issue1189.cpp
@@ -0,0 +1,13 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+
+// a function should not be able to get a JsonDocument by value
+void f(JsonDocument) {}
+
+int main() {
+  DynamicJsonDocument doc(1024);
+  f(doc);
+}
diff --git a/third-party/ArduinoJson/extras/tests/FailingBuilds/Issue978.cpp b/third-party/ArduinoJson/extras/tests/FailingBuilds/Issue978.cpp
new file mode 100644
index 0000000..aebcd59
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/FailingBuilds/Issue978.cpp
@@ -0,0 +1,13 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+
+struct Stream {};
+
+int main() {
+  Stream* stream = 0;
+  DynamicJsonDocument doc(1024);
+  deserializeJson(doc, stream);
+}
diff --git a/third-party/ArduinoJson/extras/tests/FailingBuilds/assign_char.cpp b/third-party/ArduinoJson/extras/tests/FailingBuilds/assign_char.cpp
new file mode 100644
index 0000000..28f6248
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/FailingBuilds/assign_char.cpp
@@ -0,0 +1,12 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+
+// See issue #1498
+
+int main() {
+  DynamicJsonDocument doc(1024);
+  doc["dummy"] = 'A';
+}
diff --git a/third-party/ArduinoJson/extras/tests/FailingBuilds/delete_jsondocument.cpp b/third-party/ArduinoJson/extras/tests/FailingBuilds/delete_jsondocument.cpp
new file mode 100644
index 0000000..b99fa5d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/FailingBuilds/delete_jsondocument.cpp
@@ -0,0 +1,12 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+
+struct Stream {};
+
+int main() {
+  JsonDocument* doc = new DynamicJsonDocument(42);
+  delete doc;
+}
diff --git a/third-party/ArduinoJson/extras/tests/FailingBuilds/read_long_long.cpp b/third-party/ArduinoJson/extras/tests/FailingBuilds/read_long_long.cpp
new file mode 100644
index 0000000..242231f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/FailingBuilds/read_long_long.cpp
@@ -0,0 +1,20 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_USE_LONG_LONG 0
+#include <ArduinoJson.h>
+
+#if defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ >= 8
+#  error This test requires sizeof(long) < 8
+#endif
+
+#if !ARDUINOJSON_HAS_LONG_LONG
+#  error This test requires C++11
+#endif
+
+ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(long long)
+int main() {
+  DynamicJsonDocument doc(1024);
+  doc["dummy"].as<long long>();
+}
diff --git a/third-party/ArduinoJson/extras/tests/FailingBuilds/variant_as_char.cpp b/third-party/ArduinoJson/extras/tests/FailingBuilds/variant_as_char.cpp
new file mode 100644
index 0000000..5080861
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/FailingBuilds/variant_as_char.cpp
@@ -0,0 +1,12 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+
+// See issue #1498
+
+int main() {
+  DynamicJsonDocument doc(1024);
+  doc["dummy"].as<char>();
+}
diff --git a/third-party/ArduinoJson/extras/tests/FailingBuilds/write_long_long.cpp b/third-party/ArduinoJson/extras/tests/FailingBuilds/write_long_long.cpp
new file mode 100644
index 0000000..130fabb
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/FailingBuilds/write_long_long.cpp
@@ -0,0 +1,19 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_USE_LONG_LONG 0
+#include <ArduinoJson.h>
+
+#if defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ >= 8
+#  error This test requires sizeof(long) < 8
+#endif
+
+#if !ARDUINOJSON_HAS_LONG_LONG
+#  error This test requires C++11
+#endif
+
+int main() {
+  DynamicJsonDocument doc(1024);
+  doc["dummy"] = static_cast<long long>(42);
+}
diff --git a/third-party/ArduinoJson/extras/tests/Helpers/Arduino.h b/third-party/ArduinoJson/extras/tests/Helpers/Arduino.h
new file mode 100644
index 0000000..a369622
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Helpers/Arduino.h
@@ -0,0 +1,9 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "api/Print.h"
+#include "api/Stream.h"
+#include "api/String.h"
diff --git a/third-party/ArduinoJson/extras/tests/Helpers/CustomReader.hpp b/third-party/ArduinoJson/extras/tests/Helpers/CustomReader.hpp
new file mode 100644
index 0000000..c76ce2a
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Helpers/CustomReader.hpp
@@ -0,0 +1,26 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <sstream>
+
+class CustomReader {
+  std::stringstream _stream;
+
+ public:
+  CustomReader(const char* input) : _stream(input) {}
+
+  int read() {
+    return _stream.get();
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    _stream.read(buffer, static_cast<std::streamsize>(length));
+    return static_cast<size_t>(_stream.gcount());
+  }
+
+ private:
+  CustomReader(const CustomReader&);
+};
diff --git a/third-party/ArduinoJson/extras/tests/Helpers/api/Print.h b/third-party/ArduinoJson/extras/tests/Helpers/api/Print.h
new file mode 100644
index 0000000..5af49b4
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Helpers/api/Print.h
@@ -0,0 +1,33 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+class Print {
+ public:
+  virtual ~Print() {}
+
+  virtual size_t write(uint8_t) = 0;
+  virtual size_t write(const uint8_t *buffer, size_t size) = 0;
+
+  size_t write(const char *str) {
+    if (!str)
+      return 0;
+    return write(reinterpret_cast<const uint8_t *>(str), strlen(str));
+  }
+
+  size_t write(const char *buffer, size_t size) {
+    return write(reinterpret_cast<const uint8_t *>(buffer), size);
+  }
+};
+
+class Printable {
+ public:
+  virtual ~Printable() {}
+  virtual size_t printTo(Print &p) const = 0;
+};
diff --git a/third-party/ArduinoJson/extras/tests/Helpers/api/Stream.h b/third-party/ArduinoJson/extras/tests/Helpers/api/Stream.h
new file mode 100644
index 0000000..907e69f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Helpers/api/Stream.h
@@ -0,0 +1,14 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+// Reproduces Arduino's Stream class
+class Stream  // : public Print
+{
+ public:
+  virtual ~Stream() {}
+  virtual int read() = 0;
+  virtual size_t readBytes(char *buffer, size_t length) = 0;
+};
diff --git a/third-party/ArduinoJson/extras/tests/Helpers/api/String.h b/third-party/ArduinoJson/extras/tests/Helpers/api/String.h
new file mode 100644
index 0000000..31609de
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Helpers/api/String.h
@@ -0,0 +1,58 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <string>
+
+// Reproduces Arduino's String class
+class String {
+ public:
+  String() : _maxCapacity(1024) {}
+  explicit String(const char* s) : _str(s), _maxCapacity(1024) {}
+
+  void limitCapacityTo(size_t maxCapacity) {
+    _maxCapacity = maxCapacity;
+  }
+
+  unsigned char concat(const char* s) {
+    return concat(s, strlen(s));
+  }
+
+  size_t length() const {
+    return _str.size();
+  }
+
+  const char* c_str() const {
+    return _str.c_str();
+  }
+
+  bool operator==(const char* s) const {
+    return _str == s;
+  }
+
+  friend std::ostream& operator<<(std::ostream& lhs, const ::String& rhs) {
+    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)
+      return 0;
+    _str.append(s, n);
+    return 1;
+  }
+
+ private:
+  std::string _str;
+  size_t _maxCapacity;
+};
+
+class StringSumHelper;
+
+inline bool operator==(const std::string& lhs, const ::String& rhs) {
+  return lhs == rhs.c_str();
+}
diff --git a/third-party/ArduinoJson/extras/tests/Helpers/progmem_emulation.hpp b/third-party/ArduinoJson/extras/tests/Helpers/progmem_emulation.hpp
new file mode 100644
index 0000000..086ce10
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Helpers/progmem_emulation.hpp
@@ -0,0 +1,42 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <stdint.h>  // uint8_t
+#include <string.h>  // strcmp, strlen...
+
+#define PROGMEM
+
+class __FlashStringHelper;
+
+inline const void* convertPtrToFlash(const void* s) {
+  return reinterpret_cast<const char*>(s) + 42;
+}
+
+inline const void* convertFlashToPtr(const void* s) {
+  return reinterpret_cast<const char*>(s) - 42;
+}
+
+#define PSTR(X) reinterpret_cast<const char*>(convertPtrToFlash(X))
+#define F(X) reinterpret_cast<const __FlashStringHelper*>(PSTR(X))
+
+inline uint8_t pgm_read_byte(const void* p) {
+  return *reinterpret_cast<const uint8_t*>(convertFlashToPtr(p));
+}
+
+inline void* pgm_read_ptr(const void* p) {
+  return *reinterpret_cast<void* const*>(convertFlashToPtr(p));
+}
+
+inline float pgm_read_float(const void* p) {
+  return *reinterpret_cast<const float*>(convertFlashToPtr(p));
+}
+
+inline uint32_t pgm_read_dword(const void* p) {
+  return *reinterpret_cast<const uint32_t*>(convertFlashToPtr(p));
+}
+
+#define ARDUINOJSON_DEFINE_STATIC_ARRAY(type, name, value)         \
+  static type const ARDUINOJSON_CONCAT2(name, _progmem)[] = value; \
+  static type const* name = reinterpret_cast<type const*>(         \
+      convertPtrToFlash(ARDUINOJSON_CONCAT2(name, _progmem)));
diff --git a/third-party/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt
new file mode 100644
index 0000000..8fd6921
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/IntegrationTests/CMakeLists.txt
@@ -0,0 +1,24 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(IntegrationTests
+	gbathree.cpp
+	issue772.cpp
+	round_trip.cpp
+	openweathermap.cpp
+)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	target_compile_options(IntegrationTests
+		PUBLIC
+		-fsingle-precision-constant # issue 544
+	)
+endif()
+
+add_test(IntegrationTests IntegrationTests)
+
+set_tests_properties(IntegrationTests
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp b/third-party/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp
new file mode 100644
index 0000000..c82752b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/IntegrationTests/gbathree.cpp
@@ -0,0 +1,210 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("Gbathree") {
+  DynamicJsonDocument doc(4096);
+
+  DeserializationError error = deserializeJson(
+      doc,
+      "{\"protocol_name\":\"fluorescence\",\"repeats\":1,\"wait\":0,"
+      "\"averages\":1,\"measurements\":3,\"meas2_light\":15,\"meas1_"
+      "baseline\":0,\"act_light\":20,\"pulsesize\":25,\"pulsedistance\":"
+      "10000,\"actintensity1\":50,\"actintensity2\":255,\"measintensity\":"
+      "255,\"calintensity\":255,\"pulses\":[50,50,50],\"act\":[2,1,2,2],"
+      "\"red\":[2,2,2,2],\"detectors\":[[34,34,34,34],[34,34,34,34],[34,"
+      "34,34,34],[34,34,34,34]],\"alta\":[2,2,2,2],\"altb\":[2,2,2,2],"
+      "\"measlights\":[[15,15,15,15],[15,15,15,15],[15,15,15,15],[15,15,"
+      "15,15]],\"measlights2\":[[15,15,15,15],[15,15,15,15],[15,15,15,15],"
+      "[15,15,15,15]],\"altc\":[2,2,2,2],\"altd\":[2,2,2,2]}");
+  JsonObject root = doc.as<JsonObject>();
+
+  SECTION("Success") {
+    REQUIRE(error == DeserializationError::Ok);
+  }
+
+  SECTION("ProtocolName") {
+    REQUIRE("fluorescence" == root["protocol_name"]);
+  }
+
+  SECTION("Repeats") {
+    REQUIRE(1 == root["repeats"]);
+  }
+
+  SECTION("Wait") {
+    REQUIRE(0 == root["wait"]);
+  }
+
+  SECTION("Measurements") {
+    REQUIRE(3 == root["measurements"]);
+  }
+
+  SECTION("Meas2_Light") {
+    REQUIRE(15 == root["meas2_light"]);
+  }
+
+  SECTION("Meas1_Baseline") {
+    REQUIRE(0 == root["meas1_baseline"]);
+  }
+
+  SECTION("Act_Light") {
+    REQUIRE(20 == root["act_light"]);
+  }
+
+  SECTION("Pulsesize") {
+    REQUIRE(25 == root["pulsesize"]);
+  }
+
+  SECTION("Pulsedistance") {
+    REQUIRE(10000 == root["pulsedistance"]);
+  }
+
+  SECTION("Actintensity1") {
+    REQUIRE(50 == root["actintensity1"]);
+  }
+
+  SECTION("Actintensity2") {
+    REQUIRE(255 == root["actintensity2"]);
+  }
+
+  SECTION("Measintensity") {
+    REQUIRE(255 == root["measintensity"]);
+  }
+
+  SECTION("Calintensity") {
+    REQUIRE(255 == root["calintensity"]);
+  }
+
+  SECTION("Pulses") {
+    // "pulses":[50,50,50]
+
+    JsonArray array = root["pulses"];
+    REQUIRE(array.isNull() == false);
+
+    REQUIRE(3 == array.size());
+
+    for (size_t i = 0; i < 3; i++) {
+      REQUIRE(50 == array[i]);
+    }
+  }
+
+  SECTION("Act") {
+    // "act":[2,1,2,2]
+
+    JsonArray array = root["act"];
+    REQUIRE(array.isNull() == false);
+
+    REQUIRE(4 == array.size());
+    REQUIRE(2 == array[0]);
+    REQUIRE(1 == array[1]);
+    REQUIRE(2 == array[2]);
+    REQUIRE(2 == array[3]);
+  }
+
+  SECTION("Detectors") {
+    // "detectors":[[34,34,34,34],[34,34,34,34],[34,34,34,34],[34,34,34,34]]
+
+    JsonArray array = root["detectors"];
+    REQUIRE(array.isNull() == false);
+    REQUIRE(4 == array.size());
+
+    for (size_t i = 0; i < 4; i++) {
+      JsonArray nestedArray = array[i];
+      REQUIRE(4 == nestedArray.size());
+
+      for (size_t j = 0; j < 4; j++) {
+        REQUIRE(34 == nestedArray[j]);
+      }
+    }
+  }
+
+  SECTION("Alta") {
+    // alta:[2,2,2,2]
+
+    JsonArray array = root["alta"];
+    REQUIRE(array.isNull() == false);
+
+    REQUIRE(4 == array.size());
+
+    for (size_t i = 0; i < 4; i++) {
+      REQUIRE(2 == array[i]);
+    }
+  }
+
+  SECTION("Altb") {
+    // altb:[2,2,2,2]
+
+    JsonArray array = root["altb"];
+    REQUIRE(array.isNull() == false);
+
+    REQUIRE(4 == array.size());
+
+    for (size_t i = 0; i < 4; i++) {
+      REQUIRE(2 == array[i]);
+    }
+  }
+
+  SECTION("Measlights") {
+    // "measlights":[[15,15,15,15],[15,15,15,15],[15,15,15,15],[15,15,15,15]]
+
+    JsonArray array = root["measlights"];
+    REQUIRE(array.isNull() == false);
+    REQUIRE(4 == array.size());
+
+    for (size_t i = 0; i < 4; i++) {
+      JsonArray nestedArray = array[i];
+
+      REQUIRE(4 == nestedArray.size());
+
+      for (size_t j = 0; j < 4; j++) {
+        REQUIRE(15 == nestedArray[j]);
+      }
+    }
+  }
+
+  SECTION("Measlights2") {
+    // "measlights2":[[15,15,15,15],[15,15,15,15],[15,15,15,15],[15,15,15,15]]
+
+    JsonArray array = root["measlights2"];
+    REQUIRE(array.isNull() == false);
+    REQUIRE(4 == array.size());
+
+    for (size_t i = 0; i < 4; i++) {
+      JsonArray nestedArray = array[i];
+      REQUIRE(4 == nestedArray.size());
+
+      for (size_t j = 0; j < 4; j++) {
+        REQUIRE(15 == nestedArray[j]);
+      }
+    }
+  }
+
+  SECTION("Altc") {
+    // altc:[2,2,2,2]
+
+    JsonArray array = root["altc"];
+    REQUIRE(array.isNull() == false);
+
+    REQUIRE(4 == array.size());
+
+    for (size_t i = 0; i < 4; i++) {
+      REQUIRE(2 == array[i]);
+    }
+  }
+
+  SECTION("Altd") {
+    // altd:[2,2,2,2]
+
+    JsonArray array = root["altd"];
+    REQUIRE(array.isNull() == false);
+
+    REQUIRE(4 == array.size());
+
+    for (size_t i = 0; i < 4; i++) {
+      REQUIRE(2 == array[i]);
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp b/third-party/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp
new file mode 100644
index 0000000..928fcd5
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/IntegrationTests/issue772.cpp
@@ -0,0 +1,28 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+// https://github.com/bblanchon/ArduinoJson/issues/772
+
+TEST_CASE("Issue772") {
+  DynamicJsonDocument doc1(4096);
+  DynamicJsonDocument doc2(4096);
+  DeserializationError err;
+  std::string data =
+      "{\"state\":{\"reported\":{\"timestamp\":\"2018-07-02T09:40:12Z\","
+      "\"mac\":\"2C3AE84FC076\",\"firmwareVersion\":\"v0.2.7-5-gf4d4d78\","
+      "\"visibleLight\":261,\"infraRed\":255,\"ultraViolet\":0.02,"
+      "\"Temperature\":26.63,\"Pressure\":101145.7,\"Humidity\":54.79883,"
+      "\"Vbat\":4.171261,\"soilMoisture\":0,\"ActB\":0}}}";
+  err = deserializeJson(doc1, data);
+  REQUIRE(err == DeserializationError::Ok);
+
+  data = "";
+  serializeMsgPack(doc1, data);
+  err = deserializeMsgPack(doc2, data);
+
+  REQUIRE(err == DeserializationError::Ok);
+}
diff --git a/third-party/ArduinoJson/extras/tests/IntegrationTests/openweathermap.cpp b/third-party/ArduinoJson/extras/tests/IntegrationTests/openweathermap.cpp
new file mode 100644
index 0000000..3259244
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/IntegrationTests/openweathermap.cpp
@@ -0,0 +1,68 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("OpenWeatherMap") {
+  // clang-format off
+  const char* input_json = "{\"cod\":\"200\",\"message\":0,\"cnt\":40,\"list\":[{\"dt\":1581498000,\"main\":{\"temp\":3.23,\"feels_like\":-3.63,\"temp_min\":3.23,\"temp_max\":4.62,\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":58,\"temp_kf\":-1.39},\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":0},\"wind\":{\"speed\":6.19,\"deg\":266},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 09:00:00\"},{\"dt\":1581508800,\"main\":{\"temp\":6.09,\"feels_like\":-1.07,\"temp_min\":6.09,\"temp_max\":7.13,\"pressure\":1015,\"sea_level\":1015,\"grnd_level\":1011,\"humidity\":48,\"temp_kf\":-1.04},\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear sky\",\"icon\":\"01d\"}],\"clouds\":{\"all\":9},\"wind\":{\"speed\":6.64,\"deg\":268},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 12:00:00\"},{\"dt\":1581519600,\"main\":{\"temp\":6.82,\"feels_like\":0.47,\"temp_min\":6.82,\"temp_max\":7.52,\"pressure\":1015,\"sea_level\":1015,\"grnd_level\":1011,\"humidity\":47,\"temp_kf\":-0.7},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":97},\"wind\":{\"speed\":5.55,\"deg\":267},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-12 15:00:00\"},{\"dt\":1581530400,\"main\":{\"temp\":5.76,\"feels_like\":1.84,\"temp_min\":5.76,\"temp_max\":6.11,\"pressure\":1015,\"sea_level\":1015,\"grnd_level\":1010,\"humidity\":57,\"temp_kf\":-0.35},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":99},\"wind\":{\"speed\":2.35,\"deg\":232},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-12 18:00:00\"},{\"dt\":1581541200,\"main\":{\"temp\":5.7,\"feels_like\":1.34,\"temp_min\":5.7,\"temp_max\":5.7,\"pressure\":1012,\"sea_level\":1012,\"grnd_level\":1008,\"humidity\":71,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":3.57,\"deg\":198},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-12 21:00:00\"},{\"dt\":1581552000,\"main\":{\"temp\":5.82,\"feels_like\":1.39,\"temp_min\":5.82,\"temp_max\":5.82,\"pressure\":1009,\"sea_level\":1009,\"grnd_level\":1004,\"humidity\":86,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":4.35,\"deg\":169},\"rain\":{\"3h\":0.5},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 00:00:00\"},{\"dt\":1581562800,\"main\":{\"temp\":5.9,\"feels_like\":-0.85,\"temp_min\":5.9,\"temp_max\":5.9,\"pressure\":1000,\"sea_level\":1000,\"grnd_level\":997,\"humidity\":86,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":7.69,\"deg\":178},\"rain\":{\"3h\":1.75},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 03:00:00\"},{\"dt\":1581573600,\"main\":{\"temp\":7.52,\"feels_like\":1.74,\"temp_min\":7.52,\"temp_max\":7.52,\"pressure\":993,\"sea_level\":993,\"grnd_level\":988,\"humidity\":88,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":6.84,\"deg\":184},\"rain\":{\"3h\":7.06},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 06:00:00\"},{\"dt\":1581584400,\"main\":{\"temp\":7.23,\"feels_like\":0.81,\"temp_min\":7.23,\"temp_max\":7.23,\"pressure\":992,\"sea_level\":992,\"grnd_level\":988,\"humidity\":69,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":49},\"wind\":{\"speed\":6.77,\"deg\":239},\"rain\":{\"3h\":0.25},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-13 09:00:00\"},{\"dt\":1581595200,\"main\":{\"temp\":7.67,\"feels_like\":2.81,\"temp_min\":7.67,\"temp_max\":7.67,\"pressure\":991,\"sea_level\":991,\"grnd_level\":987,\"humidity\":75,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":73},\"wind\":{\"speed\":4.93,\"deg\":235},\"rain\":{\"3h\":0.75},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-13 12:00:00\"},{\"dt\":1581606000,\"main\":{\"temp\":8.83,\"feels_like\":3.23,\"temp_min\":8.83,\"temp_max\":8.83,\"pressure\":993,\"sea_level\":993,\"grnd_level\":990,\"humidity\":64,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":83},\"wind\":{\"speed\":5.7,\"deg\":293},\"rain\":{\"3h\":0.38},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-13 15:00:00\"},{\"dt\":1581616800,\"main\":{\"temp\":7.42,\"feels_like\":1.77,\"temp_min\":7.42,\"temp_max\":7.42,\"pressure\":1000,\"sea_level\":1000,\"grnd_level\":996,\"humidity\":71,\"temp_kf\":0},\"weather\":[{\"id\":803,\"main\":\"Clouds\",\"description\":\"broken clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":54},\"wind\":{\"speed\":5.81,\"deg\":307},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 18:00:00\"},{\"dt\":1581627600,\"main\":{\"temp\":5.82,\"feels_like\":0.89,\"temp_min\":5.82,\"temp_max\":5.82,\"pressure\":1007,\"sea_level\":1007,\"grnd_level\":1003,\"humidity\":79,\"temp_kf\":0},\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear sky\",\"icon\":\"01n\"}],\"clouds\":{\"all\":6},\"wind\":{\"speed\":4.76,\"deg\":300},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-13 21:00:00\"},{\"dt\":1581638400,\"main\":{\"temp\":5.58,\"feels_like\":2.09,\"temp_min\":5.58,\"temp_max\":5.58,\"pressure\":1011,\"sea_level\":1011,\"grnd_level\":1007,\"humidity\":81,\"temp_kf\":0},\"weather\":[{\"id\":802,\"main\":\"Clouds\",\"description\":\"scattered clouds\",\"icon\":\"03n\"}],\"clouds\":{\"all\":47},\"wind\":{\"speed\":2.73,\"deg\":326},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 00:00:00\"},{\"dt\":1581649200,\"main\":{\"temp\":4.27,\"feels_like\":1.72,\"temp_min\":4.27,\"temp_max\":4.27,\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":85,\"temp_kf\":0},\"weather\":[{\"id\":803,\"main\":\"Clouds\",\"description\":\"broken clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":69},\"wind\":{\"speed\":1.24,\"deg\":295},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 03:00:00\"},{\"dt\":1581660000,\"main\":{\"temp\":3.91,\"feels_like\":1.54,\"temp_min\":3.91,\"temp_max\":3.91,\"pressure\":1016,\"sea_level\":1016,\"grnd_level\":1012,\"humidity\":87,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":85},\"wind\":{\"speed\":0.98,\"deg\":211},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 06:00:00\"},{\"dt\":1581670800,\"main\":{\"temp\":4.77,\"feels_like\":0.74,\"temp_min\":4.77,\"temp_max\":4.77,\"pressure\":1017,\"sea_level\":1017,\"grnd_level\":1013,\"humidity\":78,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":3.19,\"deg\":184},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-14 09:00:00\"},{\"dt\":1581681600,\"main\":{\"temp\":9.03,\"feels_like\":4,\"temp_min\":9.03,\"temp_max\":9.03,\"pressure\":1016,\"sea_level\":1016,\"grnd_level\":1012,\"humidity\":73,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":5.43,\"deg\":206},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-14 12:00:00\"},{\"dt\":1581692400,\"main\":{\"temp\":9.86,\"feels_like\":4.22,\"temp_min\":9.86,\"temp_max\":9.86,\"pressure\":1014,\"sea_level\":1014,\"grnd_level\":1010,\"humidity\":74,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":6.58,\"deg\":209},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-14 15:00:00\"},{\"dt\":1581703200,\"main\":{\"temp\":9.48,\"feels_like\":4.8,\"temp_min\":9.48,\"temp_max\":9.48,\"pressure\":1013,\"sea_level\":1013,\"grnd_level\":1009,\"humidity\":83,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":5.6,\"deg\":206},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 18:00:00\"},{\"dt\":1581714000,\"main\":{\"temp\":10.03,\"feels_like\":6.48,\"temp_min\":10.03,\"temp_max\":10.03,\"pressure\":1013,\"sea_level\":1013,\"grnd_level\":1009,\"humidity\":93,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":4.75,\"deg\":226},\"rain\":{\"3h\":3.13},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-14 21:00:00\"},{\"dt\":1581724800,\"main\":{\"temp\":9.48,\"feels_like\":6.25,\"temp_min\":9.48,\"temp_max\":9.48,\"pressure\":1013,\"sea_level\":1013,\"grnd_level\":1009,\"humidity\":89,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":3.87,\"deg\":214},\"rain\":{\"3h\":2.38},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 00:00:00\"},{\"dt\":1581735600,\"main\":{\"temp\":9.12,\"feels_like\":7.08,\"temp_min\":9.12,\"temp_max\":9.12,\"pressure\":1011,\"sea_level\":1011,\"grnd_level\":1007,\"humidity\":96,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":2.43,\"deg\":194},\"rain\":{\"3h\":1},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 03:00:00\"},{\"dt\":1581746400,\"main\":{\"temp\":10.32,\"feels_like\":6.71,\"temp_min\":10.32,\"temp_max\":10.32,\"pressure\":1009,\"sea_level\":1009,\"grnd_level\":1004,\"humidity\":95,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":5.05,\"deg\":196},\"rain\":{\"3h\":1.75},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 06:00:00\"},{\"dt\":1581757200,\"main\":{\"temp\":11.57,\"feels_like\":5.85,\"temp_min\":11.57,\"temp_max\":11.57,\"pressure\":1006,\"sea_level\":1006,\"grnd_level\":1002,\"humidity\":85,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":7.91,\"deg\":205},\"rain\":{\"3h\":1.44},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-15 09:00:00\"},{\"dt\":1581768000,\"main\":{\"temp\":12.25,\"feels_like\":4.46,\"temp_min\":12.25,\"temp_max\":12.25,\"pressure\":1003,\"sea_level\":1003,\"grnd_level\":998,\"humidity\":78,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":10.65,\"deg\":201},\"rain\":{\"3h\":1.81},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-15 12:00:00\"},{\"dt\":1581778800,\"main\":{\"temp\":12.19,\"feels_like\":3.17,\"temp_min\":12.19,\"temp_max\":12.19,\"pressure\":998,\"sea_level\":998,\"grnd_level\":994,\"humidity\":80,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":12.52,\"deg\":204},\"rain\":{\"3h\":3.5},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-15 15:00:00\"},{\"dt\":1581789600,\"main\":{\"temp\":12.25,\"feels_like\":4.15,\"temp_min\":12.25,\"temp_max\":12.25,\"pressure\":996,\"sea_level\":996,\"grnd_level\":992,\"humidity\":83,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":11.42,\"deg\":215},\"rain\":{\"3h\":4.88},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 18:00:00\"},{\"dt\":1581800400,\"main\":{\"temp\":12.64,\"feels_like\":5.85,\"temp_min\":12.64,\"temp_max\":12.64,\"pressure\":994,\"sea_level\":994,\"grnd_level\":990,\"humidity\":76,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":9.22,\"deg\":217},\"rain\":{\"3h\":6.88},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-15 21:00:00\"},{\"dt\":1581811200,\"main\":{\"temp\":12.96,\"feels_like\":4.03,\"temp_min\":12.96,\"temp_max\":12.96,\"pressure\":988,\"sea_level\":988,\"grnd_level\":984,\"humidity\":83,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":12.88,\"deg\":211},\"rain\":{\"3h\":5.63},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 00:00:00\"},{\"dt\":1581822000,\"main\":{\"temp\":13.13,\"feels_like\":5.17,\"temp_min\":13.13,\"temp_max\":13.13,\"pressure\":987,\"sea_level\":987,\"grnd_level\":982,\"humidity\":82,\"temp_kf\":0},\"weather\":[{\"id\":501,\"main\":\"Rain\",\"description\":\"moderate rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":11.49,\"deg\":246},\"rain\":{\"3h\":7.25},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 03:00:00\"},{\"dt\":1581832800,\"main\":{\"temp\":9.07,\"feels_like\":0.79,\"temp_min\":9.07,\"temp_max\":9.07,\"pressure\":990,\"sea_level\":990,\"grnd_level\":986,\"humidity\":75,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10n\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":10.18,\"deg\":255},\"rain\":{\"3h\":2},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 06:00:00\"},{\"dt\":1581843600,\"main\":{\"temp\":8.05,\"feels_like\":-0.9,\"temp_min\":8.05,\"temp_max\":8.05,\"pressure\":994,\"sea_level\":994,\"grnd_level\":990,\"humidity\":51,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":100},\"wind\":{\"speed\":9.65,\"deg\":245},\"rain\":{\"3h\":1.19},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-16 09:00:00\"},{\"dt\":1581854400,\"main\":{\"temp\":9.54,\"feels_like\":0.13,\"temp_min\":9.54,\"temp_max\":9.54,\"pressure\":996,\"sea_level\":996,\"grnd_level\":991,\"humidity\":41,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04d\"}],\"clouds\":{\"all\":94},\"wind\":{\"speed\":10.03,\"deg\":243},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-16 12:00:00\"},{\"dt\":1581865200,\"main\":{\"temp\":9.08,\"feels_like\":-0.35,\"temp_min\":9.08,\"temp_max\":9.08,\"pressure\":996,\"sea_level\":996,\"grnd_level\":991,\"humidity\":44,\"temp_kf\":0},\"weather\":[{\"id\":500,\"main\":\"Rain\",\"description\":\"light rain\",\"icon\":\"10d\"}],\"clouds\":{\"all\":89},\"wind\":{\"speed\":10.15,\"deg\":246},\"rain\":{\"3h\":0.25},\"sys\":{\"pod\":\"d\"},\"dt_txt\":\"2020-02-16 15:00:00\"},{\"dt\":1581876000,\"main\":{\"temp\":7.41,\"feels_like\":-1.34,\"temp_min\":7.41,\"temp_max\":7.41,\"pressure\":996,\"sea_level\":996,\"grnd_level\":992,\"humidity\":50,\"temp_kf\":0},\"weather\":[{\"id\":804,\"main\":\"Clouds\",\"description\":\"overcast clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":94},\"wind\":{\"speed\":9.21,\"deg\":240},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 18:00:00\"},{\"dt\":1581886800,\"main\":{\"temp\":6.42,\"feels_like\":-1.7,\"temp_min\":6.42,\"temp_max\":6.42,\"pressure\":997,\"sea_level\":997,\"grnd_level\":993,\"humidity\":58,\"temp_kf\":0},\"weather\":[{\"id\":803,\"main\":\"Clouds\",\"description\":\"broken clouds\",\"icon\":\"04n\"}],\"clouds\":{\"all\":67},\"wind\":{\"speed\":8.52,\"deg\":236},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-16 21:00:00\"},{\"dt\":1581897600,\"main\":{\"temp\":6.03,\"feels_like\":-2.65,\"temp_min\":6.03,\"temp_max\":6.03,\"pressure\":996,\"sea_level\":996,\"grnd_level\":993,\"humidity\":51,\"temp_kf\":0},\"weather\":[{\"id\":802,\"main\":\"Clouds\",\"description\":\"scattered clouds\",\"icon\":\"03n\"}],\"clouds\":{\"all\":38},\"wind\":{\"speed\":8.94,\"deg\":240},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-17 00:00:00\"},{\"dt\":1581908400,\"main\":{\"temp\":5.62,\"feels_like\":-2.86,\"temp_min\":5.62,\"temp_max\":5.62,\"pressure\":995,\"sea_level\":995,\"grnd_level\":991,\"humidity\":53,\"temp_kf\":0},\"weather\":[{\"id\":800,\"main\":\"Clear\",\"description\":\"clear sky\",\"icon\":\"01n\"}],\"clouds\":{\"all\":0},\"wind\":{\"speed\":8.67,\"deg\":241},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-17 03:00:00\"},{\"dt\":1581919200,\"main\":{\"temp\":5.51,\"feels_like\":-2.41,\"temp_min\":5.51,\"temp_max\":5.51,\"pressure\":995,\"sea_level\":995,\"grnd_level\":991,\"humidity\":61,\"temp_kf\":0},\"weather\":[{\"id\":802,\"main\":\"Clouds\",\"description\":\"scattered clouds\",\"icon\":\"03n\"}],\"clouds\":{\"all\":35},\"wind\":{\"speed\":8.2,\"deg\":244},\"sys\":{\"pod\":\"n\"},\"dt_txt\":\"2020-02-17 06:00:00\"}],\"city\":{\"id\":2643743,\"name\":\"London\",\"coord\":{\"lat\":51.5085,\"lon\":-0.1257},\"country\":\"GB\",\"population\":1000000,\"timezone\":0,\"sunrise\":1581492085,\"sunset\":1581527294}}";
+
+  const char* expected_json = "{\"list\":["
+      "{\"dt\":1581498000,\"main\":{\"temp\":3.23},\"weather\":[{\"description\":\"clear sky\"}]},"
+      "{\"dt\":1581508800,\"main\":{\"temp\":6.09},\"weather\":[{\"description\":\"clear sky\"}]},"
+      "{\"dt\":1581519600,\"main\":{\"temp\":6.82},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581530400,\"main\":{\"temp\":5.76},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581541200,\"main\":{\"temp\":5.7},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581552000,\"main\":{\"temp\":5.82},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581562800,\"main\":{\"temp\":5.9},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581573600,\"main\":{\"temp\":7.52},\"weather\":[{\"description\":\"moderate rain\"}]},"
+      "{\"dt\":1581584400,\"main\":{\"temp\":7.23},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581595200,\"main\":{\"temp\":7.67},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581606000,\"main\":{\"temp\":8.83},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581616800,\"main\":{\"temp\":7.42},\"weather\":[{\"description\":\"broken clouds\"}]},"
+      "{\"dt\":1581627600,\"main\":{\"temp\":5.82},\"weather\":[{\"description\":\"clear sky\"}]},"
+      "{\"dt\":1581638400,\"main\":{\"temp\":5.58},\"weather\":[{\"description\":\"scattered clouds\"}]},"
+      "{\"dt\":1581649200,\"main\":{\"temp\":4.27},\"weather\":[{\"description\":\"broken clouds\"}]},"
+      "{\"dt\":1581660000,\"main\":{\"temp\":3.91},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581670800,\"main\":{\"temp\":4.77},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581681600,\"main\":{\"temp\":9.03},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581692400,\"main\":{\"temp\":9.86},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581703200,\"main\":{\"temp\":9.48},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581714000,\"main\":{\"temp\":10.03},\"weather\":[{\"description\":\"moderate rain\"}]},"
+      "{\"dt\":1581724800,\"main\":{\"temp\":9.48},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581735600,\"main\":{\"temp\":9.12},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581746400,\"main\":{\"temp\":10.32},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581757200,\"main\":{\"temp\":11.57},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581768000,\"main\":{\"temp\":12.25},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581778800,\"main\":{\"temp\":12.19},\"weather\":[{\"description\":\"moderate rain\"}]},"
+      "{\"dt\":1581789600,\"main\":{\"temp\":12.25},\"weather\":[{\"description\":\"moderate rain\"}]},"
+      "{\"dt\":1581800400,\"main\":{\"temp\":12.64},\"weather\":[{\"description\":\"moderate rain\"}]},"
+      "{\"dt\":1581811200,\"main\":{\"temp\":12.96},\"weather\":[{\"description\":\"moderate rain\"}]},"
+      "{\"dt\":1581822000,\"main\":{\"temp\":13.13},\"weather\":[{\"description\":\"moderate rain\"}]},"
+      "{\"dt\":1581832800,\"main\":{\"temp\":9.07},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581843600,\"main\":{\"temp\":8.05},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581854400,\"main\":{\"temp\":9.54},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581865200,\"main\":{\"temp\":9.08},\"weather\":[{\"description\":\"light rain\"}]},"
+      "{\"dt\":1581876000,\"main\":{\"temp\":7.41},\"weather\":[{\"description\":\"overcast clouds\"}]},"
+      "{\"dt\":1581886800,\"main\":{\"temp\":6.42},\"weather\":[{\"description\":\"broken clouds\"}]},"
+      "{\"dt\":1581897600,\"main\":{\"temp\":6.03},\"weather\":[{\"description\":\"scattered clouds\"}]},"
+      "{\"dt\":1581908400,\"main\":{\"temp\":5.62},\"weather\":[{\"description\":\"clear sky\"}]},"
+      "{\"dt\":1581919200,\"main\":{\"temp\":5.51},\"weather\":[{\"description\":\"scattered clouds\"}]}"
+      "]}";
+  // clang-format on
+
+  StaticJsonDocument<512> filter;
+  filter["list"][0]["dt"] = true;
+  filter["list"][0]["main"]["temp"] = true;
+  filter["list"][0]["weather"][0]["description"] = true;
+
+  DynamicJsonDocument doc(16384);
+
+  REQUIRE(
+      deserializeJson(doc, input_json, DeserializationOption::Filter(filter)) ==
+      DeserializationError::Ok);
+
+  REQUIRE(doc.as<std::string>() == expected_json);
+}
diff --git a/third-party/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp b/third-party/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp
new file mode 100644
index 0000000..4646e35
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/IntegrationTests/round_trip.cpp
@@ -0,0 +1,82 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+void check(std::string originalJson) {
+  DynamicJsonDocument doc(16384);
+
+  std::string prettyJson;
+  deserializeJson(doc, originalJson);
+  serializeJsonPretty(doc, prettyJson);
+
+  std::string finalJson;
+  deserializeJson(doc, originalJson);
+  serializeJson(doc, finalJson);
+
+  REQUIRE(originalJson == finalJson);
+}
+
+TEST_CASE("Round Trip: parse -> prettyPrint -> parse -> print") {
+  SECTION("OpenWeatherMap") {
+    check(
+        "{\"coord\":{\"lon\":145.77,\"lat\":-16.92},\"sys\":{\"type\":1,\"id\":"
+        "8166,\"message\":0.1222,\"country\":\"AU\",\"sunrise\":1414784325,"
+        "\"sunset\":1414830137},\"weather\":[{\"id\":801,\"main\":\"Clouds\","
+        "\"description\":\"few clouds\",\"icon\":\"02n\"}],\"base\":\"cmc "
+        "stations\",\"main\":{\"temp\":296.15,\"pressure\":1014,\"humidity\":"
+        "83,\"temp_min\":296.15,\"temp_max\":296.15},\"wind\":{\"speed\":2.22,"
+        "\"deg\":114.501},\"clouds\":{\"all\":20},\"dt\":1414846800,\"id\":"
+        "2172797,\"name\":\"Cairns\",\"cod\":200}");
+  }
+
+  SECTION("YahooQueryLanguage") {
+    check(
+        "{\"query\":{\"count\":40,\"created\":\"2014-11-01T14:16:49Z\","
+        "\"lang\":\"fr-FR\",\"results\":{\"item\":[{\"title\":\"Burkina army "
+        "backs Zida as interim leader\"},{\"title\":\"British jets intercept "
+        "Russian bombers\"},{\"title\":\"Doubts chip away at nation's most "
+        "trusted agencies\"},{\"title\":\"Cruise ship stuck off Norway, no "
+        "damage\"},{\"title\":\"U.S. military launches 10 air strikes in "
+        "Syria, Iraq\"},{\"title\":\"Blackout hits Bangladesh as line from "
+        "India fails\"},{\"title\":\"Burkina Faso president in Ivory Coast "
+        "after ouster\"},{\"title\":\"Kurds in Turkey rally to back city "
+        "besieged by IS\"},{\"title\":\"A majority of Scots would vote for "
+        "independence now:poll\"},{\"title\":\"Tunisia elections possible "
+        "model for region\"},{\"title\":\"Islamic State kills 85 more members "
+        "of Iraqi tribe\"},{\"title\":\"Iraqi officials:IS extremists line "
+        "up, kill 50\"},{\"title\":\"Burkina Faso army backs presidential "
+        "guard official to lead transition\"},{\"title\":\"Kurdish peshmerga "
+        "arrive with weapons in Syria's Kobani\"},{\"title\":\"Driver sought "
+        "in crash that killed 3 on Halloween\"},{\"title\":\"Ex-Marine arrives "
+        "in US after release from Mexico jail\"},{\"title\":\"UN panel "
+        "scrambling to finish climate report\"},{\"title\":\"Investigators, "
+        "Branson go to spacecraft crash site\"},{\"title\":\"Soldiers vie for "
+        "power after Burkina Faso president quits\"},{\"title\":\"For a man "
+        "without a party, turnout is big test\"},{\"title\":\"'We just had a "
+        "hunch':US marshals nab Eric Frein\"},{\"title\":\"Boko Haram leader "
+        "threatens to kill German hostage\"},{\"title\":\"Nurse free to move "
+        "about as restrictions eased\"},{\"title\":\"Former Burkina president "
+        "Compaore arrives in Ivory Coast:sources\"},{\"title\":\"Libyan port "
+        "rebel leader refuses to hand over oil ports to rival "
+        "group\"},{\"title\":\"Iraqi peshmerga fighters prepare for Syria "
+        "battle\"},{\"title\":\"1 Dem Senate candidate welcoming Obama's "
+        "help\"},{\"title\":\"Bikers cancel party after police recover "
+        "bar\"},{\"title\":\"New question in Texas:Can Davis survive "
+        "defeat?\"},{\"title\":\"Ukraine rebels to hold election, despite "
+        "criticism\"},{\"title\":\"Iraqi officials say Islamic State group "
+        "lines up, kills 50 tribesmen, women in Anbar "
+        "province\"},{\"title\":\"James rebounds, leads Cavaliers past "
+        "Bulls\"},{\"title\":\"UK warns travelers they could be terror "
+        "targets\"},{\"title\":\"Hello Kitty celebrates 40th "
+        "birthday\"},{\"title\":\"A look at people killed during space "
+        "missions\"},{\"title\":\"Nigeria's purported Boko Haram leader says "
+        "has 'married off' girls:AFP\"},{\"title\":\"Mexico orders immediate "
+        "release of Marine veteran\"},{\"title\":\"As election closes in, "
+        "Obama on center stage\"},{\"title\":\"Body of Zambian president "
+        "arrives home\"},{\"title\":\"South Africa arrests 2 Vietnamese for "
+        "poaching\"}]}}}");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt
new file mode 100644
index 0000000..e0052a9
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/CMakeLists.txt
@@ -0,0 +1,28 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(JsonArrayTests 
+	add.cpp
+	clear.cpp
+	copyArray.cpp
+	createNested.cpp
+	equals.cpp
+	get.cpp
+	isNull.cpp
+	iterator.cpp
+	memoryUsage.cpp
+	nesting.cpp
+	remove.cpp
+	size.cpp
+	std_string.cpp
+	subscript.cpp
+	undefined.cpp
+)
+
+add_test(JsonArray JsonArrayTests)
+
+set_tests_properties(JsonArray
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/add.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/add.cpp
new file mode 100644
index 0000000..446f1bd
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/add.cpp
@@ -0,0 +1,138 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::add()") {
+  DynamicJsonDocument doc(4096);
+  JsonArray array = doc.to<JsonArray>();
+
+  SECTION("int") {
+    array.add(123);
+    REQUIRE(123 == array[0].as<int>());
+    REQUIRE(array[0].is<int>());
+    REQUIRE(array[0].is<double>());
+  }
+
+  SECTION("double") {
+    array.add(123.45);
+    REQUIRE(123.45 == array[0].as<double>());
+    REQUIRE(array[0].is<double>());
+    REQUIRE_FALSE(array[0].is<bool>());
+  }
+
+  SECTION("bool") {
+    array.add(true);
+    REQUIRE(true == array[0].as<bool>());
+    REQUIRE(array[0].is<bool>());
+    REQUIRE_FALSE(array[0].is<int>());
+  }
+
+  SECTION("const char*") {
+    const char* str = "hello";
+    array.add(str);
+    REQUIRE(str == array[0].as<std::string>());
+    REQUIRE(array[0].is<const char*>());
+    REQUIRE_FALSE(array[0].is<int>());
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("vla") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "world");
+
+    array.add(vla);
+
+    REQUIRE(std::string("world") == array[0]);
+  }
+#endif
+
+  SECTION("nested array") {
+    DynamicJsonDocument doc2(4096);
+    JsonArray arr = doc2.to<JsonArray>();
+
+    array.add(arr);
+
+    REQUIRE(arr == array[0].as<JsonArray>());
+    REQUIRE(array[0].is<JsonArray>());
+    REQUIRE_FALSE(array[0].is<int>());
+  }
+
+  SECTION("nested object") {
+    DynamicJsonDocument doc2(4096);
+    JsonObject obj = doc2.to<JsonObject>();
+
+    array.add(obj);
+
+    REQUIRE(obj == array[0].as<JsonObject>());
+    REQUIRE(array[0].is<JsonObject>());
+    REQUIRE_FALSE(array[0].is<int>());
+  }
+
+  SECTION("array subscript") {
+    const char* str = "hello";
+    DynamicJsonDocument doc2(4096);
+    JsonArray arr = doc2.to<JsonArray>();
+    arr.add(str);
+
+    array.add(arr[0]);
+
+    REQUIRE(str == array[0]);
+  }
+
+  SECTION("object subscript") {
+    const char* str = "hello";
+    DynamicJsonDocument doc2(4096);
+    JsonObject obj = doc2.to<JsonObject>();
+    obj["x"] = str;
+
+    array.add(obj["x"]);
+
+    REQUIRE(str == array[0]);
+  }
+
+  SECTION("should not duplicate const char*") {
+    array.add("world");
+    const size_t expectedSize = JSON_ARRAY_SIZE(1);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate char*") {
+    array.add(const_cast<char*>("world"));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate std::string") {
+    array.add(std::string("world"));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should not duplicate serialized(const char*)") {
+    array.add(serialized("{}"));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate serialized(char*)") {
+    array.add(serialized(const_cast<char*>("{}")));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(2);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate serialized(std::string)") {
+    array.add(serialized(std::string("{}")));
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(2);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  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(expectedSize == doc.memoryUsage());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/clear.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/clear.cpp
new file mode 100644
index 0000000..568c6aa
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/clear.cpp
@@ -0,0 +1,25 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::clear()") {
+  SECTION("No-op on null JsonArray") {
+    JsonArray array;
+    array.clear();
+    REQUIRE(array.isNull() == true);
+    REQUIRE(array.size() == 0);
+  }
+
+  SECTION("Removes all elements") {
+    StaticJsonDocument<64> doc;
+    JsonArray array = doc.to<JsonArray>();
+    array.add(1);
+    array.add(2);
+    array.clear();
+    REQUIRE(array.size() == 0);
+    REQUIRE(array.isNull() == false);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/copyArray.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/copyArray.cpp
new file mode 100644
index 0000000..3f5f47c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/copyArray.cpp
@@ -0,0 +1,279 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("copyArray()") {
+  SECTION("int[] -> JsonArray") {
+    DynamicJsonDocument doc(4096);
+    JsonArray array = doc.to<JsonArray>();
+    char json[32];
+    int source[] = {1, 2, 3};
+
+    bool ok = copyArray(source, array);
+    CHECK(ok);
+
+    serializeJson(array, json);
+    CHECK(std::string("[1,2,3]") == json);
+  }
+
+  SECTION("std::string[] -> JsonArray") {
+    DynamicJsonDocument doc(4096);
+    JsonArray array = doc.to<JsonArray>();
+    char json[32];
+    std::string source[] = {"a", "b", "c"};
+
+    bool ok = copyArray(source, array);
+    CHECK(ok);
+
+    serializeJson(array, json);
+    CHECK(std::string("[\"a\",\"b\",\"c\"]") == json);
+  }
+
+  SECTION("int[] -> JsonDocument") {
+    DynamicJsonDocument doc(4096);
+    char json[32];
+    int source[] = {1, 2, 3};
+
+    bool ok = copyArray(source, doc);
+    CHECK(ok);
+
+    serializeJson(doc, json);
+    CHECK(std::string("[1,2,3]") == json);
+  }
+
+  SECTION("int[] -> MemberProxy") {
+    DynamicJsonDocument doc(4096);
+    char json[32];
+    int source[] = {1, 2, 3};
+
+    bool ok = copyArray(source, doc["data"]);
+    CHECK(ok);
+
+    serializeJson(doc, json);
+    CHECK(std::string("{\"data\":[1,2,3]}") == json);
+  }
+
+  SECTION("int[] -> JsonArray, but not enough memory") {
+    const size_t SIZE = JSON_ARRAY_SIZE(2);
+    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);
+    JsonArray array = doc.to<JsonArray>();
+    char json[32];
+    int source[][3] = {{1, 2, 3}, {4, 5, 6}};
+
+    bool ok = copyArray(source, array);
+    CHECK(ok);
+
+    serializeJson(array, json);
+    CHECK(std::string("[[1,2,3],[4,5,6]]") == json);
+  }
+
+  SECTION("int[][] -> MemberProxy") {
+    DynamicJsonDocument doc(4096);
+    char json[32];
+    int source[][3] = {{1, 2, 3}, {4, 5, 6}};
+
+    bool ok = copyArray(source, doc["data"]);
+    CHECK(ok);
+
+    serializeJson(doc, json);
+    CHECK(std::string("{\"data\":[[1,2,3],[4,5,6]]}") == json);
+  }
+
+  SECTION("int[][] -> JsonDocument") {
+    DynamicJsonDocument doc(4096);
+    char json[32];
+    int source[][3] = {{1, 2, 3}, {4, 5, 6}};
+
+    bool ok = copyArray(source, doc);
+    CHECK(ok);
+
+    serializeJson(doc, json);
+    CHECK(std::string("[[1,2,3],[4,5,6]]") == json);
+  }
+
+  SECTION("int[][] -> JsonArray, but not enough memory") {
+    const size_t SIZE =
+        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());
+    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);
+    char json[] = "[1,2,3]";
+    DeserializationError err = deserializeJson(doc, json);
+    CHECK(err == DeserializationError::Ok);
+    JsonArray array = doc.as<JsonArray>();
+
+    int destination[4] = {0};
+    size_t result = copyArray(array, destination);
+
+    CHECK(3 == result);
+    CHECK(1 == destination[0]);
+    CHECK(2 == destination[1]);
+    CHECK(3 == destination[2]);
+    CHECK(0 == destination[3]);
+  }
+
+  SECTION("JsonArray -> int[], without enough space") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "[1,2,3]";
+    DeserializationError err = deserializeJson(doc, json);
+    CHECK(err == DeserializationError::Ok);
+    JsonArray array = doc.as<JsonArray>();
+
+    int destination[2] = {0};
+    size_t result = copyArray(array, destination);
+
+    CHECK(2 == result);
+    CHECK(1 == destination[0]);
+    CHECK(2 == destination[1]);
+  }
+
+  SECTION("JsonArray -> std::string[]") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "[\"a\",\"b\",\"c\"]";
+    DeserializationError err = deserializeJson(doc, json);
+    CHECK(err == DeserializationError::Ok);
+    JsonArray array = doc.as<JsonArray>();
+
+    std::string destination[4];
+    size_t result = copyArray(array, destination);
+
+    CHECK(3 == result);
+    CHECK("a" == destination[0]);
+    CHECK("b" == destination[1]);
+    CHECK("c" == destination[2]);
+    CHECK("" == destination[3]);
+  }
+
+  SECTION("JsonDocument -> int[]") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "[1,2,3]";
+    DeserializationError err = deserializeJson(doc, json);
+    CHECK(err == DeserializationError::Ok);
+
+    int destination[4] = {0};
+    size_t result = copyArray(doc, destination);
+
+    CHECK(3 == result);
+    CHECK(1 == destination[0]);
+    CHECK(2 == destination[1]);
+    CHECK(3 == destination[2]);
+    CHECK(0 == destination[3]);
+  }
+
+  SECTION("MemberProxy -> int[]") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "{\"data\":[1,2,3]}";
+    DeserializationError err = deserializeJson(doc, json);
+    CHECK(err == DeserializationError::Ok);
+
+    int destination[4] = {0};
+    size_t result = copyArray(doc["data"], destination);
+
+    CHECK(3 == result);
+    CHECK(1 == destination[0]);
+    CHECK(2 == destination[1]);
+    CHECK(3 == destination[2]);
+    CHECK(0 == destination[3]);
+  }
+
+  SECTION("ElementProxy -> int[]") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "[[1,2,3]]";
+    DeserializationError err = deserializeJson(doc, json);
+    CHECK(err == DeserializationError::Ok);
+
+    int destination[4] = {0};
+    size_t result = copyArray(doc[0], destination);
+
+    CHECK(3 == result);
+    CHECK(1 == destination[0]);
+    CHECK(2 == destination[1]);
+    CHECK(3 == destination[2]);
+    CHECK(0 == destination[3]);
+  }
+
+  SECTION("JsonArray -> int[][]") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "[[1,2],[3],[4]]";
+
+    DeserializationError err = deserializeJson(doc, json);
+    CHECK(err == DeserializationError::Ok);
+    JsonArray array = doc.as<JsonArray>();
+
+    int destination[3][2] = {{0}};
+    copyArray(array, destination);
+
+    CHECK(1 == destination[0][0]);
+    CHECK(2 == destination[0][1]);
+    CHECK(3 == destination[1][0]);
+    CHECK(0 == destination[1][1]);
+    CHECK(4 == destination[2][0]);
+    CHECK(0 == destination[2][1]);
+  }
+
+  SECTION("JsonDocument -> int[][]") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "[[1,2],[3],[4]]";
+
+    DeserializationError err = deserializeJson(doc, json);
+    CHECK(err == DeserializationError::Ok);
+
+    int destination[3][2] = {{0}};
+    copyArray(doc, destination);
+
+    CHECK(1 == destination[0][0]);
+    CHECK(2 == destination[0][1]);
+    CHECK(3 == destination[1][0]);
+    CHECK(0 == destination[1][1]);
+    CHECK(4 == destination[2][0]);
+    CHECK(0 == destination[2][1]);
+  }
+
+  SECTION("MemberProxy -> int[][]") {
+    DynamicJsonDocument doc(4096);
+    char json[] = "{\"data\":[[1,2],[3],[4]]}";
+
+    DeserializationError err = deserializeJson(doc, json);
+    CHECK(err == DeserializationError::Ok);
+
+    int destination[3][2] = {{0}};
+    copyArray(doc["data"], destination);
+
+    CHECK(1 == destination[0][0]);
+    CHECK(2 == destination[0][1]);
+    CHECK(3 == destination[1][0]);
+    CHECK(0 == destination[1][1]);
+    CHECK(4 == destination[2][0]);
+    CHECK(0 == destination[2][1]);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/createNested.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/createNested.cpp
new file mode 100644
index 0000000..9ff5544
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/createNested.cpp
@@ -0,0 +1,21 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray basics") {
+  DynamicJsonDocument doc(4096);
+  JsonArray array = doc.to<JsonArray>();
+
+  SECTION("CreateNestedArray") {
+    JsonArray arr = array.createNestedArray();
+    REQUIRE(arr == array[0].as<JsonArray>());
+  }
+
+  SECTION("CreateNestedObject") {
+    JsonObject obj = array.createNestedObject();
+    REQUIRE(obj == array[0].as<JsonObject>());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/equals.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/equals.cpp
new file mode 100644
index 0000000..718f3af
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/equals.cpp
@@ -0,0 +1,69 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::operator==()") {
+  DynamicJsonDocument doc1(4096);
+  JsonArray array1 = doc1.to<JsonArray>();
+  JsonArrayConst array1c = array1;
+
+  DynamicJsonDocument doc2(4096);
+  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") {
+    array1.add(1);
+    array1.add(2);
+    array2.add(1);
+
+    REQUIRE_FALSE(array1 == array2);
+    REQUIRE_FALSE(array1c == array2c);
+  }
+
+  SECTION("should return false when RHS has more elements") {
+    array1.add(1);
+    array2.add(1);
+    array2.add(2);
+
+    REQUIRE_FALSE(array1 == array2);
+    REQUIRE_FALSE(array1c == array2c);
+  }
+
+  SECTION("should return true when arrays equal") {
+    array1.add("coucou");
+    array2.add("coucou");
+
+    REQUIRE(array1 == array2);
+    REQUIRE(array1c == array2c);
+  }
+
+  SECTION("should return false when RHS is null") {
+    JsonArray null;
+
+    REQUIRE_FALSE(array1 == null);
+  }
+
+  SECTION("should return false when LHS is null") {
+    JsonArray null;
+
+    REQUIRE_FALSE(null == array1);
+  }
+
+  SECTION("should return true when both are null") {
+    JsonArray null1;
+    JsonArray null2;
+
+    REQUIRE(null1 == null2);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/get.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/get.cpp
new file mode 100644
index 0000000..3aa6858
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/get.cpp
@@ -0,0 +1,16 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::get()") {
+  DynamicJsonDocument doc(4096);
+  deserializeJson(doc, "[1,2,3]");
+  JsonArray array = doc.as<JsonArray>();
+
+  SECTION("Overflow") {
+    REQUIRE(array.getElement(3).isNull());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/isNull.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/isNull.cpp
new file mode 100644
index 0000000..75fdbf6
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/isNull.cpp
@@ -0,0 +1,58 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::isNull()") {
+  SECTION("returns true") {
+    JsonArray arr;
+    REQUIRE(arr.isNull() == true);
+  }
+
+  SECTION("returns false") {
+    DynamicJsonDocument doc(4096);
+    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;
+    REQUIRE(static_cast<bool>(arr) == false);
+  }
+
+  SECTION("returns true") {
+    DynamicJsonDocument doc(4096);
+    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);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/iterator.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/iterator.cpp
new file mode 100644
index 0000000..591593d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/iterator.cpp
@@ -0,0 +1,52 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+template <typename TArray>
+static void run_iterator_test() {
+  StaticJsonDocument<JSON_ARRAY_SIZE(2)> doc;
+  JsonArray tmp = doc.to<JsonArray>();
+  tmp.add(12);
+  tmp.add(34);
+
+  TArray array = tmp;
+  typename TArray::iterator it = array.begin();
+  typename TArray::iterator end = array.end();
+
+  REQUIRE(end != it);
+  REQUIRE(12 == it->template as<int>());
+  REQUIRE(12 == static_cast<int>(*it));
+  ++it;
+  REQUIRE(end != it);
+  REQUIRE(34 == it->template 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());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/memoryUsage.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/memoryUsage.cpp
new file mode 100644
index 0000000..624a891
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/memoryUsage.cpp
@@ -0,0 +1,42 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::memoryUsage()") {
+  DynamicJsonDocument doc(4096);
+  JsonArray arr = doc.to<JsonArray>();
+
+  SECTION("return 0 if uninitialized") {
+    JsonArray unitialized;
+    REQUIRE(unitialized.memoryUsage() == 0);
+  }
+
+  SECTION("JSON_ARRAY_SIZE(0) if empty") {
+    REQUIRE(arr.memoryUsage() == JSON_ARRAY_SIZE(0));
+  }
+
+  SECTION("JSON_ARRAY_SIZE(1) after add") {
+    arr.add("hello");
+    REQUIRE(arr.memoryUsage() == JSON_ARRAY_SIZE(1));
+  }
+
+  SECTION("includes the size of the string") {
+    arr.add(std::string("hello"));
+    REQUIRE(arr.memoryUsage() == JSON_ARRAY_SIZE(1) + 6);
+  }
+
+  SECTION("includes the size of the nested array") {
+    JsonArray nested = arr.createNestedArray();
+    nested.add(42);
+    REQUIRE(arr.memoryUsage() == 2 * JSON_ARRAY_SIZE(1));
+  }
+
+  SECTION("includes the size of the nested arrect") {
+    JsonObject nested = arr.createNestedObject();
+    nested["hello"] = "world";
+    REQUIRE(arr.memoryUsage() == JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(1));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/nesting.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/nesting.cpp
new file mode 100644
index 0000000..f1e0264
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/nesting.cpp
@@ -0,0 +1,35 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::nesting()") {
+  DynamicJsonDocument doc(4096);
+  JsonArray arr = doc.to<JsonArray>();
+
+  SECTION("return 0 if uninitialized") {
+    JsonArray unitialized;
+    REQUIRE(unitialized.nesting() == 0);
+  }
+
+  SECTION("returns 1 for empty array") {
+    REQUIRE(arr.nesting() == 1);
+  }
+
+  SECTION("returns 1 for flat array") {
+    arr.add("hello");
+    REQUIRE(arr.nesting() == 1);
+  }
+
+  SECTION("returns 2 with nested array") {
+    arr.createNestedArray();
+    REQUIRE(arr.nesting() == 2);
+  }
+
+  SECTION("returns 2 with nested object") {
+    arr.createNestedObject();
+    REQUIRE(arr.nesting() == 2);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/remove.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/remove.cpp
new file mode 100644
index 0000000..ee03f69
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/remove.cpp
@@ -0,0 +1,79 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::remove()") {
+  DynamicJsonDocument doc(4096);
+  JsonArray _array = doc.to<JsonArray>();
+  _array.add(1);
+  _array.add(2);
+  _array.add(3);
+
+  SECTION("RemoveFirstByIndex") {
+    _array.remove(0);
+
+    REQUIRE(2 == _array.size());
+    REQUIRE(_array[0] == 2);
+    REQUIRE(_array[1] == 3);
+  }
+
+  SECTION("RemoveMiddleByIndex") {
+    _array.remove(1);
+
+    REQUIRE(2 == _array.size());
+    REQUIRE(_array[0] == 1);
+    REQUIRE(_array[1] == 3);
+  }
+
+  SECTION("RemoveLastByIndex") {
+    _array.remove(2);
+
+    REQUIRE(2 == _array.size());
+    REQUIRE(_array[0] == 1);
+    REQUIRE(_array[1] == 2);
+  }
+
+  SECTION("RemoveFirstByIterator") {
+    JsonArray::iterator it = _array.begin();
+    _array.remove(it);
+
+    REQUIRE(2 == _array.size());
+    REQUIRE(_array[0] == 2);
+    REQUIRE(_array[1] == 3);
+  }
+
+  SECTION("RemoveMiddleByIterator") {
+    JsonArray::iterator it = _array.begin();
+    ++it;
+    _array.remove(it);
+
+    REQUIRE(2 == _array.size());
+    REQUIRE(_array[0] == 1);
+    REQUIRE(_array[1] == 3);
+  }
+
+  SECTION("RemoveLastByIterator") {
+    JsonArray::iterator it = _array.begin();
+    ++it;
+    ++it;
+    _array.remove(it);
+
+    REQUIRE(2 == _array.size());
+    REQUIRE(_array[0] == 1);
+    REQUIRE(_array[1] == 2);
+  }
+
+  SECTION("In a loop") {
+    for (JsonArray::iterator it = _array.begin(); it != _array.end(); ++it) {
+      if (*it == 2)
+        _array.remove(it);
+    }
+
+    REQUIRE(2 == _array.size());
+    REQUIRE(_array[0] == 1);
+    REQUIRE(_array[1] == 3);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/size.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/size.cpp
new file mode 100644
index 0000000..5aab205
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/size.cpp
@@ -0,0 +1,31 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::size()") {
+  DynamicJsonDocument doc(4096);
+  JsonArray array = doc.to<JsonArray>();
+
+  SECTION("returns 0 is empty") {
+    REQUIRE(0U == array.size());
+  }
+
+  SECTION("increases after add()") {
+    array.add("hello");
+    REQUIRE(1U == array.size());
+
+    array.add("world");
+    REQUIRE(2U == array.size());
+  }
+
+  SECTION("remains the same after replacing an element") {
+    array.add("hello");
+    REQUIRE(1U == array.size());
+
+    array[0] = "hello";
+    REQUIRE(1U == array.size());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/std_string.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/std_string.cpp
new file mode 100644
index 0000000..a65c321
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/std_string.cpp
@@ -0,0 +1,31 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+static void eraseString(std::string &str) {
+  char *p = const_cast<char *>(str.c_str());
+  while (*p) *p++ = '*';
+}
+
+TEST_CASE("std::string") {
+  DynamicJsonDocument doc(4096);
+  JsonArray array = doc.to<JsonArray>();
+
+  SECTION("add()") {
+    std::string value("hello");
+    array.add(value);
+    eraseString(value);
+    REQUIRE(std::string("hello") == array[0]);
+  }
+
+  SECTION("operator[]") {
+    std::string value("world");
+    array.add("hello");
+    array[0] = value;
+    eraseString(value);
+    REQUIRE(std::string("world") == array[0]);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/subscript.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/subscript.cpp
new file mode 100644
index 0000000..74180ba
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/subscript.cpp
@@ -0,0 +1,174 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonArray::operator[]") {
+  DynamicJsonDocument doc(4096);
+  JsonArray array = doc.to<JsonArray>();
+
+  SECTION("Pad with null") {
+    array[2] = 2;
+    array[5] = 5;
+    REQUIRE(array.size() == 6);
+    REQUIRE(array[0].isNull() == true);
+    REQUIRE(array[1].isNull() == true);
+    REQUIRE(array[2].isNull() == false);
+    REQUIRE(array[3].isNull() == true);
+    REQUIRE(array[4].isNull() == true);
+    REQUIRE(array[5].isNull() == false);
+    REQUIRE(array[2] == 2);
+    REQUIRE(array[5] == 5);
+  }
+
+  SECTION("int") {
+    array[0] = 123;
+    REQUIRE(123 == array[0].as<int>());
+    REQUIRE(true == array[0].is<int>());
+    REQUIRE(false == array[0].is<bool>());
+  }
+
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("long long") {
+    array[0] = 9223372036854775807;
+    REQUIRE(9223372036854775807 == array[0].as<int64_t>());
+    REQUIRE(true == array[0].is<int64_t>());
+    REQUIRE(false == array[0].is<int32_t>());
+    REQUIRE(false == array[0].is<bool>());
+  }
+#endif
+
+  SECTION("double") {
+    array[0] = 123.45;
+    REQUIRE(123.45 == array[0].as<double>());
+    REQUIRE(true == array[0].is<double>());
+    REQUIRE(false == array[0].is<int>());
+  }
+
+  SECTION("bool") {
+    array[0] = true;
+    REQUIRE(true == array[0].as<bool>());
+    REQUIRE(true == array[0].is<bool>());
+    REQUIRE(false == array[0].is<int>());
+  }
+
+  SECTION("const char*") {
+    const char* str = "hello";
+
+    array[0] = str;
+    REQUIRE(str == array[0].as<const char*>());
+    REQUIRE(true == array[0].is<const char*>());
+    REQUIRE(false == array[0].is<int>());
+  }
+
+  SECTION("nested array") {
+    DynamicJsonDocument doc2(4096);
+    JsonArray arr2 = doc2.to<JsonArray>();
+
+    array[0] = arr2;
+
+    REQUIRE(arr2 == array[0].as<JsonArray>());
+    REQUIRE(true == array[0].is<JsonArray>());
+    REQUIRE(false == array[0].is<int>());
+  }
+
+  SECTION("nested object") {
+    DynamicJsonDocument doc2(4096);
+    JsonObject obj = doc2.to<JsonObject>();
+
+    array[0] = obj;
+
+    REQUIRE(obj == array[0].as<JsonObject>());
+    REQUIRE(true == array[0].is<JsonObject>());
+    REQUIRE(false == array[0].is<int>());
+  }
+
+  SECTION("array subscript") {
+    DynamicJsonDocument doc2(4096);
+    JsonArray arr2 = doc2.to<JsonArray>();
+    const char* str = "hello";
+
+    arr2.add(str);
+
+    array[0] = arr2[0];
+
+    REQUIRE(str == array[0]);
+  }
+
+  SECTION("object subscript") {
+    const char* str = "hello";
+    DynamicJsonDocument doc2(4096);
+    JsonObject obj = doc2.to<JsonObject>();
+
+    obj["x"] = str;
+
+    array[0] = obj["x"];
+
+    REQUIRE(str == array[0]);
+  }
+
+  SECTION("should not duplicate const char*") {
+    array[0] = "world";
+    const size_t expectedSize = JSON_ARRAY_SIZE(1);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate char*") {
+    array[0] = const_cast<char*>("world");
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate std::string") {
+    array[0] = std::string("world");
+    const size_t expectedSize = JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("array[0].to<JsonObject>()") {
+    JsonObject obj = array[0].to<JsonObject>();
+    REQUIRE(obj.isNull() == false);
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("set(VLA)") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "world");
+
+    array.add("hello");
+    array[0].set(vla);
+
+    REQUIRE(std::string("world") == array[0]);
+  }
+
+  SECTION("operator=(VLA)") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "world");
+
+    array.add("hello");
+    array[0] = vla;
+
+    REQUIRE(std::string("world") == array[0]);
+  }
+#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>());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonArray/undefined.cpp b/third-party/ArduinoJson/extras/tests/JsonArray/undefined.cpp
new file mode 100644
index 0000000..f33cc19
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonArray/undefined.cpp
@@ -0,0 +1,35 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace Catch::Matchers;
+
+TEST_CASE("Undefined JsonArray") {
+  JsonArray array;
+
+  SECTION("SubscriptFails") {
+    REQUIRE(array[0].isNull());
+  }
+
+  SECTION("AddFails") {
+    array.add(1);
+    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));
+    REQUIRE_THAT(buffer, Equals("null"));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt
new file mode 100644
index 0000000..01ce19b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/CMakeLists.txt
@@ -0,0 +1,28 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(JsonDeserializerTests
+	array.cpp
+	array_static.cpp
+	DeserializationError.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
+)
+
+set_target_properties(JsonDeserializerTests PROPERTIES UNITY_BUILD OFF)
+
+add_test(JsonDeserializer JsonDeserializerTests)
+
+set_tests_properties(JsonDeserializer
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp
new file mode 100644
index 0000000..3e79290
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/DeserializationError.cpp
@@ -0,0 +1,130 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+void testStringification(DeserializationError error, std::string expected) {
+  REQUIRE(error.c_str() == expected);
+}
+
+void testBoolification(DeserializationError error, bool expected) {
+  // DeserializationError on left-hand side
+  CHECK(error == expected);
+  CHECK(error != !expected);
+  CHECK(!error == !expected);
+
+  // DeserializationError on right-hand side
+  CHECK(expected == error);
+  CHECK(!expected != error);
+  CHECK(!expected == !error);
+}
+
+#define TEST_STRINGIFICATION(symbol) \
+  testStringification(DeserializationError::symbol, #symbol)
+
+#define TEST_BOOLIFICATION(symbol, expected) \
+  testBoolification(DeserializationError::symbol, expected)
+
+TEST_CASE("DeserializationError") {
+  SECTION("c_str()") {
+    TEST_STRINGIFICATION(Ok);
+    TEST_STRINGIFICATION(EmptyInput);
+    TEST_STRINGIFICATION(IncompleteInput);
+    TEST_STRINGIFICATION(InvalidInput);
+    TEST_STRINGIFICATION(NoMemory);
+    TEST_STRINGIFICATION(TooDeep);
+  }
+
+  SECTION("as boolean") {
+    TEST_BOOLIFICATION(Ok, false);
+    TEST_BOOLIFICATION(EmptyInput, true);
+    TEST_BOOLIFICATION(IncompleteInput, true);
+    TEST_BOOLIFICATION(InvalidInput, true);
+    TEST_BOOLIFICATION(NoMemory, true);
+    TEST_BOOLIFICATION(TooDeep, true);
+  }
+
+  SECTION("ostream DeserializationError") {
+    std::stringstream s;
+    s << DeserializationError(DeserializationError::InvalidInput);
+    REQUIRE(s.str() == "InvalidInput");
+  }
+
+  SECTION("ostream DeserializationError::Code") {
+    std::stringstream s;
+    s << DeserializationError::InvalidInput;
+    REQUIRE(s.str() == "InvalidInput");
+  }
+
+  SECTION("switch") {
+    DeserializationError err = DeserializationError::InvalidInput;
+    switch (err.code()) {
+      case DeserializationError::InvalidInput:
+        SUCCEED();
+        break;
+      default:
+        FAIL();
+        break;
+    }
+  }
+
+  SECTION("Comparisons") {
+    DeserializationError invalidInput(DeserializationError::InvalidInput);
+    DeserializationError ok(DeserializationError::Ok);
+
+    SECTION("DeserializationError == bool") {
+      REQUIRE(invalidInput == true);
+      REQUIRE(ok == false);
+    }
+
+    SECTION("bool == DeserializationError") {
+      REQUIRE(true == invalidInput);
+      REQUIRE(false == ok);
+    }
+
+    SECTION("DeserializationError != bool") {
+      REQUIRE(invalidInput != false);
+      REQUIRE(ok != true);
+    }
+
+    SECTION("bool != DeserializationError") {
+      REQUIRE(false != invalidInput);
+      REQUIRE(true != ok);
+    }
+
+    SECTION("Negations") {
+      REQUIRE(!invalidInput == false);
+      REQUIRE(!ok == true);
+    }
+
+    SECTION("DeserializationError == Code") {
+      REQUIRE(invalidInput == DeserializationError::InvalidInput);
+      REQUIRE(ok == DeserializationError::Ok);
+    }
+
+    SECTION("Code == DeserializationError") {
+      REQUIRE(DeserializationError::InvalidInput == invalidInput);
+      REQUIRE(DeserializationError::Ok == ok);
+    }
+
+    SECTION("DeserializationError != Code") {
+      REQUIRE(invalidInput != DeserializationError::Ok);
+      REQUIRE(ok != DeserializationError::InvalidInput);
+    }
+
+    SECTION("Code != DeserializationError") {
+      REQUIRE(DeserializationError::Ok != invalidInput);
+      REQUIRE(DeserializationError::InvalidInput != ok);
+    }
+
+    SECTION("DeserializationError == DeserializationError") {
+      REQUIRE_FALSE(invalidInput == ok);
+    }
+
+    SECTION("DeserializationError != DeserializationError") {
+      REQUIRE(invalidInput != ok);
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/array.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/array.cpp
new file mode 100644
index 0000000..209fd60
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/array.cpp
@@ -0,0 +1,253 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize JSON array") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("An empty array") {
+    DeserializationError err = deserializeJson(doc, "[]");
+    JsonArray arr = doc.as<JsonArray>();
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(0 == arr.size());
+  }
+
+  SECTION("Spaces") {
+    SECTION("Before the opening bracket") {
+      DeserializationError err = deserializeJson(doc, "  []");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(0 == arr.size());
+    }
+
+    SECTION("Before first value") {
+      DeserializationError err = deserializeJson(doc, "[ \t\r\n42]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == 42);
+    }
+
+    SECTION("After first value") {
+      DeserializationError err = deserializeJson(doc, "[42 \t\r\n]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == 42);
+    }
+  }
+
+  SECTION("Values types") {
+    SECTION("On integer") {
+      DeserializationError err = deserializeJson(doc, "[42]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == 42);
+    }
+
+    SECTION("Two integers") {
+      DeserializationError err = deserializeJson(doc, "[42,84]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == 42);
+      REQUIRE(arr[1] == 84);
+    }
+
+    SECTION("Double") {
+      DeserializationError err = deserializeJson(doc, "[4.2,1e2]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == 4.2);
+      REQUIRE(arr[1] == 1e2);
+    }
+
+    SECTION("Unsigned long") {
+      DeserializationError err = deserializeJson(doc, "[4294967295]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == 4294967295UL);
+    }
+
+    SECTION("Boolean") {
+      DeserializationError err = deserializeJson(doc, "[true,false]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == true);
+      REQUIRE(arr[1] == false);
+    }
+
+    SECTION("Null") {
+      DeserializationError err = deserializeJson(doc, "[null,null]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0].as<const char*>() == 0);
+      REQUIRE(arr[1].as<const char*>() == 0);
+    }
+  }
+
+  SECTION("Quotes") {
+    SECTION("Double quotes") {
+      DeserializationError err =
+          deserializeJson(doc, "[ \"hello\" , \"world\" ]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("Single quotes") {
+      DeserializationError err = deserializeJson(doc, "[ 'hello' , 'world' ]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("No quotes") {
+      DeserializationError err = deserializeJson(doc, "[ hello , world ]");
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("Double quotes (empty strings)") {
+      DeserializationError err = deserializeJson(doc, "[\"\",\"\"]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "");
+      REQUIRE(arr[1] == "");
+    }
+
+    SECTION("Single quotes (empty strings)") {
+      DeserializationError err = deserializeJson(doc, "[\'\',\'\']");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "");
+      REQUIRE(arr[1] == "");
+    }
+
+    SECTION("No quotes (empty strings)") {
+      DeserializationError err = deserializeJson(doc, "[,]");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("Closing single quotes missing") {
+      DeserializationError err = deserializeJson(doc, "[\"]");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("Closing double quotes missing") {
+      DeserializationError err = deserializeJson(doc, "[\']");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+  }
+
+  SECTION("Premature null-terminator") {
+    SECTION("After opening bracket") {
+      DeserializationError err = deserializeJson(doc, "[");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("After value") {
+      DeserializationError err = deserializeJson(doc, "[1");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("After comma") {
+      DeserializationError err = deserializeJson(doc, "[1,");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+  }
+
+  SECTION("Premature end of input") {
+    const char* input = "[1,2]";
+
+    SECTION("After opening bracket") {
+      DeserializationError err = deserializeJson(doc, input, 1);
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("After value") {
+      DeserializationError err = deserializeJson(doc, input, 2);
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("After comma") {
+      DeserializationError err = deserializeJson(doc, input, 3);
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+  }
+
+  SECTION("Misc") {
+    SECTION("Nested objects") {
+      char jsonString[] =
+          " [ { \"a\" : 1 , \"b\" : 2 } , { \"c\" : 3 , \"d\" : 4 } ] ";
+
+      DeserializationError err = deserializeJson(doc, jsonString);
+      JsonArray arr = doc.as<JsonArray>();
+
+      JsonObject object1 = arr[0];
+      const JsonObject object2 = arr[1];
+      JsonObject object3 = arr[2];
+
+      REQUIRE(err == DeserializationError::Ok);
+
+      REQUIRE(object1.isNull() == false);
+      REQUIRE(object2.isNull() == false);
+      REQUIRE(object3.isNull() == true);
+
+      REQUIRE(2 == object1.size());
+      REQUIRE(2 == object2.size());
+      REQUIRE(0 == object3.size());
+
+      REQUIRE(1 == object1["a"].as<int>());
+      REQUIRE(2 == object1["b"].as<int>());
+      REQUIRE(3 == object2["c"].as<int>());
+      REQUIRE(4 == object2["d"].as<int>());
+      REQUIRE(0 == object3["e"].as<int>());
+    }
+  }
+
+  SECTION("Should clear the JsonArray") {
+    deserializeJson(doc, "[1,2,3,4]");
+    deserializeJson(doc, "[]");
+    JsonArray arr = doc.as<JsonArray>();
+
+    REQUIRE(arr.size() == 0);
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/array_static.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/array_static.cpp
new file mode 100644
index 0000000..c5689a8
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/array_static.cpp
@@ -0,0 +1,89 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize JSON array with a StaticJsonDocument") {
+  SECTION("BufferOfTheRightSizeForEmptyArray") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(0)> doc;
+    char input[] = "[]";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("TooSmallBufferForArrayWithOneValue") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(0)> doc;
+    char input[] = "[1]";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::NoMemory);
+  }
+
+  SECTION("BufferOfTheRightSizeForArrayWithOneValue") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1)> doc;
+    char input[] = "[1]";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("TooSmallBufferForArrayWithNestedObject") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(0) + JSON_OBJECT_SIZE(0)> doc;
+    char input[] = "[{}]";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::NoMemory);
+  }
+
+  SECTION("BufferOfTheRightSizeForArrayWithNestedObject") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1) + JSON_OBJECT_SIZE(0)> doc;
+    char input[] = "[{}]";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("CopyStringNotSpaces") {
+    StaticJsonDocument<100> doc;
+
+    deserializeJson(doc, "  [ \"1234567\" ] ");
+
+    REQUIRE(JSON_ARRAY_SIZE(1) + JSON_STRING_SIZE(7) == doc.memoryUsage());
+    // note: we use a string of 8 bytes to be sure that the StaticMemoryPool
+    // will not insert bytes to enforce alignement
+  }
+
+  SECTION("Should clear the JsonArray") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(4)> doc;
+    char input[] = "[1,2,3,4]";
+
+    deserializeJson(doc, input);
+    deserializeJson(doc, "[]");
+
+    JsonArray arr = doc.as<JsonArray>();
+    REQUIRE(arr.size() == 0);
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0));
+  }
+
+  SECTION("Array") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(2)> doc;
+    char input[] = "[1,2]";
+
+    DeserializationError err = deserializeJson(doc, input);
+    JsonArray arr = doc.as<JsonArray>();
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.is<JsonArray>());
+    REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(2));
+    REQUIRE(arr[0] == 1);
+    REQUIRE(arr[1] == 2);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/filter.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/filter.cpp
new file mode 100644
index 0000000..db7371d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/filter.cpp
@@ -0,0 +1,750 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_ENABLE_COMMENTS 1
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#include <sstream>
+#include <string>
+
+TEST_CASE("Filtering") {
+  struct TestCase {
+    const char* input;
+    const char* filter;
+    uint8_t nestingLimit;
+    DeserializationError error;
+    const char* output;
+    size_t memoryUsage;
+  };
+
+  // clang-format off
+  TestCase testCases[] = {
+    {
+      "{\"hello\":\"world\"}",   // 1. input
+      "null",                    // 2. filter
+      10,                        // 3. nestingLimit
+      DeserializationError::Ok,  // 4. error
+      "null",                    // 5. output
+      0                          // 6. memoryUsage
+    },
+    {
+      "{\"hello\":\"world\"}",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      "{\"abcdefg\":\"hijklmn\"}",
+      "true",
+      10,
+      DeserializationError::Ok,
+      "{\"abcdefg\":\"hijklmn\"}",
+      JSON_OBJECT_SIZE(1) + 16
+    },
+    {
+      "{\"hello\":\"world\"}",
+      "{}",
+      10,
+      DeserializationError::Ok,
+      "{}",
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // Input in an object, but filter wants an array
+      "{\"hello\":\"world\"}",
+      "[]",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // Member is a string, but filter wants an array
+      "{\"example\":\"example\"}",
+      "{\"example\":[true]}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":null}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // Input is an array, but filter wants an object
+      "[\"hello\",\"world\"]",
+      "{}",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // Input is a bool, but filter wants an object
+      "true",
+      "{}",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // Input is a string, but filter wants an object
+      "\"hello\"",
+      "{}",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // skip an integer
+      "{\"an_integer\":666,example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // skip a float
+      "{\"a_float\":12.34e-6,example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip a boolean
+      "{\"a_bool\":false,example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip a double-quoted string
+      "{\"a_double_quoted_string\":\"hello\",example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip a single-quoted string
+      "{\"a_single_quoted_string\":'hello',example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an empty array
+      "{\"an_empty_array\":[],example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can 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
+    },
+    {
+      // can skip an array
+      "{\"an_array\":[1,2,3],example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can 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
+    },
+    {
+      // can skip an empty object
+      "{\"an_empty_object\":{},example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an empty object with spaces in it
+      "{\"an_empty_object\":{    },example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // can skip an object
+      "{\"an_object\":{a:1,'b':2,\"c\":3},example:42}",
+      "{\"example\":true}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":42}",
+      JSON_OBJECT_SIZE(1) + 8
+    },
+    {
+      // 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
+    },
+    {
+      "{\"an_integer\": 0,\"example\":{\"type\":\"int\",\"outcome\":42}}",
+      "{\"example\":{\"outcome\":true}}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":{\"outcome\":42}}",
+      2 * JSON_OBJECT_SIZE(1) + 16
+    },
+    {
+      // wildcard
+      "{\"example\":{\"type\":\"int\",\"outcome\":42}}",
+      "{\"*\":{\"outcome\":true}}",
+      10,
+      DeserializationError::Ok,
+      "{\"example\":{\"outcome\":42}}",
+      2 * JSON_OBJECT_SIZE(1) + 16
+    },
+    {
+      // only the first element of array counts
+      "[1,2,3]",
+      "[true, false]",
+      10,
+      DeserializationError::Ok,
+      "[1,2,3]",
+      JSON_ARRAY_SIZE(3)
+    },
+    {
+      // only the first element of array counts
+      "[1,2,3]",
+      "[false, true]",
+      10,
+      DeserializationError::Ok,
+      "[]",
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // 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
+    },
+    {
+      "[',2,3]",
+      "[false,true]",
+      10,
+      DeserializationError::IncompleteInput,
+      "[]",
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      "[\",2,3]",
+      "[false,true]",
+      10,
+      DeserializationError::IncompleteInput,
+      "[]",
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // detect errors in skipped value
+      "[!,2,\\]",
+      "[false]",
+      10,
+      DeserializationError::InvalidInput,
+      "[]",
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // detect incomplete string event if it's skipped
+      "\"ABC",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // detect incomplete string event if it's skipped
+      "'ABC",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // handle escaped quotes
+      "'A\\'BC'",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // handle escaped quotes
+      "\"A\\\"BC\"",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // detect incomplete string in presence of escaped quotes
+      "'A\\'BC",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // detect incomplete string in presence of escaped quotes
+      "\"A\\\"BC",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // skip empty array
+      "[]",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // skip empty array with spaces
+      " [ ] ",
+      "false",
+      10,
+      DeserializationError::Ok,
+      "null",
+      0
+    },
+    {
+      // bubble up element error even if array is skipped 
+      "[1,'2,3]",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // bubble up member error even if object is skipped 
+      "{'hello':'worl}",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // bubble up colon error even if object is skipped 
+      "{'hello','world'}",
+      "false",
+      10,
+      DeserializationError::InvalidInput,
+      "null",
+      0
+    },
+    {
+      // bubble up key error even if object is skipped 
+      "{'hello:1}",
+      "false",
+      10,
+      DeserializationError::IncompleteInput,
+      "null",
+      0
+    },
+    {
+      // detect invalid value in skipped object
+      "{'hello':!}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null",
+      0
+    },
+    {
+      // ignore invalid value in skipped object
+      "{'hello':\\}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored objects
+      "{}",
+      "false", 
+      0,
+      DeserializationError::TooDeep,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored objects
+      "{'hello':{}}",
+      "false", 
+      1,
+      DeserializationError::TooDeep,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored values in objects
+      "{'hello':{}}",
+      "{}", 
+      1,
+      DeserializationError::TooDeep,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // check nesting limit even for ignored arrays
+      "[]",
+      "false", 
+      0,
+      DeserializationError::TooDeep,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored arrays
+      "[[]]",
+      "false", 
+      1,
+      DeserializationError::TooDeep,
+      "null", 
+      0
+    },
+    {
+      // check nesting limit even for ignored values in arrays
+      "[[]]",
+      "[]", 
+      1,
+      DeserializationError::TooDeep,
+      "[]", 
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // supports back-slash at the end of skipped string
+      "\"hell\\",
+      "false", 
+      1,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+    {
+      // invalid comment at after an element in a skipped array
+      "[1/]",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // incomplete comment at after an element in a skipped array
+      "[1/*]",
+      "false", 
+      10,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+    {
+      // missing comma in a skipped array
+      "[1 2]",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // invalid comment at the beginning of array
+      "[/1]",
+      "[false]", 
+      10,
+      DeserializationError::InvalidInput,
+      "[]", 
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // incomplete comment at the begining of an array
+      "[/*]",
+      "[false]", 
+      10,
+      DeserializationError::IncompleteInput,
+      "[]", 
+      JSON_ARRAY_SIZE(0)
+    },
+    {
+      // invalid comment before key
+      "{/1:2}",
+      "{}", 
+      10,
+      DeserializationError::InvalidInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // incomplete comment before key
+      "{/*:2}",
+      "{}", 
+      10,
+      DeserializationError::IncompleteInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // invalid comment after key
+      "{\"example\"/1:2}",
+      "{}", 
+      10,
+      DeserializationError::InvalidInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // incomplete comment after key
+      "{\"example\"/*:2}",
+      "{}", 
+      10,
+      DeserializationError::IncompleteInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // invalid comment after colon
+      "{\"example\":/12}",
+      "{}", 
+      10,
+      DeserializationError::InvalidInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // incomplete comment after colon
+      "{\"example\":/*2}",
+      "{}", 
+      10,
+      DeserializationError::IncompleteInput,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // comment next to an integer
+      "{\"ignore\":1//,\"example\":2\n}",
+      "{\"example\":true}", 
+      10,
+      DeserializationError::Ok,
+      "{}", 
+      JSON_OBJECT_SIZE(0)
+    },
+    {
+      // invalid comment after opening brace of a skipped object
+      "{/1:2}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // incomplete after opening brace of a skipped object
+      "{/*:2}",
+      "false", 
+      10,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+    {
+      // invalid comment after key of a skipped object
+      "{\"example\"/:2}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // incomplete after after key of a skipped object
+      "{\"example\"/*:2}",
+      "false", 
+      10,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+    {
+      // invalid comment after value in a skipped object
+      "{\"example\":2/}",
+      "false", 
+      10,
+      DeserializationError::InvalidInput,
+      "null", 
+      0
+    },
+    {
+      // incomplete after after value of a skipped object
+      "{\"example\":2/*}",
+      "false", 
+      10,
+      DeserializationError::IncompleteInput,
+      "null", 
+      0
+    },
+  };  // clang-format on
+
+  for (size_t i = 0; i < sizeof(testCases) / sizeof(testCases[0]); i++) {
+    CAPTURE(i);
+
+    DynamicJsonDocument filter(256);
+    DynamicJsonDocument doc(256);
+    TestCase& tc = testCases[i];
+
+    CAPTURE(tc.filter);
+    REQUIRE(deserializeJson(filter, tc.filter) == DeserializationError::Ok);
+
+    CAPTURE(tc.input);
+    CAPTURE(tc.nestingLimit);
+    CHECK(deserializeJson(doc, tc.input, DeserializationOption::Filter(filter),
+                          DeserializationOption::NestingLimit(
+                              tc.nestingLimit)) == tc.error);
+
+    CHECK(doc.as<std::string>() == tc.output);
+    CHECK(doc.memoryUsage() == tc.memoryUsage);
+  }
+}
+
+TEST_CASE("Overloads") {
+  StaticJsonDocument<256> doc;
+  StaticJsonDocument<256> filter;
+
+  using namespace DeserializationOption;
+
+  // deserializeJson(..., Filter)
+
+  SECTION("const char*, Filter") {
+    deserializeJson(doc, "{}", Filter(filter));
+  }
+
+  SECTION("const char*, size_t, Filter") {
+    deserializeJson(doc, "{}", 2, Filter(filter));
+  }
+
+  SECTION("const std::string&, Filter") {
+    deserializeJson(doc, std::string("{}"), Filter(filter));
+  }
+
+  SECTION("std::istream&, Filter") {
+    std::stringstream s("{}");
+    deserializeJson(doc, s, Filter(filter));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("char[n], Filter") {
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "{}");
+    deserializeJson(doc, vla, Filter(filter));
+  }
+#endif
+
+  // deserializeJson(..., Filter, NestingLimit)
+
+  SECTION("const char*, Filter, NestingLimit") {
+    deserializeJson(doc, "{}", Filter(filter), NestingLimit(5));
+  }
+
+  SECTION("const char*, size_t, Filter, NestingLimit") {
+    deserializeJson(doc, "{}", 2, Filter(filter), NestingLimit(5));
+  }
+
+  SECTION("const std::string&, Filter, NestingLimit") {
+    deserializeJson(doc, std::string("{}"), Filter(filter), NestingLimit(5));
+  }
+
+  SECTION("std::istream&, Filter, NestingLimit") {
+    std::stringstream s("{}");
+    deserializeJson(doc, s, Filter(filter), NestingLimit(5));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("char[n], Filter, NestingLimit") {
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "{}");
+    deserializeJson(doc, vla, Filter(filter), NestingLimit(5));
+  }
+#endif
+
+  // deserializeJson(..., NestingLimit, Filter)
+
+  SECTION("const char*, NestingLimit, Filter") {
+    deserializeJson(doc, "{}", NestingLimit(5), Filter(filter));
+  }
+
+  SECTION("const char*, size_t, NestingLimit, Filter") {
+    deserializeJson(doc, "{}", 2, NestingLimit(5), Filter(filter));
+  }
+
+  SECTION("const std::string&, NestingLimit, Filter") {
+    deserializeJson(doc, std::string("{}"), NestingLimit(5), Filter(filter));
+  }
+
+  SECTION("std::istream&, NestingLimit, Filter") {
+    std::stringstream s("{}");
+    deserializeJson(doc, s, NestingLimit(5), Filter(filter));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("char[n], NestingLimit, Filter") {
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "{}");
+    deserializeJson(doc, vla, NestingLimit(5), Filter(filter));
+  }
+#endif
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/incomplete_input.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/incomplete_input.cpp
new file mode 100644
index 0000000..85ea552
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/incomplete_input.cpp
@@ -0,0 +1,29 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_DECODE_UNICODE 1
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("Truncated JSON input") {
+  const char* testCases[] = {"\"hello", "\'hello", "'\\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,"};
+  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);
+
+  DynamicJsonDocument doc(4096);
+
+  for (size_t i = 0; i < testCount; i++) {
+    const char* input = testCases[i];
+    CAPTURE(input);
+    REQUIRE(deserializeJson(doc, input) ==
+            DeserializationError::IncompleteInput);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp
new file mode 100644
index 0000000..757298b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/input_types.cpp
@@ -0,0 +1,198 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+#include <sstream>
+
+#include "CustomReader.hpp"
+
+TEST_CASE("deserializeJson(char*)") {
+  StaticJsonDocument<1024> doc;
+
+  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() ==
+          JSON_OBJECT_SIZE(1));  // issue #1318
+  }
+}
+
+TEST_CASE("deserializeJson(const std::string&)") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("should accept const string") {
+    const std::string input("[42]");
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("should accept temporary string") {
+    DeserializationError err = deserializeJson(doc, std::string("[42]"));
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("should duplicate content") {
+    std::string input("[\"hello\"]");
+
+    DeserializationError err = deserializeJson(doc, input);
+    input[2] = 'X';  // alter the string tomake sure we made a copy
+
+    JsonArray array = doc.as<JsonArray>();
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(std::string("hello") == array[0]);
+  }
+}
+
+TEST_CASE("deserializeJson(std::istream&)") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("array") {
+    std::istringstream json(" [ 42 ] ");
+
+    DeserializationError err = deserializeJson(doc, json);
+    JsonArray arr = doc.as<JsonArray>();
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(1 == arr.size());
+    REQUIRE(42 == arr[0]);
+  }
+
+  SECTION("object") {
+    std::istringstream json(" { hello : 'world' }");
+
+    DeserializationError err = deserializeJson(doc, json);
+    JsonObject obj = doc.as<JsonObject>();
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(1 == obj.size());
+    REQUIRE(std::string("world") == obj["hello"]);
+  }
+
+  SECTION("Should not read after the closing brace of an empty object") {
+    std::istringstream json("{}123");
+
+    deserializeJson(doc, json);
+
+    REQUIRE('1' == char(json.get()));
+  }
+
+  SECTION("Should not read after the closing brace") {
+    std::istringstream json("{\"hello\":\"world\"}123");
+
+    deserializeJson(doc, json);
+
+    REQUIRE('1' == char(json.get()));
+  }
+
+  SECTION("Should not read after the closing bracket of an empty array") {
+    std::istringstream json("[]123");
+
+    deserializeJson(doc, json);
+
+    REQUIRE('1' == char(json.get()));
+  }
+
+  SECTION("Should not read after the closing bracket") {
+    std::istringstream json("[\"hello\",\"world\"]123");
+
+    deserializeJson(doc, json);
+
+    REQUIRE('1' == char(json.get()));
+  }
+
+  SECTION("Should not read after the closing quote") {
+    std::istringstream json("\"hello\"123");
+
+    deserializeJson(doc, json);
+
+    REQUIRE('1' == char(json.get()));
+  }
+}
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+TEST_CASE("deserializeJson(VLA)") {
+  int i = 9;
+  char vla[i];
+  strcpy(vla, "{\"a\":42}");
+
+  StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
+  DeserializationError err = deserializeJson(doc, vla);
+
+  REQUIRE(err == DeserializationError::Ok);
+}
+#endif
+
+TEST_CASE("deserializeJson(CustomReader)") {
+  DynamicJsonDocument doc(4096);
+  CustomReader reader("[4,2]");
+  DeserializationError err = deserializeJson(doc, reader);
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc.size() == 2);
+  REQUIRE(doc[0] == 4);
+  REQUIRE(doc[1] == 2);
+}
+
+TEST_CASE("deserializeJson(JsonDocument&, MemberProxy)") {
+  DynamicJsonDocument doc1(4096);
+  doc1["payload"] = "[4,2]";
+
+  DynamicJsonDocument doc2(4096);
+  DeserializationError err = deserializeJson(doc2, doc1["payload"]);
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc2.size() == 2);
+  REQUIRE(doc2[0] == 4);
+  REQUIRE(doc2[1] == 2);
+}
+
+TEST_CASE("deserializeJson(JsonDocument&, JsonVariant)") {
+  DynamicJsonDocument doc1(4096);
+  doc1["payload"] = "[4,2]";
+
+  DynamicJsonDocument doc2(4096);
+  DeserializationError err =
+      deserializeJson(doc2, doc1["payload"].as<JsonVariant>());
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc2.size() == 2);
+  REQUIRE(doc2[0] == 4);
+  REQUIRE(doc2[1] == 2);
+}
+
+TEST_CASE("deserializeJson(JsonDocument&, JsonVariantConst)") {
+  DynamicJsonDocument doc1(4096);
+  doc1["payload"] = "[4,2]";
+
+  DynamicJsonDocument doc2(4096);
+  DeserializationError err =
+      deserializeJson(doc2, doc1["payload"].as<JsonVariantConst>());
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc2.size() == 2);
+  REQUIRE(doc2[0] == 4);
+  REQUIRE(doc2[1] == 2);
+}
+
+TEST_CASE("deserializeJson(JsonDocument&, ElementProxy)") {
+  DynamicJsonDocument doc1(4096);
+  doc1[0] = "[4,2]";
+
+  DynamicJsonDocument doc2(4096);
+  DeserializationError err = deserializeJson(doc2, doc1[0]);
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc2.size() == 2);
+  REQUIRE(doc2[0] == 4);
+  REQUIRE(doc2[1] == 2);
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/invalid_input.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/invalid_input.cpp
new file mode 100644
index 0000000..b369052
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/invalid_input.cpp
@@ -0,0 +1,42 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_DECODE_UNICODE 1
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("Invalid JSON input") {
+  const char* testCases[] = {"'\\u'",     "'\\u000g'", "'\\u000'", "'\\u000G'",
+                             "'\\u000/'", "\\x1234",   "6a9",      "1,",
+                             "2]",        "3}"};
+  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);
+
+  DynamicJsonDocument doc(4096);
+
+  for (size_t i = 0; i < testCount; i++) {
+    const char* input = testCases[i];
+    CAPTURE(input);
+    REQUIRE(deserializeJson(doc, input) == DeserializationError::InvalidInput);
+  }
+}
+
+TEST_CASE("Invalid JSON input that should pass") {
+  const char* testCases[] = {
+      "nulL",
+      "tru3",
+      "fals3",
+      "'\\ud83d'",         // leading surrogate without a trailing surrogate
+      "'\\udda4'",         // trailing surrogate without a leading surrogate
+      "'\\ud83d\\ud83d'",  // two leading surrogates
+  };
+  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);
+
+  DynamicJsonDocument doc(4096);
+
+  for (size_t i = 0; i < testCount; i++) {
+    const char* input = testCases[i];
+    CAPTURE(input);
+    REQUIRE(deserializeJson(doc, input) == DeserializationError::Ok);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp
new file mode 100644
index 0000000..ab77ed1
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/misc.cpp
@@ -0,0 +1,117 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace Catch::Matchers;
+
+TEST_CASE("deserializeJson(DynamicJsonDocument&)") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("Edge cases") {
+    SECTION("null char*") {
+      DeserializationError err = deserializeJson(doc, static_cast<char*>(0));
+
+      REQUIRE(err != DeserializationError::Ok);
+    }
+
+    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") {
+      DeserializationError err = deserializeJson(doc, "%*$£¤");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+  }
+
+  SECTION("Booleans") {
+    SECTION("True") {
+      DeserializationError err = deserializeJson(doc, "true");
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<bool>());
+      REQUIRE(doc.as<bool>() == true);
+    }
+
+    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]");
+    deserializeJson(doc, "{}");
+
+    REQUIRE(doc.is<JsonObject>());
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp
new file mode 100644
index 0000000..06c9c92
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/nestingLimit.cpp
@@ -0,0 +1,101 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#define SHOULD_WORK(expression) REQUIRE(DeserializationError::Ok == expression);
+#define SHOULD_FAIL(expression) \
+  REQUIRE(DeserializationError::TooDeep == expression);
+
+TEST_CASE("JsonDeserializer nesting") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("Input = const char*") {
+    SECTION("limit = 0") {
+      DeserializationOption::NestingLimit nesting(0);
+      SHOULD_WORK(deserializeJson(doc, "\"toto\"", nesting));
+      SHOULD_WORK(deserializeJson(doc, "123", nesting));
+      SHOULD_WORK(deserializeJson(doc, "true", nesting));
+      SHOULD_FAIL(deserializeJson(doc, "[]", nesting));
+      SHOULD_FAIL(deserializeJson(doc, "{}", nesting));
+      SHOULD_FAIL(deserializeJson(doc, "[\"toto\"]", nesting));
+      SHOULD_FAIL(deserializeJson(doc, "{\"toto\":1}", nesting));
+    }
+
+    SECTION("limit = 1") {
+      DeserializationOption::NestingLimit nesting(1);
+      SHOULD_WORK(deserializeJson(doc, "[\"toto\"]", nesting));
+      SHOULD_WORK(deserializeJson(doc, "{\"toto\":1}", nesting));
+      SHOULD_FAIL(deserializeJson(doc, "{\"toto\":{}}", nesting));
+      SHOULD_FAIL(deserializeJson(doc, "{\"toto\":[]}", nesting));
+      SHOULD_FAIL(deserializeJson(doc, "[[\"toto\"]]", nesting));
+      SHOULD_FAIL(deserializeJson(doc, "[{\"toto\":1}]", nesting));
+    }
+  }
+
+  SECTION("char* and size_t") {
+    SECTION("limit = 0") {
+      DeserializationOption::NestingLimit nesting(0);
+      SHOULD_WORK(deserializeJson(doc, "\"toto\"", 6, nesting));
+      SHOULD_WORK(deserializeJson(doc, "123", 3, nesting));
+      SHOULD_WORK(deserializeJson(doc, "true", 4, nesting));
+      SHOULD_FAIL(deserializeJson(doc, "[]", 2, nesting));
+      SHOULD_FAIL(deserializeJson(doc, "{}", 2, nesting));
+      SHOULD_FAIL(deserializeJson(doc, "[\"toto\"]", 8, nesting));
+      SHOULD_FAIL(deserializeJson(doc, "{\"toto\":1}", 10, nesting));
+    }
+
+    SECTION("limit = 1") {
+      DeserializationOption::NestingLimit nesting(1);
+      SHOULD_WORK(deserializeJson(doc, "[\"toto\"]", 8, nesting));
+      SHOULD_WORK(deserializeJson(doc, "{\"toto\":1}", 10, nesting));
+      SHOULD_FAIL(deserializeJson(doc, "{\"toto\":{}}", 11, nesting));
+      SHOULD_FAIL(deserializeJson(doc, "{\"toto\":[]}", 11, nesting));
+      SHOULD_FAIL(deserializeJson(doc, "[[\"toto\"]]", 10, nesting));
+      SHOULD_FAIL(deserializeJson(doc, "[{\"toto\":1}]", 12, nesting));
+    }
+  }
+
+  SECTION("Input = std::string") {
+    SECTION("limit = 0") {
+      DeserializationOption::NestingLimit nesting(0);
+      SHOULD_WORK(deserializeJson(doc, std::string("\"toto\""), nesting));
+      SHOULD_WORK(deserializeJson(doc, std::string("123"), nesting));
+      SHOULD_WORK(deserializeJson(doc, std::string("true"), nesting));
+      SHOULD_FAIL(deserializeJson(doc, std::string("[]"), nesting));
+      SHOULD_FAIL(deserializeJson(doc, std::string("{}"), nesting));
+      SHOULD_FAIL(deserializeJson(doc, std::string("[\"toto\"]"), nesting));
+      SHOULD_FAIL(deserializeJson(doc, std::string("{\"toto\":1}"), nesting));
+    }
+
+    SECTION("limit = 1") {
+      DeserializationOption::NestingLimit nesting(1);
+      SHOULD_WORK(deserializeJson(doc, std::string("[\"toto\"]"), nesting));
+      SHOULD_WORK(deserializeJson(doc, std::string("{\"toto\":1}"), nesting));
+      SHOULD_FAIL(deserializeJson(doc, std::string("{\"toto\":{}}"), nesting));
+      SHOULD_FAIL(deserializeJson(doc, std::string("{\"toto\":[]}"), nesting));
+      SHOULD_FAIL(deserializeJson(doc, std::string("[[\"toto\"]]"), nesting));
+      SHOULD_FAIL(deserializeJson(doc, std::string("[{\"toto\":1}]"), nesting));
+    }
+  }
+
+  SECTION("Input = std::istream") {
+    SECTION("limit = 0") {
+      DeserializationOption::NestingLimit nesting(0);
+      std::istringstream good("true");
+      std::istringstream bad("[]");
+      SHOULD_WORK(deserializeJson(doc, good, nesting));
+      SHOULD_FAIL(deserializeJson(doc, bad, nesting));
+    }
+
+    SECTION("limit = 1") {
+      DeserializationOption::NestingLimit nesting(1);
+      std::istringstream good("[\"toto\"]");
+      std::istringstream bad("{\"toto\":{}}");
+      SHOULD_WORK(deserializeJson(doc, good, nesting));
+      SHOULD_FAIL(deserializeJson(doc, bad, nesting));
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/number.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/number.cpp
new file mode 100644
index 0000000..f659d20
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/number.cpp
@@ -0,0 +1,133 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_USE_LONG_LONG 0
+#define ARDUINOJSON_ENABLE_NAN 1
+#define ARDUINOJSON_ENABLE_INFINITY 1
+
+#include <ArduinoJson.h>
+#include <limits.h>
+#include <catch.hpp>
+
+namespace my {
+using ARDUINOJSON_NAMESPACE::isinf;
+using ARDUINOJSON_NAMESPACE::isnan;
+}  // namespace my
+
+TEST_CASE("deserialize an integer") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("Integer") {
+    SECTION("0") {
+      DeserializationError err = deserializeJson(doc, "0");
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<int>() == true);
+      REQUIRE(doc.as<int>() == 0);
+      REQUIRE(doc.as<std::string>() == "0");  // issue #808
+    }
+
+    SECTION("Negative") {
+      DeserializationError err = deserializeJson(doc, "-42");
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<int>());
+      REQUIRE_FALSE(doc.is<bool>());
+      REQUIRE(doc.as<int>() == -42);
+    }
+
+#if LONG_MAX == 2147483647
+    SECTION("LONG_MAX") {
+      DeserializationError err = deserializeJson(doc, "2147483647");
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<long>() == true);
+      REQUIRE(doc.as<long>() == LONG_MAX);
+    }
+
+    SECTION("LONG_MAX + 1") {
+      DeserializationError err = deserializeJson(doc, "2147483648");
+
+      CAPTURE(LONG_MIN);
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<long>() == false);
+      REQUIRE(doc.is<float>() == true);
+    }
+#endif
+
+#if LONG_MIN == -2147483648
+    SECTION("LONG_MIN") {
+      DeserializationError err = deserializeJson(doc, "-2147483648");
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<long>() == true);
+      REQUIRE(doc.as<long>() == LONG_MIN);
+    }
+
+    SECTION("LONG_MIN - 1") {
+      DeserializationError err = deserializeJson(doc, "-2147483649");
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<long>() == false);
+      REQUIRE(doc.is<float>() == true);
+    }
+#endif
+
+#if ULONG_MAX == 4294967295
+    SECTION("ULONG_MAX") {
+      DeserializationError err = deserializeJson(doc, "4294967295");
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<unsigned long>() == true);
+      REQUIRE(doc.as<unsigned long>() == ULONG_MAX);
+      REQUIRE(doc.is<long>() == false);
+    }
+
+    SECTION("ULONG_MAX + 1") {
+      DeserializationError err = deserializeJson(doc, "4294967296");
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<unsigned long>() == false);
+      REQUIRE(doc.is<float>() == true);
+    }
+#endif
+  }
+
+  SECTION("Floats") {
+    SECTION("Double") {
+      DeserializationError err = deserializeJson(doc, "-1.23e+4");
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE_FALSE(doc.is<int>());
+      REQUIRE(doc.is<double>());
+      REQUIRE(doc.as<double>() == Approx(-1.23e+4));
+    }
+
+    SECTION("NaN") {
+      DeserializationError err = deserializeJson(doc, "NaN");
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<float>() == true);
+      REQUIRE(my::isnan(doc.as<float>()));
+    }
+
+    SECTION("Infinity") {
+      DeserializationError err = deserializeJson(doc, "Infinity");
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<float>() == true);
+      REQUIRE(my::isinf(doc.as<float>()));
+    }
+
+    SECTION("+Infinity") {
+      DeserializationError err = deserializeJson(doc, "+Infinity");
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<float>() == true);
+      REQUIRE(my::isinf(doc.as<float>()));
+    }
+
+    SECTION("-Infinity") {
+      DeserializationError err = deserializeJson(doc, "-Infinity");
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<float>() == true);
+      REQUIRE(my::isinf(doc.as<float>()));
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/object.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/object.cpp
new file mode 100644
index 0000000..4c77075
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/object.cpp
@@ -0,0 +1,299 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize JSON object") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("An empty object") {
+    DeserializationError err = deserializeJson(doc, "{}");
+    JsonObject obj = doc.as<JsonObject>();
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc.is<JsonObject>());
+    REQUIRE(obj.size() == 0);
+  }
+
+  SECTION("Quotes") {
+    SECTION("Double quotes") {
+      DeserializationError err = deserializeJson(doc, "{\"key\":\"value\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("Single quotes") {
+      DeserializationError err = deserializeJson(doc, "{'key':'value'}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("No quotes") {
+      DeserializationError err = deserializeJson(doc, "{key:'value'}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("No quotes, allow underscore in key") {
+      DeserializationError err = deserializeJson(doc, "{_k_e_y_:42}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["_k_e_y_"] == 42);
+    }
+  }
+
+  SECTION("Spaces") {
+    SECTION("Before the key") {
+      DeserializationError err = deserializeJson(doc, "{ \"key\":\"value\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("After the key") {
+      DeserializationError err = deserializeJson(doc, "{\"key\" :\"value\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("Before the value") {
+      DeserializationError err = deserializeJson(doc, "{\"key\": \"value\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("After the value") {
+      DeserializationError err = deserializeJson(doc, "{\"key\":\"value\" }");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 1);
+      REQUIRE(obj["key"] == "value");
+    }
+
+    SECTION("Before the colon") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"key1\":\"value1\" ,\"key2\":\"value2\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == "value1");
+      REQUIRE(obj["key2"] == "value2");
+    }
+
+    SECTION("After the colon") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"key1\":\"value1\" ,\"key2\":\"value2\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == "value1");
+      REQUIRE(obj["key2"] == "value2");
+    }
+  }
+
+  SECTION("Values types") {
+    SECTION("String") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"key1\":\"value1\",\"key2\":\"value2\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == "value1");
+      REQUIRE(obj["key2"] == "value2");
+    }
+
+    SECTION("Integer") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"key1\":42,\"key2\":-42}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == 42);
+      REQUIRE(obj["key2"] == -42);
+    }
+
+    SECTION("Double") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"key1\":12.345,\"key2\":-7E89}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == 12.345);
+      REQUIRE(obj["key2"] == -7E89);
+    }
+
+    SECTION("Booleans") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"key1\":true,\"key2\":false}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"] == true);
+      REQUIRE(obj["key2"] == false);
+    }
+
+    SECTION("Null") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"key1\":null,\"key2\":null}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["key1"].as<const char*>() == 0);
+      REQUIRE(obj["key2"].as<const char*>() == 0);
+    }
+
+    SECTION("Array") {
+      char jsonString[] = " { \"ab\" : [ 1 , 2 ] , \"cd\" : [ 3 , 4 ] } ";
+
+      DeserializationError err = deserializeJson(doc, jsonString);
+      JsonObject obj = doc.as<JsonObject>();
+
+      JsonArray array1 = obj["ab"];
+      const JsonArray array2 = obj["cd"];
+      JsonArray array3 = obj["ef"];
+
+      REQUIRE(err == DeserializationError::Ok);
+
+      REQUIRE(array1.isNull() == false);
+      REQUIRE(array2.isNull() == false);
+      REQUIRE(array3.isNull() == true);
+
+      REQUIRE(2 == array1.size());
+      REQUIRE(2 == array2.size());
+      REQUIRE(0 == array3.size());
+
+      REQUIRE(1 == array1[0].as<int>());
+      REQUIRE(2 == array1[1].as<int>());
+
+      REQUIRE(3 == array2[0].as<int>());
+      REQUIRE(4 == array2[1].as<int>());
+
+      REQUIRE(0 == array3[0].as<int>());
+    }
+  }
+
+  SECTION("Premature null terminator") {
+    SECTION("After opening brace") {
+      DeserializationError err = deserializeJson(doc, "{");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("After key") {
+      DeserializationError err = deserializeJson(doc, "{\"hello\"");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("After colon") {
+      DeserializationError err = deserializeJson(doc, "{\"hello\":");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("After value") {
+      DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\"");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("After comma") {
+      DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\",");
+
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+  }
+
+  SECTION("Misc") {
+    SECTION("A quoted key without value") {
+      DeserializationError err = deserializeJson(doc, "{\"key\"}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("A non-quoted key without value") {
+      DeserializationError err = deserializeJson(doc, "{key}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("A dangling comma") {
+      DeserializationError err = deserializeJson(doc, "{\"key1\":\"value1\",}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("null as a key") {
+      DeserializationError err = deserializeJson(doc, "{null:\"value\"}");
+
+      REQUIRE(err == DeserializationError::Ok);
+    }
+
+    SECTION("Repeated key") {
+      DeserializationError err = deserializeJson(doc, "{a:{b:{c:1}},a:2}");
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(doc["a"] == 2);
+    }
+  }
+
+  SECTION("Should clear the JsonObject") {
+    deserializeJson(doc, "{\"hello\":\"world\"}");
+    deserializeJson(doc, "{}");
+    JsonObject obj = doc.as<JsonObject>();
+
+    REQUIRE(doc.is<JsonObject>());
+    REQUIRE(obj.size() == 0);
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+  }
+
+  SECTION("Issue #1335") {
+    std::string json("{\"a\":{},\"b\":{}}");
+    deserializeJson(doc, json);
+    CHECK(doc.as<std::string>() == json);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/object_static.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/object_static.cpp
new file mode 100644
index 0000000..b15d150
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/object_static.cpp
@@ -0,0 +1,64 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize JSON object with StaticJsonDocument") {
+  SECTION("BufferOfTheRightSizeForEmptyObject") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(0)> doc;
+    char input[] = "{}";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("TooSmallBufferForObjectWithOneValue") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(0)> doc;
+    char input[] = "{\"a\":1}";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::NoMemory);
+  }
+
+  SECTION("BufferOfTheRightSizeForObjectWithOneValue") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
+    char input[] = "{\"a\":1}";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("TooSmallBufferForObjectWithNestedObject") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(0) + JSON_ARRAY_SIZE(0)> doc;
+    char input[] = "{\"a\":[]}";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::NoMemory);
+  }
+
+  SECTION("BufferOfTheRightSizeForObjectWithNestedObject") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(0)> doc;
+    char input[] = "{\"a\":[]}";
+
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("Should clear the JsonObject") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
+    char input[] = "{\"hello\":\"world\"}";
+
+    deserializeJson(doc, input);
+    deserializeJson(doc, "{}");
+
+    REQUIRE(doc.as<JsonObject>().size() == 0);
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDeserializer/string.cpp b/third-party/ArduinoJson/extras/tests/JsonDeserializer/string.cpp
new file mode 100644
index 0000000..a5dc8f0
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDeserializer/string.cpp
@@ -0,0 +1,89 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_DECODE_UNICODE 1
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("Valid JSON strings value") {
+  struct TestCase {
+    const char* input;
+    const char* expectedOutput;
+  };
+
+  TestCase testCases[] = {
+      {"\"hello world\"", "hello world"},
+      {"\'hello world\'", "hello world"},
+      {"'\"'", "\""},
+      {"'\\\\'", "\\"},
+      {"'\\/'", "/"},
+      {"'\\b'", "\b"},
+      {"'\\f'", "\f"},
+      {"'\\n'", "\n"},
+      {"'\\r'", "\r"},
+      {"'\\t'", "\t"},
+      {"\"1\\\"2\\\\3\\/4\\b5\\f6\\n7\\r8\\t9\"", "1\"2\\3/4\b5\f6\n7\r8\t9"},
+      {"'\\u0041'", "A"},
+      {"'\\u00e4'", "\xc3\xa4"},                 // ä
+      {"'\\u00E4'", "\xc3\xa4"},                 // ä
+      {"'\\u3042'", "\xe3\x81\x82"},             // あ
+      {"'\\ud83d\\udda4'", "\xf0\x9f\x96\xa4"},  // 🖤
+      {"'\\uF053'", "\xef\x81\x93"},             // issue #1173
+      {"'\\uF015'", "\xef\x80\x95"},             // issue #1173
+      {"'\\uF054'", "\xef\x81\x94"},             // issue #1173
+  };
+  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);
+
+  DynamicJsonDocument doc(4096);
+
+  for (size_t i = 0; i < testCount; i++) {
+    const TestCase& testCase = testCases[i];
+    CAPTURE(testCase.input);
+    DeserializationError err = deserializeJson(doc, testCase.input);
+    CHECK(err == DeserializationError::Ok);
+    CHECK(doc.as<std::string>() == testCase.expectedOutput);
+  }
+}
+
+TEST_CASE("Truncated JSON string") {
+  const char* testCases[] = {"\"hello", "\'hello", "'\\u", "'\\u00", "'\\u000"};
+  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);
+
+  DynamicJsonDocument doc(4096);
+
+  for (size_t i = 0; i < testCount; i++) {
+    const char* input = testCases[i];
+    CAPTURE(input);
+    REQUIRE(deserializeJson(doc, input) ==
+            DeserializationError::IncompleteInput);
+  }
+}
+
+TEST_CASE("Invalid JSON string") {
+  const char* testCases[] = {"'\\u'",     "'\\u000g'", "'\\u000'",
+                             "'\\u000G'", "'\\u000/'", "'\\x1234'"};
+  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);
+
+  DynamicJsonDocument doc(4096);
+
+  for (size_t i = 0; i < testCount; i++) {
+    const char* input = testCases[i];
+    CAPTURE(input);
+    REQUIRE(deserializeJson(doc, input) == DeserializationError::InvalidInput);
+  }
+}
+
+TEST_CASE("Not enough room to save the key") {
+  DynamicJsonDocument doc(JSON_OBJECT_SIZE(1) + 8);
+
+  SECTION("Quoted string") {
+    REQUIRE(deserializeJson(doc, "{\"accuracy\":1}") ==
+            DeserializationError::NoMemory);
+  }
+
+  SECTION("Non-quoted string") {
+    REQUIRE(deserializeJson(doc, "{accuracy:1}") ==
+            DeserializationError::NoMemory);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/BasicJsonDocument.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/BasicJsonDocument.cpp
new file mode 100644
index 0000000..15b30f9
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/BasicJsonDocument.cpp
@@ -0,0 +1,157 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdlib.h>  // malloc, free
+#include <catch.hpp>
+#include <sstream>
+
+using ARDUINOJSON_NAMESPACE::addPadding;
+using ARDUINOJSON_NAMESPACE::move;
+
+class SpyingAllocator {
+ public:
+  SpyingAllocator(const SpyingAllocator& src) : _log(src._log) {}
+  SpyingAllocator(std::ostream& log) : _log(log) {}
+
+  void* allocate(size_t n) {
+    _log << "A" << n;
+    return malloc(n);
+  }
+  void deallocate(void* p) {
+    _log << "F";
+    free(p);
+  }
+
+ private:
+  SpyingAllocator& operator=(const SpyingAllocator& src);
+
+  std::ostream& _log;
+};
+
+class ControllableAllocator {
+ public:
+  ControllableAllocator() : _enabled(true) {}
+
+  void* allocate(size_t n) {
+    return _enabled ? malloc(n) : 0;
+  }
+
+  void deallocate(void* p) {
+    free(p);
+  }
+
+  void disable() {
+    _enabled = false;
+  }
+
+ private:
+  bool _enabled;
+};
+
+TEST_CASE("BasicJsonDocument") {
+  std::stringstream log;
+
+  SECTION("Construct/Destruct") {
+    { BasicJsonDocument<SpyingAllocator> doc(4096, log); }
+    REQUIRE(log.str() == "A4096F");
+  }
+
+  SECTION("Copy construct") {
+    {
+      BasicJsonDocument<SpyingAllocator> doc1(4096, log);
+      doc1.set(std::string("The size of this string is 32!!"));
+
+      BasicJsonDocument<SpyingAllocator> doc2(doc1);
+
+      REQUIRE(doc1.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc2.capacity() == 4096);
+    }
+    REQUIRE(log.str() == "A4096A4096FF");
+  }
+
+#if ARDUINOJSON_HAS_RVALUE_REFERENCES
+  SECTION("Move construct") {
+    {
+      BasicJsonDocument<SpyingAllocator> doc1(4096, log);
+      doc1.set(std::string("The size of this string is 32!!"));
+
+      BasicJsonDocument<SpyingAllocator> doc2(move(doc1));
+
+      REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc1.as<std::string>() == "null");
+      REQUIRE(doc1.capacity() == 0);
+      REQUIRE(doc2.capacity() == 4096);
+    }
+    REQUIRE(log.str() == "A4096F");
+  }
+#endif
+
+  SECTION("Copy assign") {
+    {
+      BasicJsonDocument<SpyingAllocator> doc1(4096, log);
+      doc1.set(std::string("The size of this string is 32!!"));
+      BasicJsonDocument<SpyingAllocator> doc2(8, log);
+
+      doc2 = doc1;
+
+      REQUIRE(doc1.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc2.capacity() == 4096);
+    }
+    REQUIRE(log.str() == "A4096A8FA4096FF");
+  }
+
+#if ARDUINOJSON_HAS_RVALUE_REFERENCES
+  SECTION("Move assign") {
+    {
+      BasicJsonDocument<SpyingAllocator> doc1(4096, log);
+      doc1.set(std::string("The size of this string is 32!!"));
+      BasicJsonDocument<SpyingAllocator> doc2(8, log);
+
+      doc2 = move(doc1);
+
+      REQUIRE(doc2.as<std::string>() == "The size of this string is 32!!");
+      REQUIRE(doc1.as<std::string>() == "null");
+      REQUIRE(doc1.capacity() == 0);
+      REQUIRE(doc2.capacity() == 4096);
+    }
+    REQUIRE(log.str() == "A4096A8FF");
+  }
+#endif
+
+  SECTION("garbageCollect()") {
+    BasicJsonDocument<ControllableAllocator> doc(4096);
+
+    SECTION("when allocation succeeds") {
+      deserializeJson(doc, "{\"blanket\":1,\"dancing\":2}");
+      REQUIRE(doc.capacity() == 4096);
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      doc.remove("blanket");
+
+      bool result = doc.garbageCollect();
+
+      REQUIRE(result == true);
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      REQUIRE(doc.capacity() == 4096);
+      REQUIRE(doc.as<std::string>() == "{\"dancing\":2}");
+    }
+
+    SECTION("when allocation fails") {
+      deserializeJson(doc, "{\"blanket\":1,\"dancing\":2}");
+      REQUIRE(doc.capacity() == 4096);
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      doc.remove("blanket");
+      doc.allocator().disable();
+
+      bool result = doc.garbageCollect();
+
+      REQUIRE(result == false);
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      REQUIRE(doc.capacity() == 4096);
+      REQUIRE(doc.as<std::string>() == "{\"dancing\":2}");
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt
new file mode 100644
index 0000000..18c07f0
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/CMakeLists.txt
@@ -0,0 +1,29 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(JsonDocumentTests
+	add.cpp
+	BasicJsonDocument.cpp
+	compare.cpp
+	containsKey.cpp
+	createNested.cpp
+	DynamicJsonDocument.cpp
+	ElementProxy.cpp
+	isNull.cpp
+	MemberProxy.cpp
+	nesting.cpp
+	overflowed.cpp
+	remove.cpp
+	shrinkToFit.cpp
+	size.cpp
+	StaticJsonDocument.cpp
+	subscript.cpp
+)
+
+add_test(JsonDocument JsonDocumentTests)
+
+set_tests_properties(JsonDocument
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/DynamicJsonDocument.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/DynamicJsonDocument.cpp
new file mode 100644
index 0000000..6cf953a
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/DynamicJsonDocument.cpp
@@ -0,0 +1,209 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using ARDUINOJSON_NAMESPACE::addPadding;
+
+static void REQUIRE_JSON(JsonDocument& doc, const std::string& expected) {
+  std::string json;
+  serializeJson(doc, json);
+  REQUIRE(json == expected);
+}
+
+TEST_CASE("DynamicJsonDocument") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("serializeJson()") {
+    JsonObject obj = doc.to<JsonObject>();
+    obj["hello"] = "world";
+
+    std::string json;
+    serializeJson(doc, json);
+
+    REQUIRE(json == "{\"hello\":\"world\"}");
+  }
+
+  SECTION("memoryUsage()") {
+    SECTION("starts at zero") {
+      REQUIRE(doc.memoryUsage() == 0);
+    }
+
+    SECTION("JSON_ARRAY_SIZE(0)") {
+      doc.to<JsonArray>();
+      REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0));
+    }
+
+    SECTION("JSON_ARRAY_SIZE(1)") {
+      doc.to<JsonArray>().add(42);
+      REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(1));
+    }
+
+    SECTION("JSON_ARRAY_SIZE(1) + JSON_ARRAY_SIZE(0)") {
+      doc.to<JsonArray>().createNestedArray();
+      REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(1) + JSON_ARRAY_SIZE(0));
+    }
+  }
+
+  SECTION("capacity()") {
+    SECTION("matches constructor argument") {
+      DynamicJsonDocument doc2(256);
+      REQUIRE(doc2.capacity() == 256);
+    }
+
+    SECTION("rounds up constructor argument") {
+      DynamicJsonDocument doc2(253);
+      REQUIRE(doc2.capacity() == 256);
+    }
+  }
+
+  SECTION("memoryUsage()") {
+    SECTION("Increases after adding value to array") {
+      JsonArray arr = doc.to<JsonArray>();
+
+      REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(0));
+      arr.add(42);
+      REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(1));
+      arr.add(43);
+      REQUIRE(doc.memoryUsage() == JSON_ARRAY_SIZE(2));
+    }
+
+    SECTION("Increases after adding value to object") {
+      JsonObject obj = doc.to<JsonObject>();
+
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+      obj["a"] = 1;
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1));
+      obj["b"] = 2;
+      REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(2));
+    }
+  }
+}
+
+TEST_CASE("DynamicJsonDocument constructor") {
+  SECTION("Copy constructor") {
+    DynamicJsonDocument doc1(1234);
+    deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+    DynamicJsonDocument doc2 = doc1;
+
+    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+
+    REQUIRE(doc2.capacity() == doc1.capacity());
+  }
+
+  SECTION("Construct from StaticJsonDocument") {
+    StaticJsonDocument<200> doc1;
+    deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+    DynamicJsonDocument doc2 = doc1;
+
+    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    REQUIRE(doc2.capacity() == doc1.capacity());
+  }
+
+  SECTION("Construct from JsonObject") {
+    StaticJsonDocument<200> doc1;
+    JsonObject obj = doc1.to<JsonObject>();
+    obj["hello"] = "world";
+
+    DynamicJsonDocument doc2 = obj;
+
+    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    REQUIRE(doc2.capacity() == addPadding(doc1.memoryUsage()));
+  }
+
+  SECTION("Construct from JsonArray") {
+    StaticJsonDocument<200> doc1;
+    JsonArray arr = doc1.to<JsonArray>();
+    arr.add("hello");
+
+    DynamicJsonDocument doc2 = arr;
+
+    REQUIRE_JSON(doc2, "[\"hello\"]");
+    REQUIRE(doc2.capacity() == addPadding(doc1.memoryUsage()));
+  }
+
+  SECTION("Construct from JsonVariant") {
+    StaticJsonDocument<200> doc1;
+    deserializeJson(doc1, "42");
+
+    DynamicJsonDocument doc2 = doc1.as<JsonVariant>();
+
+    REQUIRE_JSON(doc2, "42");
+    REQUIRE(doc2.capacity() == addPadding(doc1.memoryUsage()));
+  }
+}
+
+TEST_CASE("DynamicJsonDocument assignment") {
+  SECTION("Copy assignment preserves the buffer when capacity is sufficient") {
+    DynamicJsonDocument doc1(1234);
+    deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+    DynamicJsonDocument doc2(doc1.capacity());
+    doc2 = doc1;
+
+    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    REQUIRE(doc2.capacity() == doc1.capacity());
+  }
+
+  SECTION("Copy assignment realloc the buffer when capacity is insufficient") {
+    DynamicJsonDocument doc1(1234);
+    deserializeJson(doc1, "{\"hello\":\"world\"}");
+    DynamicJsonDocument doc2(8);
+
+    REQUIRE(doc2.capacity() < doc1.memoryUsage());
+    doc2 = doc1;
+    REQUIRE(doc2.capacity() >= doc1.memoryUsage());
+
+    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+  }
+
+  SECTION("Assign from StaticJsonDocument") {
+    StaticJsonDocument<200> doc1;
+    deserializeJson(doc1, "{\"hello\":\"world\"}");
+    DynamicJsonDocument doc2(4096);
+    doc2.to<JsonVariant>().set(666);
+
+    doc2 = doc1;
+
+    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+  }
+
+  SECTION("Assign from JsonObject") {
+    StaticJsonDocument<200> doc1;
+    JsonObject obj = doc1.to<JsonObject>();
+    obj["hello"] = "world";
+
+    DynamicJsonDocument doc2(4096);
+    doc2 = obj;
+
+    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    REQUIRE(doc2.capacity() == 4096);
+  }
+
+  SECTION("Assign from JsonArray") {
+    StaticJsonDocument<200> doc1;
+    JsonArray arr = doc1.to<JsonArray>();
+    arr.add("hello");
+
+    DynamicJsonDocument doc2(4096);
+    doc2 = arr;
+
+    REQUIRE_JSON(doc2, "[\"hello\"]");
+    REQUIRE(doc2.capacity() == 4096);
+  }
+
+  SECTION("Assign from JsonVariant") {
+    StaticJsonDocument<200> doc1;
+    deserializeJson(doc1, "42");
+
+    DynamicJsonDocument doc2(4096);
+    doc2 = doc1.as<JsonVariant>();
+
+    REQUIRE_JSON(doc2, "42");
+    REQUIRE(doc2.capacity() == 4096);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/ElementProxy.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/ElementProxy.cpp
new file mode 100644
index 0000000..1fcd24b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/ElementProxy.cpp
@@ -0,0 +1,206 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("ElementProxy::add()") {
+  DynamicJsonDocument doc(4096);
+  doc.addElement();
+  ElementProxy<JsonDocument&> ep = doc[0];
+
+  SECTION("add(int)") {
+    ep.add(42);
+
+    REQUIRE(doc.as<std::string>() == "[[42]]");
+  }
+
+  SECTION("add(const char*)") {
+    ep.add("world");
+
+    REQUIRE(doc.as<std::string>() == "[[\"world\"]]");
+  }
+
+  SECTION("set(char[])") {
+    char s[] = "world";
+    ep.add(s);
+    strcpy(s, "!!!!!");
+
+    REQUIRE(doc.as<std::string>() == "[[\"world\"]]");
+  }
+}
+
+TEST_CASE("ElementProxy::clear()") {
+  DynamicJsonDocument doc(4096);
+  doc.addElement();
+  ElementProxy<JsonDocument&> ep = doc[0];
+
+  SECTION("size goes back to zero") {
+    ep.add(42);
+    ep.clear();
+
+    REQUIRE(ep.size() == 0);
+  }
+
+  SECTION("isNull() return true") {
+    ep.add("hello");
+    ep.clear();
+
+    REQUIRE(ep.isNull() == true);
+  }
+}
+
+TEST_CASE("ElementProxy::operator==()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("1 vs 1") {
+    doc.add(1);
+    doc.add(1);
+
+    REQUIRE(doc[0] <= doc[1]);
+    REQUIRE(doc[0] == doc[1]);
+    REQUIRE(doc[0] >= doc[1]);
+    REQUIRE_FALSE(doc[0] != doc[1]);
+    REQUIRE_FALSE(doc[0] < doc[1]);
+    REQUIRE_FALSE(doc[0] > doc[1]);
+  }
+
+  SECTION("1 vs 2") {
+    doc.add(1);
+    doc.add(2);
+
+    REQUIRE(doc[0] != doc[1]);
+    REQUIRE(doc[0] < doc[1]);
+    REQUIRE(doc[0] <= doc[1]);
+    REQUIRE_FALSE(doc[0] == doc[1]);
+    REQUIRE_FALSE(doc[0] > doc[1]);
+    REQUIRE_FALSE(doc[0] >= doc[1]);
+  }
+
+  SECTION("'abc' vs 'bcd'") {
+    doc.add("abc");
+    doc.add("bcd");
+
+    REQUIRE(doc[0] != doc[1]);
+    REQUIRE(doc[0] < doc[1]);
+    REQUIRE(doc[0] <= doc[1]);
+    REQUIRE_FALSE(doc[0] == doc[1]);
+    REQUIRE_FALSE(doc[0] > doc[1]);
+    REQUIRE_FALSE(doc[0] >= doc[1]);
+  }
+}
+
+TEST_CASE("ElementProxy::remove()") {
+  DynamicJsonDocument doc(4096);
+  doc.addElement();
+  ElementProxy<JsonDocument&> ep = doc[0];
+
+  SECTION("remove(int)") {
+    ep.add(1);
+    ep.add(2);
+    ep.add(3);
+
+    ep.remove(1);
+
+    REQUIRE(ep.as<std::string>() == "[1,3]");
+  }
+
+  SECTION("remove(const char *)") {
+    ep["a"] = 1;
+    ep["b"] = 2;
+
+    ep.remove("a");
+
+    REQUIRE(ep.as<std::string>() == "{\"b\":2}");
+  }
+
+  SECTION("remove(std::string)") {
+    ep["a"] = 1;
+    ep["b"] = 2;
+
+    ep.remove(std::string("b"));
+
+    REQUIRE(ep.as<std::string>() == "{\"a\":1}");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("remove(vla)") {
+    ep["a"] = 1;
+    ep["b"] = 2;
+
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "b");
+    ep.remove(vla);
+
+    REQUIRE(ep.as<std::string>() == "{\"a\":1}");
+  }
+#endif
+}
+
+TEST_CASE("ElementProxy::set()") {
+  DynamicJsonDocument doc(4096);
+  ElementProxy<JsonDocument&> ep = doc[0];
+
+  SECTION("set(int)") {
+    ep.set(42);
+
+    REQUIRE(doc.as<std::string>() == "[42]");
+  }
+
+  SECTION("set(const char*)") {
+    ep.set("world");
+
+    REQUIRE(doc.as<std::string>() == "[\"world\"]");
+  }
+
+  SECTION("set(char[])") {
+    char s[] = "world";
+    ep.set(s);
+    strcpy(s, "!!!!!");
+
+    REQUIRE(doc.as<std::string>() == "[\"world\"]");
+  }
+}
+
+TEST_CASE("ElementProxy::size()") {
+  DynamicJsonDocument doc(4096);
+  doc.addElement();
+  ElementProxy<JsonDocument&> ep = doc[0];
+
+  SECTION("returns 0") {
+    REQUIRE(ep.size() == 0);
+  }
+
+  SECTION("as an array, returns 2") {
+    ep.add(1);
+    ep.add(2);
+    REQUIRE(ep.size() == 2);
+  }
+
+  SECTION("as an object, returns 2") {
+    ep["a"] = 1;
+    ep["b"] = 2;
+    REQUIRE(ep.size() == 2);
+  }
+}
+
+TEST_CASE("ElementProxy::operator[]") {
+  DynamicJsonDocument doc(4096);
+  ElementProxy<JsonDocument&> ep = doc[1];
+
+  SECTION("set member") {
+    ep["world"] = 42;
+
+    REQUIRE(doc.as<std::string>() == "[null,{\"world\":42}]");
+  }
+
+  SECTION("set element") {
+    ep[2] = 42;
+
+    REQUIRE(doc.as<std::string>() == "[null,[null,null,42]]");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/MemberProxy.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/MemberProxy.cpp
new file mode 100644
index 0000000..cf4e563
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/MemberProxy.cpp
@@ -0,0 +1,247 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("MemberProxy::add()") {
+  DynamicJsonDocument doc(4096);
+  MemberProxy<JsonDocument &, const char *> mp = doc["hello"];
+
+  SECTION("add(int)") {
+    mp.add(42);
+
+    REQUIRE(doc.as<std::string>() == "{\"hello\":[42]}");
+  }
+
+  SECTION("add(const char*)") {
+    mp.add("world");
+
+    REQUIRE(doc.as<std::string>() == "{\"hello\":[\"world\"]}");
+  }
+}
+
+TEST_CASE("MemberProxy::clear()") {
+  DynamicJsonDocument doc(4096);
+  MemberProxy<JsonDocument &, const char *> mp = doc["hello"];
+
+  SECTION("size goes back to zero") {
+    mp.add(42);
+    mp.clear();
+
+    REQUIRE(mp.size() == 0);
+  }
+
+  SECTION("isNull() return true") {
+    mp.add("hello");
+    mp.clear();
+
+    REQUIRE(mp.isNull() == true);
+  }
+}
+
+TEST_CASE("MemberProxy::operator==()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("1 vs 1") {
+    doc["a"] = 1;
+    doc["b"] = 1;
+
+    REQUIRE(doc["a"] <= doc["b"]);
+    REQUIRE(doc["a"] == doc["b"]);
+    REQUIRE(doc["a"] >= doc["b"]);
+    REQUIRE_FALSE(doc["a"] != doc["b"]);
+    REQUIRE_FALSE(doc["a"] < doc["b"]);
+    REQUIRE_FALSE(doc["a"] > doc["b"]);
+  }
+
+  SECTION("1 vs 2") {
+    doc["a"] = 1;
+    doc["b"] = 2;
+
+    REQUIRE(doc["a"] != doc["b"]);
+    REQUIRE(doc["a"] < doc["b"]);
+    REQUIRE(doc["a"] <= doc["b"]);
+    REQUIRE_FALSE(doc["a"] == doc["b"]);
+    REQUIRE_FALSE(doc["a"] > doc["b"]);
+    REQUIRE_FALSE(doc["a"] >= doc["b"]);
+  }
+
+  SECTION("'abc' vs 'bcd'") {
+    doc["a"] = "abc";
+    doc["b"] = "bcd";
+
+    REQUIRE(doc["a"] != doc["b"]);
+    REQUIRE(doc["a"] < doc["b"]);
+    REQUIRE(doc["a"] <= doc["b"]);
+    REQUIRE_FALSE(doc["a"] == doc["b"]);
+    REQUIRE_FALSE(doc["a"] > doc["b"]);
+    REQUIRE_FALSE(doc["a"] >= doc["b"]);
+  }
+}
+
+TEST_CASE("MemberProxy::containsKey()") {
+  DynamicJsonDocument doc(4096);
+  MemberProxy<JsonDocument &, const char *> mp = doc["hello"];
+
+  SECTION("containsKey(const char*)") {
+    mp["key"] = "value";
+
+    REQUIRE(mp.containsKey("key") == true);
+    REQUIRE(mp.containsKey("key") == true);
+  }
+
+  SECTION("containsKey(std::string)") {
+    mp["key"] = "value";
+
+    REQUIRE(mp.containsKey(std::string("key")) == true);
+    REQUIRE(mp.containsKey(std::string("key")) == true);
+  }
+}
+
+TEST_CASE("MemberProxy::operator|()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("const char*") {
+    doc["a"] = "hello";
+
+    REQUIRE((doc["a"] | "world") == std::string("hello"));
+    REQUIRE((doc["b"] | "world") == std::string("world"));
+  }
+
+  SECTION("Issue #1411") {
+    doc["sensor"] = "gps";
+
+    const char *test = "test";  // <- the literal must be captured in a variable
+                                // to trigger the bug
+    const char *sensor = doc["sensor"] | test;  // "gps"
+
+    REQUIRE(sensor == std::string("gps"));
+  }
+
+  SECTION("Issue #1415") {
+    JsonObject object = doc.to<JsonObject>();
+    object["hello"] = "world";
+
+    StaticJsonDocument<0> emptyDoc;
+    JsonObject anotherObject = object["hello"] | emptyDoc.to<JsonObject>();
+
+    REQUIRE(anotherObject.isNull() == false);
+    REQUIRE(anotherObject.size() == 0);
+  }
+}
+
+TEST_CASE("MemberProxy::remove()") {
+  DynamicJsonDocument doc(4096);
+  MemberProxy<JsonDocument &, const char *> mp = doc["hello"];
+
+  SECTION("remove(int)") {
+    mp.add(1);
+    mp.add(2);
+    mp.add(3);
+
+    mp.remove(1);
+
+    REQUIRE(mp.as<std::string>() == "[1,3]");
+  }
+
+  SECTION("remove(const char *)") {
+    mp["a"] = 1;
+    mp["b"] = 2;
+
+    mp.remove("a");
+
+    REQUIRE(mp.as<std::string>() == "{\"b\":2}");
+  }
+
+  SECTION("remove(std::string)") {
+    mp["a"] = 1;
+    mp["b"] = 2;
+
+    mp.remove(std::string("b"));
+
+    REQUIRE(mp.as<std::string>() == "{\"a\":1}");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("remove(vla)") {
+    mp["a"] = 1;
+    mp["b"] = 2;
+
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "b");
+    mp.remove(vla);
+
+    REQUIRE(mp.as<std::string>() == "{\"a\":1}");
+  }
+#endif
+}
+
+TEST_CASE("MemberProxy::set()") {
+  DynamicJsonDocument doc(4096);
+  MemberProxy<JsonDocument &, const char *> mp = doc["hello"];
+
+  SECTION("set(int)") {
+    mp.set(42);
+
+    REQUIRE(doc.as<std::string>() == "{\"hello\":42}");
+  }
+
+  SECTION("set(const char*)") {
+    mp.set("world");
+
+    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
+  }
+
+  SECTION("set(char[])") {  // issue #1191
+    char s[] = "world";
+    mp.set(s);
+    strcpy(s, "!!!!!");
+
+    REQUIRE(doc.as<std::string>() == "{\"hello\":\"world\"}");
+  }
+}
+
+TEST_CASE("MemberProxy::size()") {
+  DynamicJsonDocument doc(4096);
+  MemberProxy<JsonDocument &, const char *> mp = doc["hello"];
+
+  SECTION("returns 0") {
+    REQUIRE(mp.size() == 0);
+  }
+
+  SECTION("as an array, return 2") {
+    mp.add(1);
+    mp.add(2);
+
+    REQUIRE(mp.size() == 2);
+  }
+
+  SECTION("as an object, return 2") {
+    mp["a"] = 1;
+    mp["b"] = 2;
+
+    REQUIRE(mp.size() == 2);
+  }
+}
+
+TEST_CASE("MemberProxy::operator[]") {
+  DynamicJsonDocument doc(4096);
+  MemberProxy<JsonDocument &, const char *> mp = doc["hello"];
+
+  SECTION("set member") {
+    mp["world"] = 42;
+
+    REQUIRE(doc.as<std::string>() == "{\"hello\":{\"world\":42}}");
+  }
+
+  SECTION("set element") {
+    mp[2] = 42;
+
+    REQUIRE(doc.as<std::string>() == "{\"hello\":[null,null,42]}");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/StaticJsonDocument.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/StaticJsonDocument.cpp
new file mode 100644
index 0000000..f9ecc2e
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/StaticJsonDocument.cpp
@@ -0,0 +1,224 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+static void REQUIRE_JSON(JsonDocument& doc, const std::string& expected) {
+  std::string json;
+  serializeJson(doc, json);
+  REQUIRE(json == expected);
+}
+
+TEST_CASE("StaticJsonDocument") {
+  SECTION("capacity()") {
+    SECTION("matches template argument") {
+      StaticJsonDocument<256> doc;
+      REQUIRE(doc.capacity() == 256);
+    }
+
+    SECTION("rounds up template argument") {
+      StaticJsonDocument<253> doc;
+      REQUIRE(doc.capacity() == 256);
+    }
+  }
+
+  SECTION("serializeJson()") {
+    StaticJsonDocument<200> doc;
+    JsonObject obj = doc.to<JsonObject>();
+    obj["hello"] = "world";
+
+    std::string json;
+    serializeJson(doc, json);
+
+    REQUIRE(json == "{\"hello\":\"world\"}");
+  }
+
+  SECTION("Copy assignment") {
+    StaticJsonDocument<200> doc1, doc2;
+    doc1.to<JsonVariant>().set(666);
+    deserializeJson(doc2, "{\"hello\":\"world\"}");
+
+    doc1 = doc2;
+
+    REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+  }
+
+  SECTION("Contructor") {
+    SECTION("Copy constructor") {
+      StaticJsonDocument<200> doc1;
+      deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+      StaticJsonDocument<200> doc2 = doc1;
+
+      deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}");
+      REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    }
+
+    SECTION("Construct from StaticJsonDocument of different size") {
+      StaticJsonDocument<300> doc1;
+      deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+      StaticJsonDocument<200> doc2 = doc1;
+
+      REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    }
+
+    SECTION("Construct from DynamicJsonDocument") {
+      DynamicJsonDocument doc1(4096);
+      deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+      StaticJsonDocument<200> doc2 = doc1;
+
+      REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    }
+
+    SECTION("Construct from JsonObject") {
+      DynamicJsonDocument doc1(4096);
+      deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+      StaticJsonDocument<200> doc2 = doc1.as<JsonObject>();
+
+      deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}");
+      REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    }
+
+    SECTION("Construct from JsonArray") {
+      DynamicJsonDocument doc1(4096);
+      deserializeJson(doc1, "[\"hello\",\"world\"]");
+
+      StaticJsonDocument<200> doc2 = doc1.as<JsonArray>();
+
+      deserializeJson(doc1, "[\"HELLO\",\"WORLD\"]");
+      REQUIRE_JSON(doc2, "[\"hello\",\"world\"]");
+    }
+
+    SECTION("Construct from JsonVariant") {
+      DynamicJsonDocument doc1(4096);
+      deserializeJson(doc1, "42");
+
+      StaticJsonDocument<200> doc2 = doc1.as<JsonVariant>();
+
+      REQUIRE_JSON(doc2, "42");
+    }
+  }
+
+  SECTION("Assignment") {
+    SECTION("Copy assignment") {
+      StaticJsonDocument<200> doc1, doc2;
+      doc1.to<JsonVariant>().set(666);
+      deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+      doc2 = doc1;
+
+      deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}");
+      REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    }
+
+    SECTION("Assign from StaticJsonDocument of different capacity") {
+      StaticJsonDocument<200> doc1;
+      StaticJsonDocument<300> doc2;
+      doc1.to<JsonVariant>().set(666);
+      deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+      doc2 = doc1;
+
+      REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    }
+
+    SECTION("Assign from DynamicJsonDocument") {
+      StaticJsonDocument<200> doc1;
+      DynamicJsonDocument doc2(4096);
+      doc1.to<JsonVariant>().set(666);
+      deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+      doc2 = doc1;
+
+      deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}");
+      REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    }
+
+    SECTION("Assign from JsonArray") {
+      StaticJsonDocument<200> doc1;
+      DynamicJsonDocument doc2(4096);
+      doc1.to<JsonVariant>().set(666);
+      deserializeJson(doc1, "[\"hello\",\"world\"]");
+
+      doc2 = doc1.as<JsonArray>();
+
+      deserializeJson(doc1, "[\"HELLO\",\"WORLD\"]");
+      REQUIRE_JSON(doc2, "[\"hello\",\"world\"]");
+    }
+
+    SECTION("Assign from JsonArrayConst") {
+      StaticJsonDocument<200> doc1;
+      DynamicJsonDocument doc2(4096);
+      doc1.to<JsonVariant>().set(666);
+      deserializeJson(doc1, "[\"hello\",\"world\"]");
+
+      doc2 = doc1.as<JsonArrayConst>();
+
+      deserializeJson(doc1, "[\"HELLO\",\"WORLD\"]");
+      REQUIRE_JSON(doc2, "[\"hello\",\"world\"]");
+    }
+
+    SECTION("Assign from JsonObject") {
+      StaticJsonDocument<200> doc1;
+      DynamicJsonDocument doc2(4096);
+      doc1.to<JsonVariant>().set(666);
+      deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+      doc2 = doc1.as<JsonObject>();
+
+      deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}");
+      REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    }
+
+    SECTION("Assign from JsonObjectConst") {
+      StaticJsonDocument<200> doc1;
+      DynamicJsonDocument doc2(4096);
+      doc1.to<JsonVariant>().set(666);
+      deserializeJson(doc1, "{\"hello\":\"world\"}");
+
+      doc2 = doc1.as<JsonObjectConst>();
+
+      deserializeJson(doc1, "{\"HELLO\":\"WORLD\"}");
+      REQUIRE_JSON(doc2, "{\"hello\":\"world\"}");
+    }
+
+    SECTION("Assign from JsonVariant") {
+      DynamicJsonDocument doc1(4096);
+      doc1.to<JsonVariant>().set(666);
+      deserializeJson(doc1, "42");
+
+      StaticJsonDocument<200> doc2;
+      doc2 = doc1.as<JsonVariant>();
+
+      REQUIRE_JSON(doc2, "42");
+    }
+
+    SECTION("Assign from JsonVariantConst") {
+      DynamicJsonDocument doc1(4096);
+      doc1.to<JsonVariant>().set(666);
+      deserializeJson(doc1, "42");
+
+      StaticJsonDocument<200> doc2;
+      doc2 = doc1.as<JsonVariantConst>();
+
+      REQUIRE_JSON(doc2, "42");
+    }
+  }
+
+  SECTION("garbageCollect()") {
+    StaticJsonDocument<256> doc;
+    doc[std::string("example")] = std::string("jukebox");
+    doc.remove("example");
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 16);
+
+    doc.garbageCollect();
+
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+    REQUIRE_JSON(doc, "{}");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/add.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/add.cpp
new file mode 100644
index 0000000..c32858e
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/add.cpp
@@ -0,0 +1,22 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonDocument::add()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("integer") {
+    doc.add(42);
+
+    REQUIRE(doc.as<std::string>() == "[42]");
+  }
+
+  SECTION("const char*") {
+    doc.add("hello");
+
+    REQUIRE(doc.as<std::string>() == "[\"hello\"]");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/compare.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/compare.cpp
new file mode 100644
index 0000000..44139e0
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/compare.cpp
@@ -0,0 +1,77 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("DynamicJsonDocument::operator==(const DynamicJsonDocument&)") {
+  DynamicJsonDocument doc1(4096);
+  DynamicJsonDocument doc2(4096);
+
+  SECTION("Empty") {
+    REQUIRE(doc1 == doc2);
+    REQUIRE_FALSE(doc1 != doc2);
+  }
+
+  SECTION("With same object") {
+    doc1["hello"] = "world";
+    doc2["hello"] = "world";
+    REQUIRE(doc1 == doc2);
+    REQUIRE_FALSE(doc1 != doc2);
+  }
+  SECTION("With different object") {
+    doc1["hello"] = "world";
+    doc2["world"] = "hello";
+    REQUIRE_FALSE(doc1 == doc2);
+    REQUIRE(doc1 != doc2);
+  }
+}
+
+TEST_CASE("DynamicJsonDocument::operator==(const StaticJsonDocument&)") {
+  DynamicJsonDocument doc1(4096);
+  StaticJsonDocument<256> doc2;
+
+  SECTION("Empty") {
+    REQUIRE(doc1 == doc2);
+    REQUIRE_FALSE(doc1 != doc2);
+  }
+
+  SECTION("With same object") {
+    doc1["hello"] = "world";
+    doc2["hello"] = "world";
+    REQUIRE(doc1 == doc2);
+    REQUIRE_FALSE(doc1 != doc2);
+  }
+
+  SECTION("With different object") {
+    doc1["hello"] = "world";
+    doc2["world"] = "hello";
+    REQUIRE_FALSE(doc1 == doc2);
+    REQUIRE(doc1 != doc2);
+  }
+}
+
+TEST_CASE("StaticJsonDocument::operator==(const DynamicJsonDocument&)") {
+  StaticJsonDocument<256> doc1;
+  DynamicJsonDocument doc2(4096);
+
+  SECTION("Empty") {
+    REQUIRE(doc1 == doc2);
+    REQUIRE_FALSE(doc1 != doc2);
+  }
+
+  SECTION("With same object") {
+    doc1["hello"] = "world";
+    doc2["hello"] = "world";
+    REQUIRE(doc1 == doc2);
+    REQUIRE_FALSE(doc1 != doc2);
+  }
+
+  SECTION("With different object") {
+    doc1["hello"] = "world";
+    doc2["world"] = "hello";
+    REQUIRE_FALSE(doc1 == doc2);
+    REQUIRE(doc1 != doc2);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/containsKey.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/containsKey.cpp
new file mode 100644
index 0000000..88940d4
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/containsKey.cpp
@@ -0,0 +1,44 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonDocument::containsKey()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("returns true on object") {
+    doc["hello"] = "world";
+
+    REQUIRE(doc.containsKey("hello") == true);
+  }
+
+  SECTION("returns true when value is null") {
+    doc["hello"] = static_cast<const char*>(0);
+
+    REQUIRE(doc.containsKey("hello") == true);
+  }
+
+  SECTION("returns true when key is a std::string") {
+    doc["hello"] = "world";
+
+    REQUIRE(doc.containsKey(std::string("hello")) == true);
+  }
+
+  SECTION("returns false  on object") {
+    doc["world"] = "hello";
+
+    REQUIRE(doc.containsKey("hello") == false);
+  }
+
+  SECTION("returns false on array") {
+    doc.add("hello");
+
+    REQUIRE(doc.containsKey("hello") == false);
+  }
+
+  SECTION("returns false on null") {
+    REQUIRE(doc.containsKey("hello") == false);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/createNested.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/createNested.cpp
new file mode 100644
index 0000000..5fc7eb5
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/createNested.cpp
@@ -0,0 +1,66 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonDocument::createNestedArray()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("promotes to array") {
+    doc.createNestedArray();
+
+    REQUIRE(doc.is<JsonArray>());
+  }
+}
+
+TEST_CASE("JsonDocument::createNestedArray(key)") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("key is const char*") {
+    SECTION("promotes to object") {
+      doc.createNestedArray("hello");
+
+      REQUIRE(doc.is<JsonObject>());
+    }
+  }
+
+  SECTION("key is std::string") {
+    SECTION("promotes to object") {
+      doc.createNestedArray(std::string("hello"));
+
+      REQUIRE(doc.is<JsonObject>());
+    }
+  }
+}
+
+TEST_CASE("JsonDocument::createNestedObject()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("promotes to array") {
+    doc.createNestedObject();
+
+    REQUIRE(doc.is<JsonArray>());
+  }
+}
+
+TEST_CASE("JsonDocument::createNestedObject(key)") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("key is const char*") {
+    SECTION("promotes to object") {
+      doc.createNestedObject("hello");
+
+      REQUIRE(doc.is<JsonObject>());
+    }
+  }
+
+  SECTION("key is std::string") {
+    SECTION("promotes to object") {
+      doc.createNestedObject(std::string("hello"));
+
+      REQUIRE(doc.is<JsonObject>());
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/isNull.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/isNull.cpp
new file mode 100644
index 0000000..741f280
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/isNull.cpp
@@ -0,0 +1,39 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonDocument::isNull()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("returns true if uninitialized") {
+    REQUIRE(doc.isNull() == true);
+  }
+
+  SECTION("returns false after to<JsonObject>()") {
+    doc.to<JsonObject>();
+    REQUIRE(doc.isNull() == false);
+  }
+
+  SECTION("returns false after to<JsonArray>()") {
+    doc.to<JsonArray>();
+    REQUIRE(doc.isNull() == false);
+  }
+
+  SECTION("returns true after to<JsonVariant>()") {
+    REQUIRE(doc.isNull() == true);
+  }
+
+  SECTION("returns false after set()") {
+    doc.to<JsonVariant>().set(42);
+    REQUIRE(doc.isNull() == false);
+  }
+
+  SECTION("returns true after clear()") {
+    doc.to<JsonObject>();
+    doc.clear();
+    REQUIRE(doc.isNull() == true);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/nesting.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/nesting.cpp
new file mode 100644
index 0000000..e8ac2e5
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/nesting.cpp
@@ -0,0 +1,30 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonDocument::nesting()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("return 0 if uninitialized") {
+    REQUIRE(doc.nesting() == 0);
+  }
+
+  SECTION("returns 0 for string") {
+    JsonVariant var = doc.to<JsonVariant>();
+    var.set("hello");
+    REQUIRE(doc.nesting() == 0);
+  }
+
+  SECTION("returns 1 for empty object") {
+    doc.to<JsonObject>();
+    REQUIRE(doc.nesting() == 1);
+  }
+
+  SECTION("returns 1 for empty array") {
+    doc.to<JsonArray>();
+    REQUIRE(doc.nesting() == 1);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/overflowed.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/overflowed.cpp
new file mode 100644
index 0000000..f7b3898
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/overflowed.cpp
@@ -0,0 +1,79 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonDocument::overflowed()") {
+  SECTION("returns false on a fresh object") {
+    StaticJsonDocument<0> doc;
+    CHECK(doc.overflowed() == false);
+  }
+
+  SECTION("returns true after a failed insertion") {
+    StaticJsonDocument<0> doc;
+    doc.add(0);
+    CHECK(doc.overflowed() == true);
+  }
+
+  SECTION("returns false after successful insertion") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1)> doc;
+    doc.add(0);
+    CHECK(doc.overflowed() == false);
+  }
+
+  SECTION("returns true after a failed string copy") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1)> doc;
+    doc.add(std::string("example"));
+    CHECK(doc.overflowed() == true);
+  }
+
+  SECTION("returns false after a successful string copy") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1) + 8> doc;
+    doc.add(std::string("example"));
+    CHECK(doc.overflowed() == false);
+  }
+
+  SECTION("returns true after a failed deserialization") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1)> doc;
+    deserializeJson(doc, "[\"example\"]");
+    CHECK(doc.overflowed() == true);
+  }
+
+  SECTION("returns false after a successful deserialization") {
+    StaticJsonDocument<JSON_ARRAY_SIZE(1) + 8> doc;
+    deserializeJson(doc, "[\"example\"]");
+    CHECK(doc.overflowed() == false);
+  }
+
+  SECTION("returns false after clear()") {
+    StaticJsonDocument<0> doc;
+    doc.add(0);
+    doc.clear();
+    CHECK(doc.overflowed() == false);
+  }
+
+  SECTION("remains false after shrinkToFit()") {
+    DynamicJsonDocument doc(JSON_ARRAY_SIZE(1));
+    doc.add(0);
+    doc.shrinkToFit();
+    CHECK(doc.overflowed() == false);
+  }
+
+  SECTION("remains true after shrinkToFit()") {
+    DynamicJsonDocument doc(JSON_ARRAY_SIZE(1));
+    doc.add(0);
+    doc.add(0);
+    doc.shrinkToFit();
+    CHECK(doc.overflowed() == true);
+  }
+
+  SECTION("return false after garbageCollect()") {
+    DynamicJsonDocument doc(JSON_ARRAY_SIZE(1));
+    doc.add(0);
+    doc.add(0);
+    doc.garbageCollect();
+    CHECK(doc.overflowed() == false);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/remove.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/remove.cpp
new file mode 100644
index 0000000..84b8b6d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/remove.cpp
@@ -0,0 +1,52 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonDocument::remove()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("remove(int)") {
+    doc.add(1);
+    doc.add(2);
+    doc.add(3);
+
+    doc.remove(1);
+
+    REQUIRE(doc.as<std::string>() == "[1,3]");
+  }
+
+  SECTION("remove(const char *)") {
+    doc["a"] = 1;
+    doc["b"] = 2;
+
+    doc.remove("a");
+
+    REQUIRE(doc.as<std::string>() == "{\"b\":2}");
+  }
+
+  SECTION("remove(std::string)") {
+    doc["a"] = 1;
+    doc["b"] = 2;
+
+    doc.remove(std::string("b"));
+
+    REQUIRE(doc.as<std::string>() == "{\"a\":1}");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("remove(vla)") {
+    doc["a"] = 1;
+    doc["b"] = 2;
+
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "b");
+    doc.remove(vla);
+
+    REQUIRE(doc.as<std::string>() == "{\"a\":1}");
+  }
+#endif
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp
new file mode 100644
index 0000000..64950c0
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/shrinkToFit.cpp
@@ -0,0 +1,154 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#include <stdlib.h>  // malloc, free
+#include <string>
+
+using ARDUINOJSON_NAMESPACE::addPadding;
+
+class ArmoredAllocator {
+ public:
+  ArmoredAllocator() : _ptr(0), _size(0) {}
+
+  void* allocate(size_t size) {
+    _ptr = malloc(size);
+    _size = size;
+    return _ptr;
+  }
+
+  void deallocate(void* ptr) {
+    REQUIRE(ptr == _ptr);
+    free(ptr);
+    _ptr = 0;
+    _size = 0;
+  }
+
+  void* reallocate(void* ptr, size_t new_size) {
+    REQUIRE(ptr == _ptr);
+    // don't call realloc, instead alloc a new buffer and erase the old one
+    // this way we make sure we support relocation
+    void* new_ptr = malloc(new_size);
+    memcpy(new_ptr, _ptr, std::min(new_size, _size));
+    memset(_ptr, '#', _size);  // erase
+    free(_ptr);
+    _ptr = new_ptr;
+    return new_ptr;
+  }
+
+ private:
+  void* _ptr;
+  size_t _size;
+};
+
+typedef BasicJsonDocument<ArmoredAllocator> ShrinkToFitTestDocument;
+
+void testShrinkToFit(ShrinkToFitTestDocument& doc, std::string expected_json,
+                     size_t expected_size) {
+  // test twice: shrinkToFit() should be idempotent
+  for (int i = 0; i < 2; i++) {
+    doc.shrinkToFit();
+
+    REQUIRE(doc.capacity() == expected_size);
+    REQUIRE(doc.memoryUsage() == expected_size);
+
+    std::string json;
+    serializeJson(doc, json);
+    REQUIRE(json == expected_json);
+  }
+}
+
+TEST_CASE("BasicJsonDocument::shrinkToFit()") {
+  ShrinkToFitTestDocument doc(4096);
+
+  SECTION("null") {
+    testShrinkToFit(doc, "null", 0);
+  }
+
+  SECTION("empty object") {
+    deserializeJson(doc, "{}");
+    testShrinkToFit(doc, "{}", JSON_OBJECT_SIZE(0));
+  }
+
+  SECTION("empty array") {
+    deserializeJson(doc, "[]");
+    testShrinkToFit(doc, "[]", JSON_ARRAY_SIZE(0));
+  }
+
+  SECTION("linked string") {
+    doc.set("hello");
+    testShrinkToFit(doc, "\"hello\"", 0);
+  }
+
+  SECTION("owned string") {
+    doc.set(std::string("abcdefg"));
+    testShrinkToFit(doc, "\"abcdefg\"", 8);
+  }
+
+  SECTION("linked raw") {
+    doc.set(serialized("[{},123]"));
+    testShrinkToFit(doc, "[{},123]", 0);
+  }
+
+  SECTION("owned raw") {
+    doc.set(serialized(std::string("[{},12]")));
+    testShrinkToFit(doc, "[{},12]", 8);
+  }
+
+  SECTION("linked key") {
+    doc["key"] = 42;
+    testShrinkToFit(doc, "{\"key\":42}", JSON_OBJECT_SIZE(1));
+  }
+
+  SECTION("owned key") {
+    doc[std::string("abcdefg")] = 42;
+    testShrinkToFit(doc, "{\"abcdefg\":42}", JSON_OBJECT_SIZE(1) + 8);
+  }
+
+  SECTION("linked string in array") {
+    doc.add("hello");
+    testShrinkToFit(doc, "[\"hello\"]", JSON_ARRAY_SIZE(1));
+  }
+
+  SECTION("owned string in array") {
+    doc.add(std::string("abcdefg"));
+    testShrinkToFit(doc, "[\"abcdefg\"]", JSON_ARRAY_SIZE(1) + 8);
+  }
+
+  SECTION("linked string in object") {
+    doc["key"] = "hello";
+    testShrinkToFit(doc, "{\"key\":\"hello\"}", JSON_OBJECT_SIZE(1));
+  }
+
+  SECTION("owned string in object") {
+    doc["key"] = std::string("abcdefg");
+    testShrinkToFit(doc, "{\"key\":\"abcdefg\"}", JSON_ARRAY_SIZE(1) + 8);
+  }
+
+  SECTION("unaligned") {
+    doc.add(std::string("?"));  // two bytes in the string pool
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 2);
+
+    doc.shrinkToFit();
+
+    // the new capacity should be padded to align the pointers
+    REQUIRE(doc.capacity() == JSON_OBJECT_SIZE(1) + sizeof(void*));
+    REQUIRE(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 2);
+    REQUIRE(doc[0] == "?");
+  }
+}
+
+TEST_CASE("DynamicJsonDocument::shrinkToFit()") {
+  DynamicJsonDocument doc(4096);
+
+  deserializeJson(doc, "{\"hello\":[\"world\"]");
+
+  doc.shrinkToFit();
+
+  std::string json;
+  serializeJson(doc, json);
+  REQUIRE(json == "{\"hello\":[\"world\"]}");
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/size.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/size.cpp
new file mode 100644
index 0000000..8dcbf01
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/size.cpp
@@ -0,0 +1,28 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonDocument::size()") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("returns 0") {
+    REQUIRE(doc.size() == 0);
+  }
+
+  SECTION("as an array, return 2") {
+    doc.add(1);
+    doc.add(2);
+
+    REQUIRE(doc.size() == 2);
+  }
+
+  SECTION("as an object, return 2") {
+    doc["a"] = 1;
+    doc["b"] = 2;
+
+    REQUIRE(doc.size() == 2);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonDocument/subscript.cpp b/third-party/ArduinoJson/extras/tests/JsonDocument/subscript.cpp
new file mode 100644
index 0000000..8dc6fac
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonDocument/subscript.cpp
@@ -0,0 +1,53 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonDocument::operator[]") {
+  DynamicJsonDocument doc(4096);
+  const JsonDocument& cdoc = doc;
+
+  SECTION("object") {
+    deserializeJson(doc, "{\"hello\":\"world\"}");
+
+    SECTION("const char*") {
+      REQUIRE(doc["hello"] == "world");
+      REQUIRE(cdoc["hello"] == "world");
+    }
+
+    SECTION("std::string") {
+      REQUIRE(doc[std::string("hello")] == "world");
+      REQUIRE(cdoc[std::string("hello")] == "world");
+    }
+
+    SECTION("supports operator|") {
+      REQUIRE((doc["hello"] | "nope") == std::string("world"));
+      REQUIRE((doc["world"] | "nope") == std::string("nope"));
+    }
+  }
+
+  SECTION("array") {
+    deserializeJson(doc, "[\"hello\",\"world\"]");
+
+    REQUIRE(doc[1] == "world");
+    REQUIRE(cdoc[1] == "world");
+  }
+}
+
+TEST_CASE("JsonDocument automatically promotes to object") {
+  DynamicJsonDocument doc(4096);
+
+  doc["one"]["two"]["three"] = 4;
+
+  REQUIRE(doc["one"]["two"]["three"] == 4);
+}
+
+TEST_CASE("JsonDocument automatically promotes to array") {
+  DynamicJsonDocument doc(4096);
+
+  doc[2] = 2;
+
+  REQUIRE(doc.as<std::string>() == "[null,null,2]");
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt
new file mode 100644
index 0000000..6b8a9fd
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/CMakeLists.txt
@@ -0,0 +1,28 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(JsonObjectTests 
+	clear.cpp
+	containsKey.cpp
+	copy.cpp
+	createNestedArray.cpp
+	createNestedObject.cpp
+	equals.cpp
+	invalid.cpp
+	isNull.cpp
+	iterator.cpp
+	memoryUsage.cpp
+	nesting.cpp
+	remove.cpp
+	size.cpp
+	std_string.cpp
+	subscript.cpp
+)
+
+add_test(JsonObject JsonObjectTests)
+
+set_tests_properties(JsonObject
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/clear.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/clear.cpp
new file mode 100644
index 0000000..c18bc5e
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/clear.cpp
@@ -0,0 +1,25 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonObject::clear()") {
+  SECTION("No-op on null JsonObject") {
+    JsonObject obj;
+    obj.clear();
+    REQUIRE(obj.isNull() == true);
+    REQUIRE(obj.size() == 0);
+  }
+
+  SECTION("Removes all elements") {
+    StaticJsonDocument<64> doc;
+    JsonObject obj = doc.to<JsonObject>();
+    obj["hello"] = 1;
+    obj["world"] = 2;
+    obj.clear();
+    REQUIRE(obj.size() == 0);
+    REQUIRE(obj.isNull() == false);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/containsKey.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/containsKey.cpp
new file mode 100644
index 0000000..a666f53
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/containsKey.cpp
@@ -0,0 +1,39 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonObject::containsKey()") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+  obj["hello"] = 42;
+
+  SECTION("returns true only if key is present") {
+    REQUIRE(false == obj.containsKey("world"));
+    REQUIRE(true == obj.containsKey("hello"));
+  }
+
+  SECTION("works with JsonObjectConst") {
+    JsonObjectConst cobj = obj;
+    REQUIRE(false == cobj.containsKey("world"));
+    REQUIRE(true == cobj.containsKey("hello"));
+  }
+
+  SECTION("returns false after remove()") {
+    obj.remove("hello");
+
+    REQUIRE(false == obj.containsKey("hello"));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("key is a VLA") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "hello");
+
+    REQUIRE(true == obj.containsKey(vla));
+  }
+#endif
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/copy.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/copy.cpp
new file mode 100644
index 0000000..8a82675
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/copy.cpp
@@ -0,0 +1,115 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonObject::set()") {
+  DynamicJsonDocument doc1(4096);
+  DynamicJsonDocument doc2(4096);
+
+  JsonObject obj1 = doc1.to<JsonObject>();
+  JsonObject obj2 = doc2.to<JsonObject>();
+
+  SECTION("doesn't copy static string in key or value") {
+    obj1["hello"] = "world";
+
+    bool success = obj2.set(obj1);
+
+    REQUIRE(success == true);
+    REQUIRE(doc1.memoryUsage() == doc2.memoryUsage());
+    REQUIRE(obj2["hello"] == std::string("world"));
+  }
+
+  SECTION("copy local string value") {
+    obj1["hello"] = std::string("world");
+
+    bool success = obj2.set(obj1);
+
+    REQUIRE(success == true);
+    REQUIRE(doc1.memoryUsage() == doc2.memoryUsage());
+    REQUIRE(obj2["hello"] == std::string("world"));
+  }
+
+  SECTION("copy local key") {
+    obj1[std::string("hello")] = "world";
+
+    bool success = obj2.set(obj1);
+
+    REQUIRE(success == true);
+    REQUIRE(doc1.memoryUsage() == doc2.memoryUsage());
+    REQUIRE(obj2["hello"] == std::string("world"));
+  }
+
+  SECTION("copy string from deserializeJson()") {
+    deserializeJson(doc1, "{'hello':'world'}");
+
+    bool success = obj2.set(obj1);
+
+    REQUIRE(success == true);
+    REQUIRE(doc1.memoryUsage() == doc2.memoryUsage());
+    REQUIRE(obj2["hello"] == std::string("world"));
+  }
+
+  SECTION("copy string from deserializeMsgPack()") {
+    deserializeMsgPack(doc1, "\x81\xA5hello\xA5world");
+
+    bool success = obj2.set(obj1);
+
+    REQUIRE(success == true);
+    REQUIRE(doc1.memoryUsage() == doc2.memoryUsage());
+    REQUIRE(obj2["hello"] == std::string("world"));
+  }
+
+  SECTION("should work with JsonObjectConst") {
+    obj1["hello"] = "world";
+
+    obj2.set(static_cast<JsonObjectConst>(obj1));
+
+    REQUIRE(doc1.memoryUsage() == doc2.memoryUsage());
+    REQUIRE(obj2["hello"] == std::string("world"));
+  }
+
+  SECTION("destination too small to store the key") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc3;
+    JsonObject obj3 = doc3.to<JsonObject>();
+
+    obj1[std::string("hello")] = "world";
+
+    bool success = obj3.set(obj1);
+
+    REQUIRE(success == false);
+    REQUIRE(doc3.as<std::string>() == "{}");
+  }
+
+  SECTION("destination too small to store the value") {
+    StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc3;
+    JsonObject obj3 = doc3.to<JsonObject>();
+
+    obj1["hello"] = std::string("world");
+
+    bool success = obj3.set(obj1);
+
+    REQUIRE(success == false);
+    REQUIRE(doc3.as<std::string>() == "{\"hello\":null}");
+  }
+
+  SECTION("destination is null") {
+    JsonObject null;
+    obj1["hello"] = "world";
+
+    bool success = null.set(obj1);
+
+    REQUIRE(success == false);
+  }
+
+  SECTION("source is null") {
+    JsonObject null;
+    obj1["hello"] = "world";
+
+    bool success = obj1.set(null);
+
+    REQUIRE(success == false);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/createNestedArray.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/createNestedArray.cpp
new file mode 100644
index 0000000..0841201
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/createNestedArray.cpp
@@ -0,0 +1,27 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonObject::createNestedArray()") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+
+  SECTION("key is a const char*") {
+    JsonArray arr = obj.createNestedArray("hello");
+    REQUIRE(arr.isNull() == false);
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("key is a VLA") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "hello");
+
+    JsonArray arr = obj.createNestedArray(vla);
+    REQUIRE(arr.isNull() == false);
+  }
+#endif
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/createNestedObject.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/createNestedObject.cpp
new file mode 100644
index 0000000..602f1bb
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/createNestedObject.cpp
@@ -0,0 +1,25 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonObject::createNestedObject()") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+
+  SECTION("key is a const char*") {
+    obj.createNestedObject("hello");
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("key is a VLA") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "hello");
+
+    obj.createNestedObject(vla);
+  }
+#endif
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/equals.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/equals.cpp
new file mode 100644
index 0000000..de81f75
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/equals.cpp
@@ -0,0 +1,67 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonObject::operator==()") {
+  DynamicJsonDocument doc1(4096);
+  JsonObject obj1 = doc1.to<JsonObject>();
+  JsonObjectConst obj1c = obj1;
+
+  DynamicJsonDocument doc2(4096);
+  JsonObject obj2 = doc2.to<JsonObject>();
+  JsonObjectConst obj2c = obj2;
+
+  SECTION("should return false when objs differ") {
+    obj1["hello"] = "coucou";
+    obj2["world"] = 1;
+
+    REQUIRE_FALSE(obj1 == obj2);
+    REQUIRE_FALSE(obj1c == obj2c);
+  }
+
+  SECTION("should return false when LHS has more elements") {
+    obj1["hello"] = "coucou";
+    obj1["world"] = 666;
+    obj2["hello"] = "coucou";
+
+    REQUIRE_FALSE(obj1 == obj2);
+    REQUIRE_FALSE(obj1c == obj2c);
+  }
+
+  SECTION("should return false when RKS has more elements") {
+    obj1["hello"] = "coucou";
+    obj2["hello"] = "coucou";
+    obj2["world"] = 666;
+
+    REQUIRE_FALSE(obj1 == obj2);
+    REQUIRE_FALSE(obj1c == obj2c);
+  }
+
+  SECTION("should return true when objs equal") {
+    obj1["hello"] = "world";
+    obj1["anwser"] = 42;
+    // insert in different order
+    obj2["anwser"] = 42;
+    obj2["hello"] = "world";
+
+    REQUIRE(obj1 == obj2);
+    REQUIRE(obj1c == obj2c);
+  }
+
+  SECTION("should return false when RHS is null") {
+    JsonObject null;
+
+    REQUIRE_FALSE(obj1 == null);
+    REQUIRE_FALSE(obj1c == null);
+  }
+
+  SECTION("should return false when LHS is null") {
+    JsonObject null;
+
+    REQUIRE_FALSE(null == obj2);
+    REQUIRE_FALSE(null == obj2c);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/invalid.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/invalid.cpp
new file mode 100644
index 0000000..3423c4e
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/invalid.cpp
@@ -0,0 +1,35 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace Catch::Matchers;
+
+TEST_CASE("JsonObject::invalid()") {
+  JsonObject obj;
+
+  SECTION("SubscriptFails") {
+    REQUIRE(obj["key"].isNull());
+  }
+
+  SECTION("AddFails") {
+    obj["hello"] = "world";
+    REQUIRE(0 == obj.size());
+  }
+
+  SECTION("CreateNestedArrayFails") {
+    REQUIRE(obj.createNestedArray("hello").isNull());
+  }
+
+  SECTION("CreateNestedObjectFails") {
+    REQUIRE(obj.createNestedObject("world").isNull());
+  }
+
+  SECTION("serialize to 'null'") {
+    char buffer[32];
+    serializeJson(obj, buffer, sizeof(buffer));
+    REQUIRE_THAT(buffer, Equals("null"));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/isNull.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/isNull.cpp
new file mode 100644
index 0000000..4ef3d2d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/isNull.cpp
@@ -0,0 +1,58 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonObject::isNull()") {
+  SECTION("returns true") {
+    JsonObject obj;
+    REQUIRE(obj.isNull() == true);
+  }
+
+  SECTION("returns false") {
+    DynamicJsonDocument doc(4096);
+    JsonObject obj = doc.to<JsonObject>();
+    REQUIRE(obj.isNull() == false);
+  }
+}
+
+TEST_CASE("JsonObjectConst::isNull()") {
+  SECTION("returns true") {
+    JsonObjectConst obj;
+    REQUIRE(obj.isNull() == true);
+  }
+
+  SECTION("returns false") {
+    DynamicJsonDocument doc(4096);
+    JsonObjectConst obj = doc.to<JsonObject>();
+    REQUIRE(obj.isNull() == false);
+  }
+}
+
+TEST_CASE("JsonObject::operator bool()") {
+  SECTION("returns false") {
+    JsonObject obj;
+    REQUIRE(static_cast<bool>(obj) == false);
+  }
+
+  SECTION("returns true") {
+    DynamicJsonDocument doc(4096);
+    JsonObject obj = doc.to<JsonObject>();
+    REQUIRE(static_cast<bool>(obj) == true);
+  }
+}
+
+TEST_CASE("JsonObjectConst::operator bool()") {
+  SECTION("returns false") {
+    JsonObjectConst obj;
+    REQUIRE(static_cast<bool>(obj) == false);
+  }
+
+  SECTION("returns true") {
+    DynamicJsonDocument doc(4096);
+    JsonObjectConst obj = doc.to<JsonObject>();
+    REQUIRE(static_cast<bool>(obj) == true);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/iterator.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/iterator.cpp
new file mode 100644
index 0000000..ee556b3
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/iterator.cpp
@@ -0,0 +1,73 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace Catch::Matchers;
+
+TEST_CASE("JsonObject::begin()/end()") {
+  StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
+  JsonObject obj = doc.to<JsonObject>();
+  obj["ab"] = 12;
+  obj["cd"] = 34;
+
+  SECTION("NonConstIterator") {
+    JsonObject::iterator it = obj.begin();
+    REQUIRE(obj.end() != it);
+    REQUIRE(it->key() == "ab");
+    REQUIRE(12 == it->value());
+    ++it;
+    REQUIRE(obj.end() != it);
+    REQUIRE(it->key() == "cd");
+    REQUIRE(34 == it->value());
+    ++it;
+    REQUIRE(obj.end() == it);
+  }
+
+  SECTION("Dereferencing end() is safe") {
+    REQUIRE(obj.end()->key().isNull());
+    REQUIRE(obj.end()->value().isNull());
+  }
+
+  SECTION("null JsonObject") {
+    JsonObject null;
+    REQUIRE(null.begin() == null.end());
+  }
+}
+
+TEST_CASE("JsonObjectConst::begin()/end()") {
+  StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
+  JsonObject obj = doc.to<JsonObject>();
+  obj["ab"] = 12;
+  obj["cd"] = 34;
+
+  JsonObjectConst cobj = obj;
+
+  SECTION("Iteration") {
+    JsonObjectConst::iterator it = cobj.begin();
+    REQUIRE(cobj.end() != it);
+    REQUIRE(it->key() == "ab");
+    REQUIRE(12 == it->value());
+
+    ++it;
+    REQUIRE(cobj.end() != it);
+    JsonPairConst pair = *it;
+    REQUIRE(pair.key() == "cd");
+    REQUIRE(34 == pair.value());
+
+    ++it;
+    REQUIRE(cobj.end() == it);
+  }
+
+  SECTION("Dereferencing end() is safe") {
+    REQUIRE(cobj.end()->key().isNull());
+    REQUIRE(cobj.end()->value().isNull());
+  }
+
+  SECTION("null JsonObjectConst") {
+    JsonObjectConst null;
+    REQUIRE(null.begin() == null.end());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/memoryUsage.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/memoryUsage.cpp
new file mode 100644
index 0000000..197cb68
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/memoryUsage.cpp
@@ -0,0 +1,43 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <string>
+
+TEST_CASE("JsonObject::memoryUsage()") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+
+  SECTION("return 0 if uninitialized") {
+    JsonObject unitialized;
+    REQUIRE(unitialized.memoryUsage() == 0);
+  }
+
+  SECTION("JSON_OBJECT_SIZE(0) for empty object") {
+    REQUIRE(obj.memoryUsage() == JSON_OBJECT_SIZE(0));
+  }
+
+  SECTION("JSON_OBJECT_SIZE(1) after add") {
+    obj["hello"] = 42;
+    REQUIRE(obj.memoryUsage() == JSON_OBJECT_SIZE(1));
+  }
+
+  SECTION("includes the size of the key") {
+    obj[std::string("hello")] = 42;
+    REQUIRE(obj.memoryUsage() == JSON_OBJECT_SIZE(1) + 6);
+  }
+
+  SECTION("includes the size of the nested array") {
+    JsonArray nested = obj.createNestedArray("nested");
+    nested.add(42);
+    REQUIRE(obj.memoryUsage() == JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(1));
+  }
+
+  SECTION("includes the size of the nested object") {
+    JsonObject nested = obj.createNestedObject("nested");
+    nested["hello"] = "world";
+    REQUIRE(obj.memoryUsage() == 2 * JSON_OBJECT_SIZE(1));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/nesting.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/nesting.cpp
new file mode 100644
index 0000000..8c73cd8
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/nesting.cpp
@@ -0,0 +1,35 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonObject::nesting()") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+
+  SECTION("return 0 if uninitialized") {
+    JsonObject unitialized;
+    REQUIRE(unitialized.nesting() == 0);
+  }
+
+  SECTION("returns 1 for empty object") {
+    REQUIRE(obj.nesting() == 1);
+  }
+
+  SECTION("returns 1 for flat object") {
+    obj["hello"] = "world";
+    REQUIRE(obj.nesting() == 1);
+  }
+
+  SECTION("returns 2 with nested array") {
+    obj.createNestedArray("nested");
+    REQUIRE(obj.nesting() == 2);
+  }
+
+  SECTION("returns 2 with nested object") {
+    obj.createNestedObject("nested");
+    REQUIRE(obj.nesting() == 2);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/remove.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/remove.cpp
new file mode 100644
index 0000000..f422739
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/remove.cpp
@@ -0,0 +1,77 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <string>
+
+TEST_CASE("JsonObject::remove()") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+  obj["a"] = 0;
+  obj["b"] = 1;
+  obj["c"] = 2;
+  std::string result;
+
+  SECTION("remove(key)") {
+    SECTION("Remove first") {
+      obj.remove("a");
+      serializeJson(obj, result);
+      REQUIRE("{\"b\":1,\"c\":2}" == result);
+    }
+
+    SECTION("Remove middle") {
+      obj.remove("b");
+      serializeJson(obj, result);
+      REQUIRE("{\"a\":0,\"c\":2}" == result);
+    }
+
+    SECTION("Remove last") {
+      obj.remove("c");
+      serializeJson(obj, result);
+      REQUIRE("{\"a\":0,\"b\":1}" == result);
+    }
+  }
+
+  SECTION("remove(iterator)") {
+    JsonObject::iterator it = obj.begin();
+
+    SECTION("Remove first") {
+      obj.remove(it);
+      serializeJson(obj, result);
+      REQUIRE("{\"b\":1,\"c\":2}" == result);
+    }
+
+    SECTION("Remove middle") {
+      ++it;
+      obj.remove(it);
+      serializeJson(obj, result);
+      REQUIRE("{\"a\":0,\"c\":2}" == result);
+    }
+
+    SECTION("Remove last") {
+      it += 2;
+      obj.remove(it);
+      serializeJson(obj, result);
+      REQUIRE("{\"a\":0,\"b\":1}" == result);
+    }
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("key is a vla") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "b");
+    obj.remove(vla);
+
+    serializeJson(obj, result);
+    REQUIRE("{\"a\":0,\"c\":2}" == result);
+  }
+#endif
+
+  SECTION("should work on null object") {
+    JsonObject null;
+    null.remove("key");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/size.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/size.cpp
new file mode 100644
index 0000000..47a6fee
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/size.cpp
@@ -0,0 +1,39 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <string>
+
+TEST_CASE("JsonObject::size()") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+
+  SECTION("initial size is zero") {
+    REQUIRE(0 == obj.size());
+  }
+
+  SECTION("increases when values are added") {
+    obj["hello"] = 42;
+    REQUIRE(1 == obj.size());
+  }
+
+  SECTION("decreases when values are removed") {
+    obj["hello"] = 42;
+    obj.remove("hello");
+    REQUIRE(0 == obj.size());
+  }
+
+  SECTION("doesn't increase when the same key is added twice") {
+    obj["hello"] = 1;
+    obj["hello"] = 2;
+    REQUIRE(1 == obj.size());
+  }
+
+  SECTION("doesn't decrease when another key is removed") {
+    obj["hello"] = 1;
+    obj.remove("world");
+    REQUIRE(1 == obj.size());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/std_string.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/std_string.cpp
new file mode 100644
index 0000000..045f945
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/std_string.cpp
@@ -0,0 +1,109 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+static void eraseString(std::string &str) {
+  char *p = const_cast<char *>(str.c_str());
+  while (*p) *p++ = '*';
+}
+
+TEST_CASE("std::string") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("operator[]") {
+    char json[] = "{\"key\":\"value\"}";
+
+    deserializeJson(doc, json);
+    JsonObject obj = doc.as<JsonObject>();
+
+    REQUIRE(std::string("value") == obj[std::string("key")]);
+  }
+
+  SECTION("operator[] const") {
+    char json[] = "{\"key\":\"value\"}";
+
+    deserializeJson(doc, json);
+    JsonObject obj = doc.as<JsonObject>();
+
+    REQUIRE(std::string("value") == obj[std::string("key")]);
+  }
+
+  SECTION("createNestedObject()") {
+    JsonObject obj = doc.to<JsonObject>();
+    std::string key = "key";
+    char json[64];
+    obj.createNestedObject(key);
+    eraseString(key);
+    serializeJson(doc, json, sizeof(json));
+    REQUIRE(std::string("{\"key\":{}}") == json);
+  }
+
+  SECTION("createNestedArray()") {
+    JsonObject obj = doc.to<JsonObject>();
+    std::string key = "key";
+    char json[64];
+    obj.createNestedArray(key);
+    eraseString(key);
+    serializeJson(doc, json, sizeof(json));
+    REQUIRE(std::string("{\"key\":[]}") == json);
+  }
+
+  SECTION("containsKey()") {
+    char json[] = "{\"key\":\"value\"}";
+    deserializeJson(doc, json);
+    JsonObject obj = doc.as<JsonObject>();
+    REQUIRE(true == obj.containsKey(std::string("key")));
+  }
+
+  SECTION("remove()") {
+    JsonObject obj = doc.to<JsonObject>();
+    obj["key"] = "value";
+
+    obj.remove(std::string("key"));
+
+    REQUIRE(0 == obj.size());
+  }
+
+  SECTION("operator[], set key") {
+    std::string key("hello");
+    JsonObject obj = doc.to<JsonObject>();
+    obj[key] = "world";
+    eraseString(key);
+    REQUIRE(std::string("world") == obj["hello"]);
+  }
+
+  SECTION("operator[], set value") {
+    std::string value("world");
+    JsonObject obj = doc.to<JsonObject>();
+    obj["hello"] = value;
+    eraseString(value);
+    REQUIRE(std::string("world") == obj["hello"]);
+  }
+
+  SECTION("memoryUsage() increases when adding a new key") {
+    std::string key1("hello"), key2("world");
+    JsonObject obj = doc.to<JsonObject>();
+
+    obj[key1] = 1;
+    size_t sizeBefore = doc.memoryUsage();
+    obj[key2] = 2;
+    size_t sizeAfter = doc.memoryUsage();
+
+    REQUIRE(sizeAfter - sizeBefore >= key2.size());
+  }
+
+  SECTION("memoryUsage() remains when adding the same key") {
+    std::string key("hello");
+    JsonObject obj = doc.to<JsonObject>();
+
+    obj[key] = 1;
+    size_t sizeBefore = doc.memoryUsage();
+    obj[key] = 2;
+    size_t sizeAfter = doc.memoryUsage();
+
+    REQUIRE(sizeBefore == sizeAfter);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonObject/subscript.cpp b/third-party/ArduinoJson/extras/tests/JsonObject/subscript.cpp
new file mode 100644
index 0000000..aa4e2a1
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonObject/subscript.cpp
@@ -0,0 +1,233 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonObject::operator[]") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+
+  SECTION("int") {
+    obj["hello"] = 123;
+
+    REQUIRE(123 == obj["hello"].as<int>());
+    REQUIRE(true == obj["hello"].is<int>());
+    REQUIRE(false == obj["hello"].is<bool>());
+  }
+
+  SECTION("volatile int") {  // issue #415
+    volatile int i = 123;
+    obj["hello"] = i;
+
+    REQUIRE(123 == obj["hello"].as<int>());
+    REQUIRE(true == obj["hello"].is<int>());
+    REQUIRE(false == obj["hello"].is<bool>());
+  }
+
+  SECTION("double") {
+    obj["hello"] = 123.45;
+
+    REQUIRE(true == obj["hello"].is<double>());
+    REQUIRE(false == obj["hello"].is<long>());
+    REQUIRE(123.45 == obj["hello"].as<double>());
+  }
+
+  SECTION("bool") {
+    obj["hello"] = true;
+
+    REQUIRE(true == obj["hello"].is<bool>());
+    REQUIRE(false == obj["hello"].is<long>());
+    REQUIRE(true == obj["hello"].as<bool>());
+  }
+
+  SECTION("const char*") {
+    obj["hello"] = "h3110";
+
+    REQUIRE(true == obj["hello"].is<const char*>());
+    REQUIRE(false == obj["hello"].is<long>());
+    REQUIRE(std::string("h3110") == obj["hello"].as<const char*>());
+  }
+
+  SECTION("array") {
+    DynamicJsonDocument doc2(4096);
+    JsonArray arr = doc2.to<JsonArray>();
+
+    obj["hello"] = arr;
+
+    REQUIRE(arr == obj["hello"].as<JsonArray>());
+    REQUIRE(true == obj["hello"].is<JsonArray>());
+    REQUIRE(false == obj["hello"].is<JsonObject>());
+  }
+
+  SECTION("object") {
+    DynamicJsonDocument doc2(4096);
+    JsonObject obj2 = doc2.to<JsonObject>();
+
+    obj["hello"] = obj2;
+
+    REQUIRE(obj2 == obj["hello"].as<JsonObject>());
+    REQUIRE(true == obj["hello"].is<JsonObject>());
+    REQUIRE(false == obj["hello"].is<JsonArray>());
+  }
+
+  SECTION("array subscript") {
+    DynamicJsonDocument doc2(4096);
+    JsonArray arr = doc2.to<JsonArray>();
+    arr.add(42);
+
+    obj["a"] = arr[0];
+
+    REQUIRE(42 == obj["a"]);
+  }
+
+  SECTION("object subscript") {
+    DynamicJsonDocument doc2(4096);
+    JsonObject obj2 = doc2.to<JsonObject>();
+    obj2["x"] = 42;
+
+    obj["a"] = obj2["x"];
+
+    REQUIRE(42 == obj["a"]);
+  }
+
+  SECTION("char key[]") {  // issue #423
+    char key[] = "hello";
+    obj[key] = 42;
+    REQUIRE(42 == obj[key]);
+  }
+
+  SECTION("should not duplicate const char*") {
+    obj["hello"] = "world";
+    const size_t expectedSize = JSON_OBJECT_SIZE(1);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate char* value") {
+    obj["hello"] = const_cast<char*>("world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate char* key") {
+    obj[const_cast<char*>("hello")] = "world";
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate char* key&value") {
+    obj[const_cast<char*>("hello")] = const_cast<char*>("world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 2 * JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize <= doc.memoryUsage());
+  }
+
+  SECTION("should duplicate std::string value") {
+    obj["hello"] = std::string("world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate std::string key") {
+    obj[std::string("hello")] = "world";
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should duplicate std::string key&value") {
+    obj[std::string("hello")] = std::string("world");
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + 2 * JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize <= doc.memoryUsage());
+  }
+
+  SECTION("should duplicate a non-static JsonString key") {
+    obj[JsonString("hello", false)] = "world";
+    const size_t expectedSize = JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(5);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should not duplicate a static JsonString key") {
+    obj[JsonString("hello", true)] = "world";
+    const size_t expectedSize = JSON_OBJECT_SIZE(1);
+    REQUIRE(expectedSize == doc.memoryUsage());
+  }
+
+  SECTION("should ignore null key") {
+    // object must have a value to make a call to strcmp()
+    obj["dummy"] = 42;
+
+    const char* null = 0;
+    obj[null] = 666;
+
+    REQUIRE(obj.size() == 1);
+    REQUIRE(obj[null] == null);
+  }
+
+  SECTION("obj[key].to<JsonArray>()") {
+    JsonArray arr = obj["hello"].to<JsonArray>();
+
+    REQUIRE(arr.isNull() == false);
+  }
+
+#if defined(HAS_VARIABLE_LENGTH_ARRAY) && \
+    !defined(SUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR)
+  SECTION("obj[VLA] = str") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "hello");
+
+    obj[vla] = "world";
+
+    REQUIRE(std::string("world") == obj["hello"]);
+  }
+
+  SECTION("obj[str] = VLA") {  // issue #416
+    int i = 32;
+    char vla[i];
+    strcpy(vla, "world");
+
+    obj["hello"] = vla;
+
+    REQUIRE(std::string("world") == obj["hello"].as<const char*>());
+  }
+
+  SECTION("obj.set(VLA, str)") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "hello");
+
+    obj[vla] = "world";
+
+    REQUIRE(std::string("world") == obj["hello"]);
+  }
+
+  SECTION("obj.set(str, VLA)") {
+    int i = 32;
+    char vla[i];
+    strcpy(vla, "world");
+
+    obj["hello"].set(vla);
+
+    REQUIRE(std::string("world") == obj["hello"].as<const char*>());
+  }
+
+  SECTION("obj[VLA]") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "hello");
+
+    deserializeJson(doc, "{\"hello\":\"world\"}");
+
+    obj = doc.as<JsonObject>();
+    REQUIRE(std::string("world") == obj[vla]);
+  }
+#endif
+
+  SECTION("chain") {
+    obj.createNestedObject("hello")["world"] = 123;
+
+    REQUIRE(123 == obj["hello"]["world"].as<int>());
+    REQUIRE(true == obj["hello"]["world"].is<int>());
+    REQUIRE(false == obj["hello"]["world"].is<bool>());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt
new file mode 100644
index 0000000..5bb2cab
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/CMakeLists.txt
@@ -0,0 +1,22 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(JsonSerializerTests
+	CustomWriter.cpp
+	JsonArray.cpp
+	JsonArrayPretty.cpp
+	JsonObject.cpp
+	JsonObjectPretty.cpp
+	JsonVariant.cpp
+	misc.cpp
+	std_stream.cpp
+	std_string.cpp
+)
+
+add_test(JsonSerializer JsonSerializerTests)
+
+set_tests_properties(JsonSerializer
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp b/third-party/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp
new file mode 100644
index 0000000..01a5212
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/CustomWriter.cpp
@@ -0,0 +1,52 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+class CustomWriter {
+ public:
+  CustomWriter() {}
+
+  size_t write(uint8_t c) {
+    _str.append(1, static_cast<char>(c));
+    return 1;
+  }
+
+  size_t write(const uint8_t *s, size_t n) {
+    _str.append(reinterpret_cast<const char *>(s), n);
+    return n;
+  }
+
+  const std::string &str() const {
+    return _str;
+  }
+
+ private:
+  CustomWriter(const CustomWriter &);  // non-copiable
+  CustomWriter &operator=(const CustomWriter &);
+
+  std::string _str;
+};
+
+TEST_CASE("CustomWriter") {
+  DynamicJsonDocument doc(4096);
+  JsonArray array = doc.to<JsonArray>();
+  array.add(4);
+  array.add(2);
+
+  SECTION("serializeJson()") {
+    CustomWriter writer;
+    serializeJson(array, writer);
+
+    REQUIRE("[4,2]" == writer.str());
+  }
+
+  SECTION("serializeJsonPretty") {
+    CustomWriter writer;
+    serializeJsonPretty(array, writer);
+
+    REQUIRE("[\r\n  4,\r\n  2\r\n]" == writer.str());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp
new file mode 100644
index 0000000..9f8a241
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonArray.cpp
@@ -0,0 +1,129 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+static void check(JsonArray array, std::string expected) {
+  std::string actual;
+  size_t actualLen = serializeJson(array, actual);
+  REQUIRE(expected == actual);
+  REQUIRE(actualLen == expected.size());
+  size_t measuredLen = measureJson(array);
+  REQUIRE(measuredLen == expected.size());
+}
+
+TEST_CASE("serializeJson(JsonArray)") {
+  StaticJsonDocument<JSON_ARRAY_SIZE(2)> doc;
+  JsonArray array = doc.to<JsonArray>();
+
+  SECTION("Empty") {
+    check(array, "[]");
+  }
+
+  SECTION("Null") {
+    array.add(static_cast<char *>(0));
+
+    check(array, "[null]");
+  }
+
+  SECTION("OneString") {
+    array.add("hello");
+
+    check(array, "[\"hello\"]");
+  }
+
+  SECTION("TwoStrings") {
+    array.add("hello");
+    array.add("world");
+
+    check(array, "[\"hello\",\"world\"]");
+  }
+
+  SECTION("OneStringOverCapacity") {
+    array.add("hello");
+    array.add("world");
+    array.add("lost");
+
+    check(array, "[\"hello\",\"world\"]");
+  }
+
+  SECTION("One double") {
+    array.add(3.1415927);
+    check(array, "[3.1415927]");
+  }
+
+  SECTION("OneInteger") {
+    array.add(1);
+
+    check(array, "[1]");
+  }
+
+  SECTION("TwoIntegers") {
+    array.add(1);
+    array.add(2);
+
+    check(array, "[1,2]");
+  }
+
+  SECTION("serialized(const char*)") {
+    array.add(serialized("{\"key\":\"value\"}"));
+
+    check(array, "[{\"key\":\"value\"}]");
+  }
+
+  SECTION("serialized(char*)") {
+    char tmp[] = "{\"key\":\"value\"}";
+    array.add(serialized(tmp));
+
+    check(array, "[{\"key\":\"value\"}]");
+  }
+
+  SECTION("OneIntegerOverCapacity") {
+    array.add(1);
+    array.add(2);
+    array.add(3);
+
+    check(array, "[1,2]");
+  }
+
+  SECTION("OneTrue") {
+    array.add(true);
+
+    check(array, "[true]");
+  }
+
+  SECTION("OneFalse") {
+    array.add(false);
+
+    check(array, "[false]");
+  }
+
+  SECTION("TwoBooleans") {
+    array.add(false);
+    array.add(true);
+
+    check(array, "[false,true]");
+  }
+
+  SECTION("OneBooleanOverCapacity") {
+    array.add(false);
+    array.add(true);
+    array.add(false);
+
+    check(array, "[false,true]");
+  }
+
+  SECTION("OneEmptyNestedArray") {
+    array.createNestedArray();
+
+    check(array, "[[]]");
+  }
+
+  SECTION("OneEmptyNestedHash") {
+    array.createNestedObject();
+
+    check(array, "[{}]");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp
new file mode 100644
index 0000000..8e7a915
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonArrayPretty.cpp
@@ -0,0 +1,75 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+static void checkArray(JsonArray array, std::string expected) {
+  std::string actual;
+  size_t actualLen = serializeJsonPretty(array, actual);
+  size_t measuredLen = measureJsonPretty(array);
+  CHECK(actualLen == expected.size());
+  CHECK(measuredLen == expected.size());
+  REQUIRE(expected == actual);
+}
+
+TEST_CASE("serializeJsonPretty(JsonArray)") {
+  DynamicJsonDocument doc(4096);
+  JsonArray array = doc.to<JsonArray>();
+
+  SECTION("Empty") {
+    checkArray(array, "[]");
+  }
+
+  SECTION("OneElement") {
+    array.add(1);
+
+    checkArray(array,
+               "[\r\n"
+               "  1\r\n"
+               "]");
+  }
+
+  SECTION("TwoElements") {
+    array.add(1);
+    array.add(2);
+
+    checkArray(array,
+               "[\r\n"
+               "  1,\r\n"
+               "  2\r\n"
+               "]");
+  }
+
+  SECTION("EmptyNestedArrays") {
+    array.createNestedArray();
+    array.createNestedArray();
+
+    checkArray(array,
+               "[\r\n"
+               "  [],\r\n"
+               "  []\r\n"
+               "]");
+  }
+
+  SECTION("NestedArrays") {
+    JsonArray nested1 = array.createNestedArray();
+    nested1.add(1);
+    nested1.add(2);
+
+    JsonObject nested2 = array.createNestedObject();
+    nested2["key"] = 3;
+
+    checkArray(array,
+               "[\r\n"
+               "  [\r\n"
+               "    1,\r\n"
+               "    2\r\n"
+               "  ],\r\n"
+               "  {\r\n"
+               "    \"key\": 3\r\n"
+               "  }\r\n"
+               "]");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp
new file mode 100644
index 0000000..a1aa931
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonObject.cpp
@@ -0,0 +1,119 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <string>
+
+static void checkObject(const JsonObject obj, const std::string &expected) {
+  char actual[256];
+  memset(actual, '!', sizeof(actual));
+
+  size_t actualLen = serializeJson(obj, actual);
+  size_t measuredLen = measureJson(obj);
+
+  REQUIRE(expected.size() == measuredLen);
+  REQUIRE(expected.size() == actualLen);
+  REQUIRE(actual[actualLen] == 0);  // serializeJson() adds a null terminator
+  REQUIRE(expected == actual);
+}
+
+TEST_CASE("serializeJson(JsonObject)") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+
+  SECTION("EmptyObject") {
+    checkObject(obj, "{}");
+  }
+
+  SECTION("TwoStrings") {
+    obj["key1"] = "value1";
+    obj["key2"] = "value2";
+
+    checkObject(obj, "{\"key1\":\"value1\",\"key2\":\"value2\"}");
+  }
+
+  SECTION("RemoveFirst") {
+    obj["key1"] = "value1";
+    obj["key2"] = "value2";
+    obj.remove("key1");
+
+    checkObject(obj, "{\"key2\":\"value2\"}");
+  }
+
+  SECTION("RemoveLast") {
+    obj["key1"] = "value1";
+    obj["key2"] = "value2";
+    obj.remove("key2");
+
+    checkObject(obj, "{\"key1\":\"value1\"}");
+  }
+
+  SECTION("RemoveUnexistingKey") {
+    obj["key1"] = "value1";
+    obj["key2"] = "value2";
+    obj.remove("key3");
+
+    checkObject(obj, "{\"key1\":\"value1\",\"key2\":\"value2\"}");
+  }
+
+  SECTION("ReplaceExistingKey") {
+    obj["key"] = "value1";
+    obj["key"] = "value2";
+
+    checkObject(obj, "{\"key\":\"value2\"}");
+  }
+
+  SECTION("TwoIntegers") {
+    obj["a"] = 1;
+    obj["b"] = 2;
+    checkObject(obj, "{\"a\":1,\"b\":2}");
+  }
+
+  SECTION("serialized(const char*)") {
+    obj["a"] = serialized("[1,2]");
+    obj["b"] = serialized("[4,5]");
+    checkObject(obj, "{\"a\":[1,2],\"b\":[4,5]}");
+  }
+
+  SECTION("Two doubles") {
+    obj["a"] = 12.34;
+    obj["b"] = 56.78;
+    checkObject(obj, "{\"a\":12.34,\"b\":56.78}");
+  }
+
+  SECTION("TwoNull") {
+    obj["a"] = static_cast<char *>(0);
+    obj["b"] = static_cast<char *>(0);
+    checkObject(obj, "{\"a\":null,\"b\":null}");
+  }
+
+  SECTION("TwoBooleans") {
+    obj["a"] = true;
+    obj["b"] = false;
+    checkObject(obj, "{\"a\":true,\"b\":false}");
+  }
+
+  SECTION("ThreeNestedArrays") {
+    DynamicJsonDocument b(4096);
+    DynamicJsonDocument c(4096);
+
+    obj.createNestedArray("a");
+    obj["b"] = b.to<JsonArray>();
+    obj["c"] = c.to<JsonArray>();
+
+    checkObject(obj, "{\"a\":[],\"b\":[],\"c\":[]}");
+  }
+
+  SECTION("ThreeNestedObjects") {
+    DynamicJsonDocument b(4096);
+    DynamicJsonDocument c(4096);
+
+    obj.createNestedObject("a");
+    obj["b"] = b.to<JsonObject>();
+    obj["c"] = c.to<JsonObject>();
+
+    checkObject(obj, "{\"a\":{},\"b\":{},\"c\":{}}");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp
new file mode 100644
index 0000000..3096cf8
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonObjectPretty.cpp
@@ -0,0 +1,77 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <string>
+
+static void checkObjectPretty(const JsonObject obj,
+                              const std::string expected) {
+  char json[256];
+
+  size_t actualLen = serializeJsonPretty(obj, json);
+  size_t measuredLen = measureJsonPretty(obj);
+
+  REQUIRE(json == expected);
+  REQUIRE(expected.size() == actualLen);
+  REQUIRE(expected.size() == measuredLen);
+}
+
+TEST_CASE("serializeJsonPretty(JsonObject)") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+
+  SECTION("EmptyObject") {
+    checkObjectPretty(obj, "{}");
+  }
+
+  SECTION("OneMember") {
+    obj["key"] = "value";
+
+    checkObjectPretty(obj,
+                      "{\r\n"
+                      "  \"key\": \"value\"\r\n"
+                      "}");
+  }
+
+  SECTION("TwoMembers") {
+    obj["key1"] = "value1";
+    obj["key2"] = "value2";
+
+    checkObjectPretty(obj,
+                      "{\r\n"
+                      "  \"key1\": \"value1\",\r\n"
+                      "  \"key2\": \"value2\"\r\n"
+                      "}");
+  }
+
+  SECTION("EmptyNestedContainers") {
+    obj.createNestedObject("key1");
+    obj.createNestedArray("key2");
+
+    checkObjectPretty(obj,
+                      "{\r\n"
+                      "  \"key1\": {},\r\n"
+                      "  \"key2\": []\r\n"
+                      "}");
+  }
+
+  SECTION("NestedContainers") {
+    JsonObject nested1 = obj.createNestedObject("key1");
+    nested1["a"] = 1;
+
+    JsonArray nested2 = obj.createNestedArray("key2");
+    nested2.add(2);
+
+    checkObjectPretty(obj,
+                      "{\r\n"
+                      "  \"key1\": {\r\n"
+                      "    \"a\": 1\r\n"
+                      "  },\r\n"
+                      "  \"key2\": [\r\n"
+                      "    2\r\n"
+                      "  ]\r\n"
+                      "}");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp
new file mode 100644
index 0000000..492f886
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/JsonVariant.cpp
@@ -0,0 +1,117 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <limits>
+
+template <typename T>
+void check(T value, const std::string &expected) {
+  DynamicJsonDocument doc(4096);
+  doc.to<JsonVariant>().set(value);
+  char buffer[256] = "";
+  size_t returnValue = serializeJson(doc, buffer, sizeof(buffer));
+  REQUIRE(expected == buffer);
+  REQUIRE(expected.size() == returnValue);
+}
+
+TEST_CASE("serializeJson(JsonVariant)") {
+  SECTION("Undefined") {
+    check(JsonVariant(), "null");
+  }
+
+  SECTION("Null string") {
+    check(static_cast<char *>(0), "null");
+  }
+
+  SECTION("const char*") {
+    check("hello", "\"hello\"");
+  }
+
+  SECTION("string") {
+    check(std::string("hello"), "\"hello\"");
+
+    SECTION("Escape quotation mark") {
+      check(std::string("hello \"world\""), "\"hello \\\"world\\\"\"");
+    }
+
+    SECTION("Escape reverse solidus") {
+      check(std::string("hello\\world"), "\"hello\\\\world\"");
+    }
+
+    SECTION("Don't escape solidus") {
+      check(std::string("fifty/fifty"), "\"fifty/fifty\"");
+    }
+
+    SECTION("Escape backspace") {
+      check(std::string("hello\bworld"), "\"hello\\bworld\"");
+    }
+
+    SECTION("Escape formfeed") {
+      check(std::string("hello\fworld"), "\"hello\\fworld\"");
+    }
+
+    SECTION("Escape linefeed") {
+      check(std::string("hello\nworld"), "\"hello\\nworld\"");
+    }
+
+    SECTION("Escape carriage return") {
+      check(std::string("hello\rworld"), "\"hello\\rworld\"");
+    }
+
+    SECTION("Escape tab") {
+      check(std::string("hello\tworld"), "\"hello\\tworld\"");
+    }
+  }
+
+  SECTION("SerializedValue<const char*>") {
+    check(serialized("[1,2]"), "[1,2]");
+  }
+
+  SECTION("SerializedValue<std::string>") {
+    check(serialized(std::string("[1,2]")), "[1,2]");
+  }
+
+  SECTION("Double") {
+    check(3.1415927, "3.1415927");
+  }
+
+  SECTION("Zero") {
+    check(0, "0");
+  }
+
+  SECTION("Integer") {
+    check(42, "42");
+  }
+
+  SECTION("NegativeLong") {
+    check(-42, "-42");
+  }
+
+  SECTION("UnsignedLong") {
+    check(4294967295UL, "4294967295");
+  }
+
+  SECTION("True") {
+    check(true, "true");
+  }
+
+  SECTION("OneFalse") {
+    check(false, "false");
+  }
+
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("NegativeInt64") {
+    check(-9223372036854775807 - 1, "-9223372036854775808");
+  }
+
+  SECTION("PositiveInt64") {
+    check(9223372036854775807, "9223372036854775807");
+  }
+
+  SECTION("UInt64") {
+    check(18446744073709551615U, "18446744073709551615");
+  }
+#endif
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/misc.cpp b/third-party/ArduinoJson/extras/tests/JsonSerializer/misc.cpp
new file mode 100644
index 0000000..59c09eb
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/misc.cpp
@@ -0,0 +1,36 @@
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <limits>
+
+TEST_CASE("serializeJson(MemberProxy)") {
+  DynamicJsonDocument doc(4096);
+  deserializeJson(doc, "{\"hello\":42}");
+  JsonObject obj = doc.as<JsonObject>();
+  std::string result;
+
+  serializeJson(obj["hello"], result);
+
+  REQUIRE(result == "42");
+}
+
+TEST_CASE("serializeJson(ElementProxy)") {
+  DynamicJsonDocument doc(4096);
+  deserializeJson(doc, "[42]");
+  JsonArray arr = doc.as<JsonArray>();
+  std::string result;
+
+  serializeJson(arr[0], result);
+
+  REQUIRE(result == "42");
+}
+
+TEST_CASE("serializeJson(JsonVariantSubscript)") {
+  DynamicJsonDocument doc(4096);
+  deserializeJson(doc, "[42]");
+  JsonVariant var = doc.as<JsonVariant>();
+  std::string result;
+
+  serializeJson(var[0], result);
+
+  REQUIRE(result == "42");
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp b/third-party/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp
new file mode 100644
index 0000000..6cd9a14
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/std_stream.cpp
@@ -0,0 +1,66 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <sstream>
+
+TEST_CASE("operator<<(std::ostream)") {
+  DynamicJsonDocument doc(4096);
+  std::ostringstream os;
+
+  SECTION("JsonVariant containing false") {
+    JsonVariant variant = doc.to<JsonVariant>();
+
+    variant.set(false);
+    os << variant;
+
+    REQUIRE("false" == os.str());
+  }
+
+  SECTION("JsonVariant containing string") {
+    JsonVariant variant = doc.to<JsonVariant>();
+
+    variant.set("coucou");
+    os << variant;
+
+    REQUIRE("\"coucou\"" == os.str());
+  }
+
+  SECTION("JsonObject") {
+    JsonObject object = doc.to<JsonObject>();
+    object["key"] = "value";
+
+    os << object;
+
+    REQUIRE("{\"key\":\"value\"}" == os.str());
+  }
+
+  SECTION("MemberProxy") {
+    JsonObject object = doc.to<JsonObject>();
+    object["key"] = "value";
+
+    os << object["key"];
+
+    REQUIRE("\"value\"" == os.str());
+  }
+
+  SECTION("JsonArray") {
+    JsonArray array = doc.to<JsonArray>();
+    array.add("value");
+
+    os << array;
+
+    REQUIRE("[\"value\"]" == os.str());
+  }
+
+  SECTION("ElementProxy") {
+    JsonArray array = doc.to<JsonArray>();
+    array.add("value");
+
+    os << array[0];
+
+    REQUIRE("\"value\"" == os.str());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp b/third-party/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp
new file mode 100644
index 0000000..ab835dc
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonSerializer/std_string.cpp
@@ -0,0 +1,47 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("serialize JsonArray to std::string") {
+  DynamicJsonDocument doc(4096);
+  JsonArray array = doc.to<JsonArray>();
+  array.add(4);
+  array.add(2);
+
+  SECTION("serializeJson()") {
+    std::string json;
+    serializeJson(array, json);
+
+    REQUIRE("[4,2]" == json);
+  }
+
+  SECTION("serializeJsonPretty") {
+    std::string json;
+    serializeJsonPretty(array, json);
+
+    REQUIRE("[\r\n  4,\r\n  2\r\n]" == json);
+  }
+}
+
+TEST_CASE("serialize JsonObject to std::string") {
+  DynamicJsonDocument doc(4096);
+  JsonObject obj = doc.to<JsonObject>();
+  obj["key"] = "value";
+
+  SECTION("object") {
+    std::string json;
+    serializeJson(doc, json);
+
+    REQUIRE("{\"key\":\"value\"}" == json);
+  }
+
+  SECTION("serializeJsonPretty") {
+    std::string json;
+    serializeJsonPretty(doc, json);
+
+    REQUIRE("{\r\n  \"key\": \"value\"\r\n}" == json);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt
new file mode 100644
index 0000000..a06dc88
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/CMakeLists.txt
@@ -0,0 +1,33 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(JsonVariantTests
+	add.cpp
+	as.cpp
+	clear.cpp
+	compare.cpp
+	containsKey.cpp
+	copy.cpp
+	converters.cpp
+	createNested.cpp
+	is.cpp
+	isnull.cpp
+	memoryUsage.cpp
+	misc.cpp
+	nesting.cpp
+	or.cpp
+	overflow.cpp
+	remove.cpp
+	set.cpp
+	subscript.cpp
+	types.cpp
+	undefined.cpp
+)
+
+add_test(JsonVariant JsonVariantTests)
+
+set_tests_properties(JsonVariant
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/add.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/add.cpp
new file mode 100644
index 0000000..b0b3baa
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/add.cpp
@@ -0,0 +1,30 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant::add()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant var = doc.to<JsonVariant>();
+
+  SECTION("integer") {
+    var.add(42);
+
+    REQUIRE(var.as<std::string>() == "[42]");
+  }
+
+  SECTION("const char*") {
+    var.add("hello");
+
+    REQUIRE(var.as<std::string>() == "[\"hello\"]");
+  }
+
+  SECTION("std::string") {
+    var.add(std::string("hello"));
+
+    REQUIRE(var.as<std::string>() == "[\"hello\"]");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/as.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/as.cpp
new file mode 100644
index 0000000..add6b10
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/as.cpp
@@ -0,0 +1,249 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+
+namespace my {
+using ARDUINOJSON_NAMESPACE::isinf;
+}  // namespace my
+
+enum MY_ENUM { ONE = 1, TWO = 2 };
+
+TEST_CASE("JsonVariant::as()") {
+  static const char* null = 0;
+
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("not set") {
+    REQUIRE(false == variant.as<bool>());
+    REQUIRE(0 == variant.as<int>());
+    REQUIRE(0.0f == variant.as<float>());
+    REQUIRE(0 == variant.as<const char*>());
+    REQUIRE("null" == variant.as<std::string>());
+  }
+
+  SECTION("set(4.2)") {
+    variant.set(4.2);
+
+    REQUIRE(variant.as<bool>());
+    REQUIRE(0 == variant.as<const char*>());
+    REQUIRE(variant.as<std::string>() == "4.2");
+    REQUIRE(variant.as<long>() == 4L);
+    REQUIRE(variant.as<unsigned>() == 4U);
+  }
+
+  SECTION("set(0.0)") {
+    variant.set(0.0);
+
+    REQUIRE(variant.as<bool>() == false);
+    REQUIRE(variant.as<long>() == 0L);
+  }
+
+  SECTION("set(false)") {
+    variant.set(false);
+
+    REQUIRE(false == variant.as<bool>());
+    REQUIRE(variant.as<double>() == 0.0);
+    REQUIRE(variant.as<long>() == 0L);
+    REQUIRE(variant.as<std::string>() == "false");
+  }
+
+  SECTION("set(true)") {
+    variant.set(true);
+
+    REQUIRE(variant.as<bool>());
+    REQUIRE(variant.as<double>() == 1.0);
+    REQUIRE(variant.as<long>() == 1L);
+    REQUIRE(variant.as<std::string>() == "true");
+  }
+
+  SECTION("set(42)") {
+    variant.set(42);
+
+    REQUIRE(variant.as<bool>() == true);
+    REQUIRE(variant.as<double>() == 42.0);
+    REQUIRE(variant.as<int>() == 42);
+    REQUIRE(variant.as<unsigned int>() == 42U);  // issue #1601
+    REQUIRE(variant.as<std::string>() == "42");
+  }
+
+  SECTION("set(42L)") {
+    variant.set(42L);
+
+    REQUIRE(variant.as<bool>() == true);
+    REQUIRE(variant.as<double>() == 42.0);
+    REQUIRE(variant.as<std::string>() == "42");
+  }
+
+  SECTION("set(-42L)") {
+    variant.set(-42L);
+
+    REQUIRE(variant.as<double>() == -42.0);
+    REQUIRE(variant.as<std::string>() == "-42");
+  }
+
+  SECTION("set(42UL)") {
+    variant.set(42UL);
+
+    REQUIRE(variant.as<bool>() == true);
+    REQUIRE(variant.as<double>() == 42.0);
+    REQUIRE(variant.as<std::string>() == "42");
+  }
+
+  SECTION("set(0L)") {
+    variant.set(0L);
+
+    REQUIRE(variant.as<bool>() == false);
+    REQUIRE(variant.as<double>() == 0.0);
+    REQUIRE(variant.as<std::string>() == "0");
+  }
+
+  SECTION("set(0UL)") {
+    variant.set(0UL);
+
+    REQUIRE(variant.as<bool>() == false);
+    REQUIRE(variant.as<double>() == 0.0);
+    REQUIRE(variant.as<std::string>() == "0");
+  }
+
+  SECTION("set(null)") {
+    variant.set(null);
+
+    REQUIRE(variant.as<bool>() == false);
+    REQUIRE(variant.as<double>() == 0.0);
+    REQUIRE(variant.as<long>() == 0L);
+    REQUIRE(variant.as<std::string>() == "null");
+  }
+
+  SECTION("set(\"42\")") {
+    variant.set("42");
+
+    REQUIRE(variant.as<long>() == 42L);
+  }
+
+  SECTION("set(\"hello\")") {
+    variant.set("hello");
+
+    REQUIRE(variant.as<bool>() == true);
+    REQUIRE(variant.as<long>() == 0L);
+    REQUIRE(variant.as<const char*>() == std::string("hello"));
+    REQUIRE(variant.as<const char*>() == std::string("hello"));
+    REQUIRE(variant.as<std::string>() == std::string("hello"));
+  }
+
+  SECTION("set(std::string(\"4.2\"))") {
+    variant.set(std::string("4.2"));
+
+    REQUIRE(variant.as<bool>() == true);
+    REQUIRE(variant.as<long>() == 4L);
+    REQUIRE(variant.as<double>() == 4.2);
+    REQUIRE(variant.as<const char*>() == std::string("4.2"));
+    REQUIRE(variant.as<std::string>() == std::string("4.2"));
+  }
+
+  SECTION("set(\"true\")") {
+    variant.set("true");
+
+    REQUIRE(variant.as<bool>() == true);
+    REQUIRE(variant.as<int>() == 0);
+  }
+
+  SECTION("set(-1e300)") {
+    variant.set(-1e300);
+
+    REQUIRE(variant.as<bool>() == true);
+    REQUIRE(variant.as<double>() == -1e300);
+    REQUIRE(variant.as<float>() < 0);
+    REQUIRE(my::isinf(variant.as<float>()));
+  }
+
+  SECTION("set(1e300)") {
+    variant.set(1e300);
+
+    REQUIRE(variant.as<bool>() == true);
+    REQUIRE(variant.as<double>() == 1e300);
+    REQUIRE(variant.as<float>() > 0);
+    REQUIRE(my::isinf(variant.as<float>()));
+  }
+
+  SECTION("set(1e-300)") {
+    variant.set(1e-300);
+
+    REQUIRE(variant.as<bool>() == true);
+    REQUIRE(variant.as<double>() == 1e-300);
+    REQUIRE(variant.as<float>() == 0);
+  }
+
+  SECTION("to<JsonObject>()") {
+    JsonObject obj = variant.to<JsonObject>();
+    obj["key"] = "value";
+
+    SECTION("as<bool>()") {
+      REQUIRE(variant.as<bool>() == true);
+    }
+
+    SECTION("as<std::string>()") {
+      REQUIRE(variant.as<std::string>() == std::string("{\"key\":\"value\"}"));
+    }
+
+    SECTION("ObjectAsJsonObject") {
+      JsonObject o = variant.as<JsonObject>();
+      REQUIRE(o.size() == 1);
+      REQUIRE(o["key"] == std::string("value"));
+    }
+  }
+
+  SECTION("to<JsonArray>()") {
+    JsonArray arr = variant.to<JsonArray>();
+    arr.add(4);
+    arr.add(2);
+
+    SECTION("as<bool>()") {
+      REQUIRE(variant.as<bool>() == true);
+    }
+
+    SECTION("as<std::string>()") {
+      REQUIRE(variant.as<std::string>() == std::string("[4,2]"));
+    }
+
+    SECTION("as<JsonArray>()") {
+      JsonArray a = variant.as<JsonArray>();
+      REQUIRE(a.size() == 2);
+      REQUIRE(a[0] == 4);
+      REQUIRE(a[1] == 2);
+    }
+  }
+
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("Smallest int64 negative") {
+    variant.set("-9223372036854775808");
+    REQUIRE(variant.as<long long>() == -9223372036854775807 - 1);
+  }
+
+  SECTION("Biggerst int64 positive") {
+    variant.set("9223372036854775807");
+    REQUIRE(variant.as<long long>() == 9223372036854775807);
+  }
+#endif
+
+  SECTION("should work on JsonVariantConst") {
+    variant.set("hello");
+
+    JsonVariantConst cvar = variant;
+
+    REQUIRE(cvar.as<bool>() == true);
+    REQUIRE(cvar.as<long>() == 0L);
+    REQUIRE(cvar.as<const char*>() == std::string("hello"));
+    REQUIRE(cvar.as<std::string>() == std::string("hello"));
+  }
+
+  SECTION("as<enum>()") {
+    variant.set(1);
+
+    REQUIRE(variant.as<MY_ENUM>() == ONE);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/clear.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/clear.cpp
new file mode 100644
index 0000000..230386d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/clear.cpp
@@ -0,0 +1,26 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant::clear()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant var = doc.to<JsonVariant>();
+
+  SECTION("size goes back to zero") {
+    var.add(42);
+    var.clear();
+
+    REQUIRE(var.size() == 0);
+  }
+
+  SECTION("isNull() return true") {
+    var.add("hello");
+    var.clear();
+
+    REQUIRE(var.isNull() == true);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/compare.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/compare.cpp
new file mode 100644
index 0000000..4cd8b50
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/compare.cpp
@@ -0,0 +1,280 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+// Most code is already covered by arithmeticCompare.cpp.
+// Here, we're just filling the holes
+
+TEST_CASE("Compare JsonVariant with value") {
+  StaticJsonDocument<256> doc;
+  JsonVariant a = doc.addElement();
+
+  SECTION("null vs (char*)0") {
+    char* b = 0;
+
+    CHECK(a == b);
+    CHECK(a <= b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("42 vs 42") {
+    a.set(42);
+    int b = 42;
+
+    CHECK(a == b);
+    CHECK(a <= b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+}
+
+TEST_CASE("Compare JsonVariant with JsonVariant") {
+  StaticJsonDocument<256> doc;
+  JsonVariant a = doc.addElement();
+  JsonVariant b = doc.addElement();
+
+  SECTION("'abc' vs 'abc'") {
+    a.set("abc");
+    b.set("abc");
+
+    CHECK(a == b);
+    CHECK(a <= b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("'abc' vs 'bcd'") {
+    a.set("abc");
+    b.set("bcd");
+
+    CHECK(a != b);
+    CHECK(a < b);
+    CHECK(a <= b);
+    CHECK_FALSE(a == b);
+    CHECK_FALSE(a > b);
+    CHECK_FALSE(a >= b);
+  }
+
+  SECTION("'bcd' vs 'abc'") {
+    a.set("bcd");
+    b.set("abc");
+
+    CHECK(a != b);
+    CHECK(a > b);
+    CHECK(a >= b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a <= b);
+    CHECK_FALSE(a == b);
+  }
+
+  SECTION("serialized('abc') vs serialized('abc')") {
+    a.set(serialized("abc"));
+    b.set(serialized("abc"));
+
+    CHECK(a == b);
+    CHECK(a <= b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("serialized('abc') vs serialized('bcd')") {
+    a.set(serialized("abc"));
+    b.set(serialized("bcd"));
+
+    CHECK(a != b);
+    CHECK(a < b);
+    CHECK(a <= b);
+    CHECK_FALSE(a == b);
+    CHECK_FALSE(a > b);
+    CHECK_FALSE(a >= b);
+  }
+
+  SECTION("serialized('bcd') vs serialized('abc')") {
+    a.set(serialized("bcd"));
+    b.set(serialized("abc"));
+
+    CHECK(a != b);
+    CHECK(a > b);
+    CHECK(a >= b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a <= b);
+    CHECK_FALSE(a == b);
+  }
+
+  SECTION("false vs true") {
+    a.set(false);
+    b.set(true);
+
+    CHECK(a != b);
+    CHECK(a < b);
+    CHECK(a <= b);
+    CHECK_FALSE(a == b);
+    CHECK_FALSE(a > b);
+    CHECK_FALSE(a >= b);
+  }
+
+  SECTION("false vs -1") {
+    a.set(false);
+    b.set(-1);
+
+    CHECK(a != b);
+    CHECK(a > b);
+    CHECK(a >= b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a <= b);
+    CHECK_FALSE(a == b);
+  }
+
+  SECTION("null vs null") {
+    CHECK(a == b);
+    CHECK(a <= b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("42 vs 42") {
+    a.set(42);
+    b.set(42);
+
+    CHECK(a == b);
+    CHECK(a <= b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("42 vs 42.0") {
+    a.set(42);
+    b.set(42.0);
+
+    CHECK(a == b);
+    CHECK(a <= b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("42.0 vs 42") {
+    a.set(42.0);
+    b.set(42);
+
+    CHECK(a == b);
+    CHECK(a <= b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("-42 vs -42") {
+    a.set(-42);
+    b.set(-42);
+
+    CHECK(a == b);
+    CHECK(a <= b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("-42 vs 42") {
+    a.set(-42);
+    b.set(42);
+
+    CHECK(a != b);
+    CHECK(a < b);
+    CHECK(a <= b);
+    CHECK_FALSE(a == b);
+    CHECK_FALSE(a > b);
+    CHECK_FALSE(a >= b);
+  }
+
+  SECTION("42 vs -42") {
+    a.set(42);
+    b.set(-42);
+
+    CHECK(a != b);
+    CHECK(a > b);
+    CHECK(a >= b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a <= b);
+    CHECK_FALSE(a == b);
+  }
+
+  SECTION("42.0 vs -42") {
+    a.set(42.0);
+    b.set(-42);
+
+    CHECK(a != b);
+    CHECK(a > b);
+    CHECK(a >= b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a <= b);
+    CHECK_FALSE(a == b);
+  }
+
+  SECTION("[1] vs [1]") {
+    a.add(1);
+    b.add(1);
+
+    CHECK(a <= b);
+    CHECK(a == b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("[1] vs [2]") {
+    a.add(1);
+    b.add(2);
+
+    CHECK(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a <= b);
+    CHECK_FALSE(a == b);
+    CHECK_FALSE(a > b);
+    CHECK_FALSE(a >= b);
+  }
+
+  SECTION("{x:1} vs {x:1}") {
+    a["x"] = 1;
+    b["x"] = 1;
+
+    CHECK(a <= b);
+    CHECK(a == b);
+    CHECK(a >= b);
+    CHECK_FALSE(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a > b);
+  }
+
+  SECTION("{x:1} vs {x:2}") {
+    a["x"] = 1;
+    b["x"] = 2;
+
+    CHECK(a != b);
+    CHECK_FALSE(a < b);
+    CHECK_FALSE(a <= b);
+    CHECK_FALSE(a == b);
+    CHECK_FALSE(a > b);
+    CHECK_FALSE(a >= b);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/containsKey.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/containsKey.cpp
new file mode 100644
index 0000000..e5d3f2a
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/containsKey.cpp
@@ -0,0 +1,44 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+
+static const char* null = 0;
+
+TEST_CASE("JsonVariant::containsKey()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant var = doc.to<JsonVariant>();
+
+  SECTION("containsKey(const char*) returns true") {
+    var["hello"] = "world";
+
+    REQUIRE(var.containsKey("hello") == true);
+    REQUIRE(var.containsKey("world") == false);
+  }
+
+  SECTION("containsKey(std::string) returns true") {
+    var["hello"] = "world";
+
+    REQUIRE(var.containsKey(std::string("hello")) == true);
+    REQUIRE(var.containsKey(std::string("world")) == false);
+  }
+}
+
+TEST_CASE("JsonVariantConst::containsKey()") {
+  DynamicJsonDocument doc(4096);
+  doc["hello"] = "world";
+  JsonVariantConst cvar = doc.as<JsonVariant>();
+
+  SECTION("containsKey(const char*) returns true") {
+    REQUIRE(cvar.containsKey("hello") == true);
+    REQUIRE(cvar.containsKey("world") == false);
+  }
+
+  SECTION("containsKey(std::string) returns true") {
+    REQUIRE(cvar.containsKey(std::string("hello")) == true);
+    REQUIRE(cvar.containsKey(std::string("world")) == false);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/converters.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/converters.cpp
new file mode 100644
index 0000000..01e407b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/converters.cpp
@@ -0,0 +1,144 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+
+namespace {
+struct Date {
+  int day;
+  int month;
+  int year;
+};
+
+bool convertToJson(const Date& src, JsonVariant dst) {
+  dst["day"] = src.day;
+  dst["month"] = src.month;
+  dst["year"] = src.year;
+  return true;
+}
+
+void convertFromJson(JsonVariantConst src, Date& dst) {
+  dst.day = src["day"];
+  dst.month = src["month"];
+  dst.year = src["year"];
+}
+
+bool canConvertFromJson(JsonVariantConst src, const Date&) {
+  return src["day"].is<int>() && src["month"].is<int>() &&
+         src["year"].is<int>();
+}
+}  // namespace
+
+TEST_CASE("Custom converter with overloading") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("convert JSON to Date") {
+    doc["date"]["day"] = 2;
+    doc["date"]["month"] = 3;
+    doc["date"]["year"] = 2021;
+
+    Date date = doc["date"];
+
+    REQUIRE(date.day == 2);
+    REQUIRE(date.month == 3);
+    REQUIRE(date.year == 2021);
+  }
+
+  SECTION("is<Date>() returns true") {
+    doc["date"]["day"] = 2;
+    doc["date"]["month"] = 3;
+    doc["date"]["year"] = 2021;
+
+    REQUIRE(doc["date"].is<Date>());
+  }
+
+  SECTION("is<Date>() returns false") {
+    doc["date"]["day"] = 2;
+    doc["date"]["month"] = 3;
+    doc["date"]["year"] = "2021";
+
+    REQUIRE(doc["date"].is<Date>() == false);
+  }
+
+  SECTION("convert Date to JSON") {
+    Date date = {19, 3, 2021};
+    doc["date"] = date;
+
+    REQUIRE(doc["date"]["day"] == 19);
+    REQUIRE(doc["date"]["month"] == 3);
+    REQUIRE(doc["date"]["year"] == 2021);
+  }
+}
+
+class Complex {
+ public:
+  explicit Complex(double r, double i) : _real(r), _imag(i) {}
+
+  double real() const {
+    return _real;
+  }
+
+  double imag() const {
+    return _imag;
+  }
+
+ private:
+  double _real, _imag;
+};
+
+namespace ARDUINOJSON_NAMESPACE {
+template <>
+struct Converter<Complex> {
+  static bool toJson(const Complex& src, VariantRef dst) {
+    dst["real"] = src.real();
+    dst["imag"] = src.imag();
+    return true;
+  }
+
+  static Complex fromJson(VariantConstRef src) {
+    return Complex(src["real"], src["imag"]);
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    return src["real"].is<double>() && src["imag"].is<double>();
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
+
+TEST_CASE("Custom converter with specialization") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("convert JSON to Complex") {
+    doc["value"]["real"] = 2;
+    doc["value"]["imag"] = 3;
+
+    Complex value = doc["value"];
+
+    REQUIRE(value.real() == 2);
+    REQUIRE(value.imag() == 3);
+  }
+
+  SECTION("is<Complex>() returns true") {
+    doc["value"]["real"] = 2;
+    doc["value"]["imag"] = 3;
+
+    REQUIRE(doc["value"].is<Complex>());
+  }
+
+  SECTION("is<Complex>() returns false") {
+    doc["value"]["real"] = 2;
+    doc["value"]["imag"] = "3";
+
+    REQUIRE(doc["value"].is<Complex>() == false);
+  }
+
+  SECTION("convert value to JSON") {
+    doc["value"] = Complex(19, 3);
+
+    REQUIRE(doc["value"]["real"] == 19);
+    REQUIRE(doc["value"]["imag"] == 3);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/copy.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/copy.cpp
new file mode 100644
index 0000000..ac97f84
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/copy.cpp
@@ -0,0 +1,86 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant::set(JsonVariant)") {
+  DynamicJsonDocument doc1(4096);
+  DynamicJsonDocument doc2(4096);
+  JsonVariant var1 = doc1.to<JsonVariant>();
+  JsonVariant var2 = doc2.to<JsonVariant>();
+
+  SECTION("stores JsonArray by copy") {
+    JsonArray arr = doc2.to<JsonArray>();
+    JsonObject obj = arr.createNestedObject();
+    obj["hello"] = "world";
+
+    var1.set(arr);
+
+    arr[0] = 666;
+    REQUIRE(var1.as<std::string>() == "[{\"hello\":\"world\"}]");
+  }
+
+  SECTION("stores JsonObject by copy") {
+    JsonObject obj = doc2.to<JsonObject>();
+    JsonArray arr = obj.createNestedArray("value");
+    arr.add(42);
+
+    var1.set(obj);
+
+    obj["value"] = 666;
+    REQUIRE(var1.as<std::string>() == "{\"value\":[42]}");
+  }
+
+  SECTION("stores const char* by reference") {
+    var1.set("hello!!");
+    var2.set(var1);
+
+    REQUIRE(doc1.memoryUsage() == 0);
+    REQUIRE(doc2.memoryUsage() == 0);
+  }
+
+  SECTION("stores char* by copy") {
+    char str[] = "hello!!";
+
+    var1.set(str);
+    var2.set(var1);
+
+    REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(7));
+    REQUIRE(doc2.memoryUsage() == JSON_STRING_SIZE(7));
+  }
+
+  SECTION("stores std::string by copy") {
+    var1.set(std::string("hello!!"));
+    var2.set(var1);
+
+    REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(7));
+    REQUIRE(doc2.memoryUsage() == JSON_STRING_SIZE(7));
+  }
+
+  SECTION("stores Serialized<const char*> by reference") {
+    var1.set(serialized("hello!!", 8));
+    var2.set(var1);
+
+    REQUIRE(doc1.memoryUsage() == 0);
+    REQUIRE(doc2.memoryUsage() == 0);
+  }
+
+  SECTION("stores Serialized<char*> by copy") {
+    char str[] = "hello!!";
+    var1.set(serialized(str, 7));
+    var2.set(var1);
+
+    REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(7));
+    REQUIRE(doc2.memoryUsage() == JSON_STRING_SIZE(7));
+  }
+
+  SECTION("stores Serialized<std::string> by copy") {
+    var1.set(serialized(std::string("hello!!")));
+    var2.set(var1);
+
+    REQUIRE(doc1.memoryUsage() == JSON_STRING_SIZE(7));
+    REQUIRE(doc2.memoryUsage() == JSON_STRING_SIZE(7));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/createNested.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/createNested.cpp
new file mode 100644
index 0000000..76564da
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/createNested.cpp
@@ -0,0 +1,86 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant::createNestedObject()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("promotes to array") {
+    JsonObject obj = variant.createNestedObject();
+    obj["value"] = 42;
+
+    REQUIRE(variant.is<JsonArray>() == true);
+    REQUIRE(variant[0]["value"] == 42);
+    REQUIRE(obj.isNull() == false);
+  }
+
+  SECTION("works on MemberProxy") {
+    JsonObject obj = variant["items"].createNestedObject();
+    obj["value"] = 42;
+
+    REQUIRE(variant["items"][0]["value"] == 42);
+  }
+}
+
+TEST_CASE("JsonVariant::createNestedArray()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("promotes to array") {
+    JsonArray arr = variant.createNestedArray();
+
+    REQUIRE(variant.is<JsonArray>() == true);
+    REQUIRE(arr.isNull() == false);
+  }
+
+  SECTION("works on MemberProxy") {
+    JsonArray arr = variant["items"].createNestedArray();
+    arr.add(42);
+
+    REQUIRE(variant["items"][0][0] == 42);
+  }
+}
+
+TEST_CASE("JsonVariant::createNestedObject(key)") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("promotes to object") {
+    JsonObject obj = variant.createNestedObject("weather");
+    obj["temp"] = 42;
+
+    REQUIRE(variant.is<JsonObject>() == true);
+    REQUIRE(variant["weather"]["temp"] == 42);
+  }
+
+  SECTION("works on MemberProxy") {
+    JsonObject obj = variant["status"].createNestedObject("weather");
+    obj["temp"] = 42;
+
+    REQUIRE(variant["status"]["weather"]["temp"] == 42);
+  }
+}
+
+TEST_CASE("JsonVariant::createNestedArray(key)") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("promotes to object") {
+    JsonArray arr = variant.createNestedArray("items");
+
+    REQUIRE(variant.is<JsonObject>() == true);
+    REQUIRE(arr.isNull() == false);
+  }
+
+  SECTION("works on MemberProxy") {
+    JsonArray arr = variant["weather"].createNestedArray("temp");
+    arr.add(42);
+
+    REQUIRE(variant["weather"]["temp"][0] == 42);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/is.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/is.cpp
new file mode 100644
index 0000000..f4fe672
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/is.cpp
@@ -0,0 +1,304 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+enum MYENUM2 { ONE = 1, TWO = 2 };
+
+TEST_CASE("JsonVariant::is<T>()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("undefined") {
+    variant = JsonVariant();
+
+    CHECK(variant.is<JsonObject>() == false);
+    CHECK(variant.is<JsonArray>() == false);
+    CHECK(variant.is<JsonVariant>() == false);
+    CHECK(variant.is<JsonVariantConst>() == false);
+    CHECK(variant.is<bool>() == false);
+    CHECK(variant.is<const char *>() == false);
+    CHECK(variant.is<int>() == false);
+    CHECK(variant.is<std::string>() == false);
+    CHECK(variant.is<float>() == false);
+    CHECK(variant.is<MYENUM2>() == false);
+  }
+
+  SECTION("null") {
+    CHECK(variant.is<JsonVariant>() == true);
+    CHECK(variant.is<JsonVariantConst>() == true);
+    CHECK(variant.is<JsonObject>() == false);
+    CHECK(variant.is<JsonArray>() == false);
+    CHECK(variant.is<bool>() == false);
+    CHECK(variant.is<const char *>() == false);
+    CHECK(variant.is<int>() == false);
+    CHECK(variant.is<std::string>() == false);
+    CHECK(variant.is<float>() == false);
+    CHECK(variant.is<MYENUM2>() == false);
+  }
+
+  SECTION("true") {
+    variant.set(true);
+
+    CHECK(variant.is<bool>() == true);
+    CHECK(variant.is<JsonVariant>() == true);
+    CHECK(variant.is<JsonVariantConst>() == true);
+    CHECK(variant.is<JsonObject>() == false);
+    CHECK(variant.is<JsonArray>() == false);
+    CHECK(variant.is<const char *>() == false);
+    CHECK(variant.is<int>() == false);
+    CHECK(variant.is<std::string>() == false);
+    CHECK(variant.is<float>() == false);
+    CHECK(variant.is<MYENUM2>() == false);
+  }
+
+  SECTION("false") {
+    variant.set(false);
+
+    CHECK(variant.is<bool>() == true);
+    CHECK(variant.is<JsonVariant>() == true);
+    CHECK(variant.is<JsonVariantConst>() == true);
+    CHECK(variant.is<JsonObject>() == false);
+    CHECK(variant.is<JsonArray>() == false);
+    CHECK(variant.is<const char *>() == false);
+    CHECK(variant.is<int>() == false);
+    CHECK(variant.is<std::string>() == false);
+    CHECK(variant.is<float>() == false);
+    CHECK(variant.is<MYENUM2>() == false);
+  }
+
+  SECTION("int") {
+    variant.set(42);
+
+    CHECK(variant.is<int>() == true);
+    CHECK(variant.is<short>() == true);
+    CHECK(variant.is<long>() == true);
+    CHECK(variant.is<double>() == true);
+    CHECK(variant.is<float>() == true);
+    CHECK(variant.is<MYENUM2>() == true);
+    CHECK(variant.is<JsonVariant>() == true);
+    CHECK(variant.is<JsonVariantConst>() == true);
+    CHECK(variant.is<bool>() == false);
+    CHECK(variant.is<JsonObject>() == false);
+    CHECK(variant.is<JsonArray>() == false);
+    CHECK(variant.is<const char *>() == false);
+    CHECK(variant.is<std::string>() == false);
+  }
+
+  SECTION("double") {
+    variant.set(4.2);
+
+    CHECK(variant.is<double>() == true);
+    CHECK(variant.is<float>() == true);
+    CHECK(variant.is<JsonVariant>() == true);
+    CHECK(variant.is<JsonVariantConst>() == true);
+    CHECK(variant.is<bool>() == false);
+    CHECK(variant.is<JsonObject>() == false);
+    CHECK(variant.is<JsonArray>() == false);
+    CHECK(variant.is<const char *>() == false);
+    CHECK(variant.is<int>() == false);
+    CHECK(variant.is<std::string>() == false);
+    CHECK(variant.is<MYENUM2>() == false);
+  }
+
+  SECTION("const char*") {
+    variant.set("4.2");
+
+    CHECK(variant.is<const char *>() == true);
+    CHECK(variant.is<const char *>() == true);
+    CHECK(variant.is<std::string>() == true);
+    CHECK(variant.is<JsonVariant>() == true);
+    CHECK(variant.is<JsonVariantConst>() == true);
+    CHECK(variant.is<double>() == false);
+    CHECK(variant.is<float>() == false);
+    CHECK(variant.is<bool>() == false);
+    CHECK(variant.is<JsonObject>() == false);
+    CHECK(variant.is<JsonArray>() == false);
+    CHECK(variant.is<int>() == false);
+    CHECK(variant.is<MYENUM2>() == false);
+  }
+
+  SECTION("JsonArray") {
+    variant.to<JsonArray>();
+
+    CHECK(variant.is<JsonArray>() == true);
+    CHECK(variant.is<JsonArrayConst>() == true);
+    CHECK(variant.is<JsonVariant>() == true);
+    CHECK(variant.is<JsonVariantConst>() == true);
+    CHECK(variant.is<JsonObject>() == false);
+    CHECK(variant.is<JsonObjectConst>() == false);
+    CHECK(variant.is<int>() == false);
+    CHECK(variant.is<float>() == false);
+    CHECK(variant.is<bool>() == false);
+    CHECK(variant.is<const char *>() == false);
+    CHECK(variant.is<MYENUM2>() == false);
+  }
+
+  SECTION("JsonObject") {
+    variant.to<JsonObject>();
+
+    CHECK(variant.is<JsonObject>() == true);
+    CHECK(variant.is<JsonObjectConst>() == true);
+    CHECK(variant.is<JsonVariant>() == true);
+    CHECK(variant.is<JsonVariantConst>() == true);
+    CHECK(variant.is<JsonArray>() == false);
+    CHECK(variant.is<JsonArrayConst>() == false);
+    CHECK(variant.is<int>() == false);
+    CHECK(variant.is<float>() == false);
+    CHECK(variant.is<bool>() == false);
+    CHECK(variant.is<const char *>() == false);
+    CHECK(variant.is<MYENUM2>() == false);
+    CHECK(variant.is<JsonVariant>() == true);
+    CHECK(variant.is<JsonVariantConst>() == true);
+  }
+}
+
+TEST_CASE("JsonVariantConst::is<T>()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+  JsonVariantConst cvariant = variant;
+
+  SECTION("undefined") {
+    cvariant = JsonVariantConst();
+
+    CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<JsonArrayConst>() == false);
+    CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonObjectConst>() == false);
+    CHECK(cvariant.is<JsonVariant>() == false);
+    CHECK(cvariant.is<JsonVariantConst>() == false);
+    CHECK(cvariant.is<bool>() == false);
+    CHECK(cvariant.is<const char *>() == false);
+    CHECK(cvariant.is<int>() == false);
+    CHECK(cvariant.is<std::string>() == false);
+    CHECK(cvariant.is<float>() == false);
+    CHECK(cvariant.is<MYENUM2>() == false);
+  }
+
+  SECTION("null") {
+    CHECK(cvariant.is<JsonVariantConst>() == true);
+    CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<JsonVariant>() == false);
+    CHECK(cvariant.is<bool>() == false);
+    CHECK(cvariant.is<const char *>() == false);
+    CHECK(cvariant.is<int>() == false);
+    CHECK(cvariant.is<std::string>() == false);
+    CHECK(cvariant.is<float>() == false);
+    CHECK(cvariant.is<MYENUM2>() == false);
+  }
+
+  SECTION("true") {
+    variant.set(true);
+
+    CHECK(cvariant.is<bool>() == true);
+    CHECK(cvariant.is<JsonVariantConst>() == true);
+    CHECK(cvariant.is<JsonVariant>() == false);
+    CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<const char *>() == false);
+    CHECK(cvariant.is<int>() == false);
+    CHECK(cvariant.is<std::string>() == false);
+    CHECK(cvariant.is<float>() == false);
+    CHECK(cvariant.is<MYENUM2>() == false);
+  }
+
+  SECTION("false") {
+    variant.set(false);
+
+    CHECK(cvariant.is<bool>() == true);
+    CHECK(cvariant.is<JsonVariantConst>() == true);
+    CHECK(cvariant.is<JsonVariant>() == false);
+    CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<const char *>() == false);
+    CHECK(cvariant.is<int>() == false);
+    CHECK(cvariant.is<std::string>() == false);
+    CHECK(cvariant.is<float>() == false);
+    CHECK(cvariant.is<MYENUM2>() == false);
+  }
+
+  SECTION("int") {
+    variant.set(42);
+
+    CHECK(cvariant.is<int>() == true);
+    CHECK(cvariant.is<short>() == true);
+    CHECK(cvariant.is<long>() == true);
+    CHECK(cvariant.is<double>() == true);
+    CHECK(cvariant.is<float>() == true);
+    CHECK(cvariant.is<MYENUM2>() == true);
+    CHECK(cvariant.is<JsonVariantConst>() == true);
+    CHECK(cvariant.is<bool>() == false);
+    CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<JsonVariant>() == false);
+    CHECK(cvariant.is<const char *>() == false);
+    CHECK(cvariant.is<std::string>() == false);
+  }
+
+  SECTION("double") {
+    variant.set(4.2);
+
+    CHECK(cvariant.is<double>() == true);
+    CHECK(cvariant.is<float>() == true);
+    CHECK(cvariant.is<JsonVariantConst>() == true);
+    CHECK(cvariant.is<bool>() == false);
+    CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<JsonVariant>() == false);
+    CHECK(cvariant.is<const char *>() == false);
+    CHECK(cvariant.is<int>() == false);
+    CHECK(cvariant.is<std::string>() == false);
+    CHECK(cvariant.is<MYENUM2>() == false);
+  }
+
+  SECTION("const char*") {
+    variant.set("4.2");
+
+    CHECK(cvariant.is<const char *>() == true);
+    CHECK(cvariant.is<const char *>() == true);
+    CHECK(cvariant.is<std::string>() == true);
+    CHECK(cvariant.is<double>() == false);
+    CHECK(cvariant.is<float>() == false);
+    CHECK(cvariant.is<bool>() == false);
+    CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<JsonVariant>() == false);
+    CHECK(cvariant.is<int>() == false);
+    CHECK(cvariant.is<MYENUM2>() == false);
+  }
+
+  SECTION("JsonArray") {
+    variant.to<JsonArray>();
+
+    CHECK(cvariant.is<JsonArrayConst>() == true);
+    CHECK(cvariant.is<JsonVariantConst>() == true);
+    CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<JsonVariant>() == false);
+    CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonObjectConst>() == false);
+    CHECK(cvariant.is<int>() == false);
+    CHECK(cvariant.is<float>() == false);
+    CHECK(cvariant.is<bool>() == false);
+    CHECK(cvariant.is<const char *>() == false);
+    CHECK(cvariant.is<MYENUM2>() == false);
+  }
+
+  SECTION("JsonObject") {
+    variant.to<JsonObject>();
+
+    CHECK(cvariant.is<JsonObjectConst>() == true);
+    CHECK(cvariant.is<JsonVariantConst>() == true);
+    CHECK(cvariant.is<JsonObject>() == false);
+    CHECK(cvariant.is<JsonVariant>() == false);
+    CHECK(cvariant.is<JsonArray>() == false);
+    CHECK(cvariant.is<JsonArrayConst>() == false);
+    CHECK(cvariant.is<int>() == false);
+    CHECK(cvariant.is<float>() == false);
+    CHECK(cvariant.is<bool>() == false);
+    CHECK(cvariant.is<const char *>() == false);
+    CHECK(cvariant.is<MYENUM2>() == false);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/isnull.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/isnull.cpp
new file mode 100644
index 0000000..bfd4d51
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/isnull.cpp
@@ -0,0 +1,80 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant::isNull()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("return true when Undefined") {
+    REQUIRE(variant.isNull() == true);
+  }
+
+  SECTION("return false when Integer") {
+    variant.set(42);
+
+    REQUIRE(variant.isNull() == false);
+  }
+
+  SECTION("return false when EmptyArray") {
+    DynamicJsonDocument doc2(4096);
+    JsonArray array = doc2.to<JsonArray>();
+
+    variant.set(array);
+    REQUIRE(variant.isNull() == false);
+  }
+
+  SECTION("return false when EmptyObject") {
+    DynamicJsonDocument doc2(4096);
+    JsonObject obj = doc2.to<JsonObject>();
+
+    variant.set(obj);
+    REQUIRE(variant.isNull() == false);
+  }
+
+  SECTION("return true after set(JsonArray())") {
+    variant.set(JsonArray());
+    REQUIRE(variant.isNull() == true);
+  }
+
+  SECTION("return true after set(JsonObject())") {
+    variant.set(JsonObject());
+    REQUIRE(variant.isNull() == true);
+  }
+
+  SECTION("return false after set('hello')") {
+    variant.set("hello");
+    REQUIRE(variant.isNull() == false);
+  }
+
+  SECTION("return true after set((char*)0)") {
+    variant.set(static_cast<char*>(0));
+    REQUIRE(variant.isNull() == true);
+  }
+
+  SECTION("return true after set((const char*)0)") {
+    variant.set(static_cast<const char*>(0));
+    REQUIRE(variant.isNull() == true);
+  }
+
+  SECTION("return true after set(serialized((char*)0))") {
+    variant.set(serialized(static_cast<char*>(0)));
+    REQUIRE(variant.isNull() == true);
+  }
+
+  SECTION("return true after set(serialized((const char*)0))") {
+    variant.set(serialized(static_cast<const char*>(0)));
+    REQUIRE(variant.isNull() == true);
+  }
+
+  SECTION("works with JsonVariantConst") {
+    variant.set(42);
+
+    JsonVariantConst cvar = variant;
+
+    REQUIRE(cvar.isNull() == false);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/memoryUsage.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/memoryUsage.cpp
new file mode 100644
index 0000000..9c5c6fd
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/memoryUsage.cpp
@@ -0,0 +1,39 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <string>
+
+TEST_CASE("JsonVariant::memoryUsage()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant var = doc.to<JsonVariant>();
+
+  SECTION("returns 0 if uninitialized") {
+    JsonVariant unitialized;
+    REQUIRE(unitialized.memoryUsage() == 0);
+  }
+
+  SECTION("returns size of object") {
+    JsonObject obj = var.to<JsonObject>();
+    obj["hello"] = 42;
+    REQUIRE(var.memoryUsage() == JSON_OBJECT_SIZE(1));
+  }
+
+  SECTION("returns size of array") {
+    JsonArray arr = var.to<JsonArray>();
+    arr.add(42);
+    REQUIRE(var.memoryUsage() == JSON_ARRAY_SIZE(1));
+  }
+
+  SECTION("returns size of owned string") {
+    var.set(std::string("hello"));
+    REQUIRE(var.memoryUsage() == 6);
+  }
+
+  SECTION("returns size of owned raw") {
+    var.set(serialized(std::string("hello")));
+    REQUIRE(var.memoryUsage() == 5);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/misc.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/misc.cpp
new file mode 100644
index 0000000..6fd4f92
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/misc.cpp
@@ -0,0 +1,50 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant from JsonArray") {
+  SECTION("JsonArray is null") {
+    JsonArray arr;
+    JsonVariant v = arr;
+    REQUIRE(v.isNull() == true);
+  }
+
+  SECTION("JsonArray is not null") {
+    DynamicJsonDocument doc(4096);
+    JsonArray arr = doc.to<JsonArray>();
+    arr.add(12);
+    arr.add(34);
+
+    JsonVariant v = arr;
+
+    REQUIRE(v.is<JsonArray>() == true);
+    REQUIRE(v.size() == 2);
+    REQUIRE(v[0] == 12);
+    REQUIRE(v[1] == 34);
+  }
+}
+
+TEST_CASE("JsonVariant from JsonObject") {
+  SECTION("JsonObject is null") {
+    JsonObject obj;
+    JsonVariant v = obj;
+    REQUIRE(v.isNull() == true);
+  }
+
+  SECTION("JsonObject is not null") {
+    DynamicJsonDocument doc(4096);
+    JsonObject obj = doc.to<JsonObject>();
+    obj["a"] = 12;
+    obj["b"] = 34;
+
+    JsonVariant v = obj;
+
+    REQUIRE(v.is<JsonObject>() == true);
+    REQUIRE(v.size() == 2);
+    REQUIRE(v["a"] == 12);
+    REQUIRE(v["b"] == 34);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/nesting.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/nesting.cpp
new file mode 100644
index 0000000..74d049b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/nesting.cpp
@@ -0,0 +1,31 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant::nesting()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant var = doc.to<JsonVariant>();
+
+  SECTION("return 0 if uninitialized") {
+    JsonVariant unitialized;
+    REQUIRE(unitialized.nesting() == 0);
+  }
+
+  SECTION("returns 0 for string") {
+    var.set("hello");
+    REQUIRE(var.nesting() == 0);
+  }
+
+  SECTION("returns 1 for empty object") {
+    var.to<JsonObject>();
+    REQUIRE(var.nesting() == 1);
+  }
+
+  SECTION("returns 1 for empty array") {
+    var.to<JsonArray>();
+    REQUIRE(var.nesting() == 1);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/or.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/or.cpp
new file mode 100644
index 0000000..582c2d1
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/or.cpp
@@ -0,0 +1,159 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant::operator|()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc["value"].to<JsonVariant>();
+
+  SECTION("undefined") {
+    SECTION("undefined | const char*") {
+      std::string result = variant | "default";
+      REQUIRE(result == "default");
+    }
+
+    SECTION("undefined | int") {
+      int result = variant | 42;
+      REQUIRE(result == 42);
+    }
+
+    SECTION("undefined | bool") {
+      bool result = variant | true;
+      REQUIRE(result == true);
+    }
+
+    SECTION("undefined | ElementProxy") {
+      doc["array"][0] = 42;
+
+      JsonVariantConst result = variant | doc["array"][0];
+      REQUIRE(result == 42);
+    }
+
+    SECTION("undefined | MemberProxy") {
+      doc["other"] = 42;
+
+      JsonVariantConst result = variant | doc["other"];
+      REQUIRE(result == 42);
+    }
+
+    SECTION("ElementProxy | ElementProxy") {
+      doc["array"][0] = 42;
+
+      JsonVariantConst result = doc["array"][1] | doc["array"][0];
+      REQUIRE(result == 42);
+    }
+  }
+
+  SECTION("null") {
+    variant.set(static_cast<const char*>(0));
+
+    SECTION("null | const char*") {
+      std::string result = variant | "default";
+      REQUIRE(result == "default");
+    }
+
+    SECTION("null | int") {
+      int result = variant | 42;
+      REQUIRE(result == 42);
+    }
+
+    SECTION("null | bool") {
+      bool result = variant | true;
+      REQUIRE(result == true);
+    }
+
+    SECTION("null | ElementProxy") {
+      doc["array"][0] = 42;
+
+      JsonVariantConst result = variant | doc["array"][0];
+      REQUIRE(result == 42);
+    }
+
+    SECTION("null | MemberProxy") {
+      doc["other"] = 42;
+
+      JsonVariantConst result = variant | doc["other"];
+      REQUIRE(result == 42);
+    }
+  }
+
+  SECTION("int | const char*") {
+    variant.set(42);
+    std::string result = variant | "default";
+    REQUIRE(result == "default");
+  }
+
+  SECTION("int | uint8_t (out of range)") {
+    variant.set(666);
+    uint8_t result = variant | static_cast<uint8_t>(42);
+    REQUIRE(result == 42);
+  }
+
+  SECTION("int | ElementProxy") {
+    variant.set(42);
+    doc["array"][0] = 666;
+    JsonVariantConst result = variant | doc["array"][0];
+    REQUIRE(result == 42);
+  }
+
+  SECTION("int | MemberProxy") {
+    variant.set(42);
+    doc["other"] = 666;
+    JsonVariantConst result = variant | doc["other"];
+    REQUIRE(result == 42);
+  }
+
+  SECTION("int | int") {
+    variant.set(0);
+    int result = variant | 666;
+    REQUIRE(result == 0);
+  }
+
+  SECTION("double | int") {
+    // NOTE: changed the behavior to fix #981
+    variant.set(666.0);
+    int result = variant | 42;
+    REQUIRE(result == 42);
+  }
+
+  SECTION("bool | bool") {
+    variant.set(false);
+    bool result = variant | true;
+    REQUIRE(result == false);
+  }
+
+  SECTION("int | bool") {
+    variant.set(0);
+    bool result = variant | true;
+    REQUIRE(result == true);
+  }
+
+  SECTION("const char* | const char*") {
+    variant.set("not default");
+    std::string result = variant | "default";
+    REQUIRE(result == "not default");
+  }
+
+  SECTION("const char* | char*") {
+    char dflt[] = "default";
+    variant.set("not default");
+    std::string result = variant | dflt;
+    REQUIRE(result == "not default");
+  }
+
+  SECTION("int | char*") {
+    char dflt[] = "default";
+    variant.set(42);
+    std::string result = variant | dflt;
+    REQUIRE(result == "default");
+  }
+
+  SECTION("const char* | int") {
+    variant.set("not default");
+    int result = variant | 42;
+    REQUIRE(result == 42);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/overflow.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/overflow.cpp
new file mode 100644
index 0000000..8d1f8c4
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/overflow.cpp
@@ -0,0 +1,72 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+template <typename TOut, typename TIn>
+void shouldBeOk(TIn value) {
+  StaticJsonDocument<1> doc;
+  JsonVariant var = doc.to<JsonVariant>();
+  var.set(value);
+  REQUIRE(var.as<TOut>() == TOut(value));
+}
+
+template <typename TOut, typename TIn>
+void shouldOverflow(TIn value) {
+  StaticJsonDocument<1> doc;
+  JsonVariant var = doc.to<JsonVariant>();
+  var.set(value);
+  REQUIRE(var.as<TOut>() == 0);
+  REQUIRE(var.is<TOut>() == false);
+}
+
+TEST_CASE("Handle integer overflow in stored integer") {
+  SECTION("int8_t") {
+    // ok
+    shouldBeOk<int8_t>(-128);
+    shouldBeOk<int8_t>(42.0);
+    shouldBeOk<int8_t>(127);
+
+    // too low
+    shouldOverflow<int8_t>(-128.1);
+    shouldOverflow<int8_t>(-129);
+
+    // too high
+    shouldOverflow<int8_t>(128);
+    shouldOverflow<int8_t>(127.1);
+  }
+
+  SECTION("int16_t") {
+    // ok
+    shouldBeOk<int16_t>(-32768);
+    shouldBeOk<int16_t>(-32767.9);
+    shouldBeOk<int16_t>(32766.9);
+    shouldBeOk<int16_t>(32767);
+
+    // too low
+    shouldOverflow<int16_t>(-32768.1);
+    shouldOverflow<int16_t>(-32769);
+
+    // too high
+    shouldOverflow<int16_t>(32767.1);
+    shouldOverflow<int16_t>(32768);
+  }
+
+  SECTION("uint8_t") {
+    // ok
+    shouldBeOk<uint8_t>(1);
+    shouldBeOk<uint8_t>(42.0);
+    shouldBeOk<uint8_t>(255);
+
+    // too low
+    shouldOverflow<uint8_t>(-1);
+    shouldOverflow<uint8_t>(-0.1);
+
+    // to high
+    shouldOverflow<uint8_t>(255.1);
+    shouldOverflow<uint8_t>(256);
+    shouldOverflow<uint8_t>(257);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/remove.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/remove.cpp
new file mode 100644
index 0000000..2c4556a
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/remove.cpp
@@ -0,0 +1,42 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+
+static const char* null = 0;
+
+TEST_CASE("JsonVariant::remove()") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant var = doc.to<JsonVariant>();
+
+  SECTION("remove(int)") {
+    var.add(1);
+    var.add(2);
+    var.add(3);
+
+    var.remove(1);
+
+    REQUIRE(var.as<std::string>() == "[1,3]");
+  }
+
+  SECTION("remove(const char *)") {
+    var["a"] = 1;
+    var["b"] = 2;
+
+    var.remove("a");
+
+    REQUIRE(var.as<std::string>() == "{\"b\":2}");
+  }
+
+  SECTION("remove(std::string)") {
+    var["a"] = 1;
+    var["b"] = 2;
+
+    var.remove(std::string("b"));
+
+    REQUIRE(var.as<std::string>() == "{\"a\":1}");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/set.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/set.cpp
new file mode 100644
index 0000000..afad2f6
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/set.cpp
@@ -0,0 +1,172 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+enum ErrorCode { ERROR_01 = 1, ERROR_10 = 10 };
+
+TEST_CASE("JsonVariant::set() when there is enough memory") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("const char*") {
+    char str[16];
+
+    strcpy(str, "hello");
+    bool result = variant.set(static_cast<const char *>(str));
+    strcpy(str, "world");
+
+    REQUIRE(result == true);
+    REQUIRE(variant == "world");  // stores by pointer
+  }
+
+  SECTION("(const char*)0") {
+    bool result = variant.set(static_cast<const char *>(0));
+
+    REQUIRE(result == true);
+    REQUIRE(variant.isNull());
+  }
+
+  SECTION("char*") {
+    char str[16];
+
+    strcpy(str, "hello");
+    bool result = variant.set(str);
+    strcpy(str, "world");
+
+    REQUIRE(result == true);
+    REQUIRE(variant == "hello");  // stores by copy
+  }
+
+  SECTION("(char*)0") {
+    bool result = variant.set(static_cast<char *>(0));
+
+    REQUIRE(result == true);
+    REQUIRE(variant.isNull());
+  }
+
+  SECTION("unsigned char*") {
+    char str[16];
+
+    strcpy(str, "hello");
+    bool result = variant.set(reinterpret_cast<unsigned char *>(str));
+    strcpy(str, "world");
+
+    REQUIRE(result == true);
+    REQUIRE(variant == "hello");  // stores by copy
+  }
+
+  SECTION("signed char*") {
+    char str[16];
+
+    strcpy(str, "hello");
+    bool result = variant.set(reinterpret_cast<signed char *>(str));
+    strcpy(str, "world");
+
+    REQUIRE(result == true);
+    REQUIRE(variant == "hello");  // stores by copy
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("VLA") {
+    int n = 16;
+    char str[n];
+
+    strcpy(str, "hello");
+    bool result = variant.set(str);
+    strcpy(str, "world");
+
+    REQUIRE(result == true);
+    REQUIRE(variant == "hello");  // stores by copy
+  }
+#endif
+
+  SECTION("std::string") {
+    std::string str;
+
+    str = "hello";
+    bool result = variant.set(str);
+    str.replace(0, 5, "world");
+
+    REQUIRE(result == true);
+    REQUIRE(variant == "hello");  // stores by copy
+  }
+
+  SECTION("static JsonString") {
+    char str[16];
+
+    strcpy(str, "hello");
+    bool result = variant.set(JsonString(str, true));
+    strcpy(str, "world");
+
+    REQUIRE(result == true);
+    REQUIRE(variant == "world");  // stores by pointer
+  }
+
+  SECTION("non-static JsonString") {
+    char str[16];
+
+    strcpy(str, "hello");
+    bool result = variant.set(JsonString(str, false));
+    strcpy(str, "world");
+
+    REQUIRE(result == true);
+    REQUIRE(variant == "hello");  // stores by copy
+  }
+
+  SECTION("enum") {
+    ErrorCode code = ERROR_10;
+
+    bool result = variant.set(code);
+
+    REQUIRE(result == true);
+    REQUIRE(variant.is<int>() == true);
+    REQUIRE(variant.as<int>() == 10);
+  }
+}
+
+TEST_CASE("JsonVariant::set() with not enough memory") {
+  StaticJsonDocument<1> doc;
+
+  JsonVariant v = doc.to<JsonVariant>();
+
+  SECTION("std::string") {
+    bool result = v.set(std::string("hello world!!"));
+
+    REQUIRE(result == false);
+    REQUIRE(v.isNull());
+  }
+
+  SECTION("Serialized<std::string>") {
+    bool result = v.set(serialized(std::string("hello world!!")));
+
+    REQUIRE(result == false);
+    REQUIRE(v.isNull());
+  }
+
+  SECTION("char*") {
+    char s[] = "hello world!!";
+    bool result = v.set(s);
+
+    REQUIRE(result == false);
+    REQUIRE(v.isNull());
+  }
+}
+
+TEST_CASE("JsonVariant::set(DynamicJsonDocument)") {
+  DynamicJsonDocument doc1(1024);
+  doc1["hello"] = "world";
+
+  DynamicJsonDocument doc2(1024);
+  JsonVariant v = doc2.to<JsonVariant>();
+
+  // Should copy the doc
+  v.set(doc1);
+  doc1.clear();
+
+  std::string json;
+  serializeJson(doc2, json);
+  REQUIRE(json == "{\"hello\":\"world\"}");
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/subscript.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/subscript.cpp
new file mode 100644
index 0000000..283d04b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/subscript.cpp
@@ -0,0 +1,195 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant::operator[]") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant var = doc.to<JsonVariant>();
+
+  SECTION("The JsonVariant is undefined") {
+    REQUIRE(0 == var.size());
+    REQUIRE(var["0"].isNull());
+    REQUIRE(var[0].isNull());
+  }
+
+  SECTION("The JsonVariant is a string") {
+    var.set("hello world");
+    REQUIRE(0 == var.size());
+    REQUIRE(var["0"].isNull());
+    REQUIRE(var[0].isNull());
+  }
+
+  SECTION("The JsonVariant is a JsonArray") {
+    JsonArray array = var.to<JsonArray>();
+
+    SECTION("get value") {
+      array.add("element at index 0");
+      array.add("element at index 1");
+
+      REQUIRE(2 == var.size());
+      var[0].as<std::string>();
+      // REQUIRE(std::string("element at index 0") == );
+      REQUIRE(std::string("element at index 1") == var[1]);
+      REQUIRE(std::string("element at index 0") ==
+              var[static_cast<unsigned char>(0)]);  // issue #381
+      REQUIRE(var[666].isNull());
+      REQUIRE(var[3].isNull());
+      REQUIRE(var["0"].isNull());
+    }
+
+    SECTION("set value") {
+      array.add("hello");
+
+      var[1] = "world";
+
+      REQUIRE(var.size() == 2);
+      REQUIRE(std::string("world") == var[1]);
+    }
+
+    SECTION("set value in a nested object") {
+      array.createNestedObject();
+
+      var[0]["hello"] = "world";
+
+      REQUIRE(1 == var.size());
+      REQUIRE(1 == var[0].size());
+      REQUIRE(std::string("world") == var[0]["hello"]);
+    }
+  }
+
+  SECTION("The JsonVariant is a JsonObject") {
+    JsonObject object = var.to<JsonObject>();
+
+    SECTION("get value") {
+      object["a"] = "element at key \"a\"";
+      object["b"] = "element at key \"b\"";
+
+      REQUIRE(2 == var.size());
+      REQUIRE(std::string("element at key \"a\"") == var["a"]);
+      REQUIRE(std::string("element at key \"b\"") == var["b"]);
+      REQUIRE(var["c"].isNull());
+      REQUIRE(var[0].isNull());
+    }
+
+    SECTION("set value, key is a const char*") {
+      var["hello"] = "world";
+
+      REQUIRE(1 == var.size());
+      REQUIRE(std::string("world") == var["hello"]);
+    }
+
+    SECTION("set value, key is a char[]") {
+      char key[] = "hello";
+      var[key] = "world";
+      key[0] = '!';  // make sure the key is duplicated
+
+      REQUIRE(1 == var.size());
+      REQUIRE(std::string("world") == var["hello"]);
+    }
+
+    SECTION("var[key].to<JsonArray>()") {
+      JsonArray arr = var["hello"].to<JsonArray>();
+      REQUIRE(arr.isNull() == false);
+    }
+  }
+
+#if defined(HAS_VARIABLE_LENGTH_ARRAY) && \
+    !defined(SUBSCRIPT_CONFLICTS_WITH_BUILTIN_OPERATOR)
+  SECTION("key is a VLA") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "hello");
+
+    deserializeJson(doc, "{\"hello\":\"world\"}");
+    JsonVariant variant = doc.as<JsonVariant>();
+
+    REQUIRE(std::string("world") == variant[vla]);
+  }
+
+  SECTION("key is a VLA, const JsonVariant") {
+    int i = 16;
+    char vla[i];
+    strcpy(vla, "hello");
+
+    deserializeJson(doc, "{\"hello\":\"world\"}");
+    const JsonVariant variant = doc.as<JsonVariant>();
+
+    REQUIRE(std::string("world") == variant[vla]);
+  }
+#endif
+}
+
+TEST_CASE("JsonVariantConst::operator[]") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant var = doc.to<JsonVariant>();
+  JsonVariantConst cvar = var;
+
+  SECTION("The JsonVariant is undefined") {
+    REQUIRE(0 == cvar.size());
+    REQUIRE(cvar["0"].isNull());
+    REQUIRE(cvar[0].isNull());
+  }
+
+  SECTION("The JsonVariant is a string") {
+    var.set("hello world");
+    REQUIRE(0 == cvar.size());
+    REQUIRE(cvar["0"].isNull());
+    REQUIRE(cvar[0].isNull());
+  }
+
+  SECTION("The JsonVariant is a JsonArray") {
+    JsonArray array = var.to<JsonArray>();
+
+    SECTION("get value") {
+      array.add("element at index 0");
+      array.add("element at index 1");
+
+      REQUIRE(2 == cvar.size());
+      REQUIRE(std::string("element at index 0") == cvar[0]);
+      REQUIRE(std::string("element at index 1") == cvar[1]);
+      REQUIRE(std::string("element at index 0") ==
+              var[static_cast<unsigned char>(0)]);  // issue #381
+      REQUIRE(cvar[666].isNull());
+      REQUIRE(cvar[3].isNull());
+      REQUIRE(cvar["0"].isNull());
+    }
+  }
+
+  SECTION("The JsonVariant is a JsonObject") {
+    JsonObject object = var.to<JsonObject>();
+
+    SECTION("get value") {
+      object["a"] = "element at key \"a\"";
+      object["b"] = "element at key \"b\"";
+
+      REQUIRE(2 == cvar.size());
+      REQUIRE(std::string("element at key \"a\"") == cvar["a"]);
+      REQUIRE(std::string("element at key \"b\"") == cvar["b"]);
+      REQUIRE(cvar["c"].isNull());
+      REQUIRE(cvar[0].isNull());
+    }
+  }
+
+  SECTION("Auto promote null JsonVariant to JsonObject") {
+    var["hello"] = "world";
+
+    REQUIRE(var.is<JsonObject>() == true);
+  }
+
+  SECTION("Don't auto promote non-null JsonVariant to JsonObject") {
+    var.set(42);
+    var["hello"] = "world";
+
+    REQUIRE(var.is<JsonObject>() == false);
+  }
+
+  SECTION("Don't auto promote null JsonVariant to JsonObject when reading") {
+    const char* value = var["hello"];
+
+    REQUIRE(var.is<JsonObject>() == false);
+    REQUIRE(value == 0);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/types.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/types.cpp
new file mode 100644
index 0000000..d2665bf
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/types.cpp
@@ -0,0 +1,163 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdint.h>
+#include <catch.hpp>
+#include <limits>
+
+template <typename T>
+void checkValue(T expected) {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  variant.set(expected);
+  REQUIRE(expected == variant.as<T>());
+}
+
+template <typename T>
+void checkReference(T &expected) {
+  JsonVariant variant = expected;
+  REQUIRE(expected == variant.as<T &>());
+}
+
+template <typename T>
+void checkNumericType() {
+  DynamicJsonDocument docMin(4096), docMax(4096);
+  JsonVariant variantMin = docMin.to<JsonVariant>();
+  JsonVariant variantMax = docMax.to<JsonVariant>();
+
+  T min = std::numeric_limits<T>::min();
+  T max = std::numeric_limits<T>::max();
+
+  variantMin.set(min);
+  variantMax.set(max);
+
+  REQUIRE(min == variantMin.as<T>());
+  REQUIRE(max == variantMax.as<T>());
+}
+
+TEST_CASE("JsonVariant set()/get()") {
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("SizeOfJsonInteger") {
+    REQUIRE(8 == sizeof(JsonInteger));
+  }
+#endif
+
+  SECTION("Null") {
+    checkValue<const char *>(NULL);
+  }
+  SECTION("const char*") {
+    checkValue<const char *>("hello");
+  }
+  SECTION("std::string") {
+    checkValue<std::string>("hello");
+  }
+
+  SECTION("False") {
+    checkValue<bool>(false);
+  }
+  SECTION("True") {
+    checkValue<bool>(true);
+  }
+
+  SECTION("Double") {
+    checkNumericType<double>();
+  }
+  SECTION("Float") {
+    checkNumericType<float>();
+  }
+  SECTION("SChar") {
+    checkNumericType<signed char>();
+  }
+  SECTION("SInt") {
+    checkNumericType<signed int>();
+  }
+  SECTION("SLong") {
+    checkNumericType<signed long>();
+  }
+  SECTION("SShort") {
+    checkNumericType<signed short>();
+  }
+  SECTION("UChar") {
+    checkNumericType<unsigned char>();
+  }
+  SECTION("UInt") {
+    checkNumericType<unsigned int>();
+  }
+  SECTION("ULong") {
+    checkNumericType<unsigned long>();
+  }
+  SECTION("UShort") {
+    checkNumericType<unsigned short>();
+  }
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("LongLong") {
+    checkNumericType<unsigned long long>();
+  }
+  SECTION("ULongLong") {
+    checkNumericType<unsigned long long>();
+  }
+#endif
+
+  SECTION("Int8") {
+    checkNumericType<int8_t>();
+  }
+  SECTION("Uint8") {
+    checkNumericType<uint8_t>();
+  }
+  SECTION("Int16") {
+    checkNumericType<int16_t>();
+  }
+  SECTION("Uint16") {
+    checkNumericType<uint16_t>();
+  }
+  SECTION("Int32") {
+    checkNumericType<int32_t>();
+  }
+  SECTION("Uint32") {
+    checkNumericType<uint32_t>();
+  }
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("Int64") {
+    checkNumericType<int64_t>();
+  }
+  SECTION("Uint64") {
+    checkNumericType<uint64_t>();
+  }
+#endif
+
+  SECTION("CanStoreObject") {
+    DynamicJsonDocument doc(4096);
+    JsonObject object = doc.to<JsonObject>();
+
+    checkValue<JsonObject>(object);
+  }
+}
+
+TEST_CASE("volatile") {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+
+  SECTION("volatile int") {
+    volatile int f = 42;
+    variant.set(f);
+    CHECK(variant.is<int>() == true);
+    CHECK(variant.as<int>() == 42);
+  }
+
+  SECTION("volatile float") {  // issue #1557
+    volatile float f = 3.14f;
+    variant.set(f);
+    CHECK(variant.is<float>() == true);
+    CHECK(variant.as<float>() == 3.14f);
+  }
+
+  SECTION("volatile double") {
+    volatile double f = 3.14;
+    variant.set(f);
+    CHECK(variant.is<double>() == true);
+    CHECK(variant.as<double>() == 3.14);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/JsonVariant/undefined.cpp b/third-party/ArduinoJson/extras/tests/JsonVariant/undefined.cpp
new file mode 100644
index 0000000..8c5fdcc
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/JsonVariant/undefined.cpp
@@ -0,0 +1,96 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonVariant undefined") {
+  JsonVariant variant;
+
+  SECTION("as<T>()") {
+    SECTION("long") {
+      REQUIRE(variant.as<long>() == 0);
+    }
+
+    SECTION("unsigned") {
+      REQUIRE(variant.as<unsigned>() == 0);
+    }
+
+    SECTION("const char*") {
+      REQUIRE(variant.as<const char*>() == 0);
+    }
+
+    SECTION("double") {
+      REQUIRE(variant.as<double>() == 0);
+    }
+
+    SECTION("bool") {
+      REQUIRE(variant.as<bool>() == false);
+    }
+
+    SECTION("JsonArray") {
+      REQUIRE(variant.as<JsonArray>().isNull());
+    }
+
+    SECTION("JsonObject") {
+      REQUIRE(variant.as<JsonObject>().isNull());
+    }
+  }
+
+  SECTION("is<T>()") {
+    SECTION("long") {
+      REQUIRE(variant.is<long>() == false);
+    }
+
+    SECTION("unsigned") {
+      REQUIRE(variant.is<unsigned>() == false);
+    }
+
+    SECTION("const char*") {
+      REQUIRE(variant.is<const char*>() == false);
+    }
+
+    SECTION("double") {
+      REQUIRE(variant.is<double>() == false);
+    }
+
+    SECTION("bool") {
+      REQUIRE(variant.is<bool>() == false);
+    }
+
+    SECTION("JsonArray") {
+      REQUIRE(variant.is<JsonArray>() == false);
+    }
+
+    SECTION("JsonObject") {
+      REQUIRE(variant.is<JsonObject>() == false);
+    }
+  }
+
+  SECTION("set<T>()") {
+    SECTION("long") {
+      REQUIRE(variant.set(42L) == false);
+    }
+
+    SECTION("unsigned") {
+      REQUIRE(variant.set(42U) == false);
+    }
+
+    SECTION("const char*") {
+      REQUIRE(variant.set("42") == false);
+    }
+
+    SECTION("Serialized<const char*>") {
+      REQUIRE(variant.set(serialized("42")) == false);
+    }
+
+    SECTION("double") {
+      REQUIRE(variant.set(42.0) == false);
+    }
+
+    SECTION("bool") {
+      REQUIRE(variant.set(true) == false);
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MemoryPool/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/MemoryPool/CMakeLists.txt
new file mode 100644
index 0000000..a77089c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MemoryPool/CMakeLists.txt
@@ -0,0 +1,18 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(MemoryPoolTests 
+	allocVariant.cpp
+	clear.cpp
+	saveString.cpp
+	size.cpp
+	StringCopier.cpp
+)
+
+add_test(MemoryPool MemoryPoolTests)
+
+set_tests_properties(MemoryPool
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/MemoryPool/StringCopier.cpp b/third-party/ArduinoJson/extras/tests/MemoryPool/StringCopier.cpp
new file mode 100644
index 0000000..7d6a192
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MemoryPool/StringCopier.cpp
@@ -0,0 +1,84 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson/StringStorage/StringCopier.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("StringCopier") {
+  char buffer[4096];
+
+  SECTION("Works when buffer is big enough") {
+    MemoryPool pool(buffer, addPadding(JSON_STRING_SIZE(6)));
+    StringCopier str(pool);
+
+    str.startString();
+    str.append("hello");
+    str.append('\0');
+
+    REQUIRE(str.isValid() == true);
+    REQUIRE(str.c_str() == std::string("hello"));
+  }
+
+  SECTION("Returns null when too small") {
+    MemoryPool pool(buffer, sizeof(void*));
+    StringCopier str(pool);
+
+    str.startString();
+    str.append("hello world!");
+
+    REQUIRE(str.isValid() == false);
+  }
+
+  SECTION("Increases size of memory pool") {
+    MemoryPool pool(buffer, addPadding(JSON_STRING_SIZE(6)));
+    StringCopier str(pool);
+
+    str.startString();
+    str.append('h');
+    str.save();
+
+    REQUIRE(1 == pool.size());
+  }
+}
+
+static const char* addStringToPool(MemoryPool& pool, const char* s) {
+  StringCopier str(pool);
+  str.startString();
+  str.append(s);
+  str.append('\0');
+  return str.save();
+}
+
+TEST_CASE("StringCopier::save() deduplicates strings") {
+  char buffer[4096];
+  MemoryPool pool(buffer, 4096);
+
+  SECTION("Basic") {
+    const char* s1 = addStringToPool(pool, "hello");
+    const char* s2 = addStringToPool(pool, "world");
+    const char* s3 = addStringToPool(pool, "hello");
+
+    REQUIRE(s1 == s3);
+    REQUIRE(s2 != s3);
+    REQUIRE(pool.size() == 12);
+  }
+
+  SECTION("Requires terminator") {
+    const char* s1 = addStringToPool(pool, "hello world");
+    const char* s2 = addStringToPool(pool, "hello");
+
+    REQUIRE(s2 != s1);
+    REQUIRE(pool.size() == 12 + 6);
+  }
+
+  SECTION("Don't overrun") {
+    const char* s1 = addStringToPool(pool, "hello world");
+    const char* s2 = addStringToPool(pool, "wor");
+
+    REQUIRE(s2 != s1);
+    REQUIRE(pool.size() == 12 + 4);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MemoryPool/allocVariant.cpp b/third-party/ArduinoJson/extras/tests/MemoryPool/allocVariant.cpp
new file mode 100644
index 0000000..97111b3
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MemoryPool/allocVariant.cpp
@@ -0,0 +1,50 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("MemoryPool::allocVariant()") {
+  char buffer[4096];
+
+  SECTION("Returns different pointer") {
+    MemoryPool pool(buffer, sizeof(buffer));
+
+    VariantSlot* s1 = pool.allocVariant();
+    REQUIRE(s1 != 0);
+    VariantSlot* s2 = pool.allocVariant();
+    REQUIRE(s2 != 0);
+
+    REQUIRE(s1 != s2);
+  }
+
+  SECTION("Returns aligned pointers") {
+    MemoryPool pool(buffer, sizeof(buffer));
+
+    REQUIRE(isAligned(pool.allocVariant()));
+    REQUIRE(isAligned(pool.allocVariant()));
+  }
+
+  SECTION("Returns zero if capacity is 0") {
+    MemoryPool pool(buffer, 0);
+
+    REQUIRE(pool.allocVariant() == 0);
+  }
+
+  SECTION("Returns zero if buffer is null") {
+    MemoryPool pool(0, sizeof(buffer));
+
+    REQUIRE(pool.allocVariant() == 0);
+  }
+
+  SECTION("Returns zero if capacity is insufficient") {
+    MemoryPool pool(buffer, sizeof(VariantSlot));
+
+    pool.allocVariant();
+
+    REQUIRE(pool.allocVariant() == 0);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MemoryPool/clear.cpp b/third-party/ArduinoJson/extras/tests/MemoryPool/clear.cpp
new file mode 100644
index 0000000..391254d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MemoryPool/clear.cpp
@@ -0,0 +1,32 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Strings/StringAdapters.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+static const size_t poolCapacity = 512;
+
+TEST_CASE("MemoryPool::clear()") {
+  char buffer[poolCapacity];
+  MemoryPool pool(buffer, sizeof(buffer));
+
+  SECTION("Discards allocated variants") {
+    pool.allocVariant();
+
+    pool.clear();
+    REQUIRE(pool.size() == 0);
+  }
+
+  SECTION("Discards allocated strings") {
+    pool.saveString(adaptString(const_cast<char *>("123456789")));
+    REQUIRE(pool.size() == 10);
+
+    pool.clear();
+
+    REQUIRE(pool.size() == 0);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MemoryPool/saveString.cpp b/third-party/ArduinoJson/extras/tests/MemoryPool/saveString.cpp
new file mode 100644
index 0000000..f398ea7
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MemoryPool/saveString.cpp
@@ -0,0 +1,81 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Strings/StringAdapters.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+static const char *saveString(MemoryPool &pool, const char *s) {
+  return pool.saveString(adaptString(const_cast<char *>(s)));
+}
+
+TEST_CASE("MemoryPool::saveString()") {
+  char buffer[32];
+  MemoryPool pool(buffer, 32);
+
+  SECTION("Duplicates different strings") {
+    const char *a = saveString(pool, "hello");
+    const char *b = saveString(pool, "world");
+    REQUIRE(a != b);
+    REQUIRE(pool.size() == 6 + 6);
+  }
+
+  SECTION("Deduplicates identical strings") {
+    const char *a = saveString(pool, "hello");
+    const char *b = saveString(pool, "hello");
+    REQUIRE(a == b);
+    REQUIRE(pool.size() == 6);
+  }
+
+  SECTION("Returns NULL when full") {
+    REQUIRE(pool.capacity() == 32);
+
+    const void *p1 = saveString(pool, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    REQUIRE(p1 != 0);
+    REQUIRE(pool.size() == 32);
+
+    const void *p2 = saveString(pool, "b");
+    REQUIRE(p2 == 0);
+  }
+
+  SECTION("Returns NULL when pool is too small") {
+    const void *p = saveString(pool, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    REQUIRE(0 == p);
+  }
+
+  SECTION("Returns NULL when buffer is NULL") {
+    MemoryPool pool2(0, 32);
+    REQUIRE(0 == saveString(pool2, "a"));
+  }
+
+  SECTION("Returns NULL when capacity is 0") {
+    MemoryPool pool2(buffer, 0);
+    REQUIRE(0 == saveString(pool2, "a"));
+  }
+
+  SECTION("Returns same address after clear()") {
+    const void *a = saveString(pool, "hello");
+    pool.clear();
+    const void *b = saveString(pool, "world");
+
+    REQUIRE(a == b);
+  }
+
+  SECTION("Can use full capacity when fresh") {
+    const void *a = saveString(pool, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+
+    REQUIRE(a != 0);
+  }
+
+  SECTION("Can use full capacity after clear") {
+    saveString(pool, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+    pool.clear();
+
+    const void *a = saveString(pool, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
+
+    REQUIRE(a != 0);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MemoryPool/size.cpp b/third-party/ArduinoJson/extras/tests/MemoryPool/size.cpp
new file mode 100644
index 0000000..2b36daf
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MemoryPool/size.cpp
@@ -0,0 +1,35 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("MemoryPool::capacity()") {
+  char buffer[4096];
+  const size_t capacity = 64;
+  MemoryPool pool(buffer, capacity);
+  REQUIRE(capacity == pool.capacity());
+}
+
+TEST_CASE("MemoryPool::size()") {
+  char buffer[4096];
+  MemoryPool pool(buffer, sizeof(buffer));
+
+  SECTION("Initial size is 0") {
+    REQUIRE(0 == pool.size());
+  }
+
+  SECTION("Doesn't grow when memory pool is full") {
+    const size_t variantCount = sizeof(buffer) / sizeof(VariantSlot);
+
+    for (size_t i = 0; i < variantCount; i++) pool.allocVariant();
+    size_t size = pool.size();
+
+    pool.allocVariant();
+
+    REQUIRE(size == pool.size());
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/Misc/CMakeLists.txt
new file mode 100644
index 0000000..7aca704
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/CMakeLists.txt
@@ -0,0 +1,29 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(MiscTests
+	arithmeticCompare.cpp
+	conflicts.cpp
+	deprecated.cpp
+	FloatParts.cpp
+	JsonString.cpp
+	printable.cpp
+	Readers.cpp
+	StringAdapters.cpp
+	StringWriter.cpp
+	TypeTraits.cpp
+	unsigned_char.cpp
+	Utf16.cpp
+	Utf8.cpp
+	version.cpp
+)
+
+set_target_properties(MiscTests PROPERTIES UNITY_BUILD OFF)
+
+add_test(Misc MiscTests)
+
+set_tests_properties(Misc
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/Misc/FloatParts.cpp b/third-party/ArduinoJson/extras/tests/Misc/FloatParts.cpp
new file mode 100644
index 0000000..e8f52c8
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/FloatParts.cpp
@@ -0,0 +1,44 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson/Numbers/FloatParts.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("FloatParts<double>") {
+  SECTION("1.7976931348623157E+308") {
+    FloatParts<double> parts(1.7976931348623157E+308);
+    REQUIRE(parts.integral == 1);
+    REQUIRE(parts.decimal == 797693135);
+    REQUIRE(parts.decimalPlaces == 9);
+    REQUIRE(parts.exponent == 308);
+  }
+
+  SECTION("4.94065645841247e-324") {
+    FloatParts<double> parts(4.94065645841247e-324);
+    REQUIRE(parts.integral == 4);
+    REQUIRE(parts.decimal == 940656458);
+    REQUIRE(parts.decimalPlaces == 9);
+    REQUIRE(parts.exponent == -324);
+  }
+}
+
+TEST_CASE("FloatParts<float>") {
+  SECTION("3.4E+38") {
+    FloatParts<float> parts(3.4E+38f);
+    REQUIRE(parts.integral == 3);
+    REQUIRE(parts.decimal == 4);
+    REQUIRE(parts.decimalPlaces == 1);
+    REQUIRE(parts.exponent == 38);
+  }
+
+  SECTION("1.17549435e−38") {
+    FloatParts<float> parts(1.17549435e-38f);
+    REQUIRE(parts.integral == 1);
+    REQUIRE(parts.decimal == 175494);
+    REQUIRE(parts.decimalPlaces == 6);
+    REQUIRE(parts.exponent == -38);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/JsonString.cpp b/third-party/ArduinoJson/extras/tests/Misc/JsonString.cpp
new file mode 100644
index 0000000..eb25146
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/JsonString.cpp
@@ -0,0 +1,60 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("JsonString") {
+  SECTION("Default constructor creates a null JsonString") {
+    JsonString s;
+
+    CHECK(s.isNull() == true);
+    CHECK(s.c_str() == 0);
+    CHECK(s.isStatic() == true);
+  }
+
+  SECTION("Compare null with null") {
+    JsonString a, b;
+
+    CHECK(a == b);
+    CHECK_FALSE(a != b);
+  }
+
+  SECTION("Compare null with non-null") {
+    JsonString a(0), b("hello");
+
+    CHECK_FALSE(a == b);
+    CHECK(a != b);
+  }
+
+  SECTION("Compare non-null with null") {
+    JsonString a("hello"), b(0);
+
+    CHECK_FALSE(a == b);
+    CHECK(a != b);
+  }
+
+  SECTION("Compare different strings") {
+    JsonString a("hello"), b("world");
+
+    CHECK_FALSE(a == b);
+    CHECK(a != b);
+  }
+
+  SECTION("Compare identical by pointer") {
+    JsonString a("hello"), b("hello");
+
+    CHECK(a == b);
+    CHECK_FALSE(a != b);
+  }
+
+  SECTION("Compare identical by value") {
+    char s1[] = "hello";
+    char s2[] = "hello";
+    JsonString a(s1), b(s2);
+
+    CHECK(a == b);
+    CHECK_FALSE(a != b);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/Readers.cpp b/third-party/ArduinoJson/extras/tests/Misc/Readers.cpp
new file mode 100644
index 0000000..525fac3
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/Readers.cpp
@@ -0,0 +1,225 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <Arduino.h>
+#include <ArduinoJson.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("Reader<std::istringstream>") {
+  SECTION("read()") {
+    std::istringstream src("\x01\xFF");
+    Reader<std::istringstream> reader(src);
+
+    REQUIRE(reader.read() == 0x01);
+    REQUIRE(reader.read() == 0xFF);
+    REQUIRE(reader.read() == -1);
+  }
+
+  SECTION("readBytes() all at once") {
+    std::istringstream src("ABC");
+    Reader<std::istringstream> reader(src);
+
+    char buffer[8] = "abcd";
+    REQUIRE(reader.readBytes(buffer, 4) == 3);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'd');
+  }
+
+  SECTION("readBytes() in two parts") {
+    std::istringstream src("ABCDEF");
+    Reader<std::istringstream> reader(src);
+
+    char buffer[12] = "abcdefg";
+    REQUIRE(reader.readBytes(buffer, 4) == 4);
+    REQUIRE(reader.readBytes(buffer + 4, 4) == 2);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'D');
+    REQUIRE(buffer[4] == 'E');
+    REQUIRE(buffer[5] == 'F');
+    REQUIRE(buffer[6] == 'g');
+  }
+}
+
+TEST_CASE("BoundedReader<const char*>") {
+  SECTION("read") {
+    BoundedReader<const char*> reader("\x01\xFF", 2);
+    REQUIRE(reader.read() == 0x01);
+    REQUIRE(reader.read() == 0xFF);
+    REQUIRE(reader.read() == -1);
+    REQUIRE(reader.read() == -1);
+  }
+
+  SECTION("readBytes() all at once") {
+    BoundedReader<const char*> reader("ABCD", 3);
+
+    char buffer[8] = "abcd";
+    REQUIRE(reader.readBytes(buffer, 4) == 3);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'd');
+  }
+
+  SECTION("readBytes() in two parts") {
+    BoundedReader<const char*> reader("ABCDEF", 6);
+
+    char buffer[8] = "abcdefg";
+    REQUIRE(reader.readBytes(buffer, 4) == 4);
+    REQUIRE(reader.readBytes(buffer + 4, 4) == 2);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'D');
+    REQUIRE(buffer[4] == 'E');
+    REQUIRE(buffer[5] == 'F');
+    REQUIRE(buffer[6] == 'g');
+  }
+}
+
+TEST_CASE("Reader<const char*>") {
+  SECTION("read()") {
+    Reader<const char*> reader("\x01\xFF\x00\x12");
+    REQUIRE(reader.read() == 0x01);
+    REQUIRE(reader.read() == 0xFF);
+    REQUIRE(reader.read() == 0);
+    REQUIRE(reader.read() == 0x12);
+  }
+
+  SECTION("readBytes() all at once") {
+    Reader<const char*> reader("ABCD");
+
+    char buffer[8] = "abcd";
+    REQUIRE(reader.readBytes(buffer, 3) == 3);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'd');
+  }
+
+  SECTION("readBytes() in two parts") {
+    Reader<const char*> reader("ABCDEF");
+
+    char buffer[8] = "abcdefg";
+    REQUIRE(reader.readBytes(buffer, 4) == 4);
+    REQUIRE(reader.readBytes(buffer + 4, 2) == 2);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'D');
+    REQUIRE(buffer[4] == 'E');
+    REQUIRE(buffer[5] == 'F');
+    REQUIRE(buffer[6] == 'g');
+  }
+}
+
+TEST_CASE("IteratorReader") {
+  SECTION("read()") {
+    std::string src("\x01\xFF");
+    IteratorReader<std::string::const_iterator> reader(src.begin(), src.end());
+
+    REQUIRE(reader.read() == 0x01);
+    REQUIRE(reader.read() == 0xFF);
+    REQUIRE(reader.read() == -1);
+  }
+
+  SECTION("readBytes() all at once") {
+    std::string src("ABC");
+    IteratorReader<std::string::const_iterator> reader(src.begin(), src.end());
+
+    char buffer[8] = "abcd";
+    REQUIRE(reader.readBytes(buffer, 4) == 3);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'd');
+  }
+
+  SECTION("readBytes() in two parts") {
+    std::string src("ABCDEF");
+    IteratorReader<std::string::const_iterator> reader(src.begin(), src.end());
+
+    char buffer[12] = "abcdefg";
+    REQUIRE(reader.readBytes(buffer, 4) == 4);
+    REQUIRE(reader.readBytes(buffer + 4, 4) == 2);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'D');
+    REQUIRE(buffer[4] == 'E');
+    REQUIRE(buffer[5] == 'F');
+    REQUIRE(buffer[6] == 'g');
+  }
+}
+
+class StreamStub : public Stream {
+ public:
+  StreamStub(const char* s) : _stream(s) {}
+
+  int read() {
+    return _stream.get();
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    _stream.read(buffer, static_cast<std::streamsize>(length));
+    return static_cast<size_t>(_stream.gcount());
+  }
+
+ private:
+  std::istringstream _stream;
+};
+
+TEST_CASE("Reader<Stream>") {
+  SECTION("read()") {
+    StreamStub src("\x01\xFF");
+    Reader<StreamStub> reader(src);
+
+    REQUIRE(reader.read() == 0x01);
+    REQUIRE(reader.read() == 0xFF);
+    REQUIRE(reader.read() == -1);
+  }
+
+  SECTION("readBytes() all at once") {
+    StreamStub src("ABC");
+    Reader<StreamStub> reader(src);
+
+    char buffer[8] = "abcd";
+    REQUIRE(reader.readBytes(buffer, 4) == 3);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'd');
+  }
+
+  SECTION("readBytes() in two parts") {
+    StreamStub src("ABCDEF");
+    Reader<StreamStub> reader(src);
+
+    char buffer[12] = "abcdefg";
+    REQUIRE(reader.readBytes(buffer, 4) == 4);
+    REQUIRE(reader.readBytes(buffer + 4, 4) == 2);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'D');
+    REQUIRE(buffer[4] == 'E');
+    REQUIRE(buffer[5] == 'F');
+    REQUIRE(buffer[6] == 'g');
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/StringAdapters.cpp b/third-party/ArduinoJson/extras/tests/Misc/StringAdapters.cpp
new file mode 100644
index 0000000..7a6f652
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/StringAdapters.cpp
@@ -0,0 +1,172 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include "custom_string.hpp"
+#include "progmem_emulation.hpp"
+#include "weird_strcmp.hpp"
+
+#include <ArduinoJson/Strings/ArduinoStringAdapter.hpp>
+#include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
+#include <ArduinoJson/Strings/FlashStringAdapter.hpp>
+#include <ArduinoJson/Strings/SizedRamStringAdapter.hpp>
+#include <ArduinoJson/Strings/StdStringAdapter.hpp>
+
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("ConstRamStringAdapter") {
+  SECTION("null") {
+    ConstRamStringAdapter adapter(NULL);
+
+    CHECK(adapter.compare("bravo") < 0);
+    CHECK(adapter.compare(NULL) == 0);
+
+    CHECK(adapter.equals(NULL));
+    CHECK_FALSE(adapter.equals("charlie"));
+
+    CHECK(adapter.size() == 0);
+  }
+
+  SECTION("non-null") {
+    ConstRamStringAdapter adapter("bravo");
+
+    CHECK(adapter.compare(NULL) > 0);
+    CHECK(adapter.compare("alpha") > 0);
+    CHECK(adapter.compare("bravo") == 0);
+    CHECK(adapter.compare("charlie") < 0);
+
+    CHECK(adapter.equals("bravo"));
+    CHECK_FALSE(adapter.equals("charlie"));
+
+    CHECK(adapter.size() == 5);
+  }
+}
+
+TEST_CASE("SizedRamStringAdapter") {
+  SECTION("null") {
+    SizedRamStringAdapter adapter(NULL, 10);
+
+    CHECK(adapter.compare("bravo") < 0);
+    CHECK(adapter.compare(NULL) == 0);
+
+    CHECK(adapter.equals(NULL));
+    CHECK_FALSE(adapter.equals("charlie"));
+
+    CHECK(adapter.size() == 10);
+  }
+
+  SECTION("non-null") {
+    SizedRamStringAdapter adapter("bravo", 5);
+
+    CHECK(adapter.compare(NULL) > 0);
+    CHECK(adapter.compare("alpha") > 0);
+    CHECK(adapter.compare("bravo") == 0);
+    CHECK(adapter.compare("charlie") < 0);
+
+    CHECK(adapter.equals("bravo"));
+    CHECK_FALSE(adapter.equals("charlie"));
+
+    CHECK(adapter.size() == 5);
+  }
+}
+
+TEST_CASE("FlashStringAdapter") {
+  SECTION("null") {
+    FlashStringAdapter adapter(NULL);
+
+    CHECK(adapter.compare("bravo") < 0);
+    CHECK(adapter.compare(NULL) == 0);
+
+    CHECK(adapter.equals(NULL));
+    CHECK_FALSE(adapter.equals("charlie"));
+
+    CHECK(adapter.size() == 0);
+  }
+
+  SECTION("non-null") {
+    FlashStringAdapter adapter = adaptString(F("bravo"));
+
+    CHECK(adapter.compare(NULL) > 0);
+    CHECK(adapter.compare("alpha") > 0);
+    CHECK(adapter.compare("bravo") == 0);
+    CHECK(adapter.compare("charlie") < 0);
+
+    CHECK(adapter.equals("bravo"));
+    CHECK_FALSE(adapter.equals("charlie"));
+
+    CHECK(adapter.size() == 5);
+  }
+}
+
+TEST_CASE("std::string") {
+  std::string str("bravo");
+  StdStringAdapter<std::string> adapter = adaptString(str);
+
+  CHECK(adapter.compare(NULL) > 0);
+  CHECK(adapter.compare("alpha") > 0);
+  CHECK(adapter.compare("bravo") == 0);
+  CHECK(adapter.compare("charlie") < 0);
+
+  CHECK(adapter.equals("bravo"));
+  CHECK_FALSE(adapter.equals("charlie"));
+
+  CHECK(adapter.size() == 5);
+}
+
+TEST_CASE("Arduino String") {
+  ::String str("bravo");
+  ArduinoStringAdapter adapter = adaptString(str);
+
+  CHECK(adapter.compare(NULL) > 0);
+  CHECK(adapter.compare("alpha") > 0);
+  CHECK(adapter.compare("bravo") == 0);
+  CHECK(adapter.compare("charlie") < 0);
+
+  CHECK(adapter.equals("bravo"));
+  CHECK_FALSE(adapter.equals("charlie"));
+
+  CHECK(adapter.size() == 5);
+}
+
+TEST_CASE("custom_string") {
+  custom_string str("bravo");
+  StdStringAdapter<custom_string> adapter = adaptString(str);
+
+  CHECK(adapter.compare(NULL) > 0);
+  CHECK(adapter.compare("alpha") > 0);
+  CHECK(adapter.compare("bravo") == 0);
+  CHECK(adapter.compare("charlie") < 0);
+
+  CHECK(adapter.equals("bravo"));
+  CHECK_FALSE(adapter.equals("charlie"));
+
+  CHECK(adapter.size() == 5);
+}
+
+TEST_CASE("IsString<T>") {
+  SECTION("std::string") {
+    CHECK(IsString<std::string>::value == true);
+  }
+
+  SECTION("basic_string<wchar_t>") {
+    CHECK(IsString<std::basic_string<wchar_t> >::value == false);
+  }
+
+  SECTION("custom_string") {
+    CHECK(IsString<custom_string>::value == true);
+  }
+
+  SECTION("const __FlashStringHelper*") {
+    CHECK(IsString<const __FlashStringHelper*>::value == true);
+  }
+
+  SECTION("const char*") {
+    CHECK(IsString<const char*>::value == true);
+  }
+
+  SECTION("const char[]") {
+    CHECK(IsString<const char[8]>::value == true);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/StringWriter.cpp b/third-party/ArduinoJson/extras/tests/Misc/StringWriter.cpp
new file mode 100644
index 0000000..c2454ef
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/StringWriter.cpp
@@ -0,0 +1,161 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
+#define ARDUINOJSON_STRING_BUFFER_SIZE 5
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include "custom_string.hpp"
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+template <typename StringWriter>
+static size_t print(StringWriter& writer, const char* s) {
+  return writer.write(reinterpret_cast<const uint8_t*>(s), strlen(s));
+}
+
+template <typename StringWriter, typename String>
+void common_tests(StringWriter& writer, const String& output) {
+  SECTION("InitialState") {
+    REQUIRE(std::string("") == output);
+  }
+
+  SECTION("EmptyString") {
+    REQUIRE(0 == print(writer, ""));
+    REQUIRE(std::string("") == output);
+  }
+
+  SECTION("OneString") {
+    REQUIRE(4 == print(writer, "ABCD"));
+    REQUIRE(std::string("ABCD") == output);
+  }
+
+  SECTION("TwoStrings") {
+    REQUIRE(4 == print(writer, "ABCD"));
+    REQUIRE(4 == print(writer, "EFGH"));
+    REQUIRE(std::string("ABCDEFGH") == output);
+  }
+}
+
+TEST_CASE("StaticStringWriter") {
+  char output[20] = {0};
+  StaticStringWriter writer(output, sizeof(output));
+
+  common_tests(writer, static_cast<const char*>(output));
+
+  SECTION("OverCapacity") {
+    REQUIRE(20 == print(writer, "ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
+    REQUIRE(0 == print(writer, "ABC"));
+    REQUIRE("ABCDEFGHIJKLMNOPQRST" == std::string(output, 20));
+  }
+}
+
+TEST_CASE("Writer<std::string>") {
+  std::string output;
+  Writer<std::string> writer(output);
+  common_tests(writer, output);
+}
+
+TEST_CASE("Writer<String>") {
+  ::String output;
+  Writer< ::String> writer(output);
+
+  SECTION("write(char)") {
+    SECTION("writes to temporary buffer") {
+      // accumulate in buffer
+      writer.write('a');
+      writer.write('b');
+      writer.write('c');
+      writer.write('d');
+      REQUIRE(output == "");
+
+      // flush when full
+      writer.write('e');
+      REQUIRE(output == "abcd");
+
+      // flush on destruction
+      writer.write('f');
+      writer.~Writer();
+      REQUIRE(output == "abcdef");
+    }
+
+    SECTION("returns 1 on success") {
+      for (int i = 0; i < ARDUINOJSON_STRING_BUFFER_SIZE; i++) {
+        REQUIRE(writer.write('x') == 1);
+      }
+    }
+
+    SECTION("returns 0 on error") {
+      output.limitCapacityTo(1);
+
+      REQUIRE(writer.write('a') == 1);
+      REQUIRE(writer.write('b') == 1);
+      REQUIRE(writer.write('c') == 1);
+      REQUIRE(writer.write('d') == 1);
+      REQUIRE(writer.write('e') == 0);
+      REQUIRE(writer.write('f') == 0);
+    }
+  }
+
+  SECTION("write(char*, size_t)") {
+    SECTION("empty string") {
+      REQUIRE(0 == print(writer, ""));
+      writer.flush();
+      REQUIRE(output == "");
+    }
+
+    SECTION("writes to temporary buffer") {
+      // accumulate in buffer
+      print(writer, "abc");
+      REQUIRE(output == "");
+
+      // flush when full, and continue to accumulate
+      print(writer, "de");
+      REQUIRE(output == "abcd");
+
+      // flush on destruction
+      writer.~Writer();
+      REQUIRE(output == "abcde");
+    }
+  }
+}
+
+TEST_CASE("Writer<custom_string>") {
+  custom_string output;
+  Writer<custom_string> writer(output);
+
+  REQUIRE(4 == print(writer, "ABCD"));
+  REQUIRE("ABCD" == output);
+}
+
+TEST_CASE("IsWriteableString") {
+  SECTION("std::string") {
+    REQUIRE(IsWriteableString<std::string>::value == true);
+  }
+
+  SECTION("custom_string") {
+    REQUIRE(IsWriteableString<custom_string>::value == true);
+  }
+
+  SECTION("basic_string<wchar_t>") {
+    REQUIRE(IsWriteableString<std::basic_string<wchar_t> >::value == false);
+  }
+}
+
+TEST_CASE("serializeJson(doc, String)") {
+  StaticJsonDocument<1024> doc;
+  doc["hello"] = "world";
+  ::String output;
+
+  SECTION("sufficient capacity") {
+    serializeJson(doc, output);
+    REQUIRE(output == "{\"hello\":\"world\"}");
+  }
+
+  SECTION("unsufficient capacity") {  // issue #1561
+    output.limitCapacityTo(10);
+    serializeJson(doc, output);
+    REQUIRE(output == "{\"hello\"");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/TypeTraits.cpp b/third-party/ArduinoJson/extras/tests/Misc/TypeTraits.cpp
new file mode 100644
index 0000000..de76f4c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/TypeTraits.cpp
@@ -0,0 +1,212 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+class EmptyClass {};
+enum EmptyEnum {};
+
+TEST_CASE("Polyfills/type_traits") {
+  SECTION("is_base_of") {
+    REQUIRE_FALSE(
+        static_cast<bool>(is_base_of<std::istream, std::ostringstream>::value));
+    REQUIRE(
+        static_cast<bool>(is_base_of<std::istream, std::istringstream>::value));
+  }
+
+  SECTION("is_array") {
+    REQUIRE_FALSE((is_array<const char*>::value));
+    REQUIRE((is_array<const char[]>::value));
+    REQUIRE((is_array<const char[10]>::value));
+  }
+
+  SECTION("is_const") {
+    CHECK(is_const<char>::value == false);
+    CHECK(is_const<const char>::value == true);
+  }
+
+  SECTION("is_integral") {
+    CHECK(is_integral<double>::value == false);
+    CHECK(is_integral<float>::value == false);
+    CHECK(is_integral<const double>::value == false);
+    CHECK(is_integral<const float>::value == false);
+    CHECK(is_integral<volatile double>::value == false);
+    CHECK(is_integral<volatile float>::value == false);
+    CHECK(is_integral<const volatile double>::value == false);
+    CHECK(is_integral<const volatile float>::value == false);
+
+    CHECK(is_integral<bool>::value == true);
+    CHECK(is_integral<char>::value == true);
+    CHECK(is_integral<signed char>::value == true);
+    CHECK(is_integral<signed int>::value == true);
+    CHECK(is_integral<signed long>::value == true);
+    CHECK(is_integral<signed short>::value == true);
+    CHECK(is_integral<unsigned char>::value == true);
+    CHECK(is_integral<unsigned int>::value == true);
+    CHECK(is_integral<unsigned long>::value == true);
+    CHECK(is_integral<unsigned short>::value == true);
+    CHECK(is_integral<const bool>::value == true);
+    CHECK(is_integral<const char>::value == true);
+    CHECK(is_integral<const signed char>::value == true);
+    CHECK(is_integral<const signed int>::value == true);
+    CHECK(is_integral<const signed long>::value == true);
+    CHECK(is_integral<const signed short>::value == true);
+    CHECK(is_integral<const unsigned char>::value == true);
+    CHECK(is_integral<const unsigned int>::value == true);
+    CHECK(is_integral<const unsigned long>::value == true);
+    CHECK(is_integral<const unsigned short>::value == true);
+    CHECK(is_integral<volatile bool>::value == true);
+    CHECK(is_integral<volatile char>::value == true);
+    CHECK(is_integral<volatile signed char>::value == true);
+    CHECK(is_integral<volatile signed int>::value == true);
+    CHECK(is_integral<volatile signed long>::value == true);
+    CHECK(is_integral<volatile signed short>::value == true);
+    CHECK(is_integral<volatile unsigned char>::value == true);
+    CHECK(is_integral<volatile unsigned int>::value == true);
+    CHECK(is_integral<volatile unsigned long>::value == true);
+    CHECK(is_integral<volatile unsigned short>::value == true);
+    CHECK(is_integral<const volatile bool>::value == true);
+    CHECK(is_integral<const volatile char>::value == true);
+    CHECK(is_integral<const volatile signed char>::value == true);
+    CHECK(is_integral<const volatile signed int>::value == true);
+    CHECK(is_integral<const volatile signed long>::value == true);
+    CHECK(is_integral<const volatile signed short>::value == true);
+    CHECK(is_integral<const volatile unsigned char>::value == true);
+    CHECK(is_integral<const volatile unsigned int>::value == true);
+    CHECK(is_integral<const volatile unsigned long>::value == true);
+    CHECK(is_integral<const volatile unsigned short>::value == true);
+
+    CHECK(is_integral<UInt>::value == true);
+  }
+
+  SECTION("is_signed") {
+    CHECK(is_signed<char>::value == true);
+    CHECK(is_signed<signed char>::value == true);
+    CHECK(is_signed<signed int>::value == true);
+    CHECK(is_signed<signed short>::value == true);
+    CHECK(is_signed<signed long>::value == true);
+    CHECK(is_signed<float>::value == true);
+    CHECK(is_signed<double>::value == true);
+    CHECK(is_signed<bool>::value == false);
+
+    CHECK(is_signed<const char>::value == true);
+    CHECK(is_signed<const signed char>::value == true);
+    CHECK(is_signed<const signed int>::value == true);
+    CHECK(is_signed<const signed short>::value == true);
+    CHECK(is_signed<const signed long>::value == true);
+    CHECK(is_signed<const float>::value == true);
+    CHECK(is_signed<const double>::value == true);
+    CHECK(is_signed<const bool>::value == false);
+
+    CHECK(is_signed<volatile char>::value == true);
+    CHECK(is_signed<volatile signed char>::value == true);
+    CHECK(is_signed<volatile signed int>::value == true);
+    CHECK(is_signed<volatile signed short>::value == true);
+    CHECK(is_signed<volatile signed long>::value == true);
+    CHECK(is_signed<volatile float>::value == true);
+    CHECK(is_signed<volatile double>::value == true);
+    CHECK(is_signed<volatile bool>::value == false);
+
+    CHECK(is_signed<const volatile char>::value == true);
+    CHECK(is_signed<const volatile signed char>::value == true);
+    CHECK(is_signed<const volatile signed int>::value == true);
+    CHECK(is_signed<const volatile signed short>::value == true);
+    CHECK(is_signed<const volatile signed long>::value == true);
+    CHECK(is_signed<const volatile float>::value == true);
+    CHECK(is_signed<const volatile double>::value == true);
+    CHECK(is_signed<const volatile bool>::value == false);
+  }
+
+  SECTION("is_unsigned") {
+    CHECK(is_unsigned<unsigned char>::value == true);
+    CHECK(is_unsigned<unsigned int>::value == true);
+    CHECK(is_unsigned<unsigned short>::value == true);
+    CHECK(is_unsigned<unsigned long>::value == true);
+    CHECK(is_unsigned<bool>::value == true);
+    CHECK(is_unsigned<char>::value == false);
+    CHECK(is_unsigned<float>::value == false);
+    CHECK(is_unsigned<double>::value == false);
+
+    CHECK(is_unsigned<const unsigned char>::value == true);
+    CHECK(is_unsigned<const unsigned int>::value == true);
+    CHECK(is_unsigned<const unsigned short>::value == true);
+    CHECK(is_unsigned<const unsigned long>::value == true);
+    CHECK(is_unsigned<const bool>::value == true);
+    CHECK(is_unsigned<const char>::value == false);
+    CHECK(is_unsigned<const float>::value == false);
+    CHECK(is_unsigned<const double>::value == false);
+
+    CHECK(is_unsigned<volatile unsigned char>::value == true);
+    CHECK(is_unsigned<volatile unsigned int>::value == true);
+    CHECK(is_unsigned<volatile unsigned short>::value == true);
+    CHECK(is_unsigned<volatile unsigned long>::value == true);
+    CHECK(is_unsigned<volatile bool>::value == true);
+    CHECK(is_unsigned<volatile char>::value == false);
+    CHECK(is_unsigned<volatile float>::value == false);
+    CHECK(is_unsigned<volatile double>::value == false);
+
+    CHECK(is_unsigned<const volatile unsigned char>::value == true);
+    CHECK(is_unsigned<const volatile unsigned int>::value == true);
+    CHECK(is_unsigned<const volatile unsigned short>::value == true);
+    CHECK(is_unsigned<const volatile unsigned long>::value == true);
+    CHECK(is_unsigned<const volatile bool>::value == true);
+    CHECK(is_unsigned<const volatile char>::value == false);
+    CHECK(is_unsigned<const volatile float>::value == false);
+    CHECK(is_unsigned<const volatile double>::value == false);
+  }
+
+  SECTION("is_floating_point") {
+    CHECK(is_floating_point<int>::value == false);
+    CHECK(is_floating_point<float>::value == true);
+    CHECK(is_floating_point<double>::value == true);
+    CHECK(is_floating_point<const float>::value == true);
+    CHECK(is_floating_point<const double>::value == true);
+    CHECK(is_floating_point<volatile float>::value == true);
+    CHECK(is_floating_point<volatile double>::value == true);
+    CHECK(is_floating_point<const volatile float>::value == true);
+    CHECK(is_floating_point<const volatile double>::value == true);
+  }
+
+  SECTION("is_convertible") {
+    CHECK((is_convertible<short, int>::value == true));
+    CHECK((is_convertible<int, int>::value == true));
+    CHECK((is_convertible<EmptyEnum, int>::value == true));
+    CHECK((is_convertible<int*, int>::value == false));
+    CHECK((is_convertible<EmptyClass, int>::value == false));
+  }
+
+  SECTION("is_class") {
+    CHECK((is_class<int>::value == false));
+    CHECK((is_class<EmptyEnum>::value == false));
+    CHECK((is_class<int*>::value == false));
+    CHECK((is_class<EmptyClass>::value == true));
+  }
+
+  SECTION("is_enum") {
+    CHECK(is_enum<int>::value == false);
+    CHECK(is_enum<EmptyEnum>::value == true);
+    CHECK(is_enum<int*>::value == false);
+    CHECK(is_enum<EmptyClass>::value == false);
+    CHECK(is_enum<bool>::value == false);
+    CHECK(is_enum<double>::value == false);
+  }
+
+  SECTION("IsVisitable") {
+    CHECK(IsVisitable<DeserializationError>::value == false);
+    CHECK(IsVisitable<JsonPair>::value == false);
+    CHECK(IsVisitable<VariantRef>::value == true);
+    CHECK(IsVisitable<VariantConstRef>::value == true);
+    CHECK(IsVisitable<ArrayRef>::value == true);
+    CHECK(IsVisitable<ElementProxy<ArrayRef> >::value == true);
+    CHECK(IsVisitable<ArrayConstRef>::value == true);
+    CHECK(IsVisitable<ObjectRef>::value == true);
+    CHECK((IsVisitable<MemberProxy<ObjectRef, const char*> >::value == true));
+    CHECK(IsVisitable<ObjectConstRef>::value == true);
+    CHECK(IsVisitable<DynamicJsonDocument>::value == true);
+    CHECK(IsVisitable<StaticJsonDocument<10> >::value == true);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/Utf16.cpp b/third-party/ArduinoJson/extras/tests/Misc/Utf16.cpp
new file mode 100644
index 0000000..3e56647
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/Utf16.cpp
@@ -0,0 +1,68 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson/Json/Utf16.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+static void testUtf16Codepoint(uint16_t codeunit, uint32_t expectedCodepoint) {
+  Utf16::Codepoint cp;
+  REQUIRE(cp.append(codeunit) == true);
+  REQUIRE(cp.value() == expectedCodepoint);
+}
+
+static void testUtf16Codepoint(uint16_t codeunit1, uint16_t codeunit2,
+                               uint32_t expectedCodepoint) {
+  Utf16::Codepoint cp;
+  REQUIRE(cp.append(codeunit1) == false);
+  REQUIRE(cp.append(codeunit2) == true);
+  REQUIRE(cp.value() == expectedCodepoint);
+}
+
+TEST_CASE("Utf16::Codepoint()") {
+  SECTION("U+0000") {
+    testUtf16Codepoint(0x0000, 0x000000);
+  }
+
+  SECTION("U+0001") {
+    testUtf16Codepoint(0x0001, 0x000001);
+  }
+
+  SECTION("U+D7FF") {
+    testUtf16Codepoint(0xD7FF, 0x00D7FF);
+  }
+
+  SECTION("U+E000") {
+    testUtf16Codepoint(0xE000, 0x00E000);
+  }
+
+  SECTION("U+FFFF") {
+    testUtf16Codepoint(0xFFFF, 0x00FFFF);
+  }
+
+  SECTION("U+010000") {
+    testUtf16Codepoint(0xD800, 0xDC00, 0x010000);
+  }
+
+  SECTION("U+010001") {
+    testUtf16Codepoint(0xD800, 0xDC01, 0x010001);
+  }
+
+  SECTION("U+0103FF") {
+    testUtf16Codepoint(0xD800, 0xDFFF, 0x0103FF);
+  }
+
+  SECTION("U+010400") {
+    testUtf16Codepoint(0xD801, 0xDC00, 0x010400);
+  }
+
+  SECTION("U+010400") {
+    testUtf16Codepoint(0xDBFF, 0xDC00, 0x10FC00);
+  }
+
+  SECTION("U+10FFFF") {
+    testUtf16Codepoint(0xDBFF, 0xDFFF, 0x10FFFF);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/Utf8.cpp b/third-party/ArduinoJson/extras/tests/Misc/Utf8.cpp
new file mode 100644
index 0000000..baff622
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/Utf8.cpp
@@ -0,0 +1,61 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#include <string>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+static void testCodepoint(uint32_t codepoint, std::string expected) {
+  char buffer[4096];
+  MemoryPool pool(buffer, 4096);
+  StringCopier str(pool);
+  str.startString();
+
+  CAPTURE(codepoint);
+  Utf8::encodeCodepoint(codepoint, str);
+
+  str.append('\0');
+  REQUIRE(str.c_str() == expected);
+}
+
+TEST_CASE("Utf8::encodeCodepoint()") {
+  SECTION("U+0000") {
+    testCodepoint(0x0000, "");
+  }
+
+  SECTION("U+0001") {
+    testCodepoint(0x0001, "\x01");
+  }
+
+  SECTION("U+007F") {
+    testCodepoint(0x007F, "\x7f");
+  }
+
+  SECTION("U+0080") {
+    testCodepoint(0x0080, "\xc2\x80");
+  }
+
+  SECTION("U+07FF") {
+    testCodepoint(0x07FF, "\xdf\xbf");
+  }
+
+  SECTION("U+0800") {
+    testCodepoint(0x0800, "\xe0\xa0\x80");
+  }
+
+  SECTION("U+FFFF") {
+    testCodepoint(0xFFFF, "\xef\xbf\xbf");
+  }
+
+  SECTION("U+10000") {
+    testCodepoint(0x10000, "\xf0\x90\x80\x80");
+  }
+
+  SECTION("U+10FFFF") {
+    testCodepoint(0x10FFFF, "\xf4\x8f\xbf\xbf");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/arithmeticCompare.cpp b/third-party/ArduinoJson/extras/tests/Misc/arithmeticCompare.cpp
new file mode 100644
index 0000000..57fdd57
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/arithmeticCompare.cpp
@@ -0,0 +1,103 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson/Numbers/arithmeticCompare.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("arithmeticCompare()") {
+  SECTION("int vs uint8_t") {
+    CHECK((arithmeticCompare<int, uint8_t>(256, 1) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<int, uint8_t>(41, 42) == COMPARE_RESULT_LESS));
+    CHECK((arithmeticCompare<int, uint8_t>(42, 42) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<int, uint8_t>(43, 42) == COMPARE_RESULT_GREATER));
+  }
+
+  SECTION("unsigned vs int") {
+    CHECK((arithmeticCompare<unsigned, int>(0, -1) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<unsigned, int>(42, 41) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<unsigned, int>(42, 42) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<unsigned, int>(42, 43) == COMPARE_RESULT_LESS));
+  }
+
+  SECTION("float vs int") {
+    CHECK((arithmeticCompare<float, int>(42, 41) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<float, int>(42, 42) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<float, int>(42, 43) == COMPARE_RESULT_LESS));
+  }
+
+  SECTION("int vs unsigned") {
+    CHECK((arithmeticCompare<int, unsigned>(-1, 0) == COMPARE_RESULT_LESS));
+    CHECK((arithmeticCompare<int, unsigned>(0, 0) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<int, unsigned>(1, 0) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<int, unsigned>(42, 41) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<int, unsigned>(42, 42) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<int, unsigned>(42, 43) == COMPARE_RESULT_LESS));
+  }
+
+  SECTION("unsigned vs unsigned") {
+    CHECK((arithmeticCompare<unsigned, unsigned>(42, 41) ==
+           COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<unsigned, unsigned>(42, 42) ==
+           COMPARE_RESULT_EQUAL));
+    CHECK(
+        (arithmeticCompare<unsigned, unsigned>(42, 43) == COMPARE_RESULT_LESS));
+  }
+
+  SECTION("bool vs bool") {
+    CHECK(
+        (arithmeticCompare<bool, bool>(false, false) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<bool, bool>(true, true) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<bool, bool>(false, true) == COMPARE_RESULT_LESS));
+    CHECK(
+        (arithmeticCompare<bool, bool>(true, false) == COMPARE_RESULT_GREATER));
+  }
+
+  SECTION("bool vs int") {
+    CHECK((arithmeticCompare<bool, int>(false, -1) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<bool, int>(false, 0) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<bool, int>(false, 1) == COMPARE_RESULT_LESS));
+    CHECK((arithmeticCompare<bool, int>(true, 0) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<bool, int>(true, 1) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<bool, int>(true, 2) == COMPARE_RESULT_LESS));
+  }
+
+  SECTION("bool vs int") {
+    CHECK((arithmeticCompare<int, bool>(0, false) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<int, bool>(1, true) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompare<int, bool>(1, false) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompare<int, bool>(0, true) == COMPARE_RESULT_LESS));
+  }
+}
+
+TEST_CASE("arithmeticCompareNegateLeft()") {
+  SECTION("unsigned vs int") {
+    CHECK((arithmeticCompareNegateLeft<int>(0, 1) == COMPARE_RESULT_LESS));
+    CHECK((arithmeticCompareNegateLeft<int>(42, -41) == COMPARE_RESULT_LESS));
+    CHECK((arithmeticCompareNegateLeft<int>(42, -42) == COMPARE_RESULT_EQUAL));
+    CHECK(
+        (arithmeticCompareNegateLeft<int>(42, -43) == COMPARE_RESULT_GREATER));
+  }
+
+  SECTION("unsigned vs unsigned") {
+    CHECK(
+        (arithmeticCompareNegateLeft<unsigned>(42, 42) == COMPARE_RESULT_LESS));
+  }
+}
+
+TEST_CASE("arithmeticCompareNegateRight()") {
+  SECTION("int vs unsigned") {
+    CHECK((arithmeticCompareNegateRight<int>(1, 0) == COMPARE_RESULT_GREATER));
+    CHECK(
+        (arithmeticCompareNegateRight<int>(-41, 42) == COMPARE_RESULT_GREATER));
+    CHECK((arithmeticCompareNegateRight<int>(-42, 42) == COMPARE_RESULT_EQUAL));
+    CHECK((arithmeticCompareNegateRight<int>(-43, 42) == COMPARE_RESULT_LESS));
+  }
+
+  SECTION("unsigned vs unsigned") {
+    CHECK((arithmeticCompareNegateRight<unsigned>(42, 42) ==
+           COMPARE_RESULT_GREATER));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/conflicts.cpp b/third-party/ArduinoJson/extras/tests/Misc/conflicts.cpp
new file mode 100644
index 0000000..e94024c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/conflicts.cpp
@@ -0,0 +1,56 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+// Include any header that might use the conflicting macros
+#include <cmath>
+#include <iostream>
+#include <string>
+
+// All cores
+#define bit()
+#define constrain()
+#define DEFAULT
+#define DISABLED
+#define HIGH
+#define INPUT
+#define LOW
+#define max()
+#define min()
+#define OUTPUT
+#define round()
+#define sq()
+#define word()
+#define bitRead()
+#define bitSet()
+#define bitClear()
+#define bitWrite()
+#define interrupts()
+#define lowByte()
+#define highByte()
+#define DEC
+#define HEX
+#define OCT
+#define BIN
+#define cbi()
+#define sbi()
+
+// ESP8266
+#define _max()
+#define _min()
+
+// Realtek Ameba
+#define isdigit(c) (((c) >= '0') && ((c) <= '9'))
+#define isprint(c)
+#define isxdigit(c)
+#define isspace(c)
+#define isupper(c)
+#define islower(c)
+#define isalpha(c)
+
+// issue #839
+#define BLOCKSIZE
+#define CAPACITY
+
+// catch.hpp mutes several warnings, this file also allows to detect them
+#include "ArduinoJson.h"
diff --git a/third-party/ArduinoJson/extras/tests/Misc/custom_string.hpp b/third-party/ArduinoJson/extras/tests/Misc/custom_string.hpp
new file mode 100644
index 0000000..c8f6ada
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/custom_string.hpp
@@ -0,0 +1,12 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <string>
+
+struct custom_char_traits : std::char_traits<char> {};
+struct custom_allocator : std::allocator<char> {};
+typedef std::basic_string<char, custom_char_traits, custom_allocator>
+    custom_string;
diff --git a/third-party/ArduinoJson/extras/tests/Misc/deprecated.cpp b/third-party/ArduinoJson/extras/tests/Misc/deprecated.cpp
new file mode 100644
index 0000000..591ada8
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/deprecated.cpp
@@ -0,0 +1,115 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_DEPRECATED(msg)  // nothing
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("Deprecated features") {
+  StaticJsonDocument<256> doc;
+  const char* s = "hello";
+  doc["s"] = s;
+  doc["c"] = 42;
+  doc["a"].add(s);
+  doc["a"].add(42);
+
+  SECTION("JsonVariant::add(char)") {
+    JsonVariant v = doc.to<JsonVariant>();
+    v.add('*');
+    REQUIRE(v[0] == 42);
+  }
+
+  SECTION("JsonVariant::as<char*>()") {
+    JsonVariant v = doc["s"];
+    REQUIRE(v.as<char*>() == s);
+  }
+
+  SECTION("JsonVariant::as<char>()") {
+    JsonVariant v = doc["c"];
+    REQUIRE(v.as<char>() == '*');
+  }
+
+  SECTION("JsonVariant::is<char*>()") {
+    JsonVariant v = doc["s"];
+    REQUIRE(v.is<char*>() == true);
+  }
+
+  SECTION("JsonVariant::is<char>()") {
+    JsonVariant v = doc["c"];
+    REQUIRE(v.is<char>() == true);
+  }
+
+  SECTION("JsonVariant::set(char)") {
+    JsonVariant v = doc.to<JsonVariant>();
+    v.set('*');
+    REQUIRE(v.as<unsigned char>() == 42);
+  }
+
+  SECTION("JsonVariantConst::as<char*>()") {
+    JsonVariantConst v = doc["s"];
+    REQUIRE(v.as<char*>() == s);
+  }
+
+  SECTION("JsonVariantConst::as<char>()") {
+    JsonVariantConst v = doc["c"];
+    REQUIRE(v.as<char>() == '*');
+  }
+
+  SECTION("JsonVariantConst::is<char*>()") {
+    JsonVariantConst v = doc["s"];
+    REQUIRE(v.is<char*>() == true);
+  }
+
+  SECTION("JsonVariantConst::is<char>()") {
+    JsonVariantConst v = doc["c"];
+    REQUIRE(v.is<char>() == true);
+  }
+
+  SECTION("MemberProxy::as<char*>()") {
+    REQUIRE(doc["s"].as<char*>() == s);
+  }
+
+  SECTION("MemberProxy::as<char>()") {
+    REQUIRE(doc["c"].as<char>() == '*');
+  }
+
+  SECTION("MemberProxy::as<char>()") {
+    doc["x"].set('*');
+    REQUIRE(doc["x"] == 42);
+  }
+
+  SECTION("MemberProxy::is<char*>()") {
+    REQUIRE(doc["s"].is<char*>() == true);
+    REQUIRE(doc["c"].is<char*>() == false);
+  }
+
+  SECTION("MemberProxy::is<char>()") {
+    REQUIRE(doc["c"].is<char>() == true);
+    REQUIRE(doc["s"].is<char>() == false);
+  }
+
+  SECTION("ElementProxy::as<char*>()") {
+    REQUIRE(doc["a"][0].as<char*>() == s);
+  }
+
+  SECTION("ElementProxy::as<char>()") {
+    REQUIRE(doc["a"][1].as<char>() == '*');
+  }
+
+  SECTION("ElementProxy::as<char>()") {
+    doc["a"][0].set('*');
+    REQUIRE(doc["a"][0] == 42);
+  }
+
+  SECTION("ElementProxy::is<char*>()") {
+    REQUIRE(doc["a"][0].is<char*>() == true);
+    REQUIRE(doc["a"][1].is<char*>() == false);
+  }
+
+  SECTION("ElementProxy::is<char>()") {
+    REQUIRE(doc["a"][1].is<char>() == true);
+    REQUIRE(doc["a"][0].is<char>() == false);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/printable.cpp b/third-party/ArduinoJson/extras/tests/Misc/printable.cpp
new file mode 100644
index 0000000..27ac15e
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/printable.cpp
@@ -0,0 +1,142 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <Arduino.h>
+#include <catch.hpp>
+
+#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 1
+#include <ArduinoJson.h>
+
+struct PrintOneCharacterAtATime {
+  static size_t printStringTo(const std::string& s, Print& p) {
+    size_t result = 0;
+    for (std::string::const_iterator it = s.begin(); it != s.end(); ++it) {
+      size_t n = p.write(uint8_t(*it));
+      if (n == 0)
+        break;
+      result += n;
+    }
+    return result;
+  }
+};
+
+struct PrintAllAtOnce {
+  static size_t printStringTo(const std::string& s, Print& p) {
+    return p.write(s.data(), s.size());
+  }
+};
+
+template <typename PrintPolicy>
+struct PrintableString : public Printable {
+  PrintableString(const char* s) : _str(s), _total(0) {}
+
+  virtual size_t printTo(Print& p) const {
+    size_t result = PrintPolicy::printStringTo(_str, p);
+    _total += result;
+    return result;
+  }
+
+  size_t totalBytesWritten() const {
+    return _total;
+  }
+
+ private:
+  std::string _str;
+  mutable size_t _total;
+};
+
+TEST_CASE("Printable") {
+  SECTION("Doesn't overflow") {
+    StaticJsonDocument<8> doc;
+    const char* value = "example";  // == 7 chars
+
+    doc.set(666);  // to make sure we override the value
+
+    SECTION("Via Print::write(char)") {
+      PrintableString<PrintOneCharacterAtATime> printable(value);
+      CHECK(doc.set(printable) == true);
+      CHECK(doc.as<std::string>() == value);
+      CHECK(printable.totalBytesWritten() == 7);
+      CHECK(doc.overflowed() == false);
+      CHECK(doc.memoryUsage() == 8);
+    }
+
+    SECTION("Via Print::write(const char* size_t)") {
+      PrintableString<PrintAllAtOnce> printable(value);
+      CHECK(doc.set(printable) == true);
+      CHECK(doc.as<std::string>() == value);
+      CHECK(printable.totalBytesWritten() == 7);
+      CHECK(doc.overflowed() == false);
+      CHECK(doc.memoryUsage() == 8);
+    }
+  }
+
+  SECTION("Overflows early") {
+    StaticJsonDocument<8> doc;
+    const char* value = "hello world";  // > 8 chars
+
+    doc.set(666);  // to make sure we override the value
+
+    SECTION("Via Print::write(char)") {
+      PrintableString<PrintOneCharacterAtATime> printable(value);
+      CHECK(doc.set(printable) == false);
+      CHECK(doc.isNull());
+      CHECK(printable.totalBytesWritten() == 8);
+      CHECK(doc.overflowed() == true);
+      CHECK(doc.memoryUsage() == 0);
+    }
+
+    SECTION("Via Print::write(const char*, size_t)") {
+      PrintableString<PrintAllAtOnce> printable(value);
+      CHECK(doc.set(printable) == false);
+      CHECK(doc.isNull());
+      CHECK(printable.totalBytesWritten() == 0);
+      CHECK(doc.overflowed() == true);
+      CHECK(doc.memoryUsage() == 0);
+    }
+  }
+
+  SECTION("Overflows adding terminator") {
+    StaticJsonDocument<8> doc;
+    const char* value = "overflow";  // == 8 chars
+
+    doc.set(666);  // to make sure we override the value
+
+    SECTION("Via Print::write(char)") {
+      PrintableString<PrintOneCharacterAtATime> printable(value);
+      CHECK(doc.set(printable) == false);
+      CHECK(doc.isNull());
+      CHECK(printable.totalBytesWritten() == 8);
+      CHECK(doc.overflowed() == true);
+      CHECK(doc.memoryUsage() == 0);
+    }
+
+    SECTION("Via Print::write(const char*, size_t)") {
+      PrintableString<PrintAllAtOnce> printable(value);
+      CHECK(doc.set(printable) == false);
+      CHECK(doc.isNull());
+      CHECK(printable.totalBytesWritten() == 0);
+      CHECK(doc.overflowed() == true);
+      CHECK(doc.memoryUsage() == 0);
+    }
+  }
+
+  SECTION("Null variant") {
+    JsonVariant var;
+    PrintableString<PrintOneCharacterAtATime> printable = "Hello World!";
+    CHECK(var.set(printable) == false);
+    CHECK(var.isNull());
+    CHECK(printable.totalBytesWritten() == 0);
+  }
+
+  SECTION("String deduplication") {
+    StaticJsonDocument<128> doc;
+    doc.add(PrintableString<PrintOneCharacterAtATime>("Hello World!"));
+    doc.add(PrintableString<PrintAllAtOnce>("Hello World!"));
+    REQUIRE(doc.size() == 2);
+    CHECK(doc[0] == "Hello World!");
+    CHECK(doc[1] == "Hello World!");
+    CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 13);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/unsigned_char.cpp b/third-party/ArduinoJson/extras/tests/Misc/unsigned_char.cpp
new file mode 100644
index 0000000..acdbe93
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/unsigned_char.cpp
@@ -0,0 +1,271 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#if defined(__clang__)
+#  define CONFLICTS_WITH_BUILTIN_OPERATOR
+#endif
+
+TEST_CASE("unsigned char[]") {
+  SECTION("deserializeJson()") {
+    unsigned char input[] = "{\"a\":42}";
+
+    StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
+    DeserializationError err = deserializeJson(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("deserializeMsgPack()") {
+    unsigned char input[] = "\xDE\x00\x01\xA5Hello\xA5world";
+
+    StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
+    DeserializationError err = deserializeMsgPack(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("serializeMsgPack(unsigned char[])") {
+    unsigned char buffer[32];
+    StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
+    doc["hello"] = "world";
+
+    size_t n = serializeMsgPack(doc, buffer);
+
+    REQUIRE(n == 13);
+    REQUIRE(memcmp(buffer, "\x81\xA5hello\xA5world", 13) == 0);
+  }
+
+  SECTION("serializeMsgPack(unsigned char*)") {
+    unsigned char buffer[32];
+    StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
+    doc["hello"] = "world";
+
+    size_t n = serializeMsgPack(doc, buffer, sizeof(buffer));
+
+    REQUIRE(n == 13);
+    REQUIRE(memcmp(buffer, "\x81\xA5hello\xA5world", 13) == 0);
+  }
+
+  SECTION("serializeJson(unsigned char[])") {
+    unsigned char buffer[32];
+    StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
+    doc["hello"] = "world";
+
+    size_t n = serializeJson(doc, buffer);
+
+    REQUIRE(n == 17);
+    REQUIRE(memcmp(buffer, "{\"hello\":\"world\"}", n) == 0);
+  }
+
+  SECTION("serializeJson(unsigned char*)") {
+    unsigned char buffer[32];
+    StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
+    doc["hello"] = "world";
+
+    size_t n = serializeJson(doc, buffer, sizeof(buffer));
+
+    REQUIRE(n == 17);
+    REQUIRE(memcmp(buffer, "{\"hello\":\"world\"}", n) == 0);
+  }
+
+  SECTION("serializeJsonPretty(unsigned char[])") {
+    unsigned char buffer[32];
+    StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
+    doc["hello"] = "world";
+
+    size_t n = serializeJsonPretty(doc, buffer);
+
+    REQUIRE(n == 24);
+  }
+
+  SECTION("serializeJsonPretty(unsigned char*)") {
+    unsigned char buffer[32];
+    StaticJsonDocument<JSON_OBJECT_SIZE(2)> doc;
+    doc["hello"] = "world";
+
+    size_t n = serializeJsonPretty(doc, buffer, sizeof(buffer));
+
+    REQUIRE(n == 24);
+  }
+
+  SECTION("JsonVariant") {
+    DynamicJsonDocument doc(4096);
+
+    SECTION("set") {
+      unsigned char value[] = "42";
+
+      JsonVariant variant = doc.to<JsonVariant>();
+      variant.set(value);
+
+      REQUIRE(42 == variant.as<int>());
+    }
+
+#ifndef CONFLICTS_WITH_BUILTIN_OPERATOR
+    SECTION("operator[]") {
+      unsigned char key[] = "hello";
+
+      deserializeJson(doc, "{\"hello\":\"world\"}");
+      JsonVariant variant = doc.as<JsonVariant>();
+
+      REQUIRE(std::string("world") == variant[key]);
+    }
+#endif
+
+#ifndef CONFLICTS_WITH_BUILTIN_OPERATOR
+    SECTION("operator[] const") {
+      unsigned char key[] = "hello";
+
+      deserializeJson(doc, "{\"hello\":\"world\"}");
+      const JsonVariant variant = doc.as<JsonVariant>();
+
+      REQUIRE(std::string("world") == variant[key]);
+    }
+#endif
+
+    SECTION("operator==") {
+      unsigned char comparand[] = "hello";
+
+      JsonVariant variant = doc.to<JsonVariant>();
+      variant.set("hello");
+
+      REQUIRE(comparand == variant);
+      REQUIRE(variant == comparand);
+      REQUIRE_FALSE(comparand != variant);
+      REQUIRE_FALSE(variant != comparand);
+    }
+
+    SECTION("operator!=") {
+      unsigned char comparand[] = "hello";
+
+      JsonVariant variant = doc.to<JsonVariant>();
+      variant.set("world");
+
+      REQUIRE(comparand != variant);
+      REQUIRE(variant != comparand);
+      REQUIRE_FALSE(comparand == variant);
+      REQUIRE_FALSE(variant == comparand);
+    }
+  }
+
+  SECTION("JsonObject") {
+#ifndef CONFLICTS_WITH_BUILTIN_OPERATOR
+    SECTION("operator[]") {
+      unsigned char key[] = "hello";
+
+      DynamicJsonDocument doc(4096);
+      JsonObject obj = doc.to<JsonObject>();
+      obj[key] = "world";
+
+      REQUIRE(std::string("world") == obj["hello"]);
+    }
+
+    SECTION("JsonObject::operator[] const") {
+      unsigned char key[] = "hello";
+
+      DynamicJsonDocument doc(4096);
+      deserializeJson(doc, "{\"hello\":\"world\"}");
+
+      JsonObject obj = doc.as<JsonObject>();
+      REQUIRE(std::string("world") == obj[key]);
+    }
+#endif
+
+    SECTION("containsKey()") {
+      unsigned char key[] = "hello";
+
+      DynamicJsonDocument doc(4096);
+      deserializeJson(doc, "{\"hello\":\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+      REQUIRE(true == obj.containsKey(key));
+    }
+
+    SECTION("remove()") {
+      unsigned char key[] = "hello";
+
+      DynamicJsonDocument doc(4096);
+      deserializeJson(doc, "{\"hello\":\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+      obj.remove(key);
+
+      REQUIRE(0 == obj.size());
+    }
+
+    SECTION("createNestedArray()") {
+      unsigned char key[] = "hello";
+
+      DynamicJsonDocument doc(4096);
+      JsonObject obj = doc.to<JsonObject>();
+      obj.createNestedArray(key);
+    }
+
+    SECTION("createNestedObject()") {
+      unsigned char key[] = "hello";
+
+      DynamicJsonDocument doc(4096);
+      JsonObject obj = doc.to<JsonObject>();
+      obj.createNestedObject(key);
+    }
+  }
+
+  SECTION("MemberProxy") {
+    SECTION("operator=") {  // issue #416
+      unsigned char value[] = "world";
+
+      DynamicJsonDocument doc(4096);
+      JsonObject obj = doc.to<JsonObject>();
+      obj["hello"] = value;
+
+      REQUIRE(std::string("world") == obj["hello"]);
+    }
+
+    SECTION("set()") {
+      unsigned char value[] = "world";
+
+      DynamicJsonDocument doc(4096);
+      JsonObject obj = doc.to<JsonObject>();
+      obj["hello"].set(value);
+
+      REQUIRE(std::string("world") == obj["hello"]);
+    }
+  }
+
+  SECTION("JsonArray") {
+    SECTION("add()") {
+      unsigned char value[] = "world";
+
+      DynamicJsonDocument doc(4096);
+      JsonArray arr = doc.to<JsonArray>();
+      arr.add(value);
+
+      REQUIRE(std::string("world") == arr[0]);
+    }
+  }
+
+  SECTION("ElementProxy") {
+    SECTION("set()") {
+      unsigned char value[] = "world";
+
+      DynamicJsonDocument doc(4096);
+      JsonArray arr = doc.to<JsonArray>();
+      arr.add("hello");
+      arr[0].set(value);
+
+      REQUIRE(std::string("world") == arr[0]);
+    }
+
+    SECTION("operator=") {
+      unsigned char value[] = "world";
+
+      DynamicJsonDocument doc(4096);
+      JsonArray arr = doc.to<JsonArray>();
+      arr.add("hello");
+      arr[0] = value;
+
+      REQUIRE(std::string("world") == arr[0]);
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/version.cpp b/third-party/ArduinoJson/extras/tests/Misc/version.cpp
new file mode 100644
index 0000000..88cc9ec
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/version.cpp
@@ -0,0 +1,18 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson/version.hpp>
+#include <catch.hpp>
+#include <sstream>
+
+using Catch::Matchers::StartsWith;
+
+TEST_CASE("ARDUINOJSON_VERSION") {
+  std::stringstream version;
+
+  version << ARDUINOJSON_VERSION_MAJOR << "." << ARDUINOJSON_VERSION_MINOR
+          << "." << ARDUINOJSON_VERSION_REVISION;
+
+  REQUIRE_THAT(ARDUINOJSON_VERSION, StartsWith(version.str()));
+}
diff --git a/third-party/ArduinoJson/extras/tests/Misc/weird_strcmp.hpp b/third-party/ArduinoJson/extras/tests/Misc/weird_strcmp.hpp
new file mode 100644
index 0000000..3dbc0cf
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Misc/weird_strcmp.hpp
@@ -0,0 +1,23 @@
+#include <ArduinoJson/Namespace.hpp>
+
+// Issue #1198: strcmp() implementation that returns a value larger than 8-bit
+
+namespace ARDUINOJSON_NAMESPACE {
+int strcmp(const char* a, const char* b) {
+  int result = ::strcmp(a, b);
+  if (result > 0)
+    return 2147483647;
+  if (result < 0)
+    return -214748364;
+  return 0;
+}
+
+int strncmp(const char* a, const char* b, size_t n) {
+  int result = ::strncmp(a, b, n);
+  if (result > 0)
+    return 2147483647;
+  if (result < 0)
+    return -214748364;
+  return 0;
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt
new file mode 100644
index 0000000..de6db8c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/CMakeLists.txt
@@ -0,0 +1,30 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(MixedConfigurationTests
+	decode_unicode_0.cpp
+	decode_unicode_1.cpp
+	enable_alignment_0.cpp
+	enable_alignment_1.cpp
+	enable_comments_0.cpp
+	enable_comments_1.cpp
+	enable_infinity_0.cpp
+	enable_infinity_1.cpp
+	enable_nan_0.cpp
+	enable_nan_1.cpp
+	enable_progmem_1.cpp
+	enable_string_deduplication_0.cpp
+	enable_string_deduplication_1.cpp
+	use_double_0.cpp
+	use_double_1.cpp
+)
+
+set_target_properties(MixedConfigurationTests PROPERTIES UNITY_BUILD OFF)
+
+add_test(MixedConfiguration MixedConfigurationTests)
+
+set_tests_properties(MixedConfiguration
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp
new file mode 100644
index 0000000..b5dc1f1
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_0.cpp
@@ -0,0 +1,12 @@
+#define ARDUINOJSON_DECODE_UNICODE 0
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 0") {
+  DynamicJsonDocument doc(2048);
+  DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\"");
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc.as<std::string>() == "\\uD834\\uDD1E");
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp
new file mode 100644
index 0000000..2b5b652
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/decode_unicode_1.cpp
@@ -0,0 +1,11 @@
+#define ARDUINOJSON_DECODE_UNICODE 1
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_DECODE_UNICODE == 1") {
+  DynamicJsonDocument doc(2048);
+  DeserializationError err = deserializeJson(doc, "\"\\uD834\\uDD1E\"");
+
+  REQUIRE(err == DeserializationError::Ok);
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_0.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_0.cpp
new file mode 100644
index 0000000..426f516
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_0.cpp
@@ -0,0 +1,41 @@
+#define ARDUINOJSON_NAMESPACE ArduinoJson_NoAlignment
+#define ARDUINOJSON_ENABLE_ALIGNMENT 0
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_ENABLE_ALIGNMENT == 0") {
+  using namespace ARDUINOJSON_NAMESPACE;
+
+  const size_t N = sizeof(void*);
+
+  SECTION("isAligned()") {
+    CHECK(isAligned(0) == true);
+    CHECK(isAligned(1) == true);
+    CHECK(isAligned(N) == true);
+    CHECK(isAligned(N + 1) == true);
+    CHECK(isAligned(2 * N) == true);
+    CHECK(isAligned(2 * N + 1) == true);
+  }
+
+  SECTION("addPadding()") {
+    CHECK(addPadding(0) == 0);
+    CHECK(addPadding(1) == 1);
+    CHECK(addPadding(N) == N);
+    CHECK(addPadding(N + 1) == N + 1);
+  }
+
+  SECTION("AddPadding<>") {
+    const size_t a = AddPadding<0>::value;
+    CHECK(a == 0);
+
+    const size_t b = AddPadding<1>::value;
+    CHECK(b == 1);
+
+    const size_t c = AddPadding<N>::value;
+    CHECK(c == N);
+
+    const size_t d = AddPadding<N + 1>::value;
+    CHECK(d == N + 1);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_1.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_1.cpp
new file mode 100644
index 0000000..9abf50c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_alignment_1.cpp
@@ -0,0 +1,40 @@
+#define ARDUINOJSON_ENABLE_ALIGNMENT 1
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_ENABLE_ALIGNMENT == 1") {
+  using namespace ARDUINOJSON_NAMESPACE;
+
+  const size_t N = sizeof(void*);
+
+  SECTION("isAligned()") {
+    CHECK(isAligned(0) == true);
+    CHECK(isAligned(1) == false);
+    CHECK(isAligned(N) == true);
+    CHECK(isAligned(N + 1) == false);
+    CHECK(isAligned(2 * N) == true);
+    CHECK(isAligned(2 * N + 1) == false);
+  }
+
+  SECTION("addPadding()") {
+    CHECK(addPadding(0) == 0);
+    CHECK(addPadding(1) == N);
+    CHECK(addPadding(N) == N);
+    CHECK(addPadding(N + 1) == 2 * N);
+  }
+
+  SECTION("AddPadding<>") {
+    const size_t a = AddPadding<0>::value;
+    CHECK(a == 0);
+
+    const size_t b = AddPadding<1>::value;
+    CHECK(b == N);
+
+    const size_t c = AddPadding<N>::value;
+    CHECK(c == N);
+
+    const size_t d = AddPadding<N + 1>::value;
+    CHECK(d == 2 * N);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp
new file mode 100644
index 0000000..fd8434f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_0.cpp
@@ -0,0 +1,54 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_ENABLE_COMMENTS 0
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("Comments should produce InvalidInput") {
+  DynamicJsonDocument doc(2048);
+
+  const char* testCases[] = {
+      "/*COMMENT*/  [\"hello\"]",
+      "[/*COMMENT*/ \"hello\"]",
+      "[\"hello\"/*COMMENT*/]",
+      "[\"hello\"/*COMMENT*/,\"world\"]",
+      "[\"hello\",/*COMMENT*/ \"world\"]",
+      "[/*/\n]",
+      "[/*COMMENT]",
+      "[/*COMMENT*]",
+      "//COMMENT\n\t[\"hello\"]",
+      "[//COMMENT\n\"hello\"]",
+      "[\"hello\"//COMMENT\r\n]",
+      "[\"hello\"//COMMENT\n,\"world\"]",
+      "[\"hello\",//COMMENT\n\"world\"]",
+      "[/COMMENT\n]",
+      "[//COMMENT",
+      "/*COMMENT*/ {\"hello\":\"world\"}",
+      "{/*COMMENT*/\"hello\":\"world\"}",
+      "{\"hello\"/*COMMENT*/:\"world\"}",
+      "{\"hello\":/*COMMENT*/\"world\"}",
+      "{\"hello\":\"world\"/*COMMENT*/}",
+      "//COMMENT\n {\"hello\":\"world\"}",
+      "{//COMMENT\n\"hello\":\"world\"}",
+      "{\"hello\"//COMMENT\n:\"world\"}",
+      "{\"hello\"://COMMENT\n\"world\"}",
+      "{\"hello\":\"world\"//COMMENT\n}",
+      "/{\"hello\":\"world\"}",
+      "{/\"hello\":\"world\"}",
+      "{\"hello\"/:\"world\"}",
+      "{\"hello\":/\"world\"}",
+      "{\"hello\":\"world\"/}",
+      "{\"hello\":\"world\"/,\"answer\":42}",
+      "{\"hello\":\"world\",/\"answer\":42}",
+  };
+  const size_t testCount = sizeof(testCases) / sizeof(testCases[0]);
+
+  for (size_t i = 0; i < testCount; i++) {
+    const char* input = testCases[i];
+    CAPTURE(input);
+    REQUIRE(deserializeJson(doc, input) == DeserializationError::InvalidInput);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp
new file mode 100644
index 0000000..cc36eaf
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_comments_1.cpp
@@ -0,0 +1,411 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_ENABLE_COMMENTS 1
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("Comments in arrays") {
+  DynamicJsonDocument doc(2048);
+
+  SECTION("Block comments") {
+    SECTION("Before opening bracket") {
+      DeserializationError err =
+          deserializeJson(doc, "/*COMMENT*/  [\"hello\"]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("After opening bracket") {
+      DeserializationError err =
+          deserializeJson(doc, "[/*COMMENT*/ \"hello\"]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("Before closing bracket") {
+      DeserializationError err = deserializeJson(doc, "[\"hello\"/*COMMENT*/]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("After closing bracket") {
+      DeserializationError err = deserializeJson(doc, "[\"hello\"]/*COMMENT*/");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("Before comma") {
+      DeserializationError err =
+          deserializeJson(doc, "[\"hello\"/*COMMENT*/,\"world\"]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("After comma") {
+      DeserializationError err =
+          deserializeJson(doc, "[\"hello\",/*COMMENT*/ \"world\"]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("/*/") {
+      DeserializationError err = deserializeJson(doc, "[/*/\n]");
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("Unfinished comment") {
+      DeserializationError err = deserializeJson(doc, "[/*COMMENT]");
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+
+    SECTION("Final slash missing") {
+      DeserializationError err = deserializeJson(doc, "[/*COMMENT*]");
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+  }
+
+  SECTION("Trailing comments") {
+    SECTION("Before opening bracket") {
+      DeserializationError err =
+          deserializeJson(doc, "//COMMENT\n\t[\"hello\"]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("After opening bracket") {
+      DeserializationError err = deserializeJson(doc, "[//COMMENT\n\"hello\"]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("Before closing bracket") {
+      DeserializationError err =
+          deserializeJson(doc, "[\"hello\"//COMMENT\r\n]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("After closing bracket") {
+      DeserializationError err = deserializeJson(doc, "[\"hello\"]//COMMENT\n");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(1 == arr.size());
+      REQUIRE(arr[0] == "hello");
+    }
+
+    SECTION("Before comma") {
+      DeserializationError err =
+          deserializeJson(doc, "[\"hello\"//COMMENT\n,\"world\"]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("After comma") {
+      DeserializationError err =
+          deserializeJson(doc, "[\"hello\",//COMMENT\n\"world\"]");
+      JsonArray arr = doc.as<JsonArray>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(2 == arr.size());
+      REQUIRE(arr[0] == "hello");
+      REQUIRE(arr[1] == "world");
+    }
+
+    SECTION("Invalid comment") {
+      DeserializationError err = deserializeJson(doc, "[/COMMENT\n]");
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("End document with comment") {
+      DeserializationError err = deserializeJson(doc, "[//COMMENT");
+      REQUIRE(err == DeserializationError::IncompleteInput);
+    }
+  }
+}
+
+TEST_CASE("Comments in objects") {
+  DynamicJsonDocument doc(2048);
+
+  SECTION("Block comments") {
+    SECTION("Before opening brace") {
+      DeserializationError err =
+          deserializeJson(doc, "/*COMMENT*/ {\"hello\":\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("After opening brace") {
+      DeserializationError err =
+          deserializeJson(doc, "{/*COMMENT*/\"hello\":\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("Before colon") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\"/*COMMENT*/:\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("After colon") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\":/*COMMENT*/\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("Before closing brace") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\":\"world\"/*COMMENT*/}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("After closing brace") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\":\"world\"}/*COMMENT*/");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("Before comma") {
+      DeserializationError err = deserializeJson(
+          doc, "{\"hello\":\"world\"/*COMMENT*/,\"answer\":42}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+      REQUIRE(obj["answer"] == 42);
+    }
+
+    SECTION("After comma") {
+      DeserializationError err = deserializeJson(
+          doc, "{\"hello\":\"world\",/*COMMENT*/\"answer\":42}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+      REQUIRE(obj["answer"] == 42);
+    }
+  }
+
+  SECTION("Trailing comments") {
+    SECTION("Before opening brace") {
+      DeserializationError err =
+          deserializeJson(doc, "//COMMENT\n {\"hello\":\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("After opening brace") {
+      DeserializationError err =
+          deserializeJson(doc, "{//COMMENT\n\"hello\":\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("Before colon") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\"//COMMENT\n:\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("After colon") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\"://COMMENT\n\"world\"}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("Before closing brace") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\":\"world\"//COMMENT\n}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("After closing brace") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\":\"world\"}//COMMENT\n");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("Before comma") {
+      DeserializationError err = deserializeJson(
+          doc, "{\"hello\":\"world\"//COMMENT\n,\"answer\":42}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+      REQUIRE(obj["answer"] == 42);
+    }
+
+    SECTION("After comma") {
+      DeserializationError err = deserializeJson(
+          doc, "{\"hello\":\"world\",//COMMENT\n\"answer\":42}");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+      REQUIRE(obj["answer"] == 42);
+    }
+  }
+
+  SECTION("Dangling slash") {
+    SECTION("Before opening brace") {
+      DeserializationError err = deserializeJson(doc, "/{\"hello\":\"world\"}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("After opening brace") {
+      DeserializationError err = deserializeJson(doc, "{/\"hello\":\"world\"}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("Before colon") {
+      DeserializationError err = deserializeJson(doc, "{\"hello\"/:\"world\"}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("After colon") {
+      DeserializationError err = deserializeJson(doc, "{\"hello\":/\"world\"}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("Before closing brace") {
+      DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\"/}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("After closing brace") {
+      DeserializationError err = deserializeJson(doc, "{\"hello\":\"world\"}/");
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(err == DeserializationError::Ok);
+      REQUIRE(obj["hello"] == "world");
+    }
+
+    SECTION("Before comma") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\":\"world\"/,\"answer\":42}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+
+    SECTION("After comma") {
+      DeserializationError err =
+          deserializeJson(doc, "{\"hello\":\"world\",/\"answer\":42}");
+
+      REQUIRE(err == DeserializationError::InvalidInput);
+    }
+  }
+}
+
+TEST_CASE("Comments alone") {
+  DynamicJsonDocument doc(2048);
+
+  SECTION("Just a trailing comment with no line break") {
+    DeserializationError err = deserializeJson(doc, "// comment");
+
+    REQUIRE(err == DeserializationError::IncompleteInput);
+  }
+
+  SECTION("Just a trailing comment with no a break") {
+    DeserializationError err = deserializeJson(doc, "// comment\n");
+
+    REQUIRE(err == DeserializationError::EmptyInput);
+  }
+
+  SECTION("Just a block comment") {
+    DeserializationError err = deserializeJson(doc, "/*comment*/");
+
+    REQUIRE(err == DeserializationError::EmptyInput);
+  }
+
+  SECTION("Just a slash") {
+    DeserializationError err = deserializeJson(doc, "/");
+
+    REQUIRE(err == DeserializationError::InvalidInput);
+  }
+
+  SECTION("Premature terminator") {
+    DeserializationError err = deserializeJson(doc, "/* comment");
+
+    REQUIRE(err == DeserializationError::IncompleteInput);
+  }
+
+  SECTION("Premature end on sized input") {
+    DeserializationError err = deserializeJson(doc, "/* comment */", 10);
+
+    REQUIRE(err == DeserializationError::IncompleteInput);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp
new file mode 100644
index 0000000..521fb84
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_0.cpp
@@ -0,0 +1,35 @@
+#define ARDUINOJSON_ENABLE_INFINITY 0
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+#include <limits>
+
+static void assertParseFails(const char* json) {
+  DynamicJsonDocument doc(4096);
+  DeserializationError err = deserializeJson(doc, json);
+
+  REQUIRE(err == DeserializationError::InvalidInput);
+}
+
+static void assertJsonEquals(const JsonDocument& doc,
+                             std::string expectedJson) {
+  std::string actualJson;
+  serializeJson(doc, actualJson);
+  REQUIRE(actualJson == expectedJson);
+}
+
+TEST_CASE("ARDUINOJSON_ENABLE_INFINITY == 0") {
+  SECTION("serializeJson()") {
+    DynamicJsonDocument doc(4096);
+    doc.add(std::numeric_limits<double>::infinity());
+    doc.add(-std::numeric_limits<double>::infinity());
+
+    assertJsonEquals(doc, "[null,null]");
+  }
+
+  SECTION("deserializeJson()") {
+    assertParseFails("{\"X\":Infinity}");
+    assertParseFails("{\"X\":-Infinity}");
+    assertParseFails("{\"X\":+Infinity}");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp
new file mode 100644
index 0000000..19e0d5b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_infinity_1.cpp
@@ -0,0 +1,39 @@
+#define ARDUINOJSON_ENABLE_INFINITY 1
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+#include <limits>
+
+namespace my {
+using ARDUINOJSON_NAMESPACE::isinf;
+}  // namespace my
+
+TEST_CASE("ARDUINOJSON_ENABLE_INFINITY == 1") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("serializeJson()") {
+    doc.add(std::numeric_limits<double>::infinity());
+    doc.add(-std::numeric_limits<double>::infinity());
+
+    std::string json;
+    serializeJson(doc, json);
+
+    REQUIRE(json == "[Infinity,-Infinity]");
+  }
+
+  SECTION("deserializeJson()") {
+    DeserializationError err =
+        deserializeJson(doc, "[Infinity,-Infinity,+Infinity]");
+    float a = doc[0];
+    float b = doc[1];
+    float c = doc[2];
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(my::isinf(a));
+    REQUIRE(a > 0);
+    REQUIRE(my::isinf(b));
+    REQUIRE(b < 0);
+    REQUIRE(my::isinf(c));
+    REQUIRE(c > 0);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp
new file mode 100644
index 0000000..e015a0d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_0.cpp
@@ -0,0 +1,25 @@
+#define ARDUINOJSON_ENABLE_NAN 0
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+#include <limits>
+
+TEST_CASE("ARDUINOJSON_ENABLE_NAN == 0") {
+  DynamicJsonDocument doc(4096);
+  JsonObject root = doc.to<JsonObject>();
+
+  SECTION("serializeJson()") {
+    root["X"] = std::numeric_limits<double>::signaling_NaN();
+
+    std::string json;
+    serializeJson(doc, json);
+
+    REQUIRE(json == "{\"X\":null}");
+  }
+
+  SECTION("deserializeJson()") {
+    DeserializationError err = deserializeJson(doc, "{\"X\":NaN}");
+
+    REQUIRE(err == DeserializationError::InvalidInput);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp
new file mode 100644
index 0000000..34d94fc
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_nan_1.cpp
@@ -0,0 +1,31 @@
+#define ARDUINOJSON_ENABLE_NAN 1
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+#include <limits>
+
+namespace my {
+using ARDUINOJSON_NAMESPACE::isnan;
+}  // namespace my
+
+TEST_CASE("ARDUINOJSON_ENABLE_NAN == 1") {
+  DynamicJsonDocument doc(4096);
+  JsonObject root = doc.to<JsonObject>();
+
+  SECTION("serializeJson()") {
+    root["X"] = std::numeric_limits<double>::signaling_NaN();
+
+    std::string json;
+    serializeJson(doc, json);
+
+    REQUIRE(json == "{\"X\":NaN}");
+  }
+
+  SECTION("deserializeJson()") {
+    DeserializationError err = deserializeJson(doc, "{\"X\":NaN}");
+    float x = doc["X"];
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(my::isnan(x));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp
new file mode 100644
index 0000000..1f8e8ca
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_progmem_1.cpp
@@ -0,0 +1,185 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include "progmem_emulation.hpp"
+
+#define ARDUINOJSON_ENABLE_PROGMEM 1
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("Flash strings") {
+  DynamicJsonDocument doc(2048);
+
+  SECTION("deserializeJson()") {
+    DeserializationError err = deserializeJson(doc, F("{'hello':'world'}"));
+
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(doc["hello"] == "world");
+  }
+
+  SECTION("JsonDocument::operator[]") {
+    doc[F("hello")] = F("world");
+
+    REQUIRE(doc["hello"] == "world");
+  }
+
+  SECTION("JsonDocument::add()") {
+    doc.add(F("world"));
+
+    REQUIRE(doc[0] == "world");
+  }
+
+  SECTION("JsonVariant::set()") {
+    JsonVariant var = doc.to<JsonVariant>();
+
+    var.set(F("world"));
+
+    REQUIRE(var == "world");
+  }
+
+  SECTION("MemberProxy::operator==") {
+    doc["hello"] = "world";
+
+    REQUIRE(doc["hello"] == F("world"));
+  }
+
+  SECTION("ElementProxy::operator==") {
+    doc.add("world");
+
+    REQUIRE(doc[0] == F("world"));
+  }
+}
+
+TEST_CASE("strlen_P") {
+  CHECK(strlen_P(PSTR("")) == 0);
+  CHECK(strlen_P(PSTR("a")) == 1);
+  CHECK(strlen_P(PSTR("ac")) == 2);
+}
+
+TEST_CASE("strncmp_P") {
+  CHECK(strncmp_P("a", PSTR("b"), 0) == 0);
+  CHECK(strncmp_P("a", PSTR("b"), 1) == -1);
+  CHECK(strncmp_P("b", PSTR("a"), 1) == 1);
+  CHECK(strncmp_P("a", PSTR("a"), 0) == 0);
+  CHECK(strncmp_P("a", PSTR("b"), 2) == -1);
+  CHECK(strncmp_P("b", PSTR("a"), 2) == 1);
+  CHECK(strncmp_P("a", PSTR("a"), 2) == 0);
+}
+
+TEST_CASE("strcmp_P") {
+  CHECK(strcmp_P("a", PSTR("b")) == -1);
+  CHECK(strcmp_P("b", PSTR("a")) == 1);
+  CHECK(strcmp_P("a", PSTR("a")) == 0);
+  CHECK(strcmp_P("aa", PSTR("ab")) == -1);
+  CHECK(strcmp_P("ab", PSTR("aa")) == 1);
+  CHECK(strcmp_P("aa", PSTR("aa")) == 0);
+}
+
+TEST_CASE("memcpy_P") {
+  char dst[4];
+  CHECK(memcpy_P(dst, PSTR("ABC"), 4) == dst);
+  CHECK(dst[0] == 'A');
+  CHECK(dst[1] == 'B');
+  CHECK(dst[2] == 'C');
+  CHECK(dst[3] == 0);
+}
+
+TEST_CASE("BoundedReader<const __FlashStringHelper*>") {
+  using namespace ARDUINOJSON_NAMESPACE;
+
+  SECTION("read") {
+    BoundedReader<const __FlashStringHelper*> reader(F("\x01\xFF"), 2);
+    REQUIRE(reader.read() == 0x01);
+    REQUIRE(reader.read() == 0xFF);
+    REQUIRE(reader.read() == -1);
+    REQUIRE(reader.read() == -1);
+  }
+
+  SECTION("readBytes() all at once") {
+    BoundedReader<const __FlashStringHelper*> reader(F("ABCD"), 3);
+
+    char buffer[8] = "abcd";
+    REQUIRE(reader.readBytes(buffer, 4) == 3);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'd');
+  }
+
+  SECTION("readBytes() in two parts") {
+    BoundedReader<const __FlashStringHelper*> reader(F("ABCDEF"), 6);
+
+    char buffer[8] = "abcdefg";
+    REQUIRE(reader.readBytes(buffer, 4) == 4);
+    REQUIRE(reader.readBytes(buffer + 4, 4) == 2);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'D');
+    REQUIRE(buffer[4] == 'E');
+    REQUIRE(buffer[5] == 'F');
+    REQUIRE(buffer[6] == 'g');
+  }
+}
+
+TEST_CASE("Reader<const __FlashStringHelper*>") {
+  using namespace ARDUINOJSON_NAMESPACE;
+
+  SECTION("read()") {
+    Reader<const __FlashStringHelper*> reader(F("\x01\xFF\x00\x12"));
+    REQUIRE(reader.read() == 0x01);
+    REQUIRE(reader.read() == 0xFF);
+    REQUIRE(reader.read() == 0);
+    REQUIRE(reader.read() == 0x12);
+  }
+
+  SECTION("readBytes() all at once") {
+    Reader<const __FlashStringHelper*> reader(F("ABCD"));
+
+    char buffer[8] = "abcd";
+    REQUIRE(reader.readBytes(buffer, 3) == 3);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'd');
+  }
+
+  SECTION("readBytes() in two parts") {
+    Reader<const __FlashStringHelper*> reader(F("ABCDEF"));
+
+    char buffer[8] = "abcdefg";
+    REQUIRE(reader.readBytes(buffer, 4) == 4);
+    REQUIRE(reader.readBytes(buffer + 4, 2) == 2);
+
+    REQUIRE(buffer[0] == 'A');
+    REQUIRE(buffer[1] == 'B');
+    REQUIRE(buffer[2] == 'C');
+    REQUIRE(buffer[3] == 'D');
+    REQUIRE(buffer[4] == 'E');
+    REQUIRE(buffer[5] == 'F');
+    REQUIRE(buffer[6] == 'g');
+  }
+}
+
+static void testStringification(DeserializationError error,
+                                std::string expected) {
+  const __FlashStringHelper* s = error.f_str();
+  CHECK(reinterpret_cast<const char*>(convertFlashToPtr(s)) == expected);
+}
+
+#define TEST_STRINGIFICATION(symbol) \
+  testStringification(DeserializationError::symbol, #symbol)
+
+TEST_CASE("DeserializationError::f_str()") {
+  TEST_STRINGIFICATION(Ok);
+  TEST_STRINGIFICATION(EmptyInput);
+  TEST_STRINGIFICATION(IncompleteInput);
+  TEST_STRINGIFICATION(InvalidInput);
+  TEST_STRINGIFICATION(NoMemory);
+  TEST_STRINGIFICATION(TooDeep);
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_string_deduplication_0.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_string_deduplication_0.cpp
new file mode 100644
index 0000000..2cf6a78
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_string_deduplication_0.cpp
@@ -0,0 +1,125 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include "progmem_emulation.hpp"
+
+#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
+#define ARDUINOJSON_ENABLE_PROGMEM 1
+#define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 0
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_ENABLE_STRING_DEDUPLICATION = 0") {
+  StaticJsonDocument<1024> doc;
+
+  SECTION("deserializeJson()") {
+    SECTION("Deduplicate values") {
+      deserializeJson(doc, "[\"example\",\"example\"]");
+
+      CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16);
+      CHECK(doc[0].as<const char*>() != doc[1].as<const char*>());
+    }
+
+    SECTION("Deduplicate keys") {
+      deserializeJson(doc, "[{\"example\":1},{\"example\":2}]");
+
+      CHECK(doc.memoryUsage() ==
+            2 * JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(2) + 16);
+
+      const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+      const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+
+      CHECK(key1 != key2);
+    }
+  }
+
+  SECTION("JsonDocument") {
+    SECTION("values") {
+      SECTION("std::string") {
+        doc.add(std::string("example"));
+        doc.add(std::string("example"));
+
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16);
+        CHECK(doc[0].as<const char*>() != doc[1].as<const char*>());
+      }
+
+      SECTION("char*") {
+        char value[] = "example";
+        doc.add(value);
+        doc.add(value);
+
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16);
+        CHECK(doc[0].as<const char*>() != doc[1].as<const char*>());
+      }
+
+      SECTION("Arduino String") {
+        doc.add(String("example"));
+        doc.add(String("example"));
+
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16);
+        CHECK(doc[0].as<const char*>() != doc[1].as<const char*>());
+      }
+
+      SECTION("Flash string") {
+        doc.add(F("example"));
+        doc.add(F("example"));
+
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 16);
+        CHECK(doc[0].as<const char*>() != doc[1].as<const char*>());
+      }
+    }
+
+    SECTION("keys") {
+      SECTION("std::string") {
+        doc[0][std::string("example")] = 1;
+        doc[1][std::string("example")] = 2;
+
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 16);
+
+        const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+        const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+        CHECK(key1 != key2);
+      }
+
+      SECTION("char*") {
+        char key[] = "example";
+        doc[0][key] = 1;
+        doc[1][key] = 2;
+
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 16);
+
+        const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+        const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+        CHECK(key1 != key2);
+      }
+
+      SECTION("Arduino String") {
+        doc[0][String("example")] = 1;
+        doc[1][String("example")] = 2;
+
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 16);
+
+        const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+        const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+        CHECK(key1 != key2);
+      }
+
+      SECTION("Flash string") {
+        doc[0][F("example")] = 1;
+        doc[1][F("example")] = 2;
+
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 16);
+
+        const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+        const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+        CHECK(key1 != key2);
+      }
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_string_deduplication_1.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_string_deduplication_1.cpp
new file mode 100644
index 0000000..799e992
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/enable_string_deduplication_1.cpp
@@ -0,0 +1,124 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include "progmem_emulation.hpp"
+
+#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
+#define ARDUINOJSON_ENABLE_PROGMEM 1
+#define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 1
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_ENABLE_STRING_DEDUPLICATION = 1") {
+  StaticJsonDocument<1024> doc;
+
+  SECTION("deserializeJson()") {
+    SECTION("Deduplicate values") {
+      deserializeJson(doc, "[\"example\",\"example\"]");
+
+      CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8);
+      CHECK(doc[0].as<const char*>() == doc[1].as<const char*>());
+    }
+
+    SECTION("Deduplicate keys") {
+      deserializeJson(doc, "[{\"example\":1},{\"example\":2}]");
+
+      CHECK(doc.memoryUsage() ==
+            2 * JSON_OBJECT_SIZE(1) + JSON_ARRAY_SIZE(2) + 8);
+
+      const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+      const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+      CHECK(key1 == key2);
+    }
+  }
+
+  SECTION("JsonDocument") {
+    SECTION("values") {
+      SECTION("std::string") {
+        doc.add(std::string("example"));
+        doc.add(std::string("example"));
+
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8);
+        CHECK(doc[0].as<const char*>() == doc[1].as<const char*>());
+      }
+
+      SECTION("char*") {
+        char value[] = "example";
+        doc.add(value);
+        doc.add(value);
+
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8);
+        CHECK(doc[0].as<const char*>() == doc[1].as<const char*>());
+      }
+
+      SECTION("Arduino String") {
+        doc.add(String("example"));
+        doc.add(String("example"));
+
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8);
+        CHECK(doc[0].as<const char*>() == doc[1].as<const char*>());
+      }
+
+      SECTION("Flash string") {
+        doc.add(F("example"));
+        doc.add(F("example"));
+
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(2) + 8);
+        CHECK(doc[0].as<const char*>() == doc[1].as<const char*>());
+      }
+    }
+
+    SECTION("keys") {
+      SECTION("std::string") {
+        doc[0][std::string("example")] = 1;
+        doc[1][std::string("example")] = 2;
+
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8);
+
+        const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+        const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+        CHECK(key1 == key2);
+      }
+
+      SECTION("char*") {
+        char key[] = "example";
+        doc[0][key] = 1;
+        doc[1][key] = 2;
+
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8);
+
+        const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+        const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+        CHECK(key1 == key2);
+      }
+
+      SECTION("Arduino String") {
+        doc[0][String("example")] = 1;
+        doc[1][String("example")] = 2;
+
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8);
+
+        const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+        const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+        CHECK(key1 == key2);
+      }
+
+      SECTION("Flash string") {
+        doc[0][F("example")] = 1;
+        doc[1][F("example")] = 2;
+
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(1) + 8);
+
+        const char* key1 = doc[0].as<JsonObject>().begin()->key().c_str();
+        const char* key2 = doc[1].as<JsonObject>().begin()->key().c_str();
+        CHECK(key1 == key2);
+      }
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp
new file mode 100644
index 0000000..f38ee1f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/use_double_0.cpp
@@ -0,0 +1,17 @@
+#define ARDUINOJSON_USE_DOUBLE 0
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_USE_DOUBLE == 0") {
+  DynamicJsonDocument doc(4096);
+  JsonObject root = doc.to<JsonObject>();
+
+  root["pi"] = 3.14;
+  root["e"] = 2.72;
+
+  std::string json;
+  serializeJson(doc, json);
+
+  REQUIRE(json == "{\"pi\":3.14,\"e\":2.72}");
+}
diff --git a/third-party/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp b/third-party/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp
new file mode 100644
index 0000000..ff4a0e3
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MixedConfiguration/use_double_1.cpp
@@ -0,0 +1,17 @@
+#define ARDUINOJSON_USE_DOUBLE 1
+#include <ArduinoJson.h>
+
+#include <catch.hpp>
+
+TEST_CASE("ARDUINOJSON_USE_DOUBLE == 1") {
+  DynamicJsonDocument doc(4096);
+  JsonObject root = doc.to<JsonObject>();
+
+  root["pi"] = 3.14;
+  root["e"] = 2.72;
+
+  std::string json;
+  serializeJson(doc, json);
+
+  REQUIRE(json == "{\"pi\":3.14,\"e\":2.72}");
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt
new file mode 100644
index 0000000..3ca4d0b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/CMakeLists.txt
@@ -0,0 +1,24 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(MsgPackDeserializerTests
+	deserializeArray.cpp
+	deserializeObject.cpp
+	deserializeStaticVariant.cpp
+	deserializeVariant.cpp
+	doubleToFloat.cpp
+	filter.cpp
+	incompleteInput.cpp
+	input_types.cpp
+	misc.cpp
+	nestingLimit.cpp
+	notSupported.cpp
+)
+
+add_test(MsgPackDeserializer MsgPackDeserializerTests)
+
+set_tests_properties(MsgPackDeserializer
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp
new file mode 100644
index 0000000..877a707
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeArray.cpp
@@ -0,0 +1,83 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize MsgPack array") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("fixarray") {
+    SECTION("empty") {
+      const char* input = "\x90";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonArray array = doc.as<JsonArray>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(array.size() == 0);
+    }
+
+    SECTION("two integers") {
+      const char* input = "\x92\x01\x02";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonArray array = doc.as<JsonArray>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(array.size() == 2);
+      REQUIRE(array[0] == 1);
+      REQUIRE(array[1] == 2);
+    }
+  }
+
+  SECTION("array 16") {
+    SECTION("empty") {
+      const char* input = "\xDC\x00\x00";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonArray array = doc.as<JsonArray>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(array.size() == 0);
+    }
+
+    SECTION("two strings") {
+      const char* input = "\xDC\x00\x02\xA5hello\xA5world";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonArray array = doc.as<JsonArray>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(array.size() == 2);
+      REQUIRE(array[0] == "hello");
+      REQUIRE(array[1] == "world");
+    }
+  }
+
+  SECTION("array 32") {
+    SECTION("empty") {
+      const char* input = "\xDD\x00\x00\x00\x00";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonArray array = doc.as<JsonArray>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(array.size() == 0);
+    }
+
+    SECTION("two floats") {
+      const char* input =
+          "\xDD\x00\x00\x00\x02\xCA\x00\x00\x00\x00\xCA\x40\x48\xF5\xC3";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonArray array = doc.as<JsonArray>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(array.size() == 2);
+      REQUIRE(array[0] == 0.0f);
+      REQUIRE(array[1] == 3.14f);
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp
new file mode 100644
index 0000000..37e1e67
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeObject.cpp
@@ -0,0 +1,130 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserialize MsgPack object") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("fixmap") {
+    SECTION("empty") {
+      const char* input = "\x80";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 0);
+    }
+
+    SECTION("two integers") {
+      const char* input = "\x82\xA3one\x01\xA3two\x02";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["one"] == 1);
+      REQUIRE(obj["two"] == 2);
+    }
+
+    SECTION("key is str 8") {
+      const char* input = "\x82\xd9\x03one\x01\xd9\x03two\x02";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["one"] == 1);
+      REQUIRE(obj["two"] == 2);
+    }
+
+    SECTION("key is str 16") {
+      const char* input = "\x82\xda\x00\x03one\x01\xda\x00\x03two\x02";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["one"] == 1);
+      REQUIRE(obj["two"] == 2);
+    }
+
+    SECTION("key is str 32") {
+      const char* input =
+          "\x82\xdb\x00\x00\x00\x03one\x01\xdb\x00\x00\x00\x03two\x02";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["one"] == 1);
+      REQUIRE(obj["two"] == 2);
+    }
+  }
+
+  SECTION("map 16") {
+    SECTION("empty") {
+      const char* input = "\xDE\x00\x00";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 0);
+    }
+
+    SECTION("two strings") {
+      const char* input = "\xDE\x00\x02\xA1H\xA5hello\xA1W\xA5world";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["H"] == "hello");
+      REQUIRE(obj["W"] == "world");
+    }
+  }
+
+  SECTION("map 32") {
+    SECTION("empty") {
+      const char* input = "\xDF\x00\x00\x00\x00";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 0);
+    }
+
+    SECTION("two floats") {
+      const char* input =
+          "\xDF\x00\x00\x00\x02\xA4zero\xCA\x00\x00\x00\x00\xA2pi\xCA\x40\x48"
+          "\xF5\xC3";
+
+      DeserializationError error = deserializeMsgPack(doc, input);
+      JsonObject obj = doc.as<JsonObject>();
+
+      REQUIRE(error == DeserializationError::Ok);
+      REQUIRE(doc.is<JsonObject>());
+      REQUIRE(obj.size() == 2);
+      REQUIRE(obj["zero"] == 0.0f);
+      REQUIRE(obj["pi"] == 3.14f);
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp
new file mode 100644
index 0000000..415bb4d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeStaticVariant.cpp
@@ -0,0 +1,152 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+template <size_t Capacity>
+static void check(const char* input, DeserializationError expected) {
+  StaticJsonDocument<Capacity> doc;
+
+  DeserializationError error = deserializeMsgPack(doc, input);
+
+  CAPTURE(input);
+  REQUIRE(error == expected);
+}
+
+template <size_t Size>
+static void checkString(const char* input, DeserializationError expected) {
+  check<Size>(input, expected);
+}
+
+TEST_CASE("deserializeMsgPack(StaticJsonDocument&)") {
+  SECTION("single values always fit") {
+    check<0>("\xc0", DeserializationError::Ok);                  // nil
+    check<0>("\xc2", DeserializationError::Ok);                  // false
+    check<0>("\xc3", DeserializationError::Ok);                  // true
+    check<0>("\xcc\x00", DeserializationError::Ok);              // uint 8
+    check<0>("\xcd\x30\x39", DeserializationError::Ok);          // uint 16
+    check<0>("\xCE\x12\x34\x56\x78", DeserializationError::Ok);  // uint 32
+  }
+
+  SECTION("fixstr") {
+    checkString<8>("\xA0", DeserializationError::Ok);
+    checkString<8>("\xA7ZZZZZZZ", DeserializationError::Ok);
+    checkString<8>("\xA8ZZZZZZZZ", DeserializationError::NoMemory);
+    checkString<16>("\xAFZZZZZZZZZZZZZZZ", DeserializationError::Ok);
+    checkString<16>("\xB0ZZZZZZZZZZZZZZZZ", DeserializationError::NoMemory);
+  }
+
+  SECTION("str 8") {
+    checkString<8>("\xD9\x00", DeserializationError::Ok);
+    checkString<8>("\xD9\x07ZZZZZZZ", DeserializationError::Ok);
+    checkString<8>("\xD9\x08ZZZZZZZZ", DeserializationError::NoMemory);
+    checkString<16>("\xD9\x0FZZZZZZZZZZZZZZZ", DeserializationError::Ok);
+    checkString<16>("\xD9\x10ZZZZZZZZZZZZZZZZ", DeserializationError::NoMemory);
+  }
+
+  SECTION("str 16") {
+    checkString<8>("\xDA\x00\x00", DeserializationError::Ok);
+    checkString<8>("\xDA\x00\x07ZZZZZZZ", DeserializationError::Ok);
+    checkString<8>("\xDA\x00\x08ZZZZZZZZ", DeserializationError::NoMemory);
+    checkString<16>("\xDA\x00\x0FZZZZZZZZZZZZZZZ", DeserializationError::Ok);
+    checkString<16>("\xDA\x00\x10ZZZZZZZZZZZZZZZZ",
+                    DeserializationError::NoMemory);
+  }
+
+  SECTION("str 32") {
+    checkString<8>("\xDB\x00\x00\x00\x00", DeserializationError::Ok);
+    checkString<8>("\xDB\x00\x00\x00\x07ZZZZZZZ", DeserializationError::Ok);
+    checkString<8>("\xDB\x00\x00\x00\x08ZZZZZZZZ",
+                   DeserializationError::NoMemory);
+    checkString<16>("\xDB\x00\x00\x00\x0FZZZZZZZZZZZZZZZ",
+                    DeserializationError::Ok);
+    checkString<16>("\xDB\x00\x00\x00\x10ZZZZZZZZZZZZZZZZ",
+                    DeserializationError::NoMemory);
+  }
+
+  SECTION("fixarray") {
+    check<JSON_ARRAY_SIZE(0)>("\x90", DeserializationError::Ok);  // []
+    check<JSON_ARRAY_SIZE(0)>("\x91\x01",
+                              DeserializationError::NoMemory);        // [1]
+    check<JSON_ARRAY_SIZE(1)>("\x91\x01", DeserializationError::Ok);  // [1]
+    check<JSON_ARRAY_SIZE(1)>("\x92\x01\x02",
+                              DeserializationError::NoMemory);  // [1,2]
+  }
+
+  SECTION("array 16") {
+    check<JSON_ARRAY_SIZE(0)>("\xDC\x00\x00", DeserializationError::Ok);
+    check<JSON_ARRAY_SIZE(0)>("\xDC\x00\x01\x01",
+                              DeserializationError::NoMemory);
+    check<JSON_ARRAY_SIZE(1)>("\xDC\x00\x01\x01", DeserializationError::Ok);
+    check<JSON_ARRAY_SIZE(1)>("\xDC\x00\x02\x01\x02",
+                              DeserializationError::NoMemory);
+  }
+
+  SECTION("array 32") {
+    check<JSON_ARRAY_SIZE(0)>("\xDD\x00\x00\x00\x00", DeserializationError::Ok);
+    check<JSON_ARRAY_SIZE(0)>("\xDD\x00\x00\x00\x01\x01",
+                              DeserializationError::NoMemory);
+    check<JSON_ARRAY_SIZE(1)>("\xDD\x00\x00\x00\x01\x01",
+                              DeserializationError::Ok);
+    check<JSON_ARRAY_SIZE(1)>("\xDD\x00\x00\x00\x02\x01\x02",
+                              DeserializationError::NoMemory);
+  }
+
+  SECTION("fixmap") {
+    SECTION("{}") {
+      check<JSON_OBJECT_SIZE(0)>("\x80", DeserializationError::Ok);
+    }
+    SECTION("{H:1}") {
+      check<JSON_OBJECT_SIZE(0)>("\x81\xA1H\x01",
+                                 DeserializationError::NoMemory);
+      check<JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(2)>(
+          "\x81\xA1H\x01", DeserializationError::Ok);
+    }
+    SECTION("{H:1,W:2}") {
+      check<JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(2)>(
+          "\x82\xA1H\x01\xA1W\x02", DeserializationError::NoMemory);
+      check<JSON_OBJECT_SIZE(2) + 2 * JSON_STRING_SIZE(2)>(
+          "\x82\xA1H\x01\xA1W\x02", DeserializationError::Ok);
+    }
+  }
+
+  SECTION("map 16") {
+    SECTION("{}") {
+      check<JSON_OBJECT_SIZE(0)>("\xDE\x00\x00", DeserializationError::Ok);
+    }
+    SECTION("{H:1}") {
+      check<JSON_OBJECT_SIZE(0)>("\xDE\x00\x01\xA1H\x01",
+                                 DeserializationError::NoMemory);
+      check<JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(2)>(
+          "\xDE\x00\x01\xA1H\x01", DeserializationError::Ok);
+    }
+    SECTION("{H:1,W:2}") {
+      check<JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(2)>(
+          "\xDE\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::NoMemory);
+      check<JSON_OBJECT_SIZE(2) + 2 * JSON_OBJECT_SIZE(1)>(
+          "\xDE\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::Ok);
+    }
+  }
+
+  SECTION("map 32") {
+    SECTION("{}") {
+      check<JSON_OBJECT_SIZE(0)>("\xDF\x00\x00\x00\x00",
+                                 DeserializationError::Ok);
+    }
+    SECTION("{H:1}") {
+      check<JSON_OBJECT_SIZE(0)>("\xDF\x00\x00\x00\x01\xA1H\x01",
+                                 DeserializationError::NoMemory);
+      check<JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(2)>(
+          "\xDF\x00\x00\x00\x01\xA1H\x01", DeserializationError::Ok);
+    }
+    SECTION("{H:1,W:2}") {
+      check<JSON_OBJECT_SIZE(1) + JSON_STRING_SIZE(2)>(
+          "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02",
+          DeserializationError::NoMemory);
+      check<JSON_OBJECT_SIZE(2) + 2 * JSON_OBJECT_SIZE(1)>(
+          "\xDF\x00\x00\x00\x02\xA1H\x01\xA1W\x02", DeserializationError::Ok);
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp
new file mode 100644
index 0000000..f242231
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/deserializeVariant.cpp
@@ -0,0 +1,147 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+template <typename T, typename U>
+static void check(const char* input, U expected) {
+  DynamicJsonDocument doc(4096);
+
+  DeserializationError error = deserializeMsgPack(doc, input);
+
+  REQUIRE(error == DeserializationError::Ok);
+  REQUIRE(doc.is<T>());
+  REQUIRE(doc.as<T>() == expected);
+}
+
+#if ARDUINOJSON_USE_LONG_LONG == 0
+static void checkNotSupported(const char* input) {
+  DynamicJsonDocument doc(4096);
+  DeserializationError error = deserializeMsgPack(doc, input);
+  REQUIRE(error == DeserializationError::Ok);
+  REQUIRE(doc.isNull());
+}
+#endif
+
+static void checkIsNull(const char* input) {
+  DynamicJsonDocument doc(4096);
+
+  DeserializationError error = deserializeMsgPack(doc, input);
+
+  REQUIRE(error == DeserializationError::Ok);
+  REQUIRE(doc.as<JsonVariant>().isNull());
+}
+
+TEST_CASE("deserialize MsgPack value") {
+  SECTION("nil") {
+    checkIsNull("\xc0");
+  }
+
+  SECTION("bool") {
+    check<bool>("\xc2", false);
+    check<bool>("\xc3", true);
+  }
+
+  SECTION("positive fixint") {
+    check<int>("\x00", 0);
+    check<int>("\x7F", 127);
+  }
+
+  SECTION("negative fixint") {
+    check<int>("\xe0", -32);
+    check<int>("\xff", -1);
+  }
+
+  SECTION("uint 8") {
+    check<int>("\xcc\x00", 0);
+    check<int>("\xcc\xff", 255);
+  }
+
+  SECTION("uint 16") {
+    check<int>("\xcd\x00\x00", 0);
+    check<int>("\xcd\xFF\xFF", 65535);
+    check<int>("\xcd\x30\x39", 12345);
+  }
+
+  SECTION("uint 32") {
+    check<uint32_t>("\xCE\x00\x00\x00\x00", 0x00000000U);
+    check<uint32_t>("\xCE\xFF\xFF\xFF\xFF", 0xFFFFFFFFU);
+    check<uint32_t>("\xCE\x12\x34\x56\x78", 0x12345678U);
+  }
+
+  SECTION("uint 64") {
+#if ARDUINOJSON_USE_LONG_LONG
+    check<uint64_t>("\xCF\x00\x00\x00\x00\x00\x00\x00\x00", 0U);
+    check<uint64_t>("\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF",
+                    0xFFFFFFFFFFFFFFFFU);
+    check<uint64_t>("\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0",
+                    0x123456789ABCDEF0U);
+#else
+    checkNotSupported("\xCF\x00\x00\x00\x00\x00\x00\x00\x00");
+    checkNotSupported("\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF");
+    checkNotSupported("\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0");
+#endif
+  }
+
+  SECTION("int 8") {
+    check<int>("\xd0\x00", 0);
+    check<int>("\xd0\xff", -1);
+  }
+
+  SECTION("int 16") {
+    check<int>("\xD1\x00\x00", 0);
+    check<int>("\xD1\xFF\xFF", -1);
+    check<int>("\xD1\xCF\xC7", -12345);
+  }
+
+  SECTION("int 32") {
+    check<int>("\xD2\x00\x00\x00\x00", 0);
+    check<int>("\xD2\xFF\xFF\xFF\xFF", -1);
+    check<int>("\xD2\xB6\x69\xFD\x2E", -1234567890);
+  }
+
+  SECTION("int 64") {
+#if ARDUINOJSON_USE_LONG_LONG
+    check<int64_t>("\xD3\x00\x00\x00\x00\x00\x00\x00\x00", int64_t(0U));
+    check<int64_t>("\xD3\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF",
+                   int64_t(0xFFFFFFFFFFFFFFFFU));
+    check<int64_t>("\xD3\x12\x34\x56\x78\x9A\xBC\xDE\xF0",
+                   int64_t(0x123456789ABCDEF0));
+#else
+    checkNotSupported("\xD3\x00\x00\x00\x00\x00\x00\x00\x00");
+    checkNotSupported("\xD3\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF");
+    checkNotSupported("\xD3\x12\x34\x56\x78\x9A\xBC\xDE\xF0");
+#endif
+  }
+
+  SECTION("float 32") {
+    check<double>("\xCA\x00\x00\x00\x00", 0.0f);
+    check<double>("\xCA\x40\x48\xF5\xC3", 3.14f);
+  }
+
+  SECTION("float 64") {
+    check<double>("\xCB\x00\x00\x00\x00\x00\x00\x00\x00", 0.0);
+    check<double>("\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F", 3.1415);
+  }
+
+  SECTION("fixstr") {
+    check<const char*>("\xA0", std::string(""));
+    check<const char*>("\xABhello world", std::string("hello world"));
+    check<const char*>("\xBFhello world hello world hello !",
+                       std::string("hello world hello world hello !"));
+  }
+
+  SECTION("str 8") {
+    check<const char*>("\xd9\x05hello", std::string("hello"));
+  }
+
+  SECTION("str 16") {
+    check<const char*>("\xda\x00\x05hello", std::string("hello"));
+  }
+
+  SECTION("str 32") {
+    check<const char*>("\xdb\x00\x00\x00\x05hello", std::string("hello"));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp
new file mode 100644
index 0000000..9fd938c
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/doubleToFloat.cpp
@@ -0,0 +1,25 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+template <typename T>
+static void check(const char* input, T expected) {
+  T actual;
+  uint8_t* f = reinterpret_cast<uint8_t*>(&actual);
+  const uint8_t* d = reinterpret_cast<const uint8_t*>(input);
+  doubleToFloat(d, f);
+  fixEndianess(actual);
+  CHECK(actual == expected);
+}
+
+TEST_CASE("doubleToFloat()") {
+  check("\x40\x09\x21\xCA\xC0\x83\x12\x6F", 3.1415f);
+  check("\x00\x00\x00\x00\x00\x00\x00\x00", 0.0f);
+  check("\x80\x00\x00\x00\x00\x00\x00\x00", -0.0f);
+  check("\xC0\x5E\xDC\xCC\xCC\xCC\xCC\xCD", -123.45f);
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/filter.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/filter.cpp
new file mode 100644
index 0000000..5687bd0
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/filter.cpp
@@ -0,0 +1,1119 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("deserializeMsgPack() filter") {
+  StaticJsonDocument<4096> doc;
+  DeserializationError error;
+
+  StaticJsonDocument<200> filter;
+  DeserializationOption::Filter filterOpt(filter);
+
+  SECTION("root is fixmap") {
+    SECTION("filter = {include:true,ignore:false)") {
+      filter["include"] = true;
+      filter["ignore"] = false;
+
+      SECTION("input truncated after ignored key") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore", 8, filterOpt);
+
+        CHECK(error == DeserializationError::IncompleteInput);
+        CHECK(doc.as<std::string>() == "{}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+      }
+
+      SECTION("input truncated after inside skipped uint 8") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xCC\x2A\xA7include\x2A",
+                                   9, filterOpt);
+
+        CHECK(error == DeserializationError::IncompleteInput);
+        CHECK(doc.as<std::string>() == "{}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+      }
+
+      SECTION("input truncated after before skipped string size") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xd9", 9, filterOpt);
+
+        CHECK(error == DeserializationError::IncompleteInput);
+        CHECK(doc.as<std::string>() == "{}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+      }
+
+      SECTION("input truncated after before skipped ext size") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xC7", 9, filterOpt);
+
+        CHECK(error == DeserializationError::IncompleteInput);
+        CHECK(doc.as<std::string>() == "{}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(0));
+      }
+
+      SECTION("skip nil") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xC0\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("reject 0xc1") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xC1\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::InvalidInput);
+      }
+
+      SECTION("skip false") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xC2\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip true") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xC3\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip positive fixint") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\x2A\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip negative fixint") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xFF\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip uint 8") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xCC\x2A\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip int 8") {
+        error = deserializeMsgPack(doc, "\x82\xA6ignore\xD0\x2A\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip uint 16") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xcd\x30\x39\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip int 16") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xD1\xCF\xC7\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip uint 32") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xCE\x12\x34\x56\x78\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip int 32") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xD2\xB6\x69\xFD\x2E\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip uint 64") {
+        error = deserializeMsgPack(
+            doc,
+            "\x82\xA6ignore\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip int 64") {
+        error = deserializeMsgPack(
+            doc,
+            "\x82\xA6ignore\xD3\x12\x34\x56\x78\x9A\xBC\xDE\xF0\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip float 32") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xCA\x40\x48\xF5\xC3\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip float 64") {
+        error = deserializeMsgPack(
+            doc,
+            "\x82\xA6ignore\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip fixstr") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xABhello world\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip str 8") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xd9\x05hello\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip str 16") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xda\x00\x05hello\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip str 32") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xdb\x00\x00\x00\x05hello\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip bin 8") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xC4\x05hello\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip bin 16") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xC5\x00\x05hello\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip bin 32") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xC6\x00\x00\x00\x05hello\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip fixarray") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\x92\x01\x02\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip array 16") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\xDC\x00\x02\xA5hello\xA5world\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip array 32") {
+        error = deserializeMsgPack(
+            doc,
+            "\x82\xA6ignore"
+            "\xDD\x00\x00\x00\x02\xCA\x00\x00\x00\x00\xCA\x40\x48\xF5\xC3"
+            "\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip fixmap") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA6ignore\x82\xA3one\x01\xA3two\x02\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip map 16") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA6ignore"
+                                   "\xDE\x00\x02\xA1H\xA5hello\xA1W\xA5world"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip map 32") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA6ignore"
+                                   "\xDF\x00\x00\x00\x02"
+                                   "\xA4zero\xCA\x00\x00\x00\x00"
+                                   "\xA2pi\xCA\x40\x48\xF5\xC3"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip fixext 1") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA6ignore"
+                                   "\xd4\x01\x02"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip fixext 2") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA6ignore"
+                                   "\xd5\x01\x02\x03"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip fixext 4") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA6ignore"
+                                   "\xd6\x01\x02\x03\x04\x05"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip fixext 8") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA6ignore"
+                                   "\xd7\x01\x02\x03\x04\x05\x06\x07\x08\x09"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip fixext 16") {
+        error =
+            deserializeMsgPack(doc,
+                               "\x82\xA6ignore"
+                               "\xd8\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A"
+                               "\x0B\x0C\x0D\x0E\x0F\x10\x11"
+                               "\xA7include\x2A",
+                               filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip ext 8") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA6ignore"
+                                   "\xc7\x02\x00\x01\x02"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip ext 16") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA6ignore"
+                                   "\xc8\x00\x02\x00\x01\x02"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+
+      SECTION("skip ext 32") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA6ignore"
+                                   "\xc9\x00\x00\x00\x02\x00\x01\x02"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(1) + 8);
+      }
+    }
+
+    SECTION("Filter = {arronly:[{measure:true}],include:true}") {
+      filter["onlyarr"][0]["measure"] = true;
+      filter["include"] = true;
+
+      CAPTURE(filter.as<std::string>());
+
+      SECTION("include fixarray") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA7onlyarr\x92"
+                                   "\x82\xA8location\x01\xA7measure\x02"
+                                   "\x82\xA8location\x02\xA7measure\x04"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() ==
+              "{\"onlyarr\":[{\"measure\":2},{\"measure\":4}],\"include\":42}");
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(2) + 24);
+      }
+
+      SECTION("include array 16") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA7onlyarr"
+                                   "\xDC\x00\x02"
+                                   "\x82\xA8location\x01\xA7measure\x02"
+                                   "\x82\xA8location\x02\xA7measure\x04"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() ==
+              "{\"onlyarr\":[{\"measure\":2},{\"measure\":4}],\"include\":42}");
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(2) + 24);
+      }
+
+      SECTION("include array 32") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA7onlyarr"
+                                   "\xDD\x00\x00\x00\x02"
+                                   "\x82\xA8location\x01\xA7measure\x02"
+                                   "\x82\xA8location\x02\xA7measure\x04"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() ==
+              "{\"onlyarr\":[{\"measure\":2},{\"measure\":4}],\"include\":42}");
+        CHECK(doc.memoryUsage() ==
+              JSON_ARRAY_SIZE(2) + 2 * JSON_OBJECT_SIZE(2) + 24);
+      }
+
+      SECTION("skip null") {
+        error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xC0\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip false") {
+        error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xC2\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip true") {
+        error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xC3\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip positive fixint") {
+        error = deserializeMsgPack(doc, "\x82\xA7onlyarr\x2A\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip negative fixint") {
+        error = deserializeMsgPack(doc, "\x82\xA7onlyarr\xFF\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip uint 8") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xCC\x2A\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip uint 16") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xcd\x30\x39\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip uint 32") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xCE\x12\x34\x56\x78\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip uint 64") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA7onlyarr\xCF\x12\x34\x56\x78\x9A\xBC"
+                                   "\xDE\xF0\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip int 8") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xD0\x2A\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip int 16") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xD1\xCF\xC7\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip int 32") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xD2\xB6\x69\xFD\x2E\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip int 64") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA7onlyarr\xD3\x12\x34\x56\x78\x9A\xBC"
+                                   "\xDE\xF0\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip float 32") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xCA\x40\x48\xF5\xC3\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip float 64") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA7onlyarr\xCB\x40\x09\x21\xCA\xC0\x83"
+                                   "\x12\x6F\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip fixstr") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xABhello world\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip str 8") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xd9\x05hello\xA7include\x2A", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+      }
+
+      SECTION("skip str 16") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xda\x00\x05hello\xA7include\x2A", filterOpt);
+
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+      }
+
+      SECTION("skip str 32") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\xdb\x00\x00\x00\x05hello\xA7include\x2A",
+            filterOpt);
+
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip fixmap") {
+        error = deserializeMsgPack(
+            doc, "\x82\xA7onlyarr\x82\xA3one\x01\xA3two\x02\xA7include\x2A",
+            filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip map 16") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA7onlyarr"
+                                   "\xDE\x00\x02\xA1H\xA5hello\xA1W\xA5world"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+
+      SECTION("skip map 32") {
+        error = deserializeMsgPack(doc,
+                                   "\x82\xA7onlyarr"
+                                   "\xDF\x00\x00\x00\x02"
+                                   "\xA4zero\xCA\x00\x00\x00\x00"
+                                   "\xA2pi\xCA\x40\x48\xF5\xC3"
+                                   "\xA7include\x2A",
+                                   filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "{\"onlyarr\":null,\"include\":42}");
+        CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+      }
+    }
+  }
+
+  SECTION("root is fixarray") {
+    SECTION("filter = [false, true]") {
+      filter[0] = false;  // only the first elment of the filter matters
+      filter[1] = true;   // so this one is ignored
+
+      SECTION("input = [1,2,3]") {
+        error = deserializeMsgPack(doc, "\x93\x01\x02\x03", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "[]");
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(0));
+      }
+    }
+
+    SECTION("filter = [true, false]") {
+      filter[0] = true;   // only the first elment of the filter matters
+      filter[1] = false;  // so this one is ignored
+
+      SECTION("input = [1,2,3]") {
+        error = deserializeMsgPack(doc, "\x93\x01\x02\x03", filterOpt);
+
+        CHECK(error == DeserializationError::Ok);
+        CHECK(doc.as<std::string>() == "[1,2,3]");
+        CHECK(doc.memoryUsage() == JSON_ARRAY_SIZE(3));
+      }
+    }
+  }
+
+  SECTION("Filter = {onlyobj:{measure:true},include:true}") {
+    filter["onlyobj"]["measure"] = true;
+    filter["include"] = true;
+
+    CAPTURE(filter.as<std::string>());
+
+    SECTION("include fixmap") {
+      error = deserializeMsgPack(doc,
+                                 "\x82\xA7onlyobj"
+                                 "\x82\xA8location\x01\xA7measure\x02"
+                                 "\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() ==
+            "{\"onlyobj\":{\"measure\":2},\"include\":42}");
+      CHECK(doc.memoryUsage() ==
+            JSON_OBJECT_SIZE(2) + JSON_OBJECT_SIZE(1) + 24);
+    }
+
+    SECTION("include map 16") {
+      error = deserializeMsgPack(doc,
+                                 "\x82\xA7onlyobj"
+                                 "\xDE\x00\x02\xA8location\x01\xA7measure\x02"
+                                 "\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() ==
+            "{\"onlyobj\":{\"measure\":2},\"include\":42}");
+      CHECK(doc.memoryUsage() ==
+            JSON_OBJECT_SIZE(2) + JSON_OBJECT_SIZE(1) + 24);
+    }
+
+    SECTION("include map 32") {
+      error = deserializeMsgPack(doc,
+                                 "\x82\xA7onlyobj"
+                                 "\xDF\x00\x00\x00\x02"
+                                 "\xA8location\x01\xA7measure\x02"
+                                 "\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() ==
+            "{\"onlyobj\":{\"measure\":2},\"include\":42}");
+      CHECK(doc.memoryUsage() ==
+            JSON_OBJECT_SIZE(2) + JSON_OBJECT_SIZE(1) + 24);
+    }
+
+    SECTION("skip null") {
+      error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xC0\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip false") {
+      error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xC2\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip true") {
+      error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xC3\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip positive fixint") {
+      error = deserializeMsgPack(doc, "\x82\xA7onlyobj\x2A\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip negative fixint") {
+      error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xFF\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip uint 8") {
+      error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xCC\x2A\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip uint 16") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\xcd\x30\x39\xA7include\x2A", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip uint 32") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\xCE\x12\x34\x56\x78\xA7include\x2A", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip uint 64") {
+      error = deserializeMsgPack(doc,
+                                 "\x82\xA7onlyobj\xCF\x12\x34\x56\x78\x9A\xBC"
+                                 "\xDE\xF0\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip int 8") {
+      error = deserializeMsgPack(doc, "\x82\xA7onlyobj\xD0\x2A\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip int 16") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\xD1\xCF\xC7\xA7include\x2A", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip int 32") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\xD2\xB6\x69\xFD\x2E\xA7include\x2A", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip int 64") {
+      error = deserializeMsgPack(doc,
+                                 "\x82\xA7onlyobj\xD3\x12\x34\x56\x78\x9A\xBC"
+                                 "\xDE\xF0\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip float 32") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\xCA\x40\x48\xF5\xC3\xA7include\x2A", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip float 64") {
+      error = deserializeMsgPack(doc,
+                                 "\x82\xA7onlyobj\xCB\x40\x09\x21\xCA\xC0\x83"
+                                 "\x12\x6F\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip fixstr") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\xABhello world\xA7include\x2A", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip str 8") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\xd9\x05hello\xA7include\x2A", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+    }
+
+    SECTION("skip str 16") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\xda\x00\x05hello\xA7include\x2A", filterOpt);
+
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+    }
+
+    SECTION("skip str 32") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\xdb\x00\x00\x00\x05hello\xA7include\x2A",
+          filterOpt);
+
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip fixarray") {
+      error = deserializeMsgPack(
+          doc, "\x82\xA7onlyobj\x92\x01\x02\xA7include\x2A", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip array 16") {
+      error = deserializeMsgPack(doc,
+                                 "\x82\xA7onlyobj\xDC\x00\x01\xA7"
+                                 "example\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+
+    SECTION("skip array 32") {
+      error = deserializeMsgPack(doc,
+                                 "\x82\xA7onlyobj"
+                                 "\xDD\x00\x00\x00\x02\x01\x02"
+                                 "\xA7include\x2A",
+                                 filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.as<std::string>() == "{\"onlyobj\":null,\"include\":42}");
+      CHECK(doc.memoryUsage() == JSON_OBJECT_SIZE(2) + 16);
+    }
+  }
+
+  SECTION("filter = true") {
+    filter.set(true);
+
+    error = deserializeMsgPack(doc, "\x90", filterOpt);
+
+    CHECK(error == DeserializationError::Ok);
+    CHECK(doc.is<JsonArray>() == true);
+    CHECK(doc.size() == 0);
+  }
+
+  SECTION("filter = false") {
+    filter.set(false);
+
+    SECTION("input = fixarray") {
+      error = deserializeMsgPack(doc, "\x92\x01\x02", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.isNull() == true);
+    }
+
+    SECTION("input = array 16") {
+      error = deserializeMsgPack(doc, "\xDC\x00\x02\x01\x02", filterOpt);
+
+      CHECK(error == DeserializationError::Ok);
+      CHECK(doc.isNull() == true);
+    }
+
+    SECTION("array too deep") {
+      error = deserializeMsgPack(doc, "\x91\x91\x91\x91\x91", 5, filterOpt,
+                                 DeserializationOption::NestingLimit(4));
+
+      CHECK(error == DeserializationError::TooDeep);
+    }
+
+    SECTION("object too deep") {
+      error = deserializeMsgPack(
+          doc, "\x81\xA1z\x81\xA1z\x81\xA1z\x81\xA1z\x81\xA1z", 15, filterOpt,
+          DeserializationOption::NestingLimit(4));
+
+      CHECK(error == DeserializationError::TooDeep);
+    }
+  }
+}
+
+TEST_CASE("Overloads") {
+  StaticJsonDocument<256> doc;
+  StaticJsonDocument<256> filter;
+
+  using namespace DeserializationOption;
+
+  // deserializeMsgPack(..., Filter)
+
+  SECTION("const char*, Filter") {
+    deserializeMsgPack(doc, "{}", Filter(filter));
+  }
+
+  SECTION("const char*, size_t, Filter") {
+    deserializeMsgPack(doc, "{}", 2, Filter(filter));
+  }
+
+  SECTION("const std::string&, Filter") {
+    deserializeMsgPack(doc, std::string("{}"), Filter(filter));
+  }
+
+  SECTION("std::istream&, Filter") {
+    std::stringstream s("{}");
+    deserializeMsgPack(doc, s, Filter(filter));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("char[n], Filter") {
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "{}");
+    deserializeMsgPack(doc, vla, Filter(filter));
+  }
+#endif
+
+  // deserializeMsgPack(..., Filter, NestingLimit)
+
+  SECTION("const char*, Filter, NestingLimit") {
+    deserializeMsgPack(doc, "{}", Filter(filter), NestingLimit(5));
+  }
+
+  SECTION("const char*, size_t, Filter, NestingLimit") {
+    deserializeMsgPack(doc, "{}", 2, Filter(filter), NestingLimit(5));
+  }
+
+  SECTION("const std::string&, Filter, NestingLimit") {
+    deserializeMsgPack(doc, std::string("{}"), Filter(filter), NestingLimit(5));
+  }
+
+  SECTION("std::istream&, Filter, NestingLimit") {
+    std::stringstream s("{}");
+    deserializeMsgPack(doc, s, Filter(filter), NestingLimit(5));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("char[n], Filter, NestingLimit") {
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "{}");
+    deserializeMsgPack(doc, vla, Filter(filter), NestingLimit(5));
+  }
+#endif
+
+  // deserializeMsgPack(..., NestingLimit, Filter)
+
+  SECTION("const char*, NestingLimit, Filter") {
+    deserializeMsgPack(doc, "{}", NestingLimit(5), Filter(filter));
+  }
+
+  SECTION("const char*, size_t, NestingLimit, Filter") {
+    deserializeMsgPack(doc, "{}", 2, NestingLimit(5), Filter(filter));
+  }
+
+  SECTION("const std::string&, NestingLimit, Filter") {
+    deserializeMsgPack(doc, std::string("{}"), NestingLimit(5), Filter(filter));
+  }
+
+  SECTION("std::istream&, NestingLimit, Filter") {
+    std::stringstream s("{}");
+    deserializeMsgPack(doc, s, NestingLimit(5), Filter(filter));
+  }
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+  SECTION("char[n], NestingLimit, Filter") {
+    int i = 4;
+    char vla[i];
+    strcpy(vla, "{}");
+    deserializeMsgPack(doc, vla, NestingLimit(5), Filter(filter));
+  }
+#endif
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/incompleteInput.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/incompleteInput.cpp
new file mode 100644
index 0000000..488f889
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/incompleteInput.cpp
@@ -0,0 +1,158 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+DeserializationError deserialize(const char* input, size_t len) {
+  DynamicJsonDocument doc(4096);
+
+  return deserializeMsgPack(doc, input, len);
+}
+
+void checkAllSizes(const char* input, size_t len) {
+  REQUIRE(deserialize(input, len) == DeserializationError::Ok);
+
+  while (--len) {
+    REQUIRE(deserialize(input, len) == DeserializationError::IncompleteInput);
+  }
+}
+
+TEST_CASE("deserializeMsgPack() returns IncompleteInput") {
+  SECTION("empty input") {
+    checkAllSizes("\x00", 1);
+  }
+
+  SECTION("fixarray") {
+    checkAllSizes("\x91\x01", 2);
+  }
+
+  SECTION("array 16") {
+    checkAllSizes("\xDC\x00\x01\x01", 4);
+  }
+
+  SECTION("array 32") {
+    checkAllSizes("\xDD\x00\x00\x00\x01\x01", 6);
+  }
+
+  SECTION("fixmap") {
+    checkAllSizes("\x81\xA3one\x01", 6);
+  }
+
+  SECTION("map 16") {
+    checkAllSizes("\xDE\x00\x01\xA3one\x01", 8);
+  }
+
+  SECTION("map 32") {
+    checkAllSizes("\xDF\x00\x00\x00\x01\xA3one\x01", 10);
+    checkAllSizes("\xDF\x00\x00\x00\x01\xd9\x03one\x01", 11);
+  }
+
+  SECTION("uint 8") {
+    checkAllSizes("\xcc\x01", 2);
+  }
+
+  SECTION("uint 16") {
+    checkAllSizes("\xcd\x00\x01", 3);
+  }
+
+  SECTION("uint 32") {
+    checkAllSizes("\xCE\x00\x00\x00\x01", 5);
+  }
+
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("uint 64") {
+    checkAllSizes("\xCF\x00\x00\x00\x00\x00\x00\x00\x00", 9);
+  }
+#endif
+
+  SECTION("int 8") {
+    checkAllSizes("\xD0\x01", 2);
+  }
+
+  SECTION("int 16") {
+    checkAllSizes("\xD1\x00\x01", 3);
+  }
+
+  SECTION("int 32") {
+    checkAllSizes("\xD2\x00\x00\x00\x01", 5);
+  }
+
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("int 64") {
+    checkAllSizes("\xD3\x00\x00\x00\x00\x00\x00\x00\x00", 9);
+  }
+#endif
+
+  SECTION("float 32") {
+    checkAllSizes("\xCA\x40\x48\xF5\xC3", 5);
+  }
+
+  SECTION("float 64") {
+    checkAllSizes("\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F", 9);
+  }
+
+  SECTION("fixstr") {
+    checkAllSizes("\xABhello world", 12);
+  }
+
+  SECTION("str 8") {
+    checkAllSizes("\xd9\x05hello", 7);
+  }
+
+  SECTION("str 16") {
+    checkAllSizes("\xda\x00\x05hello", 8);
+  }
+
+  SECTION("str 32") {
+    checkAllSizes("\xdb\x00\x00\x00\x05hello", 10);
+  }
+
+  SECTION("bin 8") {
+    checkAllSizes("\xc4\x01X", 3);
+  }
+
+  SECTION("bin 16") {
+    checkAllSizes("\xc5\x00\x01X", 4);
+  }
+
+  SECTION("bin 32") {
+    checkAllSizes("\xc6\x00\x00\x00\x01X", 6);
+  }
+
+  SECTION("ext 8") {
+    checkAllSizes("\xc7\x01\x01\x01", 4);
+  }
+
+  SECTION("ext 16") {
+    checkAllSizes("\xc8\x00\x01\x01\x01", 5);
+  }
+
+  SECTION("ext 32") {
+    checkAllSizes("\xc9\x00\x00\x00\x01\x01\x01", 7);
+  }
+
+  SECTION("fixext 1") {
+    checkAllSizes("\xd4\x01\x01", 3);
+  }
+
+  SECTION("fixext 2") {
+    checkAllSizes("\xd5\x01\x01\x02", 4);
+  }
+
+  SECTION("fixext 4") {
+    checkAllSizes("\xd6\x01\x01\x02\x03\x04", 6);
+  }
+
+  SECTION("fixext 8") {
+    checkAllSizes("\xd7\x01\x01\x02\x03\x04\x05\x06\x07\x08", 10);
+  }
+
+  SECTION("fixext 16") {
+    checkAllSizes(
+        "\xd8\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E"
+        "\x0F\x10",
+        18);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp
new file mode 100644
index 0000000..952a840
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/input_types.cpp
@@ -0,0 +1,95 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#include "CustomReader.hpp"
+
+TEST_CASE("deserializeMsgPack(const std::string&)") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("should accept const string") {
+    const std::string input("\x92\x01\x02");
+
+    DeserializationError err = deserializeMsgPack(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("should accept temporary string") {
+    DeserializationError err =
+        deserializeMsgPack(doc, std::string("\x92\x01\x02"));
+
+    REQUIRE(err == DeserializationError::Ok);
+  }
+
+  SECTION("should duplicate content") {
+    std::string input("\x91\xA5hello");
+
+    DeserializationError err = deserializeMsgPack(doc, input);
+    input[2] = 'X';  // alter the string tomake sure we made a copy
+
+    JsonArray array = doc.as<JsonArray>();
+    REQUIRE(err == DeserializationError::Ok);
+    REQUIRE(std::string("hello") == array[0]);
+  }
+
+  SECTION("should accept a zero in input") {
+    DeserializationError err =
+        deserializeMsgPack(doc, std::string("\x92\x00\x02", 3));
+
+    REQUIRE(err == DeserializationError::Ok);
+    JsonArray arr = doc.as<JsonArray>();
+    REQUIRE(arr[0] == 0);
+    REQUIRE(arr[1] == 2);
+  }
+}
+
+TEST_CASE("deserializeMsgPack(std::istream&)") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("should accept a zero in input") {
+    std::istringstream input(std::string("\x92\x00\x02", 3));
+
+    DeserializationError err = deserializeMsgPack(doc, input);
+
+    REQUIRE(err == DeserializationError::Ok);
+    JsonArray arr = doc.as<JsonArray>();
+    REQUIRE(arr[0] == 0);
+    REQUIRE(arr[1] == 2);
+  }
+
+  SECTION("should detect incomplete input") {
+    std::istringstream input("\x92\x00\x02");
+
+    DeserializationError err = deserializeMsgPack(doc, input);
+
+    REQUIRE(err == DeserializationError::IncompleteInput);
+  }
+}
+
+#ifdef HAS_VARIABLE_LENGTH_ARRAY
+TEST_CASE("deserializeMsgPack(VLA)") {
+  int i = 16;
+  char vla[i];
+  memcpy(vla, "\xDE\x00\x01\xA5Hello\xA5world", 15);
+
+  StaticJsonDocument<JSON_OBJECT_SIZE(1)> doc;
+  DeserializationError err = deserializeMsgPack(doc, vla);
+
+  REQUIRE(err == DeserializationError::Ok);
+}
+#endif
+
+TEST_CASE("deserializeMsgPack(CustomReader)") {
+  DynamicJsonDocument doc(4096);
+  CustomReader reader("\x92\xA5Hello\xA5world");
+  DeserializationError err = deserializeMsgPack(doc, reader);
+
+  REQUIRE(err == DeserializationError::Ok);
+  REQUIRE(doc.size() == 2);
+  REQUIRE(doc[0] == "Hello");
+  REQUIRE(doc[1] == "world");
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/misc.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/misc.cpp
new file mode 100644
index 0000000..41b7331
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/misc.cpp
@@ -0,0 +1,24 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("deserializeMsgPack() returns EmptyInput") {
+  StaticJsonDocument<100> doc;
+
+  SECTION("from sized buffer") {
+    DeserializationError err = deserializeMsgPack(doc, "", 0);
+
+    REQUIRE(err == DeserializationError::EmptyInput);
+  }
+
+  SECTION("from stream") {
+    std::istringstream input("");
+
+    DeserializationError err = deserializeMsgPack(doc, input);
+
+    REQUIRE(err == DeserializationError::EmptyInput);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp
new file mode 100644
index 0000000..bb9bb51
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/nestingLimit.cpp
@@ -0,0 +1,85 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+#define SHOULD_WORK(expression) REQUIRE(DeserializationError::Ok == expression);
+#define SHOULD_FAIL(expression) \
+  REQUIRE(DeserializationError::TooDeep == expression);
+
+TEST_CASE("JsonDeserializer nesting") {
+  DynamicJsonDocument doc(4096);
+
+  SECTION("Input = const char*") {
+    SECTION("limit = 0") {
+      DeserializationOption::NestingLimit nesting(0);
+      SHOULD_WORK(deserializeMsgPack(doc, "\xA1H", nesting));  // "H"
+      SHOULD_FAIL(deserializeMsgPack(doc, "\x90", nesting));   // []
+      SHOULD_FAIL(deserializeMsgPack(doc, "\x80", nesting));   // {}
+    }
+
+    SECTION("limit = 1") {
+      DeserializationOption::NestingLimit nesting(1);
+      SHOULD_WORK(deserializeMsgPack(doc, "\x90", nesting));           // {}
+      SHOULD_WORK(deserializeMsgPack(doc, "\x80", nesting));           // []
+      SHOULD_FAIL(deserializeMsgPack(doc, "\x81\xA1H\x80", nesting));  // {H:{}}
+      SHOULD_FAIL(deserializeMsgPack(doc, "\x91\x90", nesting));       // [[]]
+    }
+  }
+
+  SECTION("char* and size_t") {
+    SECTION("limit = 0") {
+      DeserializationOption::NestingLimit nesting(0);
+      SHOULD_WORK(deserializeMsgPack(doc, "\xA1H", 2, nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, "\x90", 1, nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, "\x80", 1, nesting));
+    }
+
+    SECTION("limit = 1") {
+      DeserializationOption::NestingLimit nesting(1);
+      SHOULD_WORK(deserializeMsgPack(doc, "\x90", 1, nesting));
+      SHOULD_WORK(deserializeMsgPack(doc, "\x80", 1, nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, "\x81\xA1H\x80", 4, nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, "\x91\x90", 2, nesting));
+    }
+  }
+
+  SECTION("Input = std::string") {
+    using std::string;
+
+    SECTION("limit = 0") {
+      DeserializationOption::NestingLimit nesting(0);
+      SHOULD_WORK(deserializeMsgPack(doc, string("\xA1H"), nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, string("\x90"), nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, string("\x80"), nesting));
+    }
+
+    SECTION("limit = 1") {
+      DeserializationOption::NestingLimit nesting(1);
+      SHOULD_WORK(deserializeMsgPack(doc, string("\x90"), nesting));
+      SHOULD_WORK(deserializeMsgPack(doc, string("\x80"), nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, string("\x81\xA1H\x80"), nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, string("\x91\x90"), nesting));
+    }
+  }
+
+  SECTION("Input = std::istream") {
+    SECTION("limit = 0") {
+      DeserializationOption::NestingLimit nesting(0);
+      std::istringstream good("\xA1H");  // "H"
+      std::istringstream bad("\x90");    // []
+      SHOULD_WORK(deserializeMsgPack(doc, good, nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, bad, nesting));
+    }
+
+    SECTION("limit = 1") {
+      DeserializationOption::NestingLimit nesting(1);
+      std::istringstream good("\x90");     // []
+      std::istringstream bad("\x91\x90");  // [[]]
+      SHOULD_WORK(deserializeMsgPack(doc, good, nesting));
+      SHOULD_FAIL(deserializeMsgPack(doc, bad, nesting));
+    }
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/notSupported.cpp b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/notSupported.cpp
new file mode 100644
index 0000000..bf87e93
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackDeserializer/notSupported.cpp
@@ -0,0 +1,82 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+static void checkMsgPackDocument(const char* input, size_t inputSize,
+                                 const char* expectedJson) {
+  DynamicJsonDocument doc(4096);
+
+  DeserializationError error = deserializeMsgPack(doc, input, inputSize);
+
+  REQUIRE(error == DeserializationError::Ok);
+  std::string actualJson;
+  serializeJson(doc, actualJson);
+  REQUIRE(actualJson == expectedJson);
+}
+
+static void checkMsgPackError(const char* input, size_t inputSize,
+                              DeserializationError expectedError) {
+  DynamicJsonDocument doc(4096);
+
+  DeserializationError error = deserializeMsgPack(doc, input, inputSize);
+
+  REQUIRE(error == expectedError);
+}
+
+TEST_CASE("deserializeMsgPack() return NotSupported") {
+  SECTION("bin 8") {
+    checkMsgPackDocument("\x92\xc4\x01X\x2A", 5, "[null,42]");
+  }
+
+  SECTION("bin 16") {
+    checkMsgPackDocument("\x92\xc5\x00\x01X\x2A", 6, "[null,42]");
+  }
+
+  SECTION("bin 32") {
+    checkMsgPackDocument("\x92\xc6\x00\x00\x00\x01X\x2A", 8, "[null,42]");
+  }
+
+  SECTION("ext 8") {
+    checkMsgPackDocument("\x92\xc7\x01\x01\x01\x2A", 6, "[null,42]");
+  }
+
+  SECTION("ext 16") {
+    checkMsgPackDocument("\x92\xc8\x00\x01\x01\x01\x2A", 7, "[null,42]");
+  }
+
+  SECTION("ext 32") {
+    checkMsgPackDocument("\x92\xc9\x00\x00\x00\x01\x01\x01\x2A", 9,
+                         "[null,42]");
+  }
+
+  SECTION("fixext 1") {
+    checkMsgPackDocument("\x92\xd4\x01\x01\x2A", 5, "[null,42]");
+  }
+
+  SECTION("fixext 2") {
+    checkMsgPackDocument("\x92\xd5\x01\x01\x02\x2A", 6, "[null,42]");
+  }
+
+  SECTION("fixext 4") {
+    checkMsgPackDocument("\x92\xd6\x01\x01\x02\x03\x04\x2A", 8, "[null,42]");
+  }
+
+  SECTION("fixext 8") {
+    checkMsgPackDocument("\x92\xd7\x01\x01\x02\x03\x04\x05\x06\x07\x08\x2A", 12,
+                         "[null,42]");
+  }
+
+  SECTION("fixext 16") {
+    checkMsgPackDocument(
+        "\x92\xd8\x01\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E"
+        "\x0F\x10\x2A",
+        20, "[null,42]");
+  }
+
+  SECTION("integer as key") {
+    checkMsgPackError("\x81\x01\xA1H", 3, DeserializationError::InvalidInput);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt
new file mode 100644
index 0000000..1f8e20e
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/CMakeLists.txt
@@ -0,0 +1,19 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(MsgPackSerializerTests
+	destination_types.cpp
+	measure.cpp
+	misc.cpp
+	serializeArray.cpp
+	serializeObject.cpp
+	serializeVariant.cpp
+)
+
+add_test(MsgPackSerializer MsgPackSerializerTests)
+
+set_tests_properties(MsgPackSerializer
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp
new file mode 100644
index 0000000..7923800
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/destination_types.cpp
@@ -0,0 +1,59 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("serialize MsgPack to various destination types") {
+  DynamicJsonDocument doc(4096);
+  JsonObject object = doc.to<JsonObject>();
+  object["hello"] = "world";
+  const char *expected_result = "\x81\xA5hello\xA5world";
+  const size_t expected_length = 13;
+
+  SECTION("std::string") {
+    std::string result;
+    size_t len = serializeMsgPack(object, result);
+
+    REQUIRE(expected_result == result);
+    REQUIRE(expected_length == len);
+  }
+
+  /*  SECTION("std::vector<char>") {
+      std::vector<char> result;
+      size_t len = serializeMsgPack(object, result);
+
+      REQUIRE(std::vector<char>(expected_result, expected_result + 13) ==
+    result);
+    REQUIRE(expected_length == len);
+    } */
+
+  SECTION("char[] larger than needed") {
+    char result[64];
+    memset(result, 42, sizeof(result));
+    size_t len = serializeMsgPack(object, result);
+
+    REQUIRE(expected_length == len);
+    REQUIRE(std::string(expected_result, len) == std::string(result, len));
+    REQUIRE(result[len] == 42);
+  }
+
+  SECTION("char[] of the right size") {  // #1545
+    char result[13];
+    size_t len = serializeMsgPack(object, result);
+
+    REQUIRE(expected_length == len);
+    REQUIRE(std::string(expected_result, len) == std::string(result, len));
+  }
+
+  SECTION("char*") {
+    char result[64];
+    memset(result, 42, sizeof(result));
+    size_t len = serializeMsgPack(object, result, 64);
+
+    REQUIRE(expected_length == len);
+    REQUIRE(std::string(expected_result, len) == std::string(result, len));
+    REQUIRE(result[len] == 42);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp
new file mode 100644
index 0000000..fb2ec76
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/measure.cpp
@@ -0,0 +1,14 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+TEST_CASE("measureMsgPack()") {
+  DynamicJsonDocument doc(4096);
+  JsonObject object = doc.to<JsonObject>();
+  object["hello"] = "world";
+
+  REQUIRE(measureMsgPack(doc) == 13);
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp
new file mode 100644
index 0000000..52c53a7
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/misc.cpp
@@ -0,0 +1,46 @@
+#include <ArduinoJson.h>
+#include <catch.hpp>
+#include <limits>
+
+template <typename T>
+void check(T value, const std::string &expected) {
+  DynamicJsonDocument doc(4096);
+  doc.to<JsonVariant>().set(value);
+  char buffer[256] = "";
+  size_t returnValue = serializeMsgPack(doc, buffer, sizeof(buffer));
+  REQUIRE(expected == buffer);
+  REQUIRE(expected.size() == returnValue);
+}
+
+TEST_CASE("serializeMsgPack(MemberProxy)") {
+  DynamicJsonDocument doc(4096);
+  deserializeJson(doc, "{\"hello\":42}");
+  JsonObject obj = doc.as<JsonObject>();
+  std::string result;
+
+  serializeMsgPack(obj["hello"], result);
+
+  REQUIRE(result == "*");
+}
+
+TEST_CASE("serializeMsgPack(ElementProxy)") {
+  DynamicJsonDocument doc(4096);
+  deserializeJson(doc, "[42]");
+  JsonArray arr = doc.as<JsonArray>();
+  std::string result;
+
+  serializeMsgPack(arr[0], result);
+
+  REQUIRE(result == "*");
+}
+
+TEST_CASE("serializeMsgPack(JsonVariantSubscript)") {
+  DynamicJsonDocument doc(4096);
+  deserializeJson(doc, "[42]");
+  JsonVariant var = doc.as<JsonVariant>();
+  std::string result;
+
+  serializeMsgPack(var[0], result);
+
+  REQUIRE(result == "*");
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp
new file mode 100644
index 0000000..a77041b
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/serializeArray.cpp
@@ -0,0 +1,58 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+static void check(const JsonArray array, const char* expected_data,
+                  size_t expected_len) {
+  std::string expected(expected_data, expected_data + expected_len);
+  std::string actual;
+  size_t len = serializeMsgPack(array, actual);
+  CAPTURE(array);
+  REQUIRE(len == expected_len);
+  REQUIRE(actual == expected);
+}
+
+template <size_t N>
+static void check(const JsonArray array, const char (&expected_data)[N]) {
+  const size_t expected_len = N - 1;
+  check(array, expected_data, expected_len);
+}
+
+static void check(const JsonArray array, const std::string& expected) {
+  check(array, expected.data(), expected.length());
+}
+
+TEST_CASE("serialize MsgPack array") {
+  DynamicJsonDocument doc(JSON_ARRAY_SIZE(65536));
+  JsonArray array = doc.to<JsonArray>();
+
+  SECTION("empty") {
+    check(array, "\x90");
+  }
+
+  SECTION("fixarray") {
+    array.add("hello");
+    array.add("world");
+
+    check(array, "\x92\xA5hello\xA5world");
+  }
+
+  SECTION("array 16") {
+    for (int i = 0; i < 16; i++) array.add(i);
+
+    check(array,
+          "\xDC\x00\x10\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D"
+          "\x0E\x0F");
+  }
+
+  SECTION("array 32") {
+    const char* nil = 0;
+    for (int i = 0; i < 65536; i++) array.add(nil);
+
+    check(array,
+          std::string("\xDD\x00\x01\x00\x00", 5) + std::string(65536, '\xc0'));
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp
new file mode 100644
index 0000000..974ea63
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/serializeObject.cpp
@@ -0,0 +1,83 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <stdio.h>
+#include <catch.hpp>
+
+static void check(const JsonObject object, const char* expected_data,
+                  size_t expected_len) {
+  std::string expected(expected_data, expected_data + expected_len);
+  std::string actual;
+  size_t len = serializeMsgPack(object, actual);
+  CAPTURE(object);
+  REQUIRE(len == expected_len);
+  REQUIRE(actual == expected);
+}
+
+template <size_t N>
+static void check(const JsonObject object, const char (&expected_data)[N]) {
+  const size_t expected_len = N - 1;
+  check(object, expected_data, expected_len);
+}
+
+// TODO: used by the commented test
+// static void check(const JsonObject object, const std::string& expected) {
+//  check(object, expected.data(), expected.length());
+//}
+
+TEST_CASE("serialize MsgPack object") {
+  DynamicJsonDocument doc(4096);
+  JsonObject object = doc.to<JsonObject>();
+
+  SECTION("empty") {
+    check(object, "\x80");
+  }
+
+  SECTION("fixmap") {
+    object["hello"] = "world";
+
+    check(object, "\x81\xA5hello\xA5world");
+  }
+
+  SECTION("map 16") {
+    for (int i = 0; i < 16; ++i) {
+      char key[16];
+      sprintf(key, "i%X", i);
+      object[key] = i;
+    }
+
+    check(object,
+          "\xDE\x00\x10\xA2i0\x00\xA2i1\x01\xA2i2\x02\xA2i3\x03\xA2i4\x04\xA2i5"
+          "\x05\xA2i6\x06\xA2i7\x07\xA2i8\x08\xA2i9\x09\xA2iA\x0A\xA2iB\x0B\xA2"
+          "iC\x0C\xA2iD\x0D\xA2iE\x0E\xA2iF\x0F");
+  }
+
+  // TODO: improve performance and uncomment
+  // SECTION("map 32") {
+  //   std::string expected("\xDF\x00\x01\x00\x00", 5);
+  //
+  //   for (int i = 0; i < 65536; ++i) {
+  //     char kv[16];
+  //     sprintf(kv, "%04x", i);
+  //     object[kv] = kv;
+  //     expected += '\xA4';
+  //     expected += kv;
+  //     expected += '\xA4';
+  //     expected += kv;
+  //   }
+  //
+  //   check(object, expected);
+  // }
+
+  SECTION("serialized(const char*)") {
+    object["hello"] = serialized("\xDB\x00\x01\x00\x00", 5);
+    check(object, "\x81\xA5hello\xDB\x00\x01\x00\x00");
+  }
+
+  SECTION("serialized(std::string)") {
+    object["hello"] = serialized(std::string("\xDB\x00\x01\x00\x00", 5));
+    check(object, "\x81\xA5hello\xDB\x00\x01\x00\x00");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp
new file mode 100644
index 0000000..9b61f53
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/MsgPackSerializer/serializeVariant.cpp
@@ -0,0 +1,147 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.h>
+#include <catch.hpp>
+
+template <typename T>
+static void checkVariant(T value, const char* expected_data,
+                         size_t expected_len) {
+  DynamicJsonDocument doc(4096);
+  JsonVariant variant = doc.to<JsonVariant>();
+  variant.set(value);
+  std::string expected(expected_data, expected_data + expected_len);
+  std::string actual;
+  size_t len = serializeMsgPack(variant, actual);
+  CAPTURE(variant);
+  REQUIRE(len == expected_len);
+  REQUIRE(actual == expected);
+}
+
+template <typename T, size_t N>
+static void checkVariant(T value, const char (&expected_data)[N]) {
+  const size_t expected_len = N - 1;
+  checkVariant(value, expected_data, expected_len);
+}
+
+template <typename T>
+static void checkVariant(T value, const std::string& expected) {
+  checkVariant(value, expected.data(), expected.length());
+}
+
+TEST_CASE("serialize MsgPack value") {
+  SECTION("undefined") {
+    checkVariant(JsonVariant(), "\xC0");  // we represent undefined as nil
+  }
+
+  SECTION("nil") {
+    const char* nil = 0;  // ArduinoJson uses a string for null
+    checkVariant(nil, "\xC0");
+  }
+
+  SECTION("bool") {
+    checkVariant(false, "\xC2");
+    checkVariant(true, "\xC3");
+  }
+
+  SECTION("positive fixint") {
+    SECTION("signed") {
+      checkVariant(0, "\x00");
+      checkVariant(127, "\x7F");
+    }
+    SECTION("unsigned") {
+      checkVariant(0U, "\x00");
+      checkVariant(127U, "\x7F");
+    }
+  }
+
+  SECTION("uint 8") {
+    checkVariant(128, "\xCC\x80");
+    checkVariant(255, "\xCC\xFF");
+  }
+
+  SECTION("uint 16") {
+    checkVariant(256, "\xCD\x01\x00");
+    checkVariant(0xFFFF, "\xCD\xFF\xFF");
+  }
+
+  SECTION("uint 32") {
+    checkVariant(0x00010000U, "\xCE\x00\x01\x00\x00");
+    checkVariant(0x12345678U, "\xCE\x12\x34\x56\x78");
+    checkVariant(0xFFFFFFFFU, "\xCE\xFF\xFF\xFF\xFF");
+  }
+
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("uint 64") {
+    checkVariant(0x0001000000000000U, "\xCF\x00\x01\x00\x00\x00\x00\x00\x00");
+    checkVariant(0x123456789ABCDEF0U, "\xCF\x12\x34\x56\x78\x9A\xBC\xDE\xF0");
+    checkVariant(0xFFFFFFFFFFFFFFFFU, "\xCF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF");
+  }
+#endif
+
+  SECTION("negative fixint") {
+    checkVariant(-1, "\xFF");
+    checkVariant(-32, "\xE0");
+  }
+
+  SECTION("int 8") {
+    checkVariant(-33, "\xD0\xDF");
+    checkVariant(-128, "\xD0\x80");
+  }
+
+  SECTION("int 16") {
+    checkVariant(-129, "\xD1\xFF\x7F");
+    checkVariant(-32768, "\xD1\x80\x00");
+  }
+
+  SECTION("int 32") {
+    checkVariant(-32769, "\xD2\xFF\xFF\x7F\xFF");
+    checkVariant(-2147483647 - 1, "\xD2\x80\x00\x00\x00");
+  }
+
+#if ARDUINOJSON_USE_LONG_LONG
+  SECTION("int 64") {
+    checkVariant(int64_t(0xFEDCBA9876543210),
+                 "\xD3\xFE\xDC\xBA\x98\x76\x54\x32\x10");
+  }
+#endif
+
+  SECTION("float 32") {
+    checkVariant(1.25, "\xCA\x3F\xA0\x00\x00");
+  }
+
+  SECTION("float 64") {
+    checkVariant(3.1415, "\xCB\x40\x09\x21\xCA\xC0\x83\x12\x6F");
+  }
+
+  SECTION("fixstr") {
+    checkVariant("", "\xA0");
+    checkVariant("hello world hello world hello !",
+                 "\xBFhello world hello world hello !");
+  }
+
+  SECTION("str 8") {
+    checkVariant("hello world hello world hello !!",
+                 "\xD9\x20hello world hello world hello !!");
+  }
+
+  SECTION("str 16") {
+    std::string shortest(256, '?');
+    checkVariant(shortest.c_str(), std::string("\xDA\x01\x00", 3) + shortest);
+
+    std::string longest(65535, '?');
+    checkVariant(longest.c_str(), std::string("\xDA\xFF\xFF", 3) + longest);
+  }
+
+  SECTION("str 32") {
+    std::string shortest(65536, '?');
+    checkVariant(shortest.c_str(),
+                 std::string("\xDB\x00\x01\x00\x00", 5) + shortest);
+  }
+
+  SECTION("serialized(const char*)") {
+    checkVariant(serialized("\xDA\xFF\xFF"), "\xDA\xFF\xFF");
+    checkVariant(serialized("\xDB\x00\x01\x00\x00", 5), "\xDB\x00\x01\x00\x00");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Numbers/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/Numbers/CMakeLists.txt
new file mode 100644
index 0000000..7d11034
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Numbers/CMakeLists.txt
@@ -0,0 +1,19 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(NumbersTests 
+	convertNumber.cpp
+	parseFloat.cpp
+	parseDouble.cpp
+	parseInteger.cpp
+	parseNumber.cpp
+)
+
+
+add_test(Numbers NumbersTests)
+
+set_tests_properties(Numbers
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/Numbers/convertNumber.cpp b/third-party/ArduinoJson/extras/tests/Numbers/convertNumber.cpp
new file mode 100644
index 0000000..0fdc20d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Numbers/convertNumber.cpp
@@ -0,0 +1,78 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <stdint.h>
+#include <ArduinoJson.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("canConvertNumber<TOut, TIn>()") {
+  SECTION("int8_t -> int8_t") {
+    CHECK((canConvertNumber<int8_t, int8_t>(0)) == true);
+    CHECK((canConvertNumber<int8_t, int8_t>(127)) == true);
+    CHECK((canConvertNumber<int8_t, int8_t>(-128)) == true);
+  }
+
+  SECTION("int8_t -> int16_t") {
+    CHECK((canConvertNumber<int16_t, int8_t>(0)) == true);
+    CHECK((canConvertNumber<int16_t, int8_t>(127)) == true);
+    CHECK((canConvertNumber<int16_t, int8_t>(-128)) == true);
+  }
+
+  SECTION("int8_t -> uint8_t") {
+    CHECK((canConvertNumber<uint8_t, int8_t>(0)) == true);
+    CHECK((canConvertNumber<uint8_t, int8_t>(127)) == true);
+    CHECK((canConvertNumber<uint8_t, int8_t>(-128)) == false);
+  }
+
+  SECTION("int8_t -> uint16_t") {
+    CHECK((canConvertNumber<uint16_t, int8_t>(0)) == true);
+    CHECK((canConvertNumber<uint16_t, int8_t>(127)) == true);
+    CHECK((canConvertNumber<uint16_t, int8_t>(-128)) == false);
+  }
+
+  SECTION("int16_t -> int8_t") {
+    CHECK((canConvertNumber<int8_t, int16_t>(0)) == true);
+    CHECK((canConvertNumber<int8_t, int16_t>(127)) == true);
+    CHECK((canConvertNumber<int8_t, int16_t>(128)) == false);
+    CHECK((canConvertNumber<int8_t, int16_t>(-128)) == true);
+    CHECK((canConvertNumber<int8_t, int16_t>(-129)) == false);
+  }
+
+  SECTION("int16_t -> uint8_t") {
+    CHECK((canConvertNumber<uint8_t, int16_t>(0)) == true);
+    CHECK((canConvertNumber<uint8_t, int16_t>(255)) == true);
+    CHECK((canConvertNumber<uint8_t, int16_t>(256)) == false);
+    CHECK((canConvertNumber<uint8_t, int16_t>(-1)) == false);
+  }
+
+  SECTION("uint8_t -> int8_t") {
+    CHECK((canConvertNumber<int8_t, uint8_t>(0)) == true);
+    CHECK((canConvertNumber<int8_t, uint8_t>(127)) == true);
+    CHECK((canConvertNumber<int8_t, uint8_t>(128)) == false);
+    CHECK((canConvertNumber<int8_t, uint8_t>(255)) == false);
+  }
+
+  SECTION("uint8_t -> int16_t") {
+    CHECK((canConvertNumber<int16_t, uint8_t>(0)) == true);
+    CHECK((canConvertNumber<int16_t, uint8_t>(127)) == true);
+    CHECK((canConvertNumber<int16_t, uint8_t>(128)) == true);
+    CHECK((canConvertNumber<int16_t, uint8_t>(255)) == true);
+  }
+
+  SECTION("uint8_t -> uint8_t") {
+    CHECK((canConvertNumber<uint8_t, uint8_t>(0)) == true);
+    CHECK((canConvertNumber<uint8_t, uint8_t>(127)) == true);
+    CHECK((canConvertNumber<uint8_t, uint8_t>(128)) == true);
+    CHECK((canConvertNumber<uint8_t, uint8_t>(255)) == true);
+  }
+
+  SECTION("uint8_t -> uint16_t") {
+    CHECK((canConvertNumber<uint16_t, uint8_t>(0)) == true);
+    CHECK((canConvertNumber<uint16_t, uint8_t>(127)) == true);
+    CHECK((canConvertNumber<uint16_t, uint8_t>(128)) == true);
+    CHECK((canConvertNumber<uint16_t, uint8_t>(255)) == true);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Numbers/parseDouble.cpp b/third-party/ArduinoJson/extras/tests/Numbers/parseDouble.cpp
new file mode 100644
index 0000000..aae2888
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Numbers/parseDouble.cpp
@@ -0,0 +1,96 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_USE_DOUBLE 1
+#define ARDUINOJSON_ENABLE_NAN 1
+#define ARDUINOJSON_ENABLE_INFINITY 1
+
+#include <ArduinoJson.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+void checkDouble(const char* input, double expected) {
+  CAPTURE(input);
+  REQUIRE(parseNumber<double>(input) == Approx(expected));
+}
+
+void checkDoubleNaN(const char* input) {
+  CAPTURE(input);
+  double result = parseNumber<double>(input);
+  REQUIRE(result != result);
+}
+
+void checkDoubleInf(const char* input, bool negative) {
+  CAPTURE(input);
+  double x = parseNumber<double>(input);
+  if (negative)
+    REQUIRE(x < 0);
+  else
+    REQUIRE(x > 0);
+  REQUIRE(x == x);      // not a NaN
+  REQUIRE(x * 2 == x);  // a property of infinity
+}
+
+TEST_CASE("parseNumber<double>()") {
+  SECTION("Short_NoExponent") {
+    checkDouble("3.14", 3.14);
+    checkDouble("-3.14", -3.14);
+    checkDouble("+3.14", +3.14);
+  }
+
+  SECTION("Short_NoDot") {
+    checkDouble("1E+308", 1E+308);
+    checkDouble("-1E+308", -1E+308);
+    checkDouble("+1E-308", +1E-308);
+    checkDouble("+1e+308", +1e+308);
+    checkDouble("-1e-308", -1e-308);
+  }
+
+  SECTION("Max") {
+    checkDouble(".017976931348623147e+310", 1.7976931348623147e+308);
+    checkDouble(".17976931348623147e+309", 1.7976931348623147e+308);
+    checkDouble("1.7976931348623147e+308", 1.7976931348623147e+308);
+    checkDouble("17.976931348623147e+307", 1.7976931348623147e+308);
+    checkDouble("179.76931348623147e+306", 1.7976931348623147e+308);
+  }
+
+  SECTION("Min") {
+    checkDouble(".022250738585072014e-306", 2.2250738585072014e-308);
+    checkDouble(".22250738585072014e-307", 2.2250738585072014e-308);
+    checkDouble("2.2250738585072014e-308", 2.2250738585072014e-308);
+    checkDouble("22.250738585072014e-309", 2.2250738585072014e-308);
+    checkDouble("222.50738585072014e-310", 2.2250738585072014e-308);
+  }
+
+  SECTION("VeryLong") {
+    checkDouble("0.00000000000000000000000000000001", 1e-32);
+    checkDouble("100000000000000000000000000000000.0", 1e+32);
+    checkDouble(
+        "100000000000000000000000000000000.00000000000000000000000000000",
+        1e+32);
+  }
+
+  SECTION("MantissaTooLongToFit") {
+    checkDouble("0.179769313486231571111111111111", 0.17976931348623157);
+    checkDouble("17976931348623157.11111111111111", 17976931348623157.0);
+    checkDouble("1797693.134862315711111111111111", 1797693.1348623157);
+
+    checkDouble("-0.179769313486231571111111111111", -0.17976931348623157);
+    checkDouble("-17976931348623157.11111111111111", -17976931348623157.0);
+    checkDouble("-1797693.134862315711111111111111", -1797693.1348623157);
+  }
+
+  SECTION("ExponentTooBig") {
+    checkDoubleInf("1e309", false);
+    checkDoubleInf("-1e309", true);
+    checkDoubleInf("1e65535", false);
+    checkDouble("1e-65535", 0.0);
+  }
+
+  SECTION("NaN") {
+    checkDoubleNaN("NaN");
+    checkDoubleNaN("nan");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Numbers/parseFloat.cpp b/third-party/ArduinoJson/extras/tests/Numbers/parseFloat.cpp
new file mode 100644
index 0000000..f05ab7d
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Numbers/parseFloat.cpp
@@ -0,0 +1,101 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define ARDUINOJSON_USE_DOUBLE 0
+#define ARDUINOJSON_ENABLE_NAN 1
+#define ARDUINOJSON_ENABLE_INFINITY 1
+
+#include <ArduinoJson.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+void checkFloat(const char* input, float expected) {
+  CAPTURE(input);
+  REQUIRE(parseNumber<float>(input) == Approx(expected));
+}
+
+void checkFloatNaN(const char* input) {
+  CAPTURE(input);
+  float result = parseNumber<float>(input);
+  REQUIRE(result != result);
+}
+
+void checkFloatInf(const char* input, bool negative) {
+  CAPTURE(input);
+  float x = parseNumber<float>(input);
+  if (negative)
+    REQUIRE(x < 0);
+  else
+    REQUIRE(x > 0);
+  REQUIRE(x == x);      // not a NaN
+  REQUIRE(x * 2 == x);  // a property of infinity
+}
+
+TEST_CASE("parseNumber<float>()") {
+  SECTION("Float_Short_NoExponent") {
+    checkFloat("3.14", 3.14f);
+    checkFloat("-3.14", -3.14f);
+    checkFloat("+3.14", +3.14f);
+  }
+
+  SECTION("Short_NoDot") {
+    checkFloat("1E+38", 1E+38f);
+    checkFloat("-1E+38", -1E+38f);
+    checkFloat("+1E-38", +1E-38f);
+    checkFloat("+1e+38", +1e+38f);
+    checkFloat("-1e-38", -1e-38f);
+  }
+
+  SECTION("Max") {
+    checkFloat("340.2823e+36", 3.402823e+38f);
+    checkFloat("34.02823e+37", 3.402823e+38f);
+    checkFloat("3.402823e+38", 3.402823e+38f);
+    checkFloat("0.3402823e+39", 3.402823e+38f);
+    checkFloat("0.03402823e+40", 3.402823e+38f);
+    checkFloat("0.003402823e+41", 3.402823e+38f);
+  }
+
+  SECTION("VeryLong") {
+    checkFloat("0.00000000000000000000000000000001", 1e-32f);
+    checkFloat("100000000000000000000000000000000.0", 1e+32f);
+    checkFloat(
+        "100000000000000000000000000000000.00000000000000000000000000000",
+        1e+32f);
+  }
+
+  SECTION("MantissaTooLongToFit") {
+    checkFloat("0.340282346638528861111111111111", 0.34028234663852886f);
+    checkFloat("34028234663852886.11111111111111", 34028234663852886.0f);
+    checkFloat("34028234.66385288611111111111111", 34028234.663852886f);
+
+    checkFloat("-0.340282346638528861111111111111", -0.34028234663852886f);
+    checkFloat("-34028234663852886.11111111111111", -34028234663852886.0f);
+    checkFloat("-34028234.66385288611111111111111", -34028234.663852886f);
+  }
+
+  SECTION("ExponentTooBig") {
+    checkFloatInf("1e39", false);
+    checkFloatInf("-1e39", true);
+    checkFloatInf("1e255", false);
+    checkFloat("1e-255", 0.0f);
+  }
+
+  SECTION("NaN") {
+    checkFloatNaN("NaN");
+    checkFloatNaN("nan");
+  }
+
+  SECTION("Infinity") {
+    checkFloatInf("Infinity", false);
+    checkFloatInf("+Infinity", false);
+    checkFloatInf("-Infinity", true);
+    checkFloatInf("inf", false);
+    checkFloatInf("+inf", false);
+    checkFloatInf("-inf", true);
+
+    checkFloatInf("1e300", false);
+    checkFloatInf("-1e300", true);
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/Numbers/parseInteger.cpp b/third-party/ArduinoJson/extras/tests/Numbers/parseInteger.cpp
new file mode 100644
index 0000000..a5a9039
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Numbers/parseInteger.cpp
@@ -0,0 +1,68 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <stdint.h>
+#include <ArduinoJson.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+template <typename T>
+void checkInteger(const char* input, T expected) {
+  CAPTURE(input);
+  T actual = parseNumber<T>(input);
+  REQUIRE(expected == actual);
+}
+
+TEST_CASE("parseNumber<int8_t>()") {
+  checkInteger<int8_t>("-128", -128);
+  checkInteger<int8_t>("127", 127);
+  checkInteger<int8_t>("+127", 127);
+  checkInteger<int8_t>("3.14", 3);
+  checkInteger<int8_t>("x42", 0);
+  checkInteger<int8_t>("128", 0);   // overflow
+  checkInteger<int8_t>("-129", 0);  // overflow
+}
+
+TEST_CASE("parseNumber<int16_t>()") {
+  checkInteger<int16_t>("-32768", -32768);
+  checkInteger<int16_t>("32767", 32767);
+  checkInteger<int16_t>("+32767", 32767);
+  checkInteger<int16_t>("3.14", 3);
+  checkInteger<int16_t>("x42", 0);
+  checkInteger<int16_t>("-32769", 0);  // overflow
+  checkInteger<int16_t>("32768", 0);   // overflow
+}
+
+TEST_CASE("parseNumber<int32_t>()") {
+  checkInteger<int32_t>("-2147483648", (-2147483647 - 1));
+  checkInteger<int32_t>("2147483647", 2147483647);
+  checkInteger<int32_t>("+2147483647", 2147483647);
+  checkInteger<int32_t>("3.14", 3);
+  checkInteger<int32_t>("x42", 0);
+  checkInteger<int32_t>("-2147483649", 0);  // overflow
+  checkInteger<int32_t>("2147483648", 0);   // overflow
+}
+
+TEST_CASE("parseNumber<uint8_t>()") {
+  checkInteger<uint8_t>("0", 0);
+  checkInteger<uint8_t>("-0", 0);
+  checkInteger<uint8_t>("255", 255);
+  checkInteger<uint8_t>("+255", 255);
+  checkInteger<uint8_t>("3.14", 3);
+  checkInteger<uint8_t>("x42", 0);
+  checkInteger<uint8_t>("-1", 0);
+  checkInteger<uint8_t>("256", 0);
+}
+
+TEST_CASE("parseNumber<uint16_t>()") {
+  checkInteger<uint16_t>("0", 0);
+  checkInteger<uint16_t>("65535", 65535);
+  checkInteger<uint16_t>("+65535", 65535);
+  checkInteger<uint16_t>("3.14", 3);
+  // checkInteger<uint16_t>(" 42", 0);
+  checkInteger<uint16_t>("x42", 0);
+  checkInteger<uint16_t>("-1", 0);
+  checkInteger<uint16_t>("65536", 0);
+}
diff --git a/third-party/ArduinoJson/extras/tests/Numbers/parseNumber.cpp b/third-party/ArduinoJson/extras/tests/Numbers/parseNumber.cpp
new file mode 100644
index 0000000..91c98e3
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/Numbers/parseNumber.cpp
@@ -0,0 +1,57 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <ArduinoJson.hpp>
+#include <catch.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+TEST_CASE("Test unsigned integer overflow") {
+  VariantData first, second;
+  first.init();
+  second.init();
+
+  // Avoids MSVC warning C4127 (conditional expression is constant)
+  size_t integerSize = sizeof(Integer);
+
+  if (integerSize == 8) {
+    parseNumber("18446744073709551615", first);
+    parseNumber("18446744073709551616", second);
+  } else {
+    parseNumber("4294967295", first);
+    parseNumber("4294967296", second);
+  }
+
+  REQUIRE(first.type() == uint8_t(VALUE_IS_UNSIGNED_INTEGER));
+  REQUIRE(second.type() == uint8_t(VALUE_IS_FLOAT));
+}
+
+TEST_CASE("Test signed integer overflow") {
+  VariantData first, second;
+  first.init();
+  second.init();
+
+  // Avoids MSVC warning C4127 (conditional expression is constant)
+  size_t integerSize = sizeof(Integer);
+
+  if (integerSize == 8) {
+    parseNumber("-9223372036854775808", first);
+    parseNumber("-9223372036854775809", second);
+  } else {
+    parseNumber("-2147483648", first);
+    parseNumber("-2147483649", second);
+  }
+
+  REQUIRE(first.type() == uint8_t(VALUE_IS_SIGNED_INTEGER));
+  REQUIRE(second.type() == uint8_t(VALUE_IS_FLOAT));
+}
+
+TEST_CASE("Invalid value") {
+  VariantData result;
+  result.init();
+
+  parseNumber("6a3", result);
+
+  REQUIRE(result.type() == uint8_t(VALUE_IS_NULL));
+}
diff --git a/third-party/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt
new file mode 100644
index 0000000..edbb965
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/TextFormatter/CMakeLists.txt
@@ -0,0 +1,18 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_executable(TextFormatterTests 
+	writeFloat.cpp
+	writeInteger.cpp
+	writeString.cpp
+)
+
+set_target_properties(TextFormatterTests PROPERTIES UNITY_BUILD OFF)
+
+add_test(TextFormatter TextFormatterTests)
+
+set_tests_properties(TextFormatter
+	PROPERTIES
+		LABELS 		"Catch"
+)
diff --git a/third-party/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp b/third-party/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp
new file mode 100644
index 0000000..e908fc4
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/TextFormatter/writeFloat.cpp
@@ -0,0 +1,119 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <catch.hpp>
+#include <limits>
+#include <string>
+
+#define ARDUINOJSON_ENABLE_NAN 1
+#define ARDUINOJSON_ENABLE_INFINITY 1
+#include <ArduinoJson/Json/TextFormatter.hpp>
+#include <ArduinoJson/Serialization/Writer.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+template <typename TFloat>
+void check(TFloat input, const std::string& expected) {
+  std::string output;
+  Writer<std::string> sb(output);
+  TextFormatter<Writer<std::string> > writer(sb);
+  writer.writeFloat(input);
+  REQUIRE(writer.bytesWritten() == output.size());
+  CHECK(expected == output);
+}
+
+TEST_CASE("TextFormatter::writeFloat(double)") {
+  SECTION("Pi") {
+    check<double>(3.14159265359, "3.141592654");
+  }
+
+  SECTION("Signaling NaN") {
+    double nan = std::numeric_limits<double>::signaling_NaN();
+    check<double>(nan, "NaN");
+  }
+
+  SECTION("Quiet NaN") {
+    double nan = std::numeric_limits<double>::quiet_NaN();
+    check<double>(nan, "NaN");
+  }
+
+  SECTION("Infinity") {
+    double inf = std::numeric_limits<double>::infinity();
+    check<double>(inf, "Infinity");
+    check<double>(-inf, "-Infinity");
+  }
+
+  SECTION("Zero") {
+    check<double>(0.0, "0");
+    check<double>(-0.0, "0");
+  }
+
+  SECTION("Espilon") {
+    check<double>(2.2250738585072014E-308, "2.225073859e-308");
+    check<double>(-2.2250738585072014E-308, "-2.225073859e-308");
+  }
+
+  SECTION("Max double") {
+    check<double>(1.7976931348623157E+308, "1.797693135e308");
+    check<double>(-1.7976931348623157E+308, "-1.797693135e308");
+  }
+
+  SECTION("Big exponent") {
+    // this test increases coverage of normalize()
+    check<double>(1e255, "1e255");
+    check<double>(1e-255, "1e-255");
+  }
+
+  SECTION("Exponentation when <= 1e-5") {
+    check<double>(1e-4, "0.0001");
+    check<double>(1e-5, "1e-5");
+
+    check<double>(-1e-4, "-0.0001");
+    check<double>(-1e-5, "-1e-5");
+  }
+
+  SECTION("Exponentation when >= 1e7") {
+    check<double>(9999999.999, "9999999.999");
+    check<double>(10000000.0, "1e7");
+
+    check<double>(-9999999.999, "-9999999.999");
+    check<double>(-10000000.0, "-1e7");
+  }
+
+  SECTION("Rounding when too many decimals") {
+    check<double>(0.000099999999999, "0.0001");
+    check<double>(0.0000099999999999, "1e-5");
+    check<double>(0.9999999996, "1");
+  }
+
+  SECTION("9 decimal places") {
+    check<double>(0.100000001, "0.100000001");
+    check<double>(0.999999999, "0.999999999");
+
+    check<double>(9.000000001, "9.000000001");
+    check<double>(9.999999999, "9.999999999");
+  }
+
+  SECTION("10 decimal places") {
+    check<double>(0.1000000001, "0.1");
+    check<double>(0.9999999999, "1");
+
+    check<double>(9.0000000001, "9");
+    check<double>(9.9999999999, "10");
+  }
+}
+
+TEST_CASE("TextFormatter::writeFloat(float)") {
+  SECTION("Pi") {
+    check<float>(3.14159265359f, "3.141593");
+  }
+
+  SECTION("999.9") {  // issue #543
+    check<float>(999.9f, "999.9");
+  }
+
+  SECTION("24.3") {  // # issue #588
+    check<float>(24.3f, "24.3");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/TextFormatter/writeInteger.cpp b/third-party/ArduinoJson/extras/tests/TextFormatter/writeInteger.cpp
new file mode 100644
index 0000000..37fa446
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/TextFormatter/writeInteger.cpp
@@ -0,0 +1,55 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <catch.hpp>
+#include <limits>
+#include <string>
+
+#include <ArduinoJson/Json/TextFormatter.hpp>
+#include <ArduinoJson/Serialization/Writer.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+template <typename T>
+void checkWriteInteger(T value, std::string expected) {
+  char output[64] = {0};
+  StaticStringWriter sb(output, sizeof(output));
+  TextFormatter<StaticStringWriter> writer(sb);
+  writer.writeInteger<T>(value);
+  REQUIRE(expected == output);
+  REQUIRE(writer.bytesWritten() == expected.size());
+}
+
+TEST_CASE("int8_t") {
+  checkWriteInteger<int8_t>(0, "0");
+  checkWriteInteger<int8_t>(-128, "-128");
+  checkWriteInteger<int8_t>(127, "127");
+}
+
+TEST_CASE("uint8_t") {
+  checkWriteInteger<uint8_t>(0, "0");
+  checkWriteInteger<uint8_t>(255, "255");
+}
+
+TEST_CASE("int16_t") {
+  checkWriteInteger<int16_t>(0, "0");
+  checkWriteInteger<int16_t>(-32768, "-32768");
+  checkWriteInteger<int16_t>(32767, "32767");
+}
+
+TEST_CASE("uint16_t") {
+  checkWriteInteger<uint16_t>(0, "0");
+  checkWriteInteger<uint16_t>(65535, "65535");
+}
+
+TEST_CASE("int32_t") {
+  checkWriteInteger<int32_t>(0, "0");
+  checkWriteInteger<int32_t>(-2147483647 - 1, "-2147483648");
+  checkWriteInteger<int32_t>(2147483647, "2147483647");
+}
+
+TEST_CASE("uint32_t") {
+  checkWriteInteger<uint32_t>(0, "0");
+  checkWriteInteger<uint32_t>(4294967295U, "4294967295");
+}
diff --git a/third-party/ArduinoJson/extras/tests/TextFormatter/writeString.cpp b/third-party/ArduinoJson/extras/tests/TextFormatter/writeString.cpp
new file mode 100644
index 0000000..eccc4b4
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/TextFormatter/writeString.cpp
@@ -0,0 +1,57 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#include <catch.hpp>
+
+#include <ArduinoJson/Json/TextFormatter.hpp>
+#include <ArduinoJson/Serialization/Writers/StaticStringWriter.hpp>
+
+using namespace ARDUINOJSON_NAMESPACE;
+
+void check(const char* input, std::string expected) {
+  char output[64] = {0};
+  StaticStringWriter sb(output, sizeof(output));
+  TextFormatter<StaticStringWriter> writer(sb);
+  writer.writeString(input);
+  REQUIRE(expected == output);
+  REQUIRE(writer.bytesWritten() == expected.size());
+}
+
+TEST_CASE("TextFormatter::writeString()") {
+  SECTION("EmptyString") {
+    check("", "\"\"");
+  }
+
+  SECTION("QuotationMark") {
+    check("\"", "\"\\\"\"");
+  }
+
+  SECTION("ReverseSolidus") {
+    check("\\", "\"\\\\\"");
+  }
+
+  SECTION("Solidus") {
+    check("/", "\"/\"");  // but the JSON format allows \/
+  }
+
+  SECTION("Backspace") {
+    check("\b", "\"\\b\"");
+  }
+
+  SECTION("Formfeed") {
+    check("\f", "\"\\f\"");
+  }
+
+  SECTION("Newline") {
+    check("\n", "\"\\n\"");
+  }
+
+  SECTION("CarriageReturn") {
+    check("\r", "\"\\r\"");
+  }
+
+  SECTION("HorizontalTab") {
+    check("\t", "\"\\t\"");
+  }
+}
diff --git a/third-party/ArduinoJson/extras/tests/catch/CMakeLists.txt b/third-party/ArduinoJson/extras/tests/catch/CMakeLists.txt
new file mode 100644
index 0000000..55c4522
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/catch/CMakeLists.txt
@@ -0,0 +1,18 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+add_library(catch
+	catch.hpp
+	catch.cpp
+)
+
+target_include_directories(catch
+	PUBLIC
+	${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+	# prevent "xxx will change in GCC x.x" with arm-linux-gnueabihf-gcc
+	target_compile_options(catch PRIVATE -Wno-psabi)
+endif()
diff --git a/third-party/ArduinoJson/extras/tests/catch/catch.cpp b/third-party/ArduinoJson/extras/tests/catch/catch.cpp
new file mode 100644
index 0000000..e6c8548
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/catch/catch.cpp
@@ -0,0 +1,6 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git a/third-party/ArduinoJson/extras/tests/catch/catch.hpp b/third-party/ArduinoJson/extras/tests/catch/catch.hpp
new file mode 100644
index 0000000..fdb046f
--- /dev/null
+++ b/third-party/ArduinoJson/extras/tests/catch/catch.hpp
@@ -0,0 +1,11689 @@
+/*
+ *  Catch v1.12.2
+ *  Generated: 2018-05-14 15:10:01.112442
+ *  ----------------------------------------------------------
+ *  This file has been merged from multiple headers. Please don't edit it directly
+ *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+#ifndef TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+#define TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
+#define TWOBLUECUBES_CATCH_HPP_INCLUDED
+
+#ifdef __clang__
+#    pragma clang system_header
+#elif defined __GNUC__
+#    pragma GCC system_header
+#endif
+
+// #included from: internal/catch_suppress_warnings.h
+
+#ifdef __clang__
+#   ifdef __ICC // icpc defines the __clang__ macro
+#       pragma warning(push)
+#       pragma warning(disable: 161 1682)
+#   else // __ICC
+#       pragma clang diagnostic ignored "-Wglobal-constructors"
+#       pragma clang diagnostic ignored "-Wvariadic-macros"
+#       pragma clang diagnostic ignored "-Wc99-extensions"
+#       pragma clang diagnostic ignored "-Wunused-variable"
+#       pragma clang diagnostic push
+#       pragma clang diagnostic ignored "-Wpadded"
+#       pragma clang diagnostic ignored "-Wc++98-compat"
+#       pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#       pragma clang diagnostic ignored "-Wswitch-enum"
+#       pragma clang diagnostic ignored "-Wcovered-switch-default"
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic ignored "-Wvariadic-macros"
+#    pragma GCC diagnostic ignored "-Wunused-variable"
+#    pragma GCC diagnostic ignored "-Wparentheses"
+
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wpadded"
+#endif
+#if defined(CATCH_CONFIG_MAIN) || defined(CATCH_CONFIG_RUNNER)
+#  define CATCH_IMPL
+#endif
+
+#ifdef CATCH_IMPL
+#  ifndef CLARA_CONFIG_MAIN
+#    define CLARA_CONFIG_MAIN_NOT_DEFINED
+#    define CLARA_CONFIG_MAIN
+#  endif
+#endif
+
+// #included from: internal/catch_notimplemented_exception.h
+#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
+
+// #included from: catch_common.h
+#define TWOBLUECUBES_CATCH_COMMON_H_INCLUDED
+
+// #included from: catch_compiler_capabilities.h
+#define TWOBLUECUBES_CATCH_COMPILER_CAPABILITIES_HPP_INCLUDED
+
+// Detect a number of compiler features - mostly C++11/14 conformance - by compiler
+// The following features are defined:
+//
+// CATCH_CONFIG_CPP11_NULLPTR : is nullptr supported?
+// CATCH_CONFIG_CPP11_NOEXCEPT : is noexcept supported?
+// CATCH_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods
+// CATCH_CONFIG_CPP11_IS_ENUM : std::is_enum is supported?
+// CATCH_CONFIG_CPP11_TUPLE : std::tuple is supported
+// CATCH_CONFIG_CPP11_LONG_LONG : is long long supported?
+// CATCH_CONFIG_CPP11_OVERRIDE : is override supported?
+// CATCH_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr)
+// CATCH_CONFIG_CPP11_SHUFFLE : is std::shuffle supported?
+// CATCH_CONFIG_CPP11_TYPE_TRAITS : are type_traits and enable_if supported?
+
+// CATCH_CONFIG_CPP11_OR_GREATER : Is C++11 supported?
+
+// CATCH_CONFIG_VARIADIC_MACROS : are variadic macros supported?
+// CATCH_CONFIG_COUNTER : is the __COUNTER__ macro supported?
+// CATCH_CONFIG_WINDOWS_SEH : is Windows SEH supported?
+// CATCH_CONFIG_POSIX_SIGNALS : are POSIX signals supported?
+// ****************
+// Note to maintainers: if new toggles are added please document them
+// in configuration.md, too
+// ****************
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CATCH_CONFIG_CPP11_NO_NULLPTR) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+// All the C++11 features can be disabled with CATCH_CONFIG_NO_CPP11
+
+#ifdef __cplusplus
+
+#  if __cplusplus >= 201103L
+#    define CATCH_CPP11_OR_GREATER
+#  endif
+
+#  if __cplusplus >= 201402L
+#    define CATCH_CPP14_OR_GREATER
+#  endif
+
+#endif
+
+#ifdef __clang__
+
+#  if __has_feature(cxx_nullptr)
+#    define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#  endif
+
+#  if __has_feature(cxx_noexcept)
+#    define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#  endif
+
+#   if defined(CATCH_CPP11_OR_GREATER)
+#       define CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \
+            _Pragma( "clang diagnostic push" ) \
+            _Pragma( "clang diagnostic ignored \"-Wexit-time-destructors\"" )
+#       define CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \
+            _Pragma( "clang diagnostic pop" )
+
+#       define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            _Pragma( "clang diagnostic push" ) \
+            _Pragma( "clang diagnostic ignored \"-Wparentheses\"" )
+#       define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
+            _Pragma( "clang diagnostic pop" )
+#   endif
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// We know some environments not to support full POSIX signals
+#if defined(__CYGWIN__) || defined(__QNX__)
+
+#   if !defined(CATCH_CONFIG_POSIX_SIGNALS)
+#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#   endif
+
+#endif
+
+#ifdef __OS400__
+#       define CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS
+#       define CATCH_CONFIG_COLOUR_NONE
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// Cygwin
+#ifdef __CYGWIN__
+
+// Required for some versions of Cygwin to declare gettimeofday
+// see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin
+#   define _BSD_SOURCE
+
+#endif // __CYGWIN__
+
+////////////////////////////////////////////////////////////////////////////////
+// Borland
+#ifdef __BORLANDC__
+
+#endif // __BORLANDC__
+
+////////////////////////////////////////////////////////////////////////////////
+// EDG
+#ifdef __EDG_VERSION__
+
+#endif // __EDG_VERSION__
+
+////////////////////////////////////////////////////////////////////////////////
+// Digital Mars
+#ifdef __DMC__
+
+#endif // __DMC__
+
+////////////////////////////////////////////////////////////////////////////////
+// GCC
+#ifdef __GNUC__
+
+#   if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
+#       define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#   endif
+
+// - otherwise more recent versions define __cplusplus >= 201103L
+// and will get picked up below
+
+#endif // __GNUC__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#ifdef _MSC_VER
+
+#define CATCH_INTERNAL_CONFIG_WINDOWS_SEH
+
+#if (_MSC_VER >= 1600)
+#   define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#   define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
+#endif
+
+#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015))
+#define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE
+#define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS
+#endif
+
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+
+// Use variadic macros if the compiler supports them
+#if ( defined _MSC_VER && _MSC_VER > 1400 && !defined __EDGE__) || \
+    ( defined __WAVE__ && __WAVE_HAS_VARIADICS ) || \
+    ( defined __GNUC__ && __GNUC__ >= 3 ) || \
+    ( !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L )
+
+#define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
+
+#endif
+
+// Use __COUNTER__ if the compiler supports it
+#if ( defined _MSC_VER && _MSC_VER >= 1300 ) || \
+    ( defined __GNUC__  && ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3 )) ) || \
+    ( defined __clang__ && __clang_major__ >= 3 )
+
+// Use of __COUNTER__ is suppressed during code analysis in CLion/AppCode 2017.2.x and former,
+// because __COUNTER__ is not properly handled by it.
+// This does not affect compilation
+#if ( !defined __JETBRAINS_IDE__ || __JETBRAINS_IDE__ >= 20170300L )
+    #define CATCH_INTERNAL_CONFIG_COUNTER
+#endif
+
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// C++ language feature support
+
+// catch all support for C++11
+#if defined(CATCH_CPP11_OR_GREATER)
+
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR)
+#    define CATCH_INTERNAL_CONFIG_CPP11_NULLPTR
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#    define CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#    define CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM
+#    define CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_CPP11_TUPLE
+#    define CATCH_INTERNAL_CONFIG_CPP11_TUPLE
+#  endif
+
+#  ifndef CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
+#    define CATCH_INTERNAL_CONFIG_VARIADIC_MACROS
+#  endif
+
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG)
+#    define CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG
+#  endif
+
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE)
+#    define CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE
+#  endif
+#  if !defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR)
+#    define CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
+#  endif
+# if !defined(CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE)
+#   define CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE
+#  endif
+# if !defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS)
+#  define CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS
+# endif
+
+#endif // __cplusplus >= 201103L
+
+// Now set the actual defines based on the above + anything the user has configured
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NO_NULLPTR) && !defined(CATCH_CONFIG_CPP11_NULLPTR) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_NULLPTR
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_NOEXCEPT
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CATCH_CONFIG_CPP11_GENERATED_METHODS) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_GENERATED_METHODS
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_NO_IS_ENUM) && !defined(CATCH_CONFIG_CPP11_IS_ENUM) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_IS_ENUM
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_CPP11_NO_TUPLE) && !defined(CATCH_CONFIG_CPP11_TUPLE) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_TUPLE
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_VARIADIC_MACROS) && !defined(CATCH_CONFIG_NO_VARIADIC_MACROS) && !defined(CATCH_CONFIG_VARIADIC_MACROS)
+#   define CATCH_CONFIG_VARIADIC_MACROS
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_NO_LONG_LONG) && !defined(CATCH_CONFIG_CPP11_LONG_LONG) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_LONG_LONG
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_NO_OVERRIDE) && !defined(CATCH_CONFIG_CPP11_OVERRIDE) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_OVERRIDE
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_NO_UNIQUE_PTR) && !defined(CATCH_CONFIG_CPP11_UNIQUE_PTR) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_UNIQUE_PTR
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_COUNTER) && !defined(CATCH_CONFIG_NO_COUNTER) && !defined(CATCH_CONFIG_COUNTER)
+#   define CATCH_CONFIG_COUNTER
+#endif
+#if defined(CATCH_INTERNAL_CONFIG_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_NO_SHUFFLE) && !defined(CATCH_CONFIG_CPP11_SHUFFLE) && !defined(CATCH_CONFIG_NO_CPP11)
+#   define CATCH_CONFIG_CPP11_SHUFFLE
+#endif
+# if defined(CATCH_INTERNAL_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_NO_TYPE_TRAITS) && !defined(CATCH_CONFIG_CPP11_TYPE_TRAITS) && !defined(CATCH_CONFIG_NO_CPP11)
+#  define CATCH_CONFIG_CPP11_TYPE_TRAITS
+# endif
+#if defined(CATCH_INTERNAL_CONFIG_WINDOWS_SEH) && !defined(CATCH_CONFIG_NO_WINDOWS_SEH) && !defined(CATCH_CONFIG_WINDOWS_SEH)
+#   define CATCH_CONFIG_WINDOWS_SEH
+#endif
+// This is set by default, because we assume that unix compilers are posix-signal-compatible by default.
+#if !defined(CATCH_INTERNAL_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_NO_POSIX_SIGNALS) && !defined(CATCH_CONFIG_POSIX_SIGNALS)
+#   define CATCH_CONFIG_POSIX_SIGNALS
+#endif
+
+#if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS
+#   define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS
+#endif
+#if !defined(CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS)
+#   define CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS
+#   define CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS
+#endif
+
+// noexcept support:
+#if defined(CATCH_CONFIG_CPP11_NOEXCEPT) && !defined(CATCH_NOEXCEPT)
+#  define CATCH_NOEXCEPT noexcept
+#  define CATCH_NOEXCEPT_IS(x) noexcept(x)
+#else
+#  define CATCH_NOEXCEPT throw()
+#  define CATCH_NOEXCEPT_IS(x)
+#endif
+
+// nullptr support
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+#   define CATCH_NULL nullptr
+#else
+#   define CATCH_NULL NULL
+#endif
+
+// override support
+#ifdef CATCH_CONFIG_CPP11_OVERRIDE
+#   define CATCH_OVERRIDE override
+#else
+#   define CATCH_OVERRIDE
+#endif
+
+// unique_ptr support
+#ifdef CATCH_CONFIG_CPP11_UNIQUE_PTR
+#   define CATCH_AUTO_PTR( T ) std::unique_ptr<T>
+#else
+#   define CATCH_AUTO_PTR( T ) std::auto_ptr<T>
+#endif
+
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line ) name##line
+#define INTERNAL_CATCH_UNIQUE_NAME_LINE( name, line ) INTERNAL_CATCH_UNIQUE_NAME_LINE2( name, line )
+#ifdef CATCH_CONFIG_COUNTER
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __COUNTER__ )
+#else
+#  define INTERNAL_CATCH_UNIQUE_NAME( name ) INTERNAL_CATCH_UNIQUE_NAME_LINE( name, __LINE__ )
+#endif
+
+#define INTERNAL_CATCH_STRINGIFY2( expr ) #expr
+#define INTERNAL_CATCH_STRINGIFY( expr ) INTERNAL_CATCH_STRINGIFY2( expr )
+
+#include <sstream>
+#include <algorithm>
+
+namespace Catch {
+
+    struct IConfig;
+
+    struct CaseSensitive { enum Choice {
+        Yes,
+        No
+    }; };
+
+    class NonCopyable {
+#ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+        NonCopyable( NonCopyable const& )              = delete;
+        NonCopyable( NonCopyable && )                  = delete;
+        NonCopyable& operator = ( NonCopyable const& ) = delete;
+        NonCopyable& operator = ( NonCopyable && )     = delete;
+#else
+        NonCopyable( NonCopyable const& info );
+        NonCopyable& operator = ( NonCopyable const& );
+#endif
+
+    protected:
+        NonCopyable() {}
+        virtual ~NonCopyable();
+    };
+
+    class SafeBool {
+    public:
+        typedef void (SafeBool::*type)() const;
+
+        static type makeSafe( bool value ) {
+            return value ? &SafeBool::trueValue : 0;
+        }
+    private:
+        void trueValue() const {}
+    };
+
+    template<typename ContainerT>
+    void deleteAll( ContainerT& container ) {
+        typename ContainerT::const_iterator it = container.begin();
+        typename ContainerT::const_iterator itEnd = container.end();
+        for(; it != itEnd; ++it )
+            delete *it;
+    }
+    template<typename AssociativeContainerT>
+    void deleteAllValues( AssociativeContainerT& container ) {
+        typename AssociativeContainerT::const_iterator it = container.begin();
+        typename AssociativeContainerT::const_iterator itEnd = container.end();
+        for(; it != itEnd; ++it )
+            delete it->second;
+    }
+
+    bool startsWith( std::string const& s, std::string const& prefix );
+    bool startsWith( std::string const& s, char prefix );
+    bool endsWith( std::string const& s, std::string const& suffix );
+    bool endsWith( std::string const& s, char suffix );
+    bool contains( std::string const& s, std::string const& infix );
+    void toLowerInPlace( std::string& s );
+    std::string toLower( std::string const& s );
+    std::string trim( std::string const& str );
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis );
+
+    struct pluralise {
+        pluralise( std::size_t count, std::string const& label );
+
+        friend std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser );
+
+        std::size_t m_count;
+        std::string m_label;
+    };
+
+    struct SourceLineInfo {
+
+        SourceLineInfo();
+        SourceLineInfo( char const* _file, std::size_t _line );
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+        SourceLineInfo(SourceLineInfo const& other)          = default;
+        SourceLineInfo( SourceLineInfo && )                  = default;
+        SourceLineInfo& operator = ( SourceLineInfo const& ) = default;
+        SourceLineInfo& operator = ( SourceLineInfo && )     = default;
+#  endif
+        bool empty() const;
+        bool operator == ( SourceLineInfo const& other ) const;
+        bool operator < ( SourceLineInfo const& other ) const;
+
+        char const* file;
+        std::size_t line;
+    };
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info );
+
+    // This is just here to avoid compiler warnings with macro constants and boolean literals
+    inline bool isTrue( bool value ){ return value; }
+    inline bool alwaysTrue() { return true; }
+    inline bool alwaysFalse() { return false; }
+
+    void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo );
+
+    void seedRng( IConfig const& config );
+    unsigned int rngSeed();
+
+    // Use this in variadic streaming macros to allow
+    //    >> +StreamEndStop
+    // as well as
+    //    >> stuff +StreamEndStop
+    struct StreamEndStop {
+        std::string operator+() {
+            return std::string();
+        }
+    };
+    template<typename T>
+    T const& operator + ( T const& value, StreamEndStop ) {
+        return value;
+    }
+}
+
+#define CATCH_INTERNAL_LINEINFO ::Catch::SourceLineInfo( __FILE__, static_cast<std::size_t>( __LINE__ ) )
+#define CATCH_INTERNAL_ERROR( msg ) ::Catch::throwLogicError( msg, CATCH_INTERNAL_LINEINFO );
+
+namespace Catch {
+
+    class NotImplementedException : public std::exception
+    {
+    public:
+        NotImplementedException( SourceLineInfo const& lineInfo );
+
+        virtual ~NotImplementedException() CATCH_NOEXCEPT {}
+
+        virtual const char* what() const CATCH_NOEXCEPT;
+
+    private:
+        std::string m_what;
+        SourceLineInfo m_lineInfo;
+    };
+
+} // end namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define CATCH_NOT_IMPLEMENTED throw Catch::NotImplementedException( CATCH_INTERNAL_LINEINFO )
+
+// #included from: internal/catch_context.h
+#define TWOBLUECUBES_CATCH_CONTEXT_H_INCLUDED
+
+// #included from: catch_interfaces_generators.h
+#define TWOBLUECUBES_CATCH_INTERFACES_GENERATORS_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct IGeneratorInfo {
+        virtual ~IGeneratorInfo();
+        virtual bool moveNext() = 0;
+        virtual std::size_t getCurrentIndex() const = 0;
+    };
+
+    struct IGeneratorsForTest {
+        virtual ~IGeneratorsForTest();
+
+        virtual IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) = 0;
+        virtual bool moveNext() = 0;
+    };
+
+    IGeneratorsForTest* createGeneratorsForTest();
+
+} // end namespace Catch
+
+// #included from: catch_ptr.hpp
+#define TWOBLUECUBES_CATCH_PTR_HPP_INCLUDED
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    // An intrusive reference counting smart pointer.
+    // T must implement addRef() and release() methods
+    // typically implementing the IShared interface
+    template<typename T>
+    class Ptr {
+    public:
+        Ptr() : m_p( CATCH_NULL ){}
+        Ptr( T* p ) : m_p( p ){
+            if( m_p )
+                m_p->addRef();
+        }
+        Ptr( Ptr const& other ) : m_p( other.m_p ){
+            if( m_p )
+                m_p->addRef();
+        }
+        ~Ptr(){
+            if( m_p )
+                m_p->release();
+        }
+        void reset() {
+            if( m_p )
+                m_p->release();
+            m_p = CATCH_NULL;
+        }
+        Ptr& operator = ( T* p ){
+            Ptr temp( p );
+            swap( temp );
+            return *this;
+        }
+        Ptr& operator = ( Ptr const& other ){
+            Ptr temp( other );
+            swap( temp );
+            return *this;
+        }
+        void swap( Ptr& other ) { std::swap( m_p, other.m_p ); }
+        T* get() const{ return m_p; }
+        T& operator*() const { return *m_p; }
+        T* operator->() const { return m_p; }
+        bool operator !() const { return m_p == CATCH_NULL; }
+        operator SafeBool::type() const { return SafeBool::makeSafe( m_p != CATCH_NULL ); }
+
+    private:
+        T* m_p;
+    };
+
+    struct IShared : NonCopyable {
+        virtual ~IShared();
+        virtual void addRef() const = 0;
+        virtual void release() const = 0;
+    };
+
+    template<typename T = IShared>
+    struct SharedImpl : T {
+
+        SharedImpl() : m_rc( 0 ){}
+
+        virtual void addRef() const {
+            ++m_rc;
+        }
+        virtual void release() const {
+            if( --m_rc == 0 )
+                delete this;
+        }
+
+        mutable unsigned int m_rc;
+    };
+
+} // end namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+namespace Catch {
+
+    class TestCase;
+    class Stream;
+    struct IResultCapture;
+    struct IRunner;
+    struct IGeneratorsForTest;
+    struct IConfig;
+
+    struct IContext
+    {
+        virtual ~IContext();
+
+        virtual IResultCapture* getResultCapture() = 0;
+        virtual IRunner* getRunner() = 0;
+        virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) = 0;
+        virtual bool advanceGeneratorsForCurrentTest() = 0;
+        virtual Ptr<IConfig const> getConfig() const = 0;
+    };
+
+    struct IMutableContext : IContext
+    {
+        virtual ~IMutableContext();
+        virtual void setResultCapture( IResultCapture* resultCapture ) = 0;
+        virtual void setRunner( IRunner* runner ) = 0;
+        virtual void setConfig( Ptr<IConfig const> const& config ) = 0;
+    };
+
+    IContext& getCurrentContext();
+    IMutableContext& getCurrentMutableContext();
+    void cleanUpContext();
+    Stream createStream( std::string const& streamName );
+
+}
+
+// #included from: internal/catch_test_registry.hpp
+#define TWOBLUECUBES_CATCH_TEST_REGISTRY_HPP_INCLUDED
+
+// #included from: catch_interfaces_testcase.h
+#define TWOBLUECUBES_CATCH_INTERFACES_TESTCASE_H_INCLUDED
+
+#include <vector>
+
+namespace Catch {
+
+    class TestSpec;
+
+    struct ITestCase : IShared {
+        virtual void invoke () const = 0;
+    protected:
+        virtual ~ITestCase();
+    };
+
+    class TestCase;
+    struct IConfig;
+
+    struct ITestCaseRegistry {
+        virtual ~ITestCaseRegistry();
+        virtual std::vector<TestCase> const& getAllTests() const = 0;
+        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
+    };
+
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
+
+}
+
+namespace Catch {
+
+template<typename C>
+class MethodTestCase : public SharedImpl<ITestCase> {
+
+public:
+    MethodTestCase( void (C::*method)() ) : m_method( method ) {}
+
+    virtual void invoke() const {
+        C obj;
+        (obj.*m_method)();
+    }
+
+private:
+    virtual ~MethodTestCase() {}
+
+    void (C::*m_method)();
+};
+
+typedef void(*TestFunction)();
+
+struct NameAndDesc {
+    NameAndDesc( const char* _name = "", const char* _description= "" )
+    : name( _name ), description( _description )
+    {}
+
+    const char* name;
+    const char* description;
+};
+
+void registerTestCase
+    (   ITestCase* testCase,
+        char const* className,
+        NameAndDesc const& nameAndDesc,
+        SourceLineInfo const& lineInfo );
+
+struct AutoReg {
+
+    AutoReg
+        (   TestFunction function,
+            SourceLineInfo const& lineInfo,
+            NameAndDesc const& nameAndDesc );
+
+    template<typename C>
+    AutoReg
+        (   void (C::*method)(),
+            char const* className,
+            NameAndDesc const& nameAndDesc,
+            SourceLineInfo const& lineInfo ) {
+
+        registerTestCase
+            (   new MethodTestCase<C>( method ),
+                className,
+                nameAndDesc,
+                lineInfo );
+    }
+
+    ~AutoReg();
+
+private:
+    AutoReg( AutoReg const& );
+    void operator= ( AutoReg const& );
+};
+
+void registerTestCaseFunction
+    (   TestFunction function,
+        SourceLineInfo const& lineInfo,
+        NameAndDesc const& nameAndDesc );
+
+} // end namespace Catch
+
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, ... ) \
+        static void TestName(); \
+        CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); } /* NOLINT */ \
+        CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( ... ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, ... ) \
+        CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); } /* NOLINT */ \
+        CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestName, ClassName, ... )\
+        CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \
+        namespace{ \
+            struct TestName : ClassName{ \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestName::test, #ClassName, Catch::NameAndDesc( __VA_ARGS__ ), CATCH_INTERNAL_LINEINFO ); /* NOLINT */ \
+        } \
+        CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \
+        void TestName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, ... ) \
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, __VA_ARGS__ )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, ... ) \
+        CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \
+        Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( __VA_ARGS__ ) ); /* NOLINT */ \
+        CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS
+
+#else
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TESTCASE2( TestName, Name, Desc ) \
+        static void TestName(); \
+        CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &TestName, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); } /* NOLINT */ \
+        CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \
+        static void TestName()
+    #define INTERNAL_CATCH_TESTCASE( Name, Desc ) \
+        INTERNAL_CATCH_TESTCASE2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), Name, Desc )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_METHOD_AS_TEST_CASE( QualifiedMethod, Name, Desc ) \
+        CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \
+        namespace{ Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar )( &QualifiedMethod, "&" #QualifiedMethod, Catch::NameAndDesc( Name, Desc ), CATCH_INTERNAL_LINEINFO ); } /* NOLINT */ \
+        CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_TEST_CASE_METHOD2( TestCaseName, ClassName, TestName, Desc )\
+        CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \
+        namespace{ \
+            struct TestCaseName : ClassName{ \
+                void test(); \
+            }; \
+            Catch::AutoReg INTERNAL_CATCH_UNIQUE_NAME( autoRegistrar ) ( &TestCaseName::test, #ClassName, Catch::NameAndDesc( TestName, Desc ), CATCH_INTERNAL_LINEINFO ); /* NOLINT */ \
+        } \
+        CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS \
+        void TestCaseName::test()
+    #define INTERNAL_CATCH_TEST_CASE_METHOD( ClassName, TestName, Desc )\
+        INTERNAL_CATCH_TEST_CASE_METHOD2( INTERNAL_CATCH_UNIQUE_NAME( ____C_A_T_C_H____T_E_S_T____ ), ClassName, TestName, Desc )
+
+    ///////////////////////////////////////////////////////////////////////////////
+    #define INTERNAL_CATCH_REGISTER_TESTCASE( Function, Name, Desc ) \
+        CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS \
+        Catch::AutoReg( Function, CATCH_INTERNAL_LINEINFO, Catch::NameAndDesc( Name, Desc ) ); /* NOLINT */ \
+        CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS
+
+#endif
+
+// #included from: internal/catch_capture.hpp
+#define TWOBLUECUBES_CATCH_CAPTURE_HPP_INCLUDED
+
+// #included from: catch_result_builder.h
+#define TWOBLUECUBES_CATCH_RESULT_BUILDER_H_INCLUDED
+
+// #included from: catch_result_type.h
+#define TWOBLUECUBES_CATCH_RESULT_TYPE_H_INCLUDED
+
+namespace Catch {
+
+    // ResultWas::OfType enum
+    struct ResultWas { enum OfType {
+        Unknown = -1,
+        Ok = 0,
+        Info = 1,
+        Warning = 2,
+
+        FailureBit = 0x10,
+
+        ExpressionFailed = FailureBit | 1,
+        ExplicitFailure = FailureBit | 2,
+
+        Exception = 0x100 | FailureBit,
+
+        ThrewException = Exception | 1,
+        DidntThrowException = Exception | 2,
+
+        FatalErrorCondition = 0x200 | FailureBit
+
+    }; };
+
+    inline bool isOk( ResultWas::OfType resultType ) {
+        return ( resultType & ResultWas::FailureBit ) == 0;
+    }
+    inline bool isJustInfo( int flags ) {
+        return flags == ResultWas::Info;
+    }
+
+    // ResultDisposition::Flags enum
+    struct ResultDisposition { enum Flags {
+        Normal = 0x01,
+
+        ContinueOnFailure = 0x02,   // Failures fail test, but execution continues
+        FalseTest = 0x04,           // Prefix expression with !
+        SuppressFail = 0x08         // Failures are reported but do not fail the test
+    }; };
+
+    inline ResultDisposition::Flags operator | ( ResultDisposition::Flags lhs, ResultDisposition::Flags rhs ) {
+        return static_cast<ResultDisposition::Flags>( static_cast<int>( lhs ) | static_cast<int>( rhs ) );
+    }
+
+    inline bool shouldContinueOnFailure( int flags )    { return ( flags & ResultDisposition::ContinueOnFailure ) != 0; }
+    inline bool isFalseTest( int flags )                { return ( flags & ResultDisposition::FalseTest ) != 0; }
+    inline bool shouldSuppressFailure( int flags )      { return ( flags & ResultDisposition::SuppressFail ) != 0; }
+
+} // end namespace Catch
+
+// #included from: catch_assertionresult.h
+#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison;
+
+    struct DecomposedExpression
+    {
+        virtual ~DecomposedExpression() {}
+        virtual bool isBinaryExpression() const {
+            return false;
+        }
+        virtual void reconstructExpression( std::string& dest ) const = 0;
+
+        // Only simple binary comparisons can be decomposed.
+        // If more complex check is required then wrap sub-expressions in parentheses.
+        template<typename T> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator + ( T const& );
+        template<typename T> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator - ( T const& );
+        template<typename T> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator * ( T const& );
+        template<typename T> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator / ( T const& );
+        template<typename T> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator % ( T const& );
+        template<typename T> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator && ( T const& );
+        template<typename T> STATIC_ASSERT_Expression_Too_Complex_Please_Rewrite_As_Binary_Comparison& operator || ( T const& );
+
+    private:
+        DecomposedExpression& operator = (DecomposedExpression const&);
+    };
+
+    struct AssertionInfo
+    {
+        AssertionInfo();
+        AssertionInfo(  char const * _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        char const * _capturedExpression,
+                        ResultDisposition::Flags _resultDisposition,
+                        char const * _secondArg = "");
+
+        char const * macroName;
+        SourceLineInfo lineInfo;
+        char const * capturedExpression;
+        ResultDisposition::Flags resultDisposition;
+        char const * secondArg;
+    };
+
+    struct AssertionResultData
+    {
+        AssertionResultData() : decomposedExpression( CATCH_NULL )
+                              , resultType( ResultWas::Unknown )
+                              , negated( false )
+                              , parenthesized( false ) {}
+
+        void negate( bool parenthesize ) {
+            negated = !negated;
+            parenthesized = parenthesize;
+            if( resultType == ResultWas::Ok )
+                resultType = ResultWas::ExpressionFailed;
+            else if( resultType == ResultWas::ExpressionFailed )
+                resultType = ResultWas::Ok;
+        }
+
+        std::string const& reconstructExpression() const {
+            if( decomposedExpression != CATCH_NULL ) {
+                decomposedExpression->reconstructExpression( reconstructedExpression );
+                if( parenthesized ) {
+                    reconstructedExpression.insert( 0, 1, '(' );
+                    reconstructedExpression.append( 1, ')' );
+                }
+                if( negated ) {
+                    reconstructedExpression.insert( 0, 1, '!' );
+                }
+                decomposedExpression = CATCH_NULL;
+            }
+            return reconstructedExpression;
+        }
+
+        mutable DecomposedExpression const* decomposedExpression;
+        mutable std::string reconstructedExpression;
+        std::string message;
+        ResultWas::OfType resultType;
+        bool negated;
+        bool parenthesized;
+    };
+
+    class AssertionResult {
+    public:
+        AssertionResult();
+        AssertionResult( AssertionInfo const& info, AssertionResultData const& data );
+        ~AssertionResult();
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+         AssertionResult( AssertionResult const& )              = default;
+         AssertionResult( AssertionResult && )                  = default;
+         AssertionResult& operator = ( AssertionResult const& ) = default;
+         AssertionResult& operator = ( AssertionResult && )     = default;
+#  endif
+
+        bool isOk() const;
+        bool succeeded() const;
+        ResultWas::OfType getResultType() const;
+        bool hasExpression() const;
+        bool hasMessage() const;
+        std::string getExpression() const;
+        std::string getExpressionInMacro() const;
+        bool hasExpandedExpression() const;
+        std::string getExpandedExpression() const;
+        std::string getMessage() const;
+        SourceLineInfo getSourceInfo() const;
+        std::string getTestMacroName() const;
+        void discardDecomposedExpression() const;
+        void expandDecomposedExpression() const;
+
+    protected:
+        AssertionInfo m_info;
+        AssertionResultData m_resultData;
+    };
+
+} // end namespace Catch
+
+// #included from: catch_matchers.hpp
+#define TWOBLUECUBES_CATCH_MATCHERS_HPP_INCLUDED
+
+namespace Catch {
+namespace Matchers {
+    namespace Impl {
+
+        template<typename ArgT> struct MatchAllOf;
+        template<typename ArgT> struct MatchAnyOf;
+        template<typename ArgT> struct MatchNotOf;
+
+        class MatcherUntypedBase {
+        public:
+            std::string toString() const {
+                if( m_cachedToString.empty() )
+                    m_cachedToString = describe();
+                return m_cachedToString;
+            }
+
+        protected:
+            virtual ~MatcherUntypedBase();
+            virtual std::string describe() const = 0;
+            mutable std::string m_cachedToString;
+        private:
+            MatcherUntypedBase& operator = ( MatcherUntypedBase const& );
+        };
+
+        template<typename ObjectT>
+        struct MatcherMethod {
+            virtual bool match( ObjectT const& arg ) const = 0;
+        };
+        template<typename PtrT>
+        struct MatcherMethod<PtrT*> {
+            virtual bool match( PtrT* arg ) const = 0;
+        };
+
+        template<typename ObjectT, typename ComparatorT = ObjectT>
+        struct MatcherBase : MatcherUntypedBase, MatcherMethod<ObjectT> {
+
+            MatchAllOf<ComparatorT> operator && ( MatcherBase const& other ) const;
+            MatchAnyOf<ComparatorT> operator || ( MatcherBase const& other ) const;
+            MatchNotOf<ComparatorT> operator ! () const;
+        };
+
+        template<typename ArgT>
+        struct MatchAllOf : MatcherBase<ArgT> {
+            virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE {
+                for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
+                    if (!m_matchers[i]->match(arg))
+                        return false;
+                }
+                return true;
+            }
+            virtual std::string describe() const CATCH_OVERRIDE {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
+                    if( i != 0 )
+                        description += " and ";
+                    description += m_matchers[i]->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAllOf<ArgT>& operator && ( MatcherBase<ArgT> const& other ) {
+                m_matchers.push_back( &other );
+                return *this;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+        template<typename ArgT>
+        struct MatchAnyOf : MatcherBase<ArgT> {
+
+            virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE {
+                for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
+                    if (m_matchers[i]->match(arg))
+                        return true;
+                }
+                return false;
+            }
+            virtual std::string describe() const CATCH_OVERRIDE {
+                std::string description;
+                description.reserve( 4 + m_matchers.size()*32 );
+                description += "( ";
+                for( std::size_t i = 0; i < m_matchers.size(); ++i ) {
+                    if( i != 0 )
+                        description += " or ";
+                    description += m_matchers[i]->toString();
+                }
+                description += " )";
+                return description;
+            }
+
+            MatchAnyOf<ArgT>& operator || ( MatcherBase<ArgT> const& other ) {
+                m_matchers.push_back( &other );
+                return *this;
+            }
+
+            std::vector<MatcherBase<ArgT> const*> m_matchers;
+        };
+
+        template<typename ArgT>
+        struct MatchNotOf : MatcherBase<ArgT> {
+
+            MatchNotOf( MatcherBase<ArgT> const& underlyingMatcher ) : m_underlyingMatcher( underlyingMatcher ) {}
+
+            virtual bool match( ArgT const& arg ) const CATCH_OVERRIDE {
+                return !m_underlyingMatcher.match( arg );
+            }
+
+            virtual std::string describe() const CATCH_OVERRIDE {
+                return "not " + m_underlyingMatcher.toString();
+            }
+            MatcherBase<ArgT> const& m_underlyingMatcher;
+        };
+
+        template<typename ObjectT, typename ComparatorT>
+        MatchAllOf<ComparatorT> MatcherBase<ObjectT, ComparatorT>::operator && ( MatcherBase const& other ) const {
+            return MatchAllOf<ComparatorT>() && *this && other;
+        }
+        template<typename ObjectT, typename ComparatorT>
+        MatchAnyOf<ComparatorT> MatcherBase<ObjectT, ComparatorT>::operator || ( MatcherBase const& other ) const {
+            return MatchAnyOf<ComparatorT>() || *this || other;
+        }
+        template<typename ObjectT, typename ComparatorT>
+        MatchNotOf<ComparatorT> MatcherBase<ObjectT, ComparatorT>::operator ! () const {
+            return MatchNotOf<ComparatorT>( *this );
+        }
+
+    } // namespace Impl
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+    // - deprecated: prefer ||, && and !
+    template<typename T>
+    Impl::MatchNotOf<T> Not( Impl::MatcherBase<T> const& underlyingMatcher ) {
+        return Impl::MatchNotOf<T>( underlyingMatcher );
+    }
+    template<typename T>
+    Impl::MatchAllOf<T> AllOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2 ) {
+        return Impl::MatchAllOf<T>() && m1 && m2;
+    }
+    template<typename T>
+    Impl::MatchAllOf<T> AllOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2, Impl::MatcherBase<T> const& m3 ) {
+        return Impl::MatchAllOf<T>() && m1 && m2 && m3;
+    }
+    template<typename T>
+    Impl::MatchAnyOf<T> AnyOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2 ) {
+        return Impl::MatchAnyOf<T>() || m1 || m2;
+    }
+    template<typename T>
+    Impl::MatchAnyOf<T> AnyOf( Impl::MatcherBase<T> const& m1, Impl::MatcherBase<T> const& m2, Impl::MatcherBase<T> const& m3 ) {
+        return Impl::MatchAnyOf<T>() || m1 || m2 || m3;
+    }
+
+} // namespace Matchers
+
+using namespace Matchers;
+using Matchers::Impl::MatcherBase;
+
+} // namespace Catch
+
+namespace Catch {
+
+    struct TestFailureException{};
+
+    template<typename T> class ExpressionLhs;
+
+    struct CopyableStream {
+        CopyableStream() {}
+        CopyableStream( CopyableStream const& other ) {
+            oss << other.oss.str();
+        }
+        CopyableStream& operator=( CopyableStream const& other ) {
+            oss.str(std::string());
+            oss << other.oss.str();
+            return *this;
+        }
+        std::ostringstream oss;
+    };
+
+    class ResultBuilder : public DecomposedExpression {
+    public:
+        ResultBuilder(  char const* macroName,
+                        SourceLineInfo const& lineInfo,
+                        char const* capturedExpression,
+                        ResultDisposition::Flags resultDisposition,
+                        char const* secondArg = "" );
+        ~ResultBuilder();
+
+        template<typename T>
+        ExpressionLhs<T const&> operator <= ( T const& operand );
+        ExpressionLhs<bool> operator <= ( bool value );
+
+        template<typename T>
+        ResultBuilder& operator << ( T const& value ) {
+            stream().oss << value;
+            return *this;
+        }
+
+        ResultBuilder& setResultType( ResultWas::OfType result );
+        ResultBuilder& setResultType( bool result );
+
+        void endExpression( DecomposedExpression const& expr );
+
+        virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE;
+
+        AssertionResult build() const;
+        AssertionResult build( DecomposedExpression const& expr ) const;
+
+        void useActiveException( ResultDisposition::Flags resultDisposition = ResultDisposition::Normal );
+        void captureResult( ResultWas::OfType resultType );
+        void captureExpression();
+        void captureExpectedException( std::string const& expectedMessage );
+        void captureExpectedException( Matchers::Impl::MatcherBase<std::string> const& matcher );
+        void handleResult( AssertionResult const& result );
+        void react();
+        bool shouldDebugBreak() const;
+        bool allowThrows() const;
+
+        template<typename ArgT, typename MatcherT>
+        void captureMatch( ArgT const& arg, MatcherT const& matcher, char const* matcherString );
+
+        void setExceptionGuard();
+        void unsetExceptionGuard();
+
+    private:
+        AssertionInfo m_assertionInfo;
+        AssertionResultData m_data;
+
+        CopyableStream &stream()
+        {
+            if(!m_usedStream)
+            {
+                m_usedStream = true;
+                m_stream().oss.str("");
+            }
+            return m_stream();
+        }
+
+        static CopyableStream &m_stream()
+        {
+            static CopyableStream s;
+            return s;
+        }
+
+        bool m_shouldDebugBreak;
+        bool m_shouldThrow;
+        bool m_guardException;
+        bool m_usedStream;
+    };
+
+} // namespace Catch
+
+// Include after due to circular dependency:
+// #included from: catch_expression_lhs.hpp
+#define TWOBLUECUBES_CATCH_EXPRESSION_LHS_HPP_INCLUDED
+
+// #included from: catch_evaluate.hpp
+#define TWOBLUECUBES_CATCH_EVALUATE_HPP_INCLUDED
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4389) // '==' : signed/unsigned mismatch
+#pragma warning(disable:4018) // more "signed/unsigned mismatch"
+#pragma warning(disable:4312) // Converting int to T* using reinterpret_cast (issue on x64 platform)
+#endif
+
+#include <cstddef>
+
+namespace Catch {
+namespace Internal {
+
+    enum Operator {
+        IsEqualTo,
+        IsNotEqualTo,
+        IsLessThan,
+        IsGreaterThan,
+        IsLessThanOrEqualTo,
+        IsGreaterThanOrEqualTo
+    };
+
+    template<Operator Op> struct OperatorTraits             { static const char* getName(){ return "*error*"; } };
+    template<> struct OperatorTraits<IsEqualTo>             { static const char* getName(){ return "=="; } };
+    template<> struct OperatorTraits<IsNotEqualTo>          { static const char* getName(){ return "!="; } };
+    template<> struct OperatorTraits<IsLessThan>            { static const char* getName(){ return "<"; } };
+    template<> struct OperatorTraits<IsGreaterThan>         { static const char* getName(){ return ">"; } };
+    template<> struct OperatorTraits<IsLessThanOrEqualTo>   { static const char* getName(){ return "<="; } };
+    template<> struct OperatorTraits<IsGreaterThanOrEqualTo>{ static const char* getName(){ return ">="; } };
+
+    template<typename T>
+    T& opCast(T const& t) { return const_cast<T&>(t); }
+
+// nullptr_t support based on pull request #154 from Konstantin Baumann
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+    inline std::nullptr_t opCast(std::nullptr_t) { return nullptr; }
+#endif // CATCH_CONFIG_CPP11_NULLPTR
+
+    // So the compare overloads can be operator agnostic we convey the operator as a template
+    // enum, which is used to specialise an Evaluator for doing the comparison.
+    template<typename T1, typename T2, Operator Op>
+    struct Evaluator{};
+
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsEqualTo> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs) {
+            return bool( opCast( lhs ) ==  opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsNotEqualTo> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) != opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsLessThan> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) < opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsGreaterThan> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) > opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsGreaterThanOrEqualTo> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) >= opCast( rhs ) );
+        }
+    };
+    template<typename T1, typename T2>
+    struct Evaluator<T1, T2, IsLessThanOrEqualTo> {
+        static bool evaluate( T1 const& lhs, T2 const& rhs ) {
+            return bool( opCast( lhs ) <= opCast( rhs ) );
+        }
+    };
+
+    template<Operator Op, typename T1, typename T2>
+    bool applyEvaluator( T1 const& lhs, T2 const& rhs ) {
+        return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
+    }
+
+    // This level of indirection allows us to specialise for integer types
+    // to avoid signed/ unsigned warnings
+
+    // "base" overload
+    template<Operator Op, typename T1, typename T2>
+    bool compare( T1 const& lhs, T2 const& rhs ) {
+        return Evaluator<T1, T2, Op>::evaluate( lhs, rhs );
+    }
+
+    // unsigned X to int
+    template<Operator Op> bool compare( unsigned int lhs, int rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
+    }
+    template<Operator Op> bool compare( unsigned long lhs, int rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
+    }
+    template<Operator Op> bool compare( unsigned char lhs, int rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned int>( rhs ) );
+    }
+
+    // unsigned X to long
+    template<Operator Op> bool compare( unsigned int lhs, long rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
+    }
+    template<Operator Op> bool compare( unsigned long lhs, long rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
+    }
+    template<Operator Op> bool compare( unsigned char lhs, long rhs ) {
+        return applyEvaluator<Op>( lhs, static_cast<unsigned long>( rhs ) );
+    }
+
+    // int to unsigned X
+    template<Operator Op> bool compare( int lhs, unsigned int rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( int lhs, unsigned long rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( int lhs, unsigned char rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned int>( lhs ), rhs );
+    }
+
+    // long to unsigned X
+    template<Operator Op> bool compare( long lhs, unsigned int rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long lhs, unsigned long rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long lhs, unsigned char rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+
+    // pointer to long (when comparing against NULL)
+    template<Operator Op, typename T> bool compare( long lhs, T* rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
+    }
+    template<Operator Op, typename T> bool compare( T* lhs, long rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
+    }
+
+    // pointer to int (when comparing against NULL)
+    template<Operator Op, typename T> bool compare( int lhs, T* rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
+    }
+    template<Operator Op, typename T> bool compare( T* lhs, int rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
+    }
+
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+    // long long to unsigned X
+    template<Operator Op> bool compare( long long lhs, unsigned int rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long long lhs, unsigned long rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long long lhs, unsigned long long rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( long long lhs, unsigned char rhs ) {
+        return applyEvaluator<Op>( static_cast<unsigned long>( lhs ), rhs );
+    }
+
+    // unsigned long long to X
+    template<Operator Op> bool compare( unsigned long long lhs, int rhs ) {
+        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( unsigned long long lhs, long rhs ) {
+        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( unsigned long long lhs, long long rhs ) {
+        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+    }
+    template<Operator Op> bool compare( unsigned long long lhs, char rhs ) {
+        return applyEvaluator<Op>( static_cast<long>( lhs ), rhs );
+    }
+
+    // pointer to long long (when comparing against NULL)
+    template<Operator Op, typename T> bool compare( long long lhs, T* rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( reinterpret_cast<T*>( lhs ), rhs );
+    }
+    template<Operator Op, typename T> bool compare( T* lhs, long long rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( lhs, reinterpret_cast<T*>( rhs ) );
+    }
+#endif // CATCH_CONFIG_CPP11_LONG_LONG
+
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+    // pointer to nullptr_t (when comparing against nullptr)
+    template<Operator Op, typename T> bool compare( std::nullptr_t, T* rhs ) {
+        return Evaluator<T*, T*, Op>::evaluate( nullptr, rhs );
+    }
+    template<Operator Op, typename T> bool compare( T* lhs, std::nullptr_t ) {
+        return Evaluator<T*, T*, Op>::evaluate( lhs, nullptr );
+    }
+#endif // CATCH_CONFIG_CPP11_NULLPTR
+
+} // end of namespace Internal
+} // end of namespace Catch
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+// #included from: catch_tostring.h
+#define TWOBLUECUBES_CATCH_TOSTRING_H_INCLUDED
+
+#include <sstream>
+#include <iomanip>
+#include <limits>
+#include <vector>
+#include <cstddef>
+
+#ifdef __OBJC__
+// #included from: catch_objc_arc.hpp
+#define TWOBLUECUBES_CATCH_OBJC_ARC_HPP_INCLUDED
+
+#import <Foundation/Foundation.h>
+
+#ifdef __has_feature
+#define CATCH_ARC_ENABLED __has_feature(objc_arc)
+#else
+#define CATCH_ARC_ENABLED 0
+#endif
+
+void arcSafeRelease( NSObject* obj );
+id performOptionalSelector( id obj, SEL sel );
+
+#if !CATCH_ARC_ENABLED
+inline void arcSafeRelease( NSObject* obj ) {
+    [obj release];
+}
+inline id performOptionalSelector( id obj, SEL sel ) {
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED
+#define CATCH_ARC_STRONG
+#else
+inline void arcSafeRelease( NSObject* ){}
+inline id performOptionalSelector( id obj, SEL sel ) {
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+#endif
+    if( [obj respondsToSelector: sel] )
+        return [obj performSelector: sel];
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+    return nil;
+}
+#define CATCH_UNSAFE_UNRETAINED __unsafe_unretained
+#define CATCH_ARC_STRONG __strong
+#endif
+
+#endif
+
+#ifdef CATCH_CONFIG_CPP11_TUPLE
+#include <tuple>
+#endif
+
+#ifdef CATCH_CONFIG_CPP11_IS_ENUM
+#include <type_traits>
+#endif
+
+namespace Catch {
+
+// Why we're here.
+template<typename T>
+std::string toString( T const& value );
+
+// Built in overloads
+
+std::string toString( std::string const& value );
+std::string toString( std::wstring const& value );
+std::string toString( const char* const value );
+std::string toString( char* const value );
+std::string toString( const wchar_t* const value );
+std::string toString( wchar_t* const value );
+std::string toString( int value );
+std::string toString( unsigned long value );
+std::string toString( unsigned int value );
+std::string toString( const double value );
+std::string toString( const float value );
+std::string toString( bool value );
+std::string toString( char value );
+std::string toString( signed char value );
+std::string toString( unsigned char value );
+
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+std::string toString( long long value );
+std::string toString( unsigned long long value );
+#endif
+
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+std::string toString( std::nullptr_t );
+#endif
+
+#ifdef __OBJC__
+    std::string toString( NSString const * const& nsstring );
+    std::string toString( NSString * CATCH_ARC_STRONG & nsstring );
+    std::string toString( NSObject* const& nsObject );
+#endif
+
+namespace Detail {
+
+    extern const std::string unprintableString;
+
+ #if !defined(CATCH_CONFIG_CPP11_STREAM_INSERTABLE_CHECK)
+    struct BorgType {
+        template<typename T> BorgType( T const& );
+    };
+
+    struct TrueType { char sizer[1]; };
+    struct FalseType { char sizer[2]; };
+
+    TrueType& testStreamable( std::ostream& );
+    FalseType testStreamable( FalseType );
+
+    FalseType operator<<( std::ostream const&, BorgType const& );
+
+    template<typename T>
+    struct IsStreamInsertable {
+        static std::ostream &s;
+        static T  const&t;
+        enum { value = sizeof( testStreamable(s << t) ) == sizeof( TrueType ) };
+    };
+#else
+    template<typename T>
+    class IsStreamInsertable {
+        template<typename SS, typename TT>
+        static auto test(int)
+        -> decltype( std::declval<SS&>() << std::declval<TT>(), std::true_type() );
+
+        template<typename, typename>
+        static auto test(...) -> std::false_type;
+
+    public:
+        static const bool value = decltype(test<std::ostream,const T&>(0))::value;
+    };
+#endif
+
+#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
+    template<typename T,
+             bool IsEnum = std::is_enum<T>::value
+             >
+    struct EnumStringMaker
+    {
+        static std::string convert( T const& ) { return unprintableString; }
+    };
+
+    template<typename T>
+    struct EnumStringMaker<T,true>
+    {
+        static std::string convert( T const& v )
+        {
+            return ::Catch::toString(
+                static_cast<typename std::underlying_type<T>::type>(v)
+                );
+        }
+    };
+#endif
+    template<bool C>
+    struct StringMakerBase {
+#if defined(CATCH_CONFIG_CPP11_IS_ENUM)
+        template<typename T>
+        static std::string convert( T const& v )
+        {
+            return EnumStringMaker<T>::convert( v );
+        }
+#else
+        template<typename T>
+        static std::string convert( T const& ) { return unprintableString; }
+#endif
+    };
+
+    template<>
+    struct StringMakerBase<true> {
+        template<typename T>
+        static std::string convert( T const& _value ) {
+            std::ostringstream oss;
+            oss << _value;
+            return oss.str();
+        }
+    };
+
+    std::string rawMemoryToString( const void *object, std::size_t size );
+
+    template<typename T>
+    std::string rawMemoryToString( const T& object ) {
+      return rawMemoryToString( &object, sizeof(object) );
+    }
+
+} // end namespace Detail
+
+template<typename T>
+struct StringMaker :
+    Detail::StringMakerBase<Detail::IsStreamInsertable<T>::value> {};
+
+template<typename T>
+struct StringMaker<T*> {
+    template<typename U>
+    static std::string convert( U* p ) {
+        if( !p )
+            return "NULL";
+        else
+            return Detail::rawMemoryToString( p );
+    }
+};
+
+template<typename R, typename C>
+struct StringMaker<R C::*> {
+    static std::string convert( R C::* p ) {
+        if( !p )
+            return "NULL";
+        else
+            return Detail::rawMemoryToString( p );
+    }
+};
+
+namespace Detail {
+    template<typename InputIterator>
+    std::string rangeToString( InputIterator first, InputIterator last );
+}
+
+//template<typename T, typename Allocator>
+//struct StringMaker<std::vector<T, Allocator> > {
+//    static std::string convert( std::vector<T,Allocator> const& v ) {
+//        return Detail::rangeToString( v.begin(), v.end() );
+//    }
+//};
+
+template<typename T, typename Allocator>
+std::string toString( std::vector<T,Allocator> const& v ) {
+    return Detail::rangeToString( v.begin(), v.end() );
+}
+
+#ifdef CATCH_CONFIG_CPP11_TUPLE
+
+// toString for tuples
+namespace TupleDetail {
+  template<
+      typename Tuple,
+      std::size_t N = 0,
+      bool = (N < std::tuple_size<Tuple>::value)
+      >
+  struct ElementPrinter {
+      static void print( const Tuple& tuple, std::ostream& os )
+      {
+          os << ( N ? ", " : " " )
+             << Catch::toString(std::get<N>(tuple));
+          ElementPrinter<Tuple,N+1>::print(tuple,os);
+      }
+  };
+
+  template<
+      typename Tuple,
+      std::size_t N
+      >
+  struct ElementPrinter<Tuple,N,false> {
+      static void print( const Tuple&, std::ostream& ) {}
+  };
+
+}
+
+template<typename ...Types>
+struct StringMaker<std::tuple<Types...>> {
+
+    static std::string convert( const std::tuple<Types...>& tuple )
+    {
+        std::ostringstream os;
+        os << '{';
+        TupleDetail::ElementPrinter<std::tuple<Types...>>::print( tuple, os );
+        os << " }";
+        return os.str();
+    }
+};
+#endif // CATCH_CONFIG_CPP11_TUPLE
+
+namespace Detail {
+    template<typename T>
+    std::string makeString( T const& value ) {
+        return StringMaker<T>::convert( value );
+    }
+} // end namespace Detail
+
+/// \brief converts any type to a string
+///
+/// The default template forwards on to ostringstream - except when an
+/// ostringstream overload does not exist - in which case it attempts to detect
+/// that and writes {?}.
+/// Overload (not specialise) this template for custom typs that you don't want
+/// to provide an ostream overload for.
+template<typename T>
+std::string toString( T const& value ) {
+    return StringMaker<T>::convert( value );
+}
+
+    namespace Detail {
+    template<typename InputIterator>
+    std::string rangeToString( InputIterator first, InputIterator last ) {
+        std::ostringstream oss;
+        oss << "{ ";
+        if( first != last ) {
+            oss << Catch::toString( *first );
+            for( ++first ; first != last ; ++first )
+                oss << ", " << Catch::toString( *first );
+        }
+        oss << " }";
+        return oss.str();
+    }
+}
+
+} // end namespace Catch
+
+namespace Catch {
+
+template<typename LhsT, Internal::Operator Op, typename RhsT>
+class BinaryExpression;
+
+template<typename ArgT, typename MatcherT>
+class MatchExpression;
+
+// Wraps the LHS of an expression and overloads comparison operators
+// for also capturing those and RHS (if any)
+template<typename T>
+class ExpressionLhs : public DecomposedExpression {
+public:
+    ExpressionLhs( ResultBuilder& rb, T lhs ) : m_rb( rb ), m_lhs( lhs ), m_truthy(false) {}
+
+    ExpressionLhs& operator = ( const ExpressionLhs& );
+
+    template<typename RhsT>
+    BinaryExpression<T, Internal::IsEqualTo, RhsT const&>
+    operator == ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsEqualTo>( rhs );
+    }
+
+    template<typename RhsT>
+    BinaryExpression<T, Internal::IsNotEqualTo, RhsT const&>
+    operator != ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsNotEqualTo>( rhs );
+    }
+
+    template<typename RhsT>
+    BinaryExpression<T, Internal::IsLessThan, RhsT const&>
+    operator < ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsLessThan>( rhs );
+    }
+
+    template<typename RhsT>
+    BinaryExpression<T, Internal::IsGreaterThan, RhsT const&>
+    operator > ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsGreaterThan>( rhs );
+    }
+
+    template<typename RhsT>
+    BinaryExpression<T, Internal::IsLessThanOrEqualTo, RhsT const&>
+    operator <= ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsLessThanOrEqualTo>( rhs );
+    }
+
+    template<typename RhsT>
+    BinaryExpression<T, Internal::IsGreaterThanOrEqualTo, RhsT const&>
+    operator >= ( RhsT const& rhs ) {
+        return captureExpression<Internal::IsGreaterThanOrEqualTo>( rhs );
+    }
+
+    BinaryExpression<T, Internal::IsEqualTo, bool> operator == ( bool rhs ) {
+        return captureExpression<Internal::IsEqualTo>( rhs );
+    }
+
+    BinaryExpression<T, Internal::IsNotEqualTo, bool> operator != ( bool rhs ) {
+        return captureExpression<Internal::IsNotEqualTo>( rhs );
+    }
+
+    void endExpression() {
+        m_truthy = m_lhs ? true : false;
+        m_rb
+            .setResultType( m_truthy )
+            .endExpression( *this );
+    }
+
+    virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE {
+        dest = Catch::toString( m_lhs );
+    }
+
+private:
+    template<Internal::Operator Op, typename RhsT>
+    BinaryExpression<T, Op, RhsT&> captureExpression( RhsT& rhs ) const {
+        return BinaryExpression<T, Op, RhsT&>( m_rb, m_lhs, rhs );
+    }
+
+    template<Internal::Operator Op>
+    BinaryExpression<T, Op, bool> captureExpression( bool rhs ) const {
+        return BinaryExpression<T, Op, bool>( m_rb, m_lhs, rhs );
+    }
+
+private:
+    ResultBuilder& m_rb;
+    T m_lhs;
+    bool m_truthy;
+};
+
+template<typename LhsT, Internal::Operator Op, typename RhsT>
+class BinaryExpression : public DecomposedExpression {
+public:
+    BinaryExpression( ResultBuilder& rb, LhsT lhs, RhsT rhs )
+        : m_rb( rb ), m_lhs( lhs ), m_rhs( rhs ) {}
+
+    BinaryExpression& operator = ( BinaryExpression& );
+
+    void endExpression() const {
+        m_rb
+            .setResultType( Internal::compare<Op>( m_lhs, m_rhs ) )
+            .endExpression( *this );
+    }
+
+    virtual bool isBinaryExpression() const CATCH_OVERRIDE {
+        return true;
+    }
+
+    virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE {
+        std::string lhs = Catch::toString( m_lhs );
+        std::string rhs = Catch::toString( m_rhs );
+        char delim = lhs.size() + rhs.size() < 40 &&
+                     lhs.find('\n') == std::string::npos &&
+                     rhs.find('\n') == std::string::npos ? ' ' : '\n';
+        dest.reserve( 7 + lhs.size() + rhs.size() );
+                   // 2 for spaces around operator
+                   // 2 for operator
+                   // 2 for parentheses (conditionally added later)
+                   // 1 for negation (conditionally added later)
+        dest = lhs;
+        dest += delim;
+        dest += Internal::OperatorTraits<Op>::getName();
+        dest += delim;
+        dest += rhs;
+    }
+
+private:
+    ResultBuilder& m_rb;
+    LhsT m_lhs;
+    RhsT m_rhs;
+};
+
+template<typename ArgT, typename MatcherT>
+class MatchExpression : public DecomposedExpression {
+public:
+    MatchExpression( ArgT arg, MatcherT matcher, char const* matcherString )
+        : m_arg( arg ), m_matcher( matcher ), m_matcherString( matcherString ) {}
+
+    virtual bool isBinaryExpression() const CATCH_OVERRIDE {
+        return true;
+    }
+
+    virtual void reconstructExpression( std::string& dest ) const CATCH_OVERRIDE {
+        std::string matcherAsString = m_matcher.toString();
+        dest = Catch::toString( m_arg );
+        dest += ' ';
+        if( matcherAsString == Detail::unprintableString )
+            dest += m_matcherString;
+        else
+            dest += matcherAsString;
+    }
+
+private:
+    ArgT m_arg;
+    MatcherT m_matcher;
+    char const* m_matcherString;
+};
+
+} // end namespace Catch
+
+
+namespace Catch {
+
+    template<typename T>
+    ExpressionLhs<T const&> ResultBuilder::operator <= ( T const& operand ) {
+        return ExpressionLhs<T const&>( *this, operand );
+    }
+
+    inline ExpressionLhs<bool> ResultBuilder::operator <= ( bool value ) {
+        return ExpressionLhs<bool>( *this, value );
+    }
+
+    template<typename ArgT, typename MatcherT>
+    void ResultBuilder::captureMatch( ArgT const& arg, MatcherT const& matcher,
+                                             char const* matcherString ) {
+        MatchExpression<ArgT const&, MatcherT const&> expr( arg, matcher, matcherString );
+        setResultType( matcher.match( arg ) );
+        endExpression( expr );
+    }
+
+} // namespace Catch
+
+// #included from: catch_message.h
+#define TWOBLUECUBES_CATCH_MESSAGE_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct MessageInfo {
+        MessageInfo(    std::string const& _macroName,
+                        SourceLineInfo const& _lineInfo,
+                        ResultWas::OfType _type );
+
+        std::string macroName;
+        SourceLineInfo lineInfo;
+        ResultWas::OfType type;
+        std::string message;
+        unsigned int sequence;
+
+        bool operator == ( MessageInfo const& other ) const {
+            return sequence == other.sequence;
+        }
+        bool operator < ( MessageInfo const& other ) const {
+            return sequence < other.sequence;
+        }
+    private:
+        static unsigned int globalCount;
+    };
+
+    struct MessageBuilder {
+        MessageBuilder( std::string const& macroName,
+                        SourceLineInfo const& lineInfo,
+                        ResultWas::OfType type )
+        : m_info( macroName, lineInfo, type )
+        {}
+
+        template<typename T>
+        MessageBuilder& operator << ( T const& value ) {
+            m_stream << value;
+            return *this;
+        }
+
+        MessageInfo m_info;
+        std::ostringstream m_stream;
+    };
+
+    class ScopedMessage {
+    public:
+        ScopedMessage( MessageBuilder const& builder );
+        ScopedMessage( ScopedMessage const& other );
+        ~ScopedMessage();
+
+        MessageInfo m_info;
+    };
+
+} // end namespace Catch
+
+// #included from: catch_interfaces_capture.h
+#define TWOBLUECUBES_CATCH_INTERFACES_CAPTURE_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    class TestCase;
+    class AssertionResult;
+    struct AssertionInfo;
+    struct SectionInfo;
+    struct SectionEndInfo;
+    struct MessageInfo;
+    class ScopedMessageBuilder;
+    struct Counts;
+
+    struct IResultCapture {
+
+        virtual ~IResultCapture();
+
+        virtual void assertionEnded( AssertionResult const& result ) = 0;
+        virtual bool sectionStarted(    SectionInfo const& sectionInfo,
+                                        Counts& assertions ) = 0;
+        virtual void sectionEnded( SectionEndInfo const& endInfo ) = 0;
+        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) = 0;
+        virtual void pushScopedMessage( MessageInfo const& message ) = 0;
+        virtual void popScopedMessage( MessageInfo const& message ) = 0;
+
+        virtual std::string getCurrentTestName() const = 0;
+        virtual const AssertionResult* getLastResult() const = 0;
+
+        virtual void exceptionEarlyReported() = 0;
+
+        virtual void handleFatalErrorCondition( std::string const& message ) = 0;
+
+        virtual bool lastAssertionPassed() = 0;
+        virtual void assertionPassed() = 0;
+        virtual void assertionRun() = 0;
+    };
+
+    IResultCapture& getResultCapture();
+}
+
+// #included from: catch_debugger.h
+#define TWOBLUECUBES_CATCH_DEBUGGER_H_INCLUDED
+
+// #included from: catch_platform.h
+#define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
+
+#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+#  define CATCH_PLATFORM_MAC
+#elif  defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+#  define CATCH_PLATFORM_IPHONE
+#elif defined(linux) || defined(__linux) || defined(__linux__)
+#  define CATCH_PLATFORM_LINUX
+#elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
+#  define CATCH_PLATFORM_WINDOWS
+#  if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)
+#    define CATCH_DEFINES_NOMINMAX
+#  endif
+#  if !defined(WIN32_LEAN_AND_MEAN) && !defined(CATCH_CONFIG_NO_WIN32_LEAN_AND_MEAN)
+#    define CATCH_DEFINES_WIN32_LEAN_AND_MEAN
+#  endif
+#endif
+
+#include <string>
+
+namespace Catch{
+
+    bool isDebuggerActive();
+    void writeToDebugConsole( std::string const& text );
+}
+
+#ifdef CATCH_PLATFORM_MAC
+
+    // The following code snippet based on:
+    // http://cocoawithlove.com/2008/03/break-into-debugger.html
+    #if defined(__ppc64__) || defined(__ppc__)
+        #define CATCH_TRAP() \
+                __asm__("li r0, 20\nsc\nnop\nli r0, 37\nli r4, 2\nsc\nnop\n" \
+                : : : "memory","r0","r3","r4" ) /* NOLINT */
+    #else
+        #define CATCH_TRAP() __asm__("int $3\n" : : /* NOLINT */ )
+    #endif
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    // If we can use inline assembler, do it because this allows us to break
+    // directly at the location of the failing check instead of breaking inside
+    // raise() called from it, i.e. one stack frame below.
+    #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64))
+        #define CATCH_TRAP() asm volatile ("int $3") /* NOLINT */
+    #else // Fall back to the generic way.
+        #include <signal.h>
+
+        #define CATCH_TRAP() raise(SIGTRAP)
+    #endif
+#elif defined(_MSC_VER)
+    #define CATCH_TRAP() __debugbreak()
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) void __stdcall DebugBreak();
+    #define CATCH_TRAP() DebugBreak()
+#endif
+
+#ifdef CATCH_TRAP
+    #define CATCH_BREAK_INTO_DEBUGGER() if( Catch::isDebuggerActive() ) { CATCH_TRAP(); }
+#else
+    #define CATCH_BREAK_INTO_DEBUGGER() Catch::alwaysTrue();
+#endif
+
+// #included from: catch_interfaces_runner.h
+#define TWOBLUECUBES_CATCH_INTERFACES_RUNNER_H_INCLUDED
+
+namespace Catch {
+    class TestCase;
+
+    struct IRunner {
+        virtual ~IRunner();
+        virtual bool aborting() const = 0;
+    };
+}
+
+#if !defined(CATCH_CONFIG_DISABLE_STRINGIFICATION)
+# define CATCH_INTERNAL_STRINGIFY(expr) #expr
+#else
+# define CATCH_INTERNAL_STRINGIFY(expr) "Disabled by CATCH_CONFIG_DISABLE_STRINGIFICATION"
+#endif
+
+#if defined(CATCH_CONFIG_FAST_COMPILE)
+///////////////////////////////////////////////////////////////////////////////
+// We can speedup compilation significantly by breaking into debugger lower in
+// the callstack, because then we don't have to expand CATCH_BREAK_INTO_DEBUGGER
+// macro in each assertion
+#define INTERNAL_CATCH_REACT( resultBuilder ) \
+    resultBuilder.react();
+
+///////////////////////////////////////////////////////////////////////////////
+// Another way to speed-up compilation is to omit local try-catch for REQUIRE*
+// macros.
+// This can potentially cause false negative, if the test code catches
+// the exception before it propagates back up to the runner.
+#define INTERNAL_CATCH_TEST_NO_TRY( macroName, resultDisposition, expr ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr), resultDisposition ); \
+        __catchResult.setExceptionGuard(); \
+        CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+        ( __catchResult <= expr ).endExpression(); \
+        CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
+        __catchResult.unsetExceptionGuard(); \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::isTrue( false && static_cast<bool>( !!(expr) ) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look
+// The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&.
+
+#define INTERNAL_CHECK_THAT_NO_TRY( macroName, matcher, resultDisposition, arg ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        __catchResult.setExceptionGuard(); \
+        __catchResult.captureMatch( arg, matcher, CATCH_INTERNAL_STRINGIFY(matcher) ); \
+        __catchResult.unsetExceptionGuard(); \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::alwaysFalse() )
+
+#else
+///////////////////////////////////////////////////////////////////////////////
+// In the event of a failure works out if the debugger needs to be invoked
+// and/or an exception thrown and takes appropriate action.
+// This needs to be done as a macro so the debugger will stop in the user
+// source code rather than in Catch library code
+#define INTERNAL_CATCH_REACT( resultBuilder ) \
+    if( resultBuilder.shouldDebugBreak() ) CATCH_BREAK_INTO_DEBUGGER(); \
+    resultBuilder.react();
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr), resultDisposition ); \
+        try { \
+            CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS \
+            ( __catchResult <= expr ).endExpression(); \
+            CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS \
+        } \
+        catch( ... ) { \
+            __catchResult.useActiveException( resultDisposition ); \
+        } \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::isTrue( false && static_cast<bool>( !!(expr) ) ) ) // expr here is never evaluated at runtime but it forces the compiler to give it a look
+    // The double negation silences MSVC's C4800 warning, the static_cast forces short-circuit evaluation if the type has overloaded &&.
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_IF( macroName, resultDisposition, expr ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ); \
+    if( Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_ELSE( macroName, resultDisposition, expr ) \
+    INTERNAL_CATCH_TEST( macroName, resultDisposition, expr ); \
+    if( !Catch::getResultCapture().lastAssertionPassed() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_NO_THROW( macroName, resultDisposition, expr ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr), resultDisposition ); \
+        try { \
+            static_cast<void>(expr); \
+            __catchResult.captureResult( Catch::ResultWas::Ok ); \
+        } \
+        catch( ... ) { \
+            __catchResult.useActiveException( resultDisposition ); \
+        } \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::alwaysFalse() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS( macroName, resultDisposition, matcher, expr ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr), resultDisposition, CATCH_INTERNAL_STRINGIFY(matcher) ); \
+        if( __catchResult.allowThrows() ) \
+            try { \
+                static_cast<void>(expr); \
+                __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
+            } \
+            catch( ... ) { \
+                __catchResult.captureExpectedException( matcher ); \
+            } \
+        else \
+            __catchResult.captureResult( Catch::ResultWas::Ok ); \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::alwaysFalse() )
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_THROWS_AS( macroName, exceptionType, resultDisposition, expr ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(expr) ", " CATCH_INTERNAL_STRINGIFY(exceptionType), resultDisposition ); \
+        if( __catchResult.allowThrows() ) \
+            try { \
+                static_cast<void>(expr); \
+                __catchResult.captureResult( Catch::ResultWas::DidntThrowException ); \
+            } \
+            catch( exceptionType ) { \
+                __catchResult.captureResult( Catch::ResultWas::Ok ); \
+            } \
+            catch( ... ) { \
+                __catchResult.useActiveException( resultDisposition ); \
+            } \
+        else \
+            __catchResult.captureResult( Catch::ResultWas::Ok ); \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::alwaysFalse() )
+
+///////////////////////////////////////////////////////////////////////////////
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+    #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, ... ) \
+        do { \
+            Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
+            __catchResult << __VA_ARGS__ + ::Catch::StreamEndStop(); \
+            __catchResult.captureResult( messageType ); \
+            INTERNAL_CATCH_REACT( __catchResult ) \
+        } while( Catch::alwaysFalse() )
+#else
+    #define INTERNAL_CATCH_MSG( macroName, messageType, resultDisposition, log ) \
+        do { \
+            Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, "", resultDisposition ); \
+            __catchResult << log + ::Catch::StreamEndStop(); \
+            __catchResult.captureResult( messageType ); \
+            INTERNAL_CATCH_REACT( __catchResult ) \
+        } while( Catch::alwaysFalse() )
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_INFO( macroName, log ) \
+    Catch::ScopedMessage INTERNAL_CATCH_UNIQUE_NAME( scopedMessage ) = Catch::MessageBuilder( macroName, CATCH_INTERNAL_LINEINFO, Catch::ResultWas::Info ) << log;
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CHECK_THAT( macroName, matcher, resultDisposition, arg ) \
+    do { \
+        Catch::ResultBuilder __catchResult( macroName, CATCH_INTERNAL_LINEINFO, CATCH_INTERNAL_STRINGIFY(arg) ", " CATCH_INTERNAL_STRINGIFY(matcher), resultDisposition ); \
+        try { \
+            __catchResult.captureMatch( arg, matcher, CATCH_INTERNAL_STRINGIFY(matcher) ); \
+        } catch( ... ) { \
+            __catchResult.useActiveException( resultDisposition | Catch::ResultDisposition::ContinueOnFailure ); \
+        } \
+        INTERNAL_CATCH_REACT( __catchResult ) \
+    } while( Catch::alwaysFalse() )
+
+// #included from: internal/catch_section.h
+#define TWOBLUECUBES_CATCH_SECTION_H_INCLUDED
+
+// #included from: catch_section_info.h
+#define TWOBLUECUBES_CATCH_SECTION_INFO_H_INCLUDED
+
+// #included from: catch_totals.hpp
+#define TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED
+
+#include <cstddef>
+
+namespace Catch {
+
+    struct Counts {
+        Counts() : passed( 0 ), failed( 0 ), failedButOk( 0 ) {}
+
+        Counts operator - ( Counts const& other ) const {
+            Counts diff;
+            diff.passed = passed - other.passed;
+            diff.failed = failed - other.failed;
+            diff.failedButOk = failedButOk - other.failedButOk;
+            return diff;
+        }
+        Counts& operator += ( Counts const& other ) {
+            passed += other.passed;
+            failed += other.failed;
+            failedButOk += other.failedButOk;
+            return *this;
+        }
+
+        std::size_t total() const {
+            return passed + failed + failedButOk;
+        }
+        bool allPassed() const {
+            return failed == 0 && failedButOk == 0;
+        }
+        bool allOk() const {
+            return failed == 0;
+        }
+
+        std::size_t passed;
+        std::size_t failed;
+        std::size_t failedButOk;
+    };
+
+    struct Totals {
+
+        Totals operator - ( Totals const& other ) const {
+            Totals diff;
+            diff.assertions = assertions - other.assertions;
+            diff.testCases = testCases - other.testCases;
+            return diff;
+        }
+
+        Totals delta( Totals const& prevTotals ) const {
+            Totals diff = *this - prevTotals;
+            if( diff.assertions.failed > 0 )
+                ++diff.testCases.failed;
+            else if( diff.assertions.failedButOk > 0 )
+                ++diff.testCases.failedButOk;
+            else
+                ++diff.testCases.passed;
+            return diff;
+        }
+
+        Totals& operator += ( Totals const& other ) {
+            assertions += other.assertions;
+            testCases += other.testCases;
+            return *this;
+        }
+
+        Counts assertions;
+        Counts testCases;
+    };
+}
+
+#include <string>
+
+namespace Catch {
+
+    struct SectionInfo {
+        SectionInfo
+            (   SourceLineInfo const& _lineInfo,
+                std::string const& _name,
+                std::string const& _description = std::string() );
+
+        std::string name;
+        std::string description;
+        SourceLineInfo lineInfo;
+    };
+
+    struct SectionEndInfo {
+        SectionEndInfo( SectionInfo const& _sectionInfo, Counts const& _prevAssertions, double _durationInSeconds )
+        : sectionInfo( _sectionInfo ), prevAssertions( _prevAssertions ), durationInSeconds( _durationInSeconds )
+        {}
+
+        SectionInfo sectionInfo;
+        Counts prevAssertions;
+        double durationInSeconds;
+    };
+
+} // end namespace Catch
+
+// #included from: catch_timer.h
+#define TWOBLUECUBES_CATCH_TIMER_H_INCLUDED
+
+#ifdef _MSC_VER
+
+namespace Catch {
+    typedef unsigned long long UInt64;
+}
+#else
+#include <stdint.h>
+namespace Catch {
+    typedef uint64_t UInt64;
+}
+#endif
+
+namespace Catch {
+    class Timer {
+    public:
+        Timer() : m_ticks( 0 ) {}
+        void start();
+        unsigned int getElapsedMicroseconds() const;
+        unsigned int getElapsedMilliseconds() const;
+        double getElapsedSeconds() const;
+
+    private:
+        UInt64 m_ticks;
+    };
+
+} // namespace Catch
+
+#include <string>
+
+namespace Catch {
+
+    class Section : NonCopyable {
+    public:
+        Section( SectionInfo const& info );
+        ~Section();
+
+        // This indicates whether the section should be executed or not
+        operator bool() const;
+
+    private:
+        SectionInfo m_info;
+
+        std::string m_name;
+        Counts m_assertions;
+        bool m_sectionIncluded;
+        Timer m_timer;
+    };
+
+} // end namespace Catch
+
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+    #define INTERNAL_CATCH_SECTION( ... ) \
+        if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, __VA_ARGS__ ) )
+#else
+    #define INTERNAL_CATCH_SECTION( name, desc ) \
+        if( Catch::Section const& INTERNAL_CATCH_UNIQUE_NAME( catch_internal_Section ) = Catch::SectionInfo( CATCH_INTERNAL_LINEINFO, name, desc ) )
+#endif
+
+// #included from: internal/catch_generators.hpp
+#define TWOBLUECUBES_CATCH_GENERATORS_HPP_INCLUDED
+
+#include <vector>
+#include <string>
+#include <stdlib.h>
+
+namespace Catch {
+
+template<typename T>
+struct IGenerator {
+    virtual ~IGenerator() {}
+    virtual T getValue( std::size_t index ) const = 0;
+    virtual std::size_t size () const = 0;
+};
+
+template<typename T>
+class BetweenGenerator : public IGenerator<T> {
+public:
+    BetweenGenerator( T from, T to ) : m_from( from ), m_to( to ){}
+
+    virtual T getValue( std::size_t index ) const {
+        return m_from+static_cast<int>( index );
+    }
+
+    virtual std::size_t size() const {
+        return static_cast<std::size_t>( 1+m_to-m_from );
+    }
+
+private:
+
+    T m_from;
+    T m_to;
+};
+
+template<typename T>
+class ValuesGenerator : public IGenerator<T> {
+public:
+    ValuesGenerator(){}
+
+    void add( T value ) {
+        m_values.push_back( value );
+    }
+
+    virtual T getValue( std::size_t index ) const {
+        return m_values[index];
+    }
+
+    virtual std::size_t size() const {
+        return m_values.size();
+    }
+
+private:
+    std::vector<T> m_values;
+};
+
+template<typename T>
+class CompositeGenerator {
+public:
+    CompositeGenerator() : m_totalSize( 0 ) {}
+
+    // *** Move semantics, similar to auto_ptr ***
+    CompositeGenerator( CompositeGenerator& other )
+    :   m_fileInfo( other.m_fileInfo ),
+        m_totalSize( 0 )
+    {
+        move( other );
+    }
+
+    CompositeGenerator& setFileInfo( const char* fileInfo ) {
+        m_fileInfo = fileInfo;
+        return *this;
+    }
+
+    ~CompositeGenerator() {
+        deleteAll( m_composed );
+    }
+
+    operator T () const {
+        size_t overallIndex = getCurrentContext().getGeneratorIndex( m_fileInfo, m_totalSize );
+
+        typename std::vector<const IGenerator<T>*>::const_iterator it = m_composed.begin();
+        typename std::vector<const IGenerator<T>*>::const_iterator itEnd = m_composed.end();
+        for( size_t index = 0; it != itEnd; ++it )
+        {
+            const IGenerator<T>* generator = *it;
+            if( overallIndex >= index && overallIndex < index + generator->size() )
+            {
+                return generator->getValue( overallIndex-index );
+            }
+            index += generator->size();
+        }
+        CATCH_INTERNAL_ERROR( "Indexed past end of generated range" );
+        return T(); // Suppress spurious "not all control paths return a value" warning in Visual Studio - if you know how to fix this please do so
+    }
+
+    void add( const IGenerator<T>* generator ) {
+        m_totalSize += generator->size();
+        m_composed.push_back( generator );
+    }
+
+    CompositeGenerator& then( CompositeGenerator& other ) {
+        move( other );
+        return *this;
+    }
+
+    CompositeGenerator& then( T value ) {
+        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
+        valuesGen->add( value );
+        add( valuesGen );
+        return *this;
+    }
+
+private:
+
+    void move( CompositeGenerator& other ) {
+        m_composed.insert( m_composed.end(), other.m_composed.begin(), other.m_composed.end() );
+        m_totalSize += other.m_totalSize;
+        other.m_composed.clear();
+    }
+
+    std::vector<const IGenerator<T>*> m_composed;
+    std::string m_fileInfo;
+    size_t m_totalSize;
+};
+
+namespace Generators
+{
+    template<typename T>
+    CompositeGenerator<T> between( T from, T to ) {
+        CompositeGenerator<T> generators;
+        generators.add( new BetweenGenerator<T>( from, to ) );
+        return generators;
+    }
+
+    template<typename T>
+    CompositeGenerator<T> values( T val1, T val2 ) {
+        CompositeGenerator<T> generators;
+        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
+        valuesGen->add( val1 );
+        valuesGen->add( val2 );
+        generators.add( valuesGen );
+        return generators;
+    }
+
+    template<typename T>
+    CompositeGenerator<T> values( T val1, T val2, T val3 ){
+        CompositeGenerator<T> generators;
+        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
+        valuesGen->add( val1 );
+        valuesGen->add( val2 );
+        valuesGen->add( val3 );
+        generators.add( valuesGen );
+        return generators;
+    }
+
+    template<typename T>
+    CompositeGenerator<T> values( T val1, T val2, T val3, T val4 ) {
+        CompositeGenerator<T> generators;
+        ValuesGenerator<T>* valuesGen = new ValuesGenerator<T>();
+        valuesGen->add( val1 );
+        valuesGen->add( val2 );
+        valuesGen->add( val3 );
+        valuesGen->add( val4 );
+        generators.add( valuesGen );
+        return generators;
+    }
+
+} // end namespace Generators
+
+using namespace Generators;
+
+} // end namespace Catch
+
+#define INTERNAL_CATCH_LINESTR2( line ) #line
+#define INTERNAL_CATCH_LINESTR( line ) INTERNAL_CATCH_LINESTR2( line )
+
+#define INTERNAL_CATCH_GENERATE( expr ) expr.setFileInfo( __FILE__ "(" INTERNAL_CATCH_LINESTR( __LINE__ ) ")" )
+
+// #included from: internal/catch_interfaces_exception.h
+#define TWOBLUECUBES_CATCH_INTERFACES_EXCEPTION_H_INCLUDED
+
+#include <string>
+#include <vector>
+
+// #included from: catch_interfaces_registry_hub.h
+#define TWOBLUECUBES_CATCH_INTERFACES_REGISTRY_HUB_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    class TestCase;
+    struct ITestCaseRegistry;
+    struct IExceptionTranslatorRegistry;
+    struct IExceptionTranslator;
+    struct IReporterRegistry;
+    struct IReporterFactory;
+    struct ITagAliasRegistry;
+
+    struct IRegistryHub {
+        virtual ~IRegistryHub();
+
+        virtual IReporterRegistry const& getReporterRegistry() const = 0;
+        virtual ITestCaseRegistry const& getTestCaseRegistry() const = 0;
+        virtual ITagAliasRegistry const& getTagAliasRegistry() const = 0;
+
+        virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() = 0;
+    };
+
+    struct IMutableRegistryHub {
+        virtual ~IMutableRegistryHub();
+        virtual void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) = 0;
+        virtual void registerListener( Ptr<IReporterFactory> const& factory ) = 0;
+        virtual void registerTest( TestCase const& testInfo ) = 0;
+        virtual void registerTranslator( const IExceptionTranslator* translator ) = 0;
+        virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) = 0;
+    };
+
+    IRegistryHub& getRegistryHub();
+    IMutableRegistryHub& getMutableRegistryHub();
+    void cleanUp();
+    std::string translateActiveException();
+
+}
+
+namespace Catch {
+
+    typedef std::string(*exceptionTranslateFunction)();
+
+    struct IExceptionTranslator;
+    typedef std::vector<const IExceptionTranslator*> ExceptionTranslators;
+
+    struct IExceptionTranslator {
+        virtual ~IExceptionTranslator();
+        virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const = 0;
+    };
+
+    struct IExceptionTranslatorRegistry {
+        virtual ~IExceptionTranslatorRegistry();
+
+        virtual std::string translateActiveException() const = 0;
+    };
+
+    class ExceptionTranslatorRegistrar {
+        template<typename T>
+        class ExceptionTranslator : public IExceptionTranslator {
+        public:
+
+            ExceptionTranslator( std::string(*translateFunction)( T& ) )
+            : m_translateFunction( translateFunction )
+            {}
+
+            virtual std::string translate( ExceptionTranslators::const_iterator it, ExceptionTranslators::const_iterator itEnd ) const CATCH_OVERRIDE {
+                try {
+                    if( it == itEnd )
+                        throw;
+                    else
+                        return (*it)->translate( it+1, itEnd );
+                }
+                catch( T& ex ) {
+                    return m_translateFunction( ex );
+                }
+            }
+
+        protected:
+            std::string(*m_translateFunction)( T& );
+        };
+
+    public:
+        template<typename T>
+        ExceptionTranslatorRegistrar( std::string(*translateFunction)( T& ) ) {
+            getMutableRegistryHub().registerTranslator
+                ( new ExceptionTranslator<T>( translateFunction ) );
+        }
+    };
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION2( translatorName, signature ) \
+    static std::string translatorName( signature ); \
+    namespace{ Catch::ExceptionTranslatorRegistrar INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionRegistrar )( &translatorName ); }\
+    static std::string translatorName( signature )
+
+#define INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION2( INTERNAL_CATCH_UNIQUE_NAME( catch_internal_ExceptionTranslator ), signature )
+
+// #included from: internal/catch_approx.hpp
+#define TWOBLUECUBES_CATCH_APPROX_HPP_INCLUDED
+
+#include <cmath>
+#include <limits>
+
+#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS)
+#include <type_traits>
+#endif
+
+namespace Catch {
+namespace Detail {
+
+    class Approx {
+    public:
+        explicit Approx ( double value )
+        :   m_epsilon( std::numeric_limits<float>::epsilon()*100 ),
+            m_margin( 0.0 ),
+            m_scale( 1.0 ),
+            m_value( value )
+        {}
+
+        static Approx custom() {
+            return Approx( 0 );
+        }
+
+#if defined(CATCH_CONFIG_CPP11_TYPE_TRAITS)
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx operator()( T value ) {
+            Approx approx( static_cast<double>(value) );
+            approx.epsilon( m_epsilon );
+            approx.margin( m_margin );
+            approx.scale( m_scale );
+            return approx;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        explicit Approx( T value ): Approx(static_cast<double>(value))
+        {}
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( const T& lhs, Approx const& rhs ) {
+            // Thanks to Richard Harris for his help refining this formula
+            auto lhs_v = double(lhs);
+            bool relativeOK = std::fabs(lhs_v - rhs.m_value) < rhs.m_epsilon * (rhs.m_scale + (std::max)(std::fabs(lhs_v), std::fabs(rhs.m_value)));
+            if (relativeOK) {
+                return true;
+            }
+
+            return std::fabs(lhs_v - rhs.m_value) <= rhs.m_margin;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator == ( Approx const& lhs, const T& rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( T lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator != ( Approx const& lhs, T rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( T lhs, Approx const& rhs ) {
+            return double(lhs) < rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator <= ( Approx const& lhs, T rhs ) {
+            return lhs.m_value < double(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( T lhs, Approx const& rhs ) {
+            return double(lhs) > rhs.m_value || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        friend bool operator >= ( Approx const& lhs, T rhs ) {
+            return lhs.m_value > double(rhs) || lhs == rhs;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& epsilon( T newEpsilon ) {
+            m_epsilon = double(newEpsilon);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& margin( T newMargin ) {
+            m_margin = double(newMargin);
+            return *this;
+        }
+
+        template <typename T, typename = typename std::enable_if<std::is_constructible<double, T>::value>::type>
+        Approx& scale( T newScale ) {
+            m_scale = double(newScale);
+            return *this;
+        }
+
+#else
+
+        Approx operator()( double value ) {
+            Approx approx( value );
+            approx.epsilon( m_epsilon );
+            approx.margin( m_margin );
+            approx.scale( m_scale );
+            return approx;
+        }
+
+        friend bool operator == ( double lhs, Approx const& rhs ) {
+            // Thanks to Richard Harris for his help refining this formula
+            bool relativeOK = std::fabs( lhs - rhs.m_value ) < rhs.m_epsilon * (rhs.m_scale + (std::max)( std::fabs(lhs), std::fabs(rhs.m_value) ) );
+            if (relativeOK) {
+                return true;
+            }
+            return std::fabs(lhs - rhs.m_value) <= rhs.m_margin;
+        }
+
+        friend bool operator == ( Approx const& lhs, double rhs ) {
+            return operator==( rhs, lhs );
+        }
+
+        friend bool operator != ( double lhs, Approx const& rhs ) {
+            return !operator==( lhs, rhs );
+        }
+
+        friend bool operator != ( Approx const& lhs, double rhs ) {
+            return !operator==( rhs, lhs );
+        }
+
+        friend bool operator <= ( double lhs, Approx const& rhs ) {
+            return lhs < rhs.m_value || lhs == rhs;
+        }
+
+        friend bool operator <= ( Approx const& lhs, double rhs ) {
+            return lhs.m_value < rhs || lhs == rhs;
+        }
+
+        friend bool operator >= ( double lhs, Approx const& rhs ) {
+            return lhs > rhs.m_value || lhs == rhs;
+        }
+
+        friend bool operator >= ( Approx const& lhs, double rhs ) {
+            return lhs.m_value > rhs || lhs == rhs;
+        }
+
+        Approx& epsilon( double newEpsilon ) {
+            m_epsilon = newEpsilon;
+            return *this;
+        }
+
+        Approx& margin( double newMargin ) {
+            m_margin = newMargin;
+            return *this;
+        }
+
+        Approx& scale( double newScale ) {
+            m_scale = newScale;
+            return *this;
+        }
+#endif
+
+        std::string toString() const {
+            std::ostringstream oss;
+            oss << "Approx( " << Catch::toString( m_value ) << " )";
+            return oss.str();
+        }
+
+    private:
+        double m_epsilon;
+        double m_margin;
+        double m_scale;
+        double m_value;
+    };
+}
+
+template<>
+inline std::string toString<Detail::Approx>( Detail::Approx const& value ) {
+    return value.toString();
+}
+
+} // end namespace Catch
+
+// #included from: internal/catch_matchers_string.h
+#define TWOBLUECUBES_CATCH_MATCHERS_STRING_H_INCLUDED
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        struct CasedString
+        {
+            CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity );
+            std::string adjustString( std::string const& str ) const;
+            std::string caseSensitivitySuffix() const;
+
+            CaseSensitive::Choice m_caseSensitivity;
+            std::string m_str;
+        };
+
+        struct StringMatcherBase : MatcherBase<std::string> {
+            StringMatcherBase( std::string const& operation, CasedString const& comparator );
+            virtual std::string describe() const CATCH_OVERRIDE;
+
+            CasedString m_comparator;
+            std::string m_operation;
+        };
+
+        struct EqualsMatcher : StringMatcherBase {
+            EqualsMatcher( CasedString const& comparator );
+            virtual bool match( std::string const& source ) const CATCH_OVERRIDE;
+        };
+        struct ContainsMatcher : StringMatcherBase {
+            ContainsMatcher( CasedString const& comparator );
+            virtual bool match( std::string const& source ) const CATCH_OVERRIDE;
+        };
+        struct StartsWithMatcher : StringMatcherBase {
+            StartsWithMatcher( CasedString const& comparator );
+            virtual bool match( std::string const& source ) const CATCH_OVERRIDE;
+        };
+        struct EndsWithMatcher : StringMatcherBase {
+            EndsWithMatcher( CasedString const& comparator );
+            virtual bool match( std::string const& source ) const CATCH_OVERRIDE;
+        };
+
+    } // namespace StdString
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity = CaseSensitive::Yes );
+
+} // namespace Matchers
+} // namespace Catch
+
+// #included from: internal/catch_matchers_vector.h
+#define TWOBLUECUBES_CATCH_MATCHERS_VECTOR_H_INCLUDED
+
+namespace Catch {
+namespace Matchers {
+
+    namespace Vector {
+
+        template<typename T>
+        struct ContainsElementMatcher : MatcherBase<std::vector<T>, T> {
+
+            ContainsElementMatcher(T const &comparator) : m_comparator( comparator) {}
+
+            bool match(std::vector<T> const &v) const CATCH_OVERRIDE {
+                return std::find(v.begin(), v.end(), m_comparator) != v.end();
+            }
+
+            virtual std::string describe() const CATCH_OVERRIDE {
+                return "Contains: " + Catch::toString( m_comparator );
+            }
+
+            T const& m_comparator;
+        };
+
+        template<typename T>
+        struct ContainsMatcher : MatcherBase<std::vector<T>, std::vector<T> > {
+
+            ContainsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T> const &v) const CATCH_OVERRIDE {
+                // !TBD: see note in EqualsMatcher
+                if (m_comparator.size() > v.size())
+                    return false;
+                for (size_t i = 0; i < m_comparator.size(); ++i)
+                    if (std::find(v.begin(), v.end(), m_comparator[i]) == v.end())
+                        return false;
+                return true;
+            }
+            virtual std::string describe() const CATCH_OVERRIDE {
+                return "Contains: " + Catch::toString( m_comparator );
+            }
+
+            std::vector<T> const& m_comparator;
+        };
+
+        template<typename T>
+        struct EqualsMatcher : MatcherBase<std::vector<T>, std::vector<T> > {
+
+            EqualsMatcher(std::vector<T> const &comparator) : m_comparator( comparator ) {}
+
+            bool match(std::vector<T> const &v) const CATCH_OVERRIDE {
+                // !TBD: This currently works if all elements can be compared using !=
+                // - a more general approach would be via a compare template that defaults
+                // to using !=. but could be specialised for, e.g. std::vector<T> etc
+                // - then just call that directly
+                if (m_comparator.size() != v.size())
+                    return false;
+                for (size_t i = 0; i < v.size(); ++i)
+                    if (m_comparator[i] != v[i])
+                        return false;
+                return true;
+            }
+            virtual std::string describe() const CATCH_OVERRIDE {
+                return "Equals: " + Catch::toString( m_comparator );
+            }
+            std::vector<T> const& m_comparator;
+        };
+
+    } // namespace Vector
+
+    // The following functions create the actual matcher objects.
+    // This allows the types to be inferred
+
+    template<typename T>
+    Vector::ContainsMatcher<T> Contains( std::vector<T> const& comparator ) {
+        return Vector::ContainsMatcher<T>( comparator );
+    }
+
+    template<typename T>
+    Vector::ContainsElementMatcher<T> VectorContains( T const& comparator ) {
+        return Vector::ContainsElementMatcher<T>( comparator );
+    }
+
+    template<typename T>
+    Vector::EqualsMatcher<T> Equals( std::vector<T> const& comparator ) {
+        return Vector::EqualsMatcher<T>( comparator );
+    }
+
+} // namespace Matchers
+} // namespace Catch
+
+// #included from: internal/catch_interfaces_tag_alias_registry.h
+#define TWOBLUECUBES_CATCH_INTERFACES_TAG_ALIAS_REGISTRY_H_INCLUDED
+
+// #included from: catch_tag_alias.h
+#define TWOBLUECUBES_CATCH_TAG_ALIAS_H_INCLUDED
+
+#include <string>
+
+namespace Catch {
+
+    struct TagAlias {
+        TagAlias( std::string const& _tag, SourceLineInfo _lineInfo ) : tag( _tag ), lineInfo( _lineInfo ) {}
+
+        std::string tag;
+        SourceLineInfo lineInfo;
+    };
+
+    struct RegistrarForTagAliases {
+        RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo );
+    };
+
+} // end namespace Catch
+
+#define CATCH_REGISTER_TAG_ALIAS( alias, spec ) namespace{ Catch::RegistrarForTagAliases INTERNAL_CATCH_UNIQUE_NAME( AutoRegisterTagAlias )( alias, spec, CATCH_INTERNAL_LINEINFO ); }
+// #included from: catch_option.hpp
+#define TWOBLUECUBES_CATCH_OPTION_HPP_INCLUDED
+
+namespace Catch {
+
+    // An optional type
+    template<typename T>
+    class Option {
+    public:
+        Option() : nullableValue( CATCH_NULL ) {}
+        Option( T const& _value )
+        : nullableValue( new( storage ) T( _value ) )
+        {}
+        Option( Option const& _other )
+        : nullableValue( _other ? new( storage ) T( *_other ) : CATCH_NULL )
+        {}
+
+        ~Option() {
+            reset();
+        }
+
+        Option& operator= ( Option const& _other ) {
+            if( &_other != this ) {
+                reset();
+                if( _other )
+                    nullableValue = new( storage ) T( *_other );
+            }
+            return *this;
+        }
+        Option& operator = ( T const& _value ) {
+            reset();
+            nullableValue = new( storage ) T( _value );
+            return *this;
+        }
+
+        void reset() {
+            if( nullableValue )
+                nullableValue->~T();
+            nullableValue = CATCH_NULL;
+        }
+
+        T& operator*() { return *nullableValue; }
+        T const& operator*() const { return *nullableValue; }
+        T* operator->() { return nullableValue; }
+        const T* operator->() const { return nullableValue; }
+
+        T valueOr( T const& defaultValue ) const {
+            return nullableValue ? *nullableValue : defaultValue;
+        }
+
+        bool some() const { return nullableValue != CATCH_NULL; }
+        bool none() const { return nullableValue == CATCH_NULL; }
+
+        bool operator !() const { return nullableValue == CATCH_NULL; }
+        operator SafeBool::type() const {
+            return SafeBool::makeSafe( some() );
+        }
+
+    private:
+        T *nullableValue;
+        union {
+            char storage[sizeof(T)];
+
+            // These are here to force alignment for the storage
+            long double dummy1;
+            void (*dummy2)();
+            long double dummy3;
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+            long long dummy4;
+#endif
+        };
+    };
+
+} // end namespace Catch
+
+namespace Catch {
+
+    struct ITagAliasRegistry {
+        virtual ~ITagAliasRegistry();
+        virtual Option<TagAlias> find( std::string const& alias ) const = 0;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const = 0;
+
+        static ITagAliasRegistry const& get();
+    };
+
+} // end namespace Catch
+
+// These files are included here so the single_include script doesn't put them
+// in the conditionally compiled sections
+// #included from: internal/catch_test_case_info.h
+#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_H_INCLUDED
+
+#include <string>
+#include <set>
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+namespace Catch {
+
+    struct ITestCase;
+
+    struct TestCaseInfo {
+        enum SpecialProperties{
+            None = 0,
+            IsHidden = 1 << 1,
+            ShouldFail = 1 << 2,
+            MayFail = 1 << 3,
+            Throws = 1 << 4,
+            NonPortable = 1 << 5
+        };
+
+        TestCaseInfo(   std::string const& _name,
+                        std::string const& _className,
+                        std::string const& _description,
+                        std::set<std::string> const& _tags,
+                        SourceLineInfo const& _lineInfo );
+
+        TestCaseInfo( TestCaseInfo const& other );
+
+        friend void setTags( TestCaseInfo& testCaseInfo, std::set<std::string> const& tags );
+
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
+        std::string name;
+        std::string className;
+        std::string description;
+        std::set<std::string> tags;
+        std::set<std::string> lcaseTags;
+        std::string tagsAsString;
+        SourceLineInfo lineInfo;
+        SpecialProperties properties;
+    };
+
+    class TestCase : public TestCaseInfo {
+    public:
+
+        TestCase( ITestCase* testCase, TestCaseInfo const& info );
+        TestCase( TestCase const& other );
+
+        TestCase withName( std::string const& _newName ) const;
+
+        void invoke() const;
+
+        TestCaseInfo const& getTestCaseInfo() const;
+
+        void swap( TestCase& other );
+        bool operator == ( TestCase const& other ) const;
+        bool operator < ( TestCase const& other ) const;
+        TestCase& operator = ( TestCase const& other );
+
+    private:
+        Ptr<ITestCase> test;
+    };
+
+    TestCase makeTestCase(  ITestCase* testCase,
+                            std::string const& className,
+                            std::string const& name,
+                            std::string const& description,
+                            SourceLineInfo const& lineInfo );
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+
+#ifdef __OBJC__
+// #included from: internal/catch_objc.hpp
+#define TWOBLUECUBES_CATCH_OBJC_HPP_INCLUDED
+
+#import <objc/runtime.h>
+
+#include <string>
+
+// NB. Any general catch headers included here must be included
+// in catch.hpp first to make sure they are included by the single
+// header for non obj-usage
+
+///////////////////////////////////////////////////////////////////////////////
+// This protocol is really only here for (self) documenting purposes, since
+// all its methods are optional.
+@protocol OcFixture
+
+@optional
+
+-(void) setUp;
+-(void) tearDown;
+
+@end
+
+namespace Catch {
+
+    class OcMethod : public SharedImpl<ITestCase> {
+
+    public:
+        OcMethod( Class cls, SEL sel ) : m_cls( cls ), m_sel( sel ) {}
+
+        virtual void invoke() const {
+            id obj = [[m_cls alloc] init];
+
+            performOptionalSelector( obj, @selector(setUp)  );
+            performOptionalSelector( obj, m_sel );
+            performOptionalSelector( obj, @selector(tearDown)  );
+
+            arcSafeRelease( obj );
+        }
+    private:
+        virtual ~OcMethod() {}
+
+        Class m_cls;
+        SEL m_sel;
+    };
+
+    namespace Detail{
+
+        inline std::string getAnnotation(   Class cls,
+                                            std::string const& annotationName,
+                                            std::string const& testCaseName ) {
+            NSString* selStr = [[NSString alloc] initWithFormat:@"Catch_%s_%s", annotationName.c_str(), testCaseName.c_str()];
+            SEL sel = NSSelectorFromString( selStr );
+            arcSafeRelease( selStr );
+            id value = performOptionalSelector( cls, sel );
+            if( value )
+                return [(NSString*)value UTF8String];
+            return "";
+        }
+    }
+
+    inline size_t registerTestMethods() {
+        size_t noTestMethods = 0;
+        int noClasses = objc_getClassList( CATCH_NULL, 0 );
+
+        Class* classes = (CATCH_UNSAFE_UNRETAINED Class *)malloc( sizeof(Class) * noClasses);
+        objc_getClassList( classes, noClasses );
+
+        for( int c = 0; c < noClasses; c++ ) {
+            Class cls = classes[c];
+            {
+                u_int count;
+                Method* methods = class_copyMethodList( cls, &count );
+                for( u_int m = 0; m < count ; m++ ) {
+                    SEL selector = method_getName(methods[m]);
+                    std::string methodName = sel_getName(selector);
+                    if( startsWith( methodName, "Catch_TestCase_" ) ) {
+                        std::string testCaseName = methodName.substr( 15 );
+                        std::string name = Detail::getAnnotation( cls, "Name", testCaseName );
+                        std::string desc = Detail::getAnnotation( cls, "Description", testCaseName );
+                        const char* className = class_getName( cls );
+
+                        getMutableRegistryHub().registerTest( makeTestCase( new OcMethod( cls, selector ), className, name.c_str(), desc.c_str(), SourceLineInfo() ) );
+                        noTestMethods++;
+                    }
+                }
+                free(methods);
+            }
+        }
+        return noTestMethods;
+    }
+
+    namespace Matchers {
+        namespace Impl {
+        namespace NSStringMatchers {
+
+            struct StringHolder : MatcherBase<NSString*>{
+                StringHolder( NSString* substr ) : m_substr( [substr copy] ){}
+                StringHolder( StringHolder const& other ) : m_substr( [other.m_substr copy] ){}
+                StringHolder() {
+                    arcSafeRelease( m_substr );
+                }
+
+                virtual bool match( NSString* arg ) const CATCH_OVERRIDE {
+                    return false;
+                }
+
+                NSString* m_substr;
+            };
+
+            struct Equals : StringHolder {
+                Equals( NSString* substr ) : StringHolder( substr ){}
+
+                virtual bool match( NSString* str ) const CATCH_OVERRIDE {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str isEqualToString:m_substr];
+                }
+
+                virtual std::string describe() const CATCH_OVERRIDE {
+                    return "equals string: " + Catch::toString( m_substr );
+                }
+            };
+
+            struct Contains : StringHolder {
+                Contains( NSString* substr ) : StringHolder( substr ){}
+
+                virtual bool match( NSString* str ) const {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location != NSNotFound;
+                }
+
+                virtual std::string describe() const CATCH_OVERRIDE {
+                    return "contains string: " + Catch::toString( m_substr );
+                }
+            };
+
+            struct StartsWith : StringHolder {
+                StartsWith( NSString* substr ) : StringHolder( substr ){}
+
+                virtual bool match( NSString* str ) const {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == 0;
+                }
+
+                virtual std::string describe() const CATCH_OVERRIDE {
+                    return "starts with: " + Catch::toString( m_substr );
+                }
+            };
+            struct EndsWith : StringHolder {
+                EndsWith( NSString* substr ) : StringHolder( substr ){}
+
+                virtual bool match( NSString* str ) const {
+                    return  (str != nil || m_substr == nil ) &&
+                            [str rangeOfString:m_substr].location == [str length] - [m_substr length];
+                }
+
+                virtual std::string describe() const CATCH_OVERRIDE {
+                    return "ends with: " + Catch::toString( m_substr );
+                }
+            };
+
+        } // namespace NSStringMatchers
+        } // namespace Impl
+
+        inline Impl::NSStringMatchers::Equals
+            Equals( NSString* substr ){ return Impl::NSStringMatchers::Equals( substr ); }
+
+        inline Impl::NSStringMatchers::Contains
+            Contains( NSString* substr ){ return Impl::NSStringMatchers::Contains( substr ); }
+
+        inline Impl::NSStringMatchers::StartsWith
+            StartsWith( NSString* substr ){ return Impl::NSStringMatchers::StartsWith( substr ); }
+
+        inline Impl::NSStringMatchers::EndsWith
+            EndsWith( NSString* substr ){ return Impl::NSStringMatchers::EndsWith( substr ); }
+
+    } // namespace Matchers
+
+    using namespace Matchers;
+
+} // namespace Catch
+
+///////////////////////////////////////////////////////////////////////////////
+#define OC_TEST_CASE( name, desc )\
++(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Name_test ) \
+{\
+return @ name; \
+}\
++(NSString*) INTERNAL_CATCH_UNIQUE_NAME( Catch_Description_test ) \
+{ \
+return @ desc; \
+} \
+-(void) INTERNAL_CATCH_UNIQUE_NAME( Catch_TestCase_test )
+
+#endif
+
+#ifdef CATCH_IMPL
+
+// !TBD: Move the leak detector code into a separate header
+#ifdef CATCH_CONFIG_WINDOWS_CRTDBG
+#include <crtdbg.h>
+class LeakDetector {
+public:
+    LeakDetector() {
+        int flag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
+        flag |= _CRTDBG_LEAK_CHECK_DF;
+        flag |= _CRTDBG_ALLOC_MEM_DF;
+        _CrtSetDbgFlag(flag);
+        _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+        _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+        // Change this to leaking allocation's number to break there
+        _CrtSetBreakAlloc(-1);
+    }
+};
+#else
+class LeakDetector {};
+#endif
+
+LeakDetector leakDetector;
+
+// #included from: internal/catch_impl.hpp
+#define TWOBLUECUBES_CATCH_IMPL_HPP_INCLUDED
+
+// Collect all the implementation files together here
+// These are the equivalent of what would usually be cpp files
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wweak-vtables"
+#endif
+
+// #included from: ../catch_session.hpp
+#define TWOBLUECUBES_CATCH_RUNNER_HPP_INCLUDED
+
+// #included from: internal/catch_commandline.hpp
+#define TWOBLUECUBES_CATCH_COMMANDLINE_HPP_INCLUDED
+
+// #included from: catch_config.hpp
+#define TWOBLUECUBES_CATCH_CONFIG_HPP_INCLUDED
+
+// #included from: catch_test_spec_parser.hpp
+#define TWOBLUECUBES_CATCH_TEST_SPEC_PARSER_HPP_INCLUDED
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// #included from: catch_test_spec.hpp
+#define TWOBLUECUBES_CATCH_TEST_SPEC_HPP_INCLUDED
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpadded"
+#endif
+
+// #included from: catch_wildcard_pattern.hpp
+#define TWOBLUECUBES_CATCH_WILDCARD_PATTERN_HPP_INCLUDED
+
+#include <stdexcept>
+
+namespace Catch
+{
+    class WildcardPattern {
+        enum WildcardPosition {
+            NoWildcard = 0,
+            WildcardAtStart = 1,
+            WildcardAtEnd = 2,
+            WildcardAtBothEnds = WildcardAtStart | WildcardAtEnd
+        };
+
+    public:
+
+        WildcardPattern( std::string const& pattern, CaseSensitive::Choice caseSensitivity )
+        :   m_caseSensitivity( caseSensitivity ),
+            m_wildcard( NoWildcard ),
+            m_pattern( adjustCase( pattern ) )
+        {
+            if( startsWith( m_pattern, '*' ) ) {
+                m_pattern = m_pattern.substr( 1 );
+                m_wildcard = WildcardAtStart;
+            }
+            if( endsWith( m_pattern, '*' ) ) {
+                m_pattern = m_pattern.substr( 0, m_pattern.size()-1 );
+                m_wildcard = static_cast<WildcardPosition>( m_wildcard | WildcardAtEnd );
+            }
+        }
+        virtual ~WildcardPattern();
+        virtual bool matches( std::string const& str ) const {
+            switch( m_wildcard ) {
+                case NoWildcard:
+                    return m_pattern == adjustCase( str );
+                case WildcardAtStart:
+                    return endsWith( adjustCase( str ), m_pattern );
+                case WildcardAtEnd:
+                    return startsWith( adjustCase( str ), m_pattern );
+                case WildcardAtBothEnds:
+                    return contains( adjustCase( str ), m_pattern );
+            }
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunreachable-code"
+#endif
+            throw std::logic_error( "Unknown enum" );
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+        }
+    private:
+        std::string adjustCase( std::string const& str ) const {
+            return m_caseSensitivity == CaseSensitive::No ? toLower( str ) : str;
+        }
+        CaseSensitive::Choice m_caseSensitivity;
+        WildcardPosition m_wildcard;
+        std::string m_pattern;
+    };
+}
+
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    class TestSpec {
+        struct Pattern : SharedImpl<> {
+            virtual ~Pattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+        };
+        class NamePattern : public Pattern {
+        public:
+            NamePattern( std::string const& name )
+            : m_wildcardPattern( toLower( name ), CaseSensitive::No )
+            {}
+            virtual ~NamePattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const {
+                return m_wildcardPattern.matches( toLower( testCase.name ) );
+            }
+        private:
+            WildcardPattern m_wildcardPattern;
+        };
+
+        class TagPattern : public Pattern {
+        public:
+            TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {}
+            virtual ~TagPattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const {
+                return testCase.lcaseTags.find( m_tag ) != testCase.lcaseTags.end();
+            }
+        private:
+            std::string m_tag;
+        };
+
+        class ExcludedPattern : public Pattern {
+        public:
+            ExcludedPattern( Ptr<Pattern> const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {}
+            virtual ~ExcludedPattern();
+            virtual bool matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); }
+        private:
+            Ptr<Pattern> m_underlyingPattern;
+        };
+
+        struct Filter {
+            std::vector<Ptr<Pattern> > m_patterns;
+
+            bool matches( TestCaseInfo const& testCase ) const {
+                // All patterns in a filter must match for the filter to be a match
+                for( std::vector<Ptr<Pattern> >::const_iterator it = m_patterns.begin(), itEnd = m_patterns.end(); it != itEnd; ++it ) {
+                    if( !(*it)->matches( testCase ) )
+                        return false;
+                }
+                return true;
+            }
+        };
+
+    public:
+        bool hasFilters() const {
+            return !m_filters.empty();
+        }
+        bool matches( TestCaseInfo const& testCase ) const {
+            // A TestSpec matches if any filter matches
+            for( std::vector<Filter>::const_iterator it = m_filters.begin(), itEnd = m_filters.end(); it != itEnd; ++it )
+                if( it->matches( testCase ) )
+                    return true;
+            return false;
+        }
+
+    private:
+        std::vector<Filter> m_filters;
+
+        friend class TestSpecParser;
+    };
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+namespace Catch {
+
+    class TestSpecParser {
+        enum Mode{ None, Name, QuotedName, Tag, EscapedName };
+        Mode m_mode;
+        bool m_exclusion;
+        std::size_t m_start, m_pos;
+        std::string m_arg;
+        std::vector<std::size_t> m_escapeChars;
+        TestSpec::Filter m_currentFilter;
+        TestSpec m_testSpec;
+        ITagAliasRegistry const* m_tagAliases;
+
+    public:
+        TestSpecParser( ITagAliasRegistry const& tagAliases ) :m_mode(None), m_exclusion(false), m_start(0), m_pos(0), m_tagAliases( &tagAliases ) {}
+
+        TestSpecParser& parse( std::string const& arg ) {
+            m_mode = None;
+            m_exclusion = false;
+            m_start = std::string::npos;
+            m_arg = m_tagAliases->expandAliases( arg );
+            m_escapeChars.clear();
+            for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
+                visitChar( m_arg[m_pos] );
+            if( m_mode == Name )
+                addPattern<TestSpec::NamePattern>();
+            return *this;
+        }
+        TestSpec testSpec() {
+            addFilter();
+            return m_testSpec;
+        }
+    private:
+        void visitChar( char c ) {
+            if( m_mode == None ) {
+                switch( c ) {
+                case ' ': return;
+                case '~': m_exclusion = true; return;
+                case '[': return startNewMode( Tag, ++m_pos );
+                case '"': return startNewMode( QuotedName, ++m_pos );
+                case '\\': return escape();
+                default: startNewMode( Name, m_pos ); break;
+                }
+            }
+            if( m_mode == Name ) {
+                if( c == ',' ) {
+                    addPattern<TestSpec::NamePattern>();
+                    addFilter();
+                }
+                else if( c == '[' ) {
+                    if( subString() == "exclude:" )
+                        m_exclusion = true;
+                    else
+                        addPattern<TestSpec::NamePattern>();
+                    startNewMode( Tag, ++m_pos );
+                }
+                else if( c == '\\' )
+                    escape();
+            }
+            else if( m_mode == EscapedName )
+                m_mode = Name;
+            else if( m_mode == QuotedName && c == '"' )
+                addPattern<TestSpec::NamePattern>();
+            else if( m_mode == Tag && c == ']' )
+                addPattern<TestSpec::TagPattern>();
+        }
+        void startNewMode( Mode mode, std::size_t start ) {
+            m_mode = mode;
+            m_start = start;
+        }
+        void escape() {
+            if( m_mode == None )
+                m_start = m_pos;
+            m_mode = EscapedName;
+            m_escapeChars.push_back( m_pos );
+        }
+        std::string subString() const { return m_arg.substr( m_start, m_pos - m_start ); }
+        template<typename T>
+        void addPattern() {
+            std::string token = subString();
+            for( size_t i = 0; i < m_escapeChars.size(); ++i )
+                token = token.substr( 0, m_escapeChars[i]-m_start-i ) + token.substr( m_escapeChars[i]-m_start-i+1 );
+            m_escapeChars.clear();
+            if( startsWith( token, "exclude:" ) ) {
+                m_exclusion = true;
+                token = token.substr( 8 );
+            }
+            if( !token.empty() ) {
+                Ptr<TestSpec::Pattern> pattern = new T( token );
+                if( m_exclusion )
+                    pattern = new TestSpec::ExcludedPattern( pattern );
+                m_currentFilter.m_patterns.push_back( pattern );
+            }
+            m_exclusion = false;
+            m_mode = None;
+        }
+        void addFilter() {
+            if( !m_currentFilter.m_patterns.empty() ) {
+                m_testSpec.m_filters.push_back( m_currentFilter );
+                m_currentFilter = TestSpec::Filter();
+            }
+        }
+    };
+    inline TestSpec parseTestSpec( std::string const& arg ) {
+        return TestSpecParser( ITagAliasRegistry::get() ).parse( arg ).testSpec();
+    }
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+// #included from: catch_interfaces_config.h
+#define TWOBLUECUBES_CATCH_INTERFACES_CONFIG_H_INCLUDED
+
+#include <iosfwd>
+#include <string>
+#include <vector>
+
+namespace Catch {
+
+    struct Verbosity { enum Level {
+        NoOutput = 0,
+        Quiet,
+        Normal
+    }; };
+
+    struct WarnAbout { enum What {
+        Nothing = 0x00,
+        NoAssertions = 0x01
+    }; };
+
+    struct ShowDurations { enum OrNot {
+        DefaultForReporter,
+        Always,
+        Never
+    }; };
+    struct RunTests { enum InWhatOrder {
+        InDeclarationOrder,
+        InLexicographicalOrder,
+        InRandomOrder
+    }; };
+    struct UseColour { enum YesOrNo {
+        Auto,
+        Yes,
+        No
+    }; };
+    struct WaitForKeypress { enum When {
+        Never,
+        BeforeStart = 1,
+        BeforeExit = 2,
+        BeforeStartAndExit = BeforeStart | BeforeExit
+    }; };
+
+    class TestSpec;
+
+    struct IConfig : IShared {
+
+        virtual ~IConfig();
+
+        virtual bool allowThrows() const = 0;
+        virtual std::ostream& stream() const = 0;
+        virtual std::string name() const = 0;
+        virtual bool includeSuccessfulResults() const = 0;
+        virtual bool shouldDebugBreak() const = 0;
+        virtual bool warnAboutMissingAssertions() const = 0;
+        virtual int abortAfter() const = 0;
+        virtual bool showInvisibles() const = 0;
+        virtual ShowDurations::OrNot showDurations() const = 0;
+        virtual TestSpec const& testSpec() const = 0;
+        virtual RunTests::InWhatOrder runOrder() const = 0;
+        virtual unsigned int rngSeed() const = 0;
+        virtual UseColour::YesOrNo useColour() const = 0;
+        virtual std::vector<std::string> const& getSectionsToRun() const = 0;
+
+    };
+}
+
+// #included from: catch_stream.h
+#define TWOBLUECUBES_CATCH_STREAM_H_INCLUDED
+
+// #included from: catch_streambuf.h
+#define TWOBLUECUBES_CATCH_STREAMBUF_H_INCLUDED
+
+#include <streambuf>
+
+namespace Catch {
+
+    class StreamBufBase : public std::streambuf {
+    public:
+        virtual ~StreamBufBase() CATCH_NOEXCEPT;
+    };
+}
+
+#include <streambuf>
+#include <ostream>
+#include <fstream>
+#include <memory>
+
+namespace Catch {
+
+    std::ostream& cout();
+    std::ostream& cerr();
+    std::ostream& clog();
+
+    struct IStream {
+        virtual ~IStream() CATCH_NOEXCEPT;
+        virtual std::ostream& stream() const = 0;
+    };
+
+    class FileStream : public IStream {
+        mutable std::ofstream m_ofs;
+    public:
+        FileStream( std::string const& filename );
+        virtual ~FileStream() CATCH_NOEXCEPT;
+    public: // IStream
+        virtual std::ostream& stream() const CATCH_OVERRIDE;
+    };
+
+    class CoutStream : public IStream {
+        mutable std::ostream m_os;
+    public:
+        CoutStream();
+        virtual ~CoutStream() CATCH_NOEXCEPT;
+
+    public: // IStream
+        virtual std::ostream& stream() const CATCH_OVERRIDE;
+    };
+
+    class DebugOutStream : public IStream {
+        CATCH_AUTO_PTR( StreamBufBase ) m_streamBuf;
+        mutable std::ostream m_os;
+    public:
+        DebugOutStream();
+        virtual ~DebugOutStream() CATCH_NOEXCEPT;
+
+    public: // IStream
+        virtual std::ostream& stream() const CATCH_OVERRIDE;
+    };
+}
+
+#include <memory>
+#include <vector>
+#include <string>
+#include <stdexcept>
+
+#ifndef CATCH_CONFIG_CONSOLE_WIDTH
+#define CATCH_CONFIG_CONSOLE_WIDTH 80
+#endif
+
+namespace Catch {
+
+    struct ConfigData {
+
+        ConfigData()
+        :   listTests( false ),
+            listTags( false ),
+            listReporters( false ),
+            listTestNamesOnly( false ),
+            listExtraInfo( false ),
+            showSuccessfulTests( false ),
+            shouldDebugBreak( false ),
+            noThrow( false ),
+            showHelp( false ),
+            showInvisibles( false ),
+            filenamesAsTags( false ),
+            libIdentify( false ),
+            abortAfter( -1 ),
+            rngSeed( 0 ),
+            verbosity( Verbosity::Normal ),
+            warnings( WarnAbout::Nothing ),
+            showDurations( ShowDurations::DefaultForReporter ),
+            runOrder( RunTests::InDeclarationOrder ),
+            useColour( UseColour::Auto ),
+            waitForKeypress( WaitForKeypress::Never )
+        {}
+
+        bool listTests;
+        bool listTags;
+        bool listReporters;
+        bool listTestNamesOnly;
+        bool listExtraInfo;
+
+        bool showSuccessfulTests;
+        bool shouldDebugBreak;
+        bool noThrow;
+        bool showHelp;
+        bool showInvisibles;
+        bool filenamesAsTags;
+        bool libIdentify;
+
+        int abortAfter;
+        unsigned int rngSeed;
+
+        Verbosity::Level verbosity;
+        WarnAbout::What warnings;
+        ShowDurations::OrNot showDurations;
+        RunTests::InWhatOrder runOrder;
+        UseColour::YesOrNo useColour;
+        WaitForKeypress::When waitForKeypress;
+
+        std::string outputFilename;
+        std::string name;
+        std::string processName;
+
+        std::vector<std::string> reporterNames;
+        std::vector<std::string> testsOrTags;
+        std::vector<std::string> sectionsToRun;
+    };
+
+    class Config : public SharedImpl<IConfig> {
+    private:
+        Config( Config const& other );
+        Config& operator = ( Config const& other );
+        virtual void dummy();
+    public:
+
+        Config()
+        {}
+
+        Config( ConfigData const& data )
+        :   m_data( data ),
+            m_stream( openStream() )
+        {
+            if( !data.testsOrTags.empty() ) {
+                TestSpecParser parser( ITagAliasRegistry::get() );
+                for( std::size_t i = 0; i < data.testsOrTags.size(); ++i )
+                    parser.parse( data.testsOrTags[i] );
+                m_testSpec = parser.testSpec();
+            }
+        }
+
+        virtual ~Config() {}
+
+        std::string const& getFilename() const {
+            return m_data.outputFilename ;
+        }
+
+        bool listTests() const { return m_data.listTests; }
+        bool listTestNamesOnly() const { return m_data.listTestNamesOnly; }
+        bool listTags() const { return m_data.listTags; }
+        bool listReporters() const { return m_data.listReporters; }
+        bool listExtraInfo() const { return m_data.listExtraInfo; }
+
+        std::string getProcessName() const { return m_data.processName; }
+
+        std::vector<std::string> const& getReporterNames() const { return m_data.reporterNames; }
+        std::vector<std::string> const& getSectionsToRun() const CATCH_OVERRIDE { return m_data.sectionsToRun; }
+
+        virtual TestSpec const& testSpec() const CATCH_OVERRIDE { return m_testSpec; }
+
+        bool showHelp() const { return m_data.showHelp; }
+
+        // IConfig interface
+        virtual bool allowThrows() const CATCH_OVERRIDE                 { return !m_data.noThrow; }
+        virtual std::ostream& stream() const CATCH_OVERRIDE             { return m_stream->stream(); }
+        virtual std::string name() const CATCH_OVERRIDE                 { return m_data.name.empty() ? m_data.processName : m_data.name; }
+        virtual bool includeSuccessfulResults() const CATCH_OVERRIDE    { return m_data.showSuccessfulTests; }
+        virtual bool warnAboutMissingAssertions() const CATCH_OVERRIDE  { return m_data.warnings & WarnAbout::NoAssertions; }
+        virtual ShowDurations::OrNot showDurations() const CATCH_OVERRIDE { return m_data.showDurations; }
+        virtual RunTests::InWhatOrder runOrder() const CATCH_OVERRIDE   { return m_data.runOrder; }
+        virtual unsigned int rngSeed() const CATCH_OVERRIDE             { return m_data.rngSeed; }
+        virtual UseColour::YesOrNo useColour() const CATCH_OVERRIDE     { return m_data.useColour; }
+        virtual bool shouldDebugBreak() const CATCH_OVERRIDE { return m_data.shouldDebugBreak; }
+        virtual int abortAfter() const CATCH_OVERRIDE { return m_data.abortAfter; }
+        virtual bool showInvisibles() const CATCH_OVERRIDE { return m_data.showInvisibles; }
+
+    private:
+
+        IStream const* openStream() {
+            if( m_data.outputFilename.empty() )
+                return new CoutStream();
+            else if( m_data.outputFilename[0] == '%' ) {
+                if( m_data.outputFilename == "%debug" )
+                    return new DebugOutStream();
+                else
+                    throw std::domain_error( "Unrecognised stream: " + m_data.outputFilename );
+            }
+            else
+                return new FileStream( m_data.outputFilename );
+        }
+        ConfigData m_data;
+
+        CATCH_AUTO_PTR( IStream const ) m_stream;
+        TestSpec m_testSpec;
+    };
+
+} // end namespace Catch
+
+// #included from: catch_clara.h
+#define TWOBLUECUBES_CATCH_CLARA_H_INCLUDED
+
+// Use Catch's value for console width (store Clara's off to the side, if present)
+#ifdef CLARA_CONFIG_CONSOLE_WIDTH
+#define CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH CLARA_CONFIG_CONSOLE_WIDTH
+#undef CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH
+
+// Declare Clara inside the Catch namespace
+#define STITCH_CLARA_OPEN_NAMESPACE namespace Catch {
+// #included from: ../external/clara.h
+
+// Version 0.0.2.4
+
+// Only use header guard if we are not using an outer namespace
+#if !defined(TWOBLUECUBES_CLARA_H_INCLUDED) || defined(STITCH_CLARA_OPEN_NAMESPACE)
+
+#ifndef STITCH_CLARA_OPEN_NAMESPACE
+#define TWOBLUECUBES_CLARA_H_INCLUDED
+#define STITCH_CLARA_OPEN_NAMESPACE
+#define STITCH_CLARA_CLOSE_NAMESPACE
+#else
+#define STITCH_CLARA_CLOSE_NAMESPACE }
+#endif
+
+#define STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE STITCH_CLARA_OPEN_NAMESPACE
+
+// ----------- #included from tbc_text_format.h -----------
+
+// Only use header guard if we are not using an outer namespace
+#if !defined(TBC_TEXT_FORMAT_H_INCLUDED) || defined(STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE)
+#ifndef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+#define TBC_TEXT_FORMAT_H_INCLUDED
+#endif
+
+#include <string>
+#include <vector>
+#include <sstream>
+#include <algorithm>
+#include <cctype>
+
+// Use optional outer namespace
+#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+namespace STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
+#endif
+
+namespace Tbc {
+
+#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH
+    const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH;
+#else
+    const unsigned int consoleWidth = 80;
+#endif
+
+    struct TextAttributes {
+        TextAttributes()
+        :   initialIndent( std::string::npos ),
+            indent( 0 ),
+            width( consoleWidth-1 ),
+            tabChar( '\t' )
+        {}
+
+        TextAttributes& setInitialIndent( std::size_t _value )  { initialIndent = _value; return *this; }
+        TextAttributes& setIndent( std::size_t _value )         { indent = _value; return *this; }
+        TextAttributes& setWidth( std::size_t _value )          { width = _value; return *this; }
+        TextAttributes& setTabChar( char _value )               { tabChar = _value; return *this; }
+
+        std::size_t initialIndent;  // indent of first line, or npos
+        std::size_t indent;         // indent of subsequent lines, or all if initialIndent is npos
+        std::size_t width;          // maximum width of text, including indent. Longer text will wrap
+        char tabChar;               // If this char is seen the indent is changed to current pos
+    };
+
+    class Text {
+    public:
+        Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() )
+        : attr( _attr )
+        {
+            std::string wrappableChars = " [({.,/|\\-";
+            std::size_t indent = _attr.initialIndent != std::string::npos
+                ? _attr.initialIndent
+                : _attr.indent;
+            std::string remainder = _str;
+
+            while( !remainder.empty() ) {
+                if( lines.size() >= 1000 ) {
+                    lines.push_back( "... message truncated due to excessive size" );
+                    return;
+                }
+                std::size_t tabPos = std::string::npos;
+                std::size_t width = (std::min)( remainder.size(), _attr.width - indent );
+                std::size_t pos = remainder.find_first_of( '\n' );
+                if( pos <= width ) {
+                    width = pos;
+                }
+                pos = remainder.find_last_of( _attr.tabChar, width );
+                if( pos != std::string::npos ) {
+                    tabPos = pos;
+                    if( remainder[width] == '\n' )
+                        width--;
+                    remainder = remainder.substr( 0, tabPos ) + remainder.substr( tabPos+1 );
+                }
+
+                if( width == remainder.size() ) {
+                    spliceLine( indent, remainder, width );
+                }
+                else if( remainder[width] == '\n' ) {
+                    spliceLine( indent, remainder, width );
+                    if( width <= 1 || remainder.size() != 1 )
+                        remainder = remainder.substr( 1 );
+                    indent = _attr.indent;
+                }
+                else {
+                    pos = remainder.find_last_of( wrappableChars, width );
+                    if( pos != std::string::npos && pos > 0 ) {
+                        spliceLine( indent, remainder, pos );
+                        if( remainder[0] == ' ' )
+                            remainder = remainder.substr( 1 );
+                    }
+                    else {
+                        spliceLine( indent, remainder, width-1 );
+                        lines.back() += "-";
+                    }
+                    if( lines.size() == 1 )
+                        indent = _attr.indent;
+                    if( tabPos != std::string::npos )
+                        indent += tabPos;
+                }
+            }
+        }
+
+        void spliceLine( std::size_t _indent, std::string& _remainder, std::size_t _pos ) {
+            lines.push_back( std::string( _indent, ' ' ) + _remainder.substr( 0, _pos ) );
+            _remainder = _remainder.substr( _pos );
+        }
+
+        typedef std::vector<std::string>::const_iterator const_iterator;
+
+        const_iterator begin() const { return lines.begin(); }
+        const_iterator end() const { return lines.end(); }
+        std::string const& last() const { return lines.back(); }
+        std::size_t size() const { return lines.size(); }
+        std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
+        std::string toString() const {
+            std::ostringstream oss;
+            oss << *this;
+            return oss.str();
+        }
+
+        friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
+            for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
+                it != itEnd; ++it ) {
+                if( it != _text.begin() )
+                    _stream << "\n";
+                _stream << *it;
+            }
+            return _stream;
+        }
+
+    private:
+        std::string str;
+        TextAttributes attr;
+        std::vector<std::string> lines;
+    };
+
+} // end namespace Tbc
+
+#ifdef STITCH_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+} // end outer namespace
+#endif
+
+#endif // TBC_TEXT_FORMAT_H_INCLUDED
+
+// ----------- end of #include from tbc_text_format.h -----------
+// ........... back in clara.h
+
+#undef STITCH_TBC_TEXT_FORMAT_OPEN_NAMESPACE
+
+// ----------- #included from clara_compilers.h -----------
+
+#ifndef TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED
+#define TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED
+
+// Detect a number of compiler features - mostly C++11/14 conformance - by compiler
+// The following features are defined:
+//
+// CLARA_CONFIG_CPP11_NULLPTR : is nullptr supported?
+// CLARA_CONFIG_CPP11_NOEXCEPT : is noexcept supported?
+// CLARA_CONFIG_CPP11_GENERATED_METHODS : The delete and default keywords for compiler generated methods
+// CLARA_CONFIG_CPP11_OVERRIDE : is override supported?
+// CLARA_CONFIG_CPP11_UNIQUE_PTR : is unique_ptr supported (otherwise use auto_ptr)
+
+// CLARA_CONFIG_CPP11_OR_GREATER : Is C++11 supported?
+
+// CLARA_CONFIG_VARIADIC_MACROS : are variadic macros supported?
+
+// In general each macro has a _NO_<feature name> form
+// (e.g. CLARA_CONFIG_CPP11_NO_NULLPTR) which disables the feature.
+// Many features, at point of detection, define an _INTERNAL_ macro, so they
+// can be combined, en-mass, with the _NO_ forms later.
+
+// All the C++11 features can be disabled with CLARA_CONFIG_NO_CPP11
+
+#ifdef __clang__
+
+#if __has_feature(cxx_nullptr)
+#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
+#endif
+
+#if __has_feature(cxx_noexcept)
+#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#endif
+
+#endif // __clang__
+
+////////////////////////////////////////////////////////////////////////////////
+// GCC
+#ifdef __GNUC__
+
+#if __GNUC__ == 4 && __GNUC_MINOR__ >= 6 && defined(__GXX_EXPERIMENTAL_CXX0X__)
+#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
+#endif
+
+// - otherwise more recent versions define __cplusplus >= 201103L
+// and will get picked up below
+
+#endif // __GNUC__
+
+////////////////////////////////////////////////////////////////////////////////
+// Visual C++
+#ifdef _MSC_VER
+
+#if (_MSC_VER >= 1600)
+#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
+#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
+#endif
+
+#if (_MSC_VER >= 1900 ) // (VC++ 13 (VS2015))
+#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#endif
+
+#endif // _MSC_VER
+
+////////////////////////////////////////////////////////////////////////////////
+// C++ language feature support
+
+// catch all support for C++11
+#if defined(__cplusplus) && __cplusplus >= 201103L
+
+#define CLARA_CPP11_OR_GREATER
+
+#if !defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR)
+#define CLARA_INTERNAL_CONFIG_CPP11_NULLPTR
+#endif
+
+#ifndef CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#define CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT
+#endif
+
+#ifndef CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#define CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS
+#endif
+
+#if !defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE)
+#define CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE
+#endif
+#if !defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR)
+#define CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR
+#endif
+
+#endif // __cplusplus >= 201103L
+
+// Now set the actual defines based on the above + anything the user has configured
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NO_NULLPTR) && !defined(CLARA_CONFIG_CPP11_NULLPTR) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_NULLPTR
+#endif
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NO_NOEXCEPT) && !defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_NOEXCEPT
+#endif
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_NO_GENERATED_METHODS) && !defined(CLARA_CONFIG_CPP11_GENERATED_METHODS) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_GENERATED_METHODS
+#endif
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_OVERRIDE) && !defined(CLARA_CONFIG_CPP11_OVERRIDE) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_OVERRIDE
+#endif
+#if defined(CLARA_INTERNAL_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_UNIQUE_PTR) && !defined(CLARA_CONFIG_CPP11_UNIQUE_PTR) && !defined(CLARA_CONFIG_NO_CPP11)
+#define CLARA_CONFIG_CPP11_UNIQUE_PTR
+#endif
+
+// noexcept support:
+#if defined(CLARA_CONFIG_CPP11_NOEXCEPT) && !defined(CLARA_NOEXCEPT)
+#define CLARA_NOEXCEPT noexcept
+#  define CLARA_NOEXCEPT_IS(x) noexcept(x)
+#else
+#define CLARA_NOEXCEPT throw()
+#  define CLARA_NOEXCEPT_IS(x)
+#endif
+
+// nullptr support
+#ifdef CLARA_CONFIG_CPP11_NULLPTR
+#define CLARA_NULL nullptr
+#else
+#define CLARA_NULL NULL
+#endif
+
+// override support
+#ifdef CLARA_CONFIG_CPP11_OVERRIDE
+#define CLARA_OVERRIDE override
+#else
+#define CLARA_OVERRIDE
+#endif
+
+// unique_ptr support
+#ifdef CLARA_CONFIG_CPP11_UNIQUE_PTR
+#   define CLARA_AUTO_PTR( T ) std::unique_ptr<T>
+#else
+#   define CLARA_AUTO_PTR( T ) std::auto_ptr<T>
+#endif
+
+#endif // TWOBLUECUBES_CLARA_COMPILERS_H_INCLUDED
+
+// ----------- end of #include from clara_compilers.h -----------
+// ........... back in clara.h
+
+#include <map>
+#include <stdexcept>
+#include <memory>
+
+#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
+#define CLARA_PLATFORM_WINDOWS
+#endif
+
+// Use optional outer namespace
+#ifdef STITCH_CLARA_OPEN_NAMESPACE
+STITCH_CLARA_OPEN_NAMESPACE
+#endif
+
+namespace Clara {
+
+    struct UnpositionalTag {};
+
+    extern UnpositionalTag _;
+
+#ifdef CLARA_CONFIG_MAIN
+    UnpositionalTag _;
+#endif
+
+    namespace Detail {
+
+#ifdef CLARA_CONSOLE_WIDTH
+    const unsigned int consoleWidth = CLARA_CONFIG_CONSOLE_WIDTH;
+#else
+    const unsigned int consoleWidth = 80;
+#endif
+
+        using namespace Tbc;
+
+        inline bool startsWith( std::string const& str, std::string const& prefix ) {
+            return str.size() >= prefix.size() && str.substr( 0, prefix.size() ) == prefix;
+        }
+
+        template<typename T> struct RemoveConstRef{ typedef T type; };
+        template<typename T> struct RemoveConstRef<T&>{ typedef T type; };
+        template<typename T> struct RemoveConstRef<T const&>{ typedef T type; };
+        template<typename T> struct RemoveConstRef<T const>{ typedef T type; };
+
+        template<typename T>    struct IsBool       { static const bool value = false; };
+        template<>              struct IsBool<bool> { static const bool value = true; };
+
+        template<typename T>
+        void convertInto( std::string const& _source, T& _dest ) {
+            std::stringstream ss;
+            ss << _source;
+            ss >> _dest;
+            if( ss.fail() )
+                throw std::runtime_error( "Unable to convert " + _source + " to destination type" );
+        }
+        inline void convertInto( std::string const& _source, std::string& _dest ) {
+            _dest = _source;
+        }
+        char toLowerCh(char c) {
+            return static_cast<char>( std::tolower( c ) );
+        }
+        inline void convertInto( std::string const& _source, bool& _dest ) {
+            std::string sourceLC = _source;
+            std::transform( sourceLC.begin(), sourceLC.end(), sourceLC.begin(), toLowerCh );
+            if( sourceLC == "y" || sourceLC == "1" || sourceLC == "true" || sourceLC == "yes" || sourceLC == "on" )
+                _dest = true;
+            else if( sourceLC == "n" || sourceLC == "0" || sourceLC == "false" || sourceLC == "no" || sourceLC == "off" )
+                _dest = false;
+            else
+                throw std::runtime_error( "Expected a boolean value but did not recognise:\n  '" + _source + "'" );
+        }
+
+        template<typename ConfigT>
+        struct IArgFunction {
+            virtual ~IArgFunction() {}
+#ifdef CLARA_CONFIG_CPP11_GENERATED_METHODS
+            IArgFunction()                      = default;
+            IArgFunction( IArgFunction const& ) = default;
+#endif
+            virtual void set( ConfigT& config, std::string const& value ) const = 0;
+            virtual bool takesArg() const = 0;
+            virtual IArgFunction* clone() const = 0;
+        };
+
+        template<typename ConfigT>
+        class BoundArgFunction {
+        public:
+            BoundArgFunction() : functionObj( CLARA_NULL ) {}
+            BoundArgFunction( IArgFunction<ConfigT>* _functionObj ) : functionObj( _functionObj ) {}
+            BoundArgFunction( BoundArgFunction const& other ) : functionObj( other.functionObj ? other.functionObj->clone() : CLARA_NULL ) {}
+            BoundArgFunction& operator = ( BoundArgFunction const& other ) {
+                IArgFunction<ConfigT>* newFunctionObj = other.functionObj ? other.functionObj->clone() : CLARA_NULL;
+                delete functionObj;
+                functionObj = newFunctionObj;
+                return *this;
+            }
+            ~BoundArgFunction() { delete functionObj; }
+
+            void set( ConfigT& config, std::string const& value ) const {
+                functionObj->set( config, value );
+            }
+            bool takesArg() const { return functionObj->takesArg(); }
+
+            bool isSet() const {
+                return functionObj != CLARA_NULL;
+            }
+        private:
+            IArgFunction<ConfigT>* functionObj;
+        };
+
+        template<typename C>
+        struct NullBinder : IArgFunction<C>{
+            virtual void set( C&, std::string const& ) const {}
+            virtual bool takesArg() const { return true; }
+            virtual IArgFunction<C>* clone() const { return new NullBinder( *this ); }
+        };
+
+        template<typename C, typename M>
+        struct BoundDataMember : IArgFunction<C>{
+            BoundDataMember( M C::* _member ) : member( _member ) {}
+            virtual void set( C& p, std::string const& stringValue ) const {
+                convertInto( stringValue, p.*member );
+            }
+            virtual bool takesArg() const { return !IsBool<M>::value; }
+            virtual IArgFunction<C>* clone() const { return new BoundDataMember( *this ); }
+            M C::* member;
+        };
+        template<typename C, typename M>
+        struct BoundUnaryMethod : IArgFunction<C>{
+            BoundUnaryMethod( void (C::*_member)( M ) ) : member( _member ) {}
+            virtual void set( C& p, std::string const& stringValue ) const {
+                typename RemoveConstRef<M>::type value;
+                convertInto( stringValue, value );
+                (p.*member)( value );
+            }
+            virtual bool takesArg() const { return !IsBool<M>::value; }
+            virtual IArgFunction<C>* clone() const { return new BoundUnaryMethod( *this ); }
+            void (C::*member)( M );
+        };
+        template<typename C>
+        struct BoundNullaryMethod : IArgFunction<C>{
+            BoundNullaryMethod( void (C::*_member)() ) : member( _member ) {}
+            virtual void set( C& p, std::string const& stringValue ) const {
+                bool value;
+                convertInto( stringValue, value );
+                if( value )
+                    (p.*member)();
+            }
+            virtual bool takesArg() const { return false; }
+            virtual IArgFunction<C>* clone() const { return new BoundNullaryMethod( *this ); }
+            void (C::*member)();
+        };
+
+        template<typename C>
+        struct BoundUnaryFunction : IArgFunction<C>{
+            BoundUnaryFunction( void (*_function)( C& ) ) : function( _function ) {}
+            virtual void set( C& obj, std::string const& stringValue ) const {
+                bool value;
+                convertInto( stringValue, value );
+                if( value )
+                    function( obj );
+            }
+            virtual bool takesArg() const { return false; }
+            virtual IArgFunction<C>* clone() const { return new BoundUnaryFunction( *this ); }
+            void (*function)( C& );
+        };
+
+        template<typename C, typename T>
+        struct BoundBinaryFunction : IArgFunction<C>{
+            BoundBinaryFunction( void (*_function)( C&, T ) ) : function( _function ) {}
+            virtual void set( C& obj, std::string const& stringValue ) const {
+                typename RemoveConstRef<T>::type value;
+                convertInto( stringValue, value );
+                function( obj, value );
+            }
+            virtual bool takesArg() const { return !IsBool<T>::value; }
+            virtual IArgFunction<C>* clone() const { return new BoundBinaryFunction( *this ); }
+            void (*function)( C&, T );
+        };
+
+    } // namespace Detail
+
+    inline std::vector<std::string> argsToVector( int argc, char const* const* const argv ) {
+        std::vector<std::string> args( static_cast<std::size_t>( argc ) );
+        for( std::size_t i = 0; i < static_cast<std::size_t>( argc ); ++i )
+            args[i] = argv[i];
+
+        return args;
+    }
+
+    class Parser {
+        enum Mode { None, MaybeShortOpt, SlashOpt, ShortOpt, LongOpt, Positional };
+        Mode mode;
+        std::size_t from;
+        bool inQuotes;
+    public:
+
+        struct Token {
+            enum Type { Positional, ShortOpt, LongOpt };
+            Token( Type _type, std::string const& _data ) : type( _type ), data( _data ) {}
+            Type type;
+            std::string data;
+        };
+
+        Parser() : mode( None ), from( 0 ), inQuotes( false ){}
+
+        void parseIntoTokens( std::vector<std::string> const& args, std::vector<Token>& tokens ) {
+            const std::string doubleDash = "--";
+            for( std::size_t i = 1; i < args.size() && args[i] != doubleDash; ++i )
+                parseIntoTokens( args[i], tokens);
+        }
+
+        void parseIntoTokens( std::string const& arg, std::vector<Token>& tokens ) {
+            for( std::size_t i = 0; i < arg.size(); ++i ) {
+                char c = arg[i];
+                if( c == '"' )
+                    inQuotes = !inQuotes;
+                mode = handleMode( i, c, arg, tokens );
+            }
+            mode = handleMode( arg.size(), '\0', arg, tokens );
+        }
+        Mode handleMode( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
+            switch( mode ) {
+                case None: return handleNone( i, c );
+                case MaybeShortOpt: return handleMaybeShortOpt( i, c );
+                case ShortOpt:
+                case LongOpt:
+                case SlashOpt: return handleOpt( i, c, arg, tokens );
+                case Positional: return handlePositional( i, c, arg, tokens );
+                default: throw std::logic_error( "Unknown mode" );
+            }
+        }
+
+        Mode handleNone( std::size_t i, char c ) {
+            if( inQuotes ) {
+                from = i;
+                return Positional;
+            }
+            switch( c ) {
+                case '-': return MaybeShortOpt;
+#ifdef CLARA_PLATFORM_WINDOWS
+                case '/': from = i+1; return SlashOpt;
+#endif
+                default: from = i; return Positional;
+            }
+        }
+        Mode handleMaybeShortOpt( std::size_t i, char c ) {
+            switch( c ) {
+                case '-': from = i+1; return LongOpt;
+                default: from = i; return ShortOpt;
+            }
+        }
+
+        Mode handleOpt( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
+            if( std::string( ":=\0", 3 ).find( c ) == std::string::npos )
+                return mode;
+
+            std::string optName = arg.substr( from, i-from );
+            if( mode == ShortOpt )
+                for( std::size_t j = 0; j < optName.size(); ++j )
+                    tokens.push_back( Token( Token::ShortOpt, optName.substr( j, 1 ) ) );
+            else if( mode == SlashOpt && optName.size() == 1 )
+                tokens.push_back( Token( Token::ShortOpt, optName ) );
+            else
+                tokens.push_back( Token( Token::LongOpt, optName ) );
+            return None;
+        }
+        Mode handlePositional( std::size_t i, char c, std::string const& arg, std::vector<Token>& tokens ) {
+            if( inQuotes || std::string( "\0", 1 ).find( c ) == std::string::npos )
+                return mode;
+
+            std::string data = arg.substr( from, i-from );
+            tokens.push_back( Token( Token::Positional, data ) );
+            return None;
+        }
+    };
+
+    template<typename ConfigT>
+    struct CommonArgProperties {
+        CommonArgProperties() {}
+        CommonArgProperties( Detail::BoundArgFunction<ConfigT> const& _boundField ) : boundField( _boundField ) {}
+
+        Detail::BoundArgFunction<ConfigT> boundField;
+        std::string description;
+        std::string detail;
+        std::string placeholder; // Only value if boundField takes an arg
+
+        bool takesArg() const {
+            return !placeholder.empty();
+        }
+        void validate() const {
+            if( !boundField.isSet() )
+                throw std::logic_error( "option not bound" );
+        }
+    };
+    struct OptionArgProperties {
+        std::vector<std::string> shortNames;
+        std::string longName;
+
+        bool hasShortName( std::string const& shortName ) const {
+            return std::find( shortNames.begin(), shortNames.end(), shortName ) != shortNames.end();
+        }
+        bool hasLongName( std::string const& _longName ) const {
+            return _longName == longName;
+        }
+    };
+    struct PositionalArgProperties {
+        PositionalArgProperties() : position( -1 ) {}
+        int position; // -1 means non-positional (floating)
+
+        bool isFixedPositional() const {
+            return position != -1;
+        }
+    };
+
+    template<typename ConfigT>
+    class CommandLine {
+
+        struct Arg : CommonArgProperties<ConfigT>, OptionArgProperties, PositionalArgProperties {
+            Arg() {}
+            Arg( Detail::BoundArgFunction<ConfigT> const& _boundField ) : CommonArgProperties<ConfigT>( _boundField ) {}
+
+            using CommonArgProperties<ConfigT>::placeholder; // !TBD
+
+            std::string dbgName() const {
+                if( !longName.empty() )
+                    return "--" + longName;
+                if( !shortNames.empty() )
+                    return "-" + shortNames[0];
+                return "positional args";
+            }
+            std::string commands() const {
+                std::ostringstream oss;
+                bool first = true;
+                std::vector<std::string>::const_iterator it = shortNames.begin(), itEnd = shortNames.end();
+                for(; it != itEnd; ++it ) {
+                    if( first )
+                        first = false;
+                    else
+                        oss << ", ";
+                    oss << "-" << *it;
+                }
+                if( !longName.empty() ) {
+                    if( !first )
+                        oss << ", ";
+                    oss << "--" << longName;
+                }
+                if( !placeholder.empty() )
+                    oss << " <" << placeholder << ">";
+                return oss.str();
+            }
+        };
+
+        typedef CLARA_AUTO_PTR( Arg ) ArgAutoPtr;
+
+        friend void addOptName( Arg& arg, std::string const& optName )
+        {
+            if( optName.empty() )
+                return;
+            if( Detail::startsWith( optName, "--" ) ) {
+                if( !arg.longName.empty() )
+                    throw std::logic_error( "Only one long opt may be specified. '"
+                        + arg.longName
+                        + "' already specified, now attempting to add '"
+                        + optName + "'" );
+                arg.longName = optName.substr( 2 );
+            }
+            else if( Detail::startsWith( optName, "-" ) )
+                arg.shortNames.push_back( optName.substr( 1 ) );
+            else
+                throw std::logic_error( "option must begin with - or --. Option was: '" + optName + "'" );
+        }
+        friend void setPositionalArg( Arg& arg, int position )
+        {
+            arg.position = position;
+        }
+
+        class ArgBuilder {
+        public:
+            ArgBuilder( Arg* arg ) : m_arg( arg ) {}
+
+            // Bind a non-boolean data member (requires placeholder string)
+            template<typename C, typename M>
+            void bind( M C::* field, std::string const& placeholder ) {
+                m_arg->boundField = new Detail::BoundDataMember<C,M>( field );
+                m_arg->placeholder = placeholder;
+            }
+            // Bind a boolean data member (no placeholder required)
+            template<typename C>
+            void bind( bool C::* field ) {
+                m_arg->boundField = new Detail::BoundDataMember<C,bool>( field );
+            }
+
+            // Bind a method taking a single, non-boolean argument (requires a placeholder string)
+            template<typename C, typename M>
+            void bind( void (C::* unaryMethod)( M ), std::string const& placeholder ) {
+                m_arg->boundField = new Detail::BoundUnaryMethod<C,M>( unaryMethod );
+                m_arg->placeholder = placeholder;
+            }
+
+            // Bind a method taking a single, boolean argument (no placeholder string required)
+            template<typename C>
+            void bind( void (C::* unaryMethod)( bool ) ) {
+                m_arg->boundField = new Detail::BoundUnaryMethod<C,bool>( unaryMethod );
+            }
+
+            // Bind a method that takes no arguments (will be called if opt is present)
+            template<typename C>
+            void bind( void (C::* nullaryMethod)() ) {
+                m_arg->boundField = new Detail::BoundNullaryMethod<C>( nullaryMethod );
+            }
+
+            // Bind a free function taking a single argument - the object to operate on (no placeholder string required)
+            template<typename C>
+            void bind( void (* unaryFunction)( C& ) ) {
+                m_arg->boundField = new Detail::BoundUnaryFunction<C>( unaryFunction );
+            }
+
+            // Bind a free function taking a single argument - the object to operate on (requires a placeholder string)
+            template<typename C, typename T>
+            void bind( void (* binaryFunction)( C&, T ), std::string const& placeholder ) {
+                m_arg->boundField = new Detail::BoundBinaryFunction<C, T>( binaryFunction );
+                m_arg->placeholder = placeholder;
+            }
+
+            ArgBuilder& describe( std::string const& description ) {
+                m_arg->description = description;
+                return *this;
+            }
+            ArgBuilder& detail( std::string const& detail ) {
+                m_arg->detail = detail;
+                return *this;
+            }
+
+        protected:
+            Arg* m_arg;
+        };
+
+        class OptBuilder : public ArgBuilder {
+        public:
+            OptBuilder( Arg* arg ) : ArgBuilder( arg ) {}
+            OptBuilder( OptBuilder& other ) : ArgBuilder( other ) {}
+
+            OptBuilder& operator[]( std::string const& optName ) {
+                addOptName( *ArgBuilder::m_arg, optName );
+                return *this;
+            }
+        };
+
+    public:
+
+        CommandLine()
+        :   m_boundProcessName( new Detail::NullBinder<ConfigT>() ),
+            m_highestSpecifiedArgPosition( 0 ),
+            m_throwOnUnrecognisedTokens( false )
+        {}
+        CommandLine( CommandLine const& other )
+        :   m_boundProcessName( other.m_boundProcessName ),
+            m_options ( other.m_options ),
+            m_positionalArgs( other.m_positionalArgs ),
+            m_highestSpecifiedArgPosition( other.m_highestSpecifiedArgPosition ),
+            m_throwOnUnrecognisedTokens( other.m_throwOnUnrecognisedTokens )
+        {
+            if( other.m_floatingArg.get() )
+                m_floatingArg.reset( new Arg( *other.m_floatingArg ) );
+        }
+
+        CommandLine& setThrowOnUnrecognisedTokens( bool shouldThrow = true ) {
+            m_throwOnUnrecognisedTokens = shouldThrow;
+            return *this;
+        }
+
+        OptBuilder operator[]( std::string const& optName ) {
+            m_options.push_back( Arg() );
+            addOptName( m_options.back(), optName );
+            OptBuilder builder( &m_options.back() );
+            return builder;
+        }
+
+        ArgBuilder operator[]( int position ) {
+            m_positionalArgs.insert( std::make_pair( position, Arg() ) );
+            if( position > m_highestSpecifiedArgPosition )
+                m_highestSpecifiedArgPosition = position;
+            setPositionalArg( m_positionalArgs[position], position );
+            ArgBuilder builder( &m_positionalArgs[position] );
+            return builder;
+        }
+
+        // Invoke this with the _ instance
+        ArgBuilder operator[]( UnpositionalTag ) {
+            if( m_floatingArg.get() )
+                throw std::logic_error( "Only one unpositional argument can be added" );
+            m_floatingArg.reset( new Arg() );
+            ArgBuilder builder( m_floatingArg.get() );
+            return builder;
+        }
+
+        template<typename C, typename M>
+        void bindProcessName( M C::* field ) {
+            m_boundProcessName = new Detail::BoundDataMember<C,M>( field );
+        }
+        template<typename C, typename M>
+        void bindProcessName( void (C::*_unaryMethod)( M ) ) {
+            m_boundProcessName = new Detail::BoundUnaryMethod<C,M>( _unaryMethod );
+        }
+
+        void optUsage( std::ostream& os, std::size_t indent = 0, std::size_t width = Detail::consoleWidth ) const {
+            typename std::vector<Arg>::const_iterator itBegin = m_options.begin(), itEnd = m_options.end(), it;
+            std::size_t maxWidth = 0;
+            for( it = itBegin; it != itEnd; ++it )
+                maxWidth = (std::max)( maxWidth, it->commands().size() );
+
+            for( it = itBegin; it != itEnd; ++it ) {
+                Detail::Text usage( it->commands(), Detail::TextAttributes()
+                                                        .setWidth( maxWidth+indent )
+                                                        .setIndent( indent ) );
+                Detail::Text desc( it->description, Detail::TextAttributes()
+                                                        .setWidth( width - maxWidth - 3 ) );
+
+                for( std::size_t i = 0; i < (std::max)( usage.size(), desc.size() ); ++i ) {
+                    std::string usageCol = i < usage.size() ? usage[i] : "";
+                    os << usageCol;
+
+                    if( i < desc.size() && !desc[i].empty() )
+                        os  << std::string( indent + 2 + maxWidth - usageCol.size(), ' ' )
+                            << desc[i];
+                    os << "\n";
+                }
+            }
+        }
+        std::string optUsage() const {
+            std::ostringstream oss;
+            optUsage( oss );
+            return oss.str();
+        }
+
+        void argSynopsis( std::ostream& os ) const {
+            for( int i = 1; i <= m_highestSpecifiedArgPosition; ++i ) {
+                if( i > 1 )
+                    os << " ";
+                typename std::map<int, Arg>::const_iterator it = m_positionalArgs.find( i );
+                if( it != m_positionalArgs.end() )
+                    os << "<" << it->second.placeholder << ">";
+                else if( m_floatingArg.get() )
+                    os << "<" << m_floatingArg->placeholder << ">";
+                else
+                    throw std::logic_error( "non consecutive positional arguments with no floating args" );
+            }
+            // !TBD No indication of mandatory args
+            if( m_floatingArg.get() ) {
+                if( m_highestSpecifiedArgPosition > 1 )
+                    os << " ";
+                os << "[<" << m_floatingArg->placeholder << "> ...]";
+            }
+        }
+        std::string argSynopsis() const {
+            std::ostringstream oss;
+            argSynopsis( oss );
+            return oss.str();
+        }
+
+        void usage( std::ostream& os, std::string const& procName ) const {
+            validate();
+            os << "usage:\n  " << procName << " ";
+            argSynopsis( os );
+            if( !m_options.empty() ) {
+                os << " [options]\n\nwhere options are: \n";
+                optUsage( os, 2 );
+            }
+            os << "\n";
+        }
+        std::string usage( std::string const& procName ) const {
+            std::ostringstream oss;
+            usage( oss, procName );
+            return oss.str();
+        }
+
+        ConfigT parse( std::vector<std::string> const& args ) const {
+            ConfigT config;
+            parseInto( args, config );
+            return config;
+        }
+
+        std::vector<Parser::Token> parseInto( std::vector<std::string> const& args, ConfigT& config ) const {
+            std::string processName = args.empty() ? std::string() : args[0];
+            std::size_t lastSlash = processName.find_last_of( "/\\" );
+            if( lastSlash != std::string::npos )
+                processName = processName.substr( lastSlash+1 );
+            m_boundProcessName.set( config, processName );
+            std::vector<Parser::Token> tokens;
+            Parser parser;
+            parser.parseIntoTokens( args, tokens );
+            return populate( tokens, config );
+        }
+
+        std::vector<Parser::Token> populate( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
+            validate();
+            std::vector<Parser::Token> unusedTokens = populateOptions( tokens, config );
+            unusedTokens = populateFixedArgs( unusedTokens, config );
+            unusedTokens = populateFloatingArgs( unusedTokens, config );
+            return unusedTokens;
+        }
+
+        std::vector<Parser::Token> populateOptions( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
+            std::vector<Parser::Token> unusedTokens;
+            std::vector<std::string> errors;
+            for( std::size_t i = 0; i < tokens.size(); ++i ) {
+                Parser::Token const& token = tokens[i];
+                typename std::vector<Arg>::const_iterator it = m_options.begin(), itEnd = m_options.end();
+                for(; it != itEnd; ++it ) {
+                    Arg const& arg = *it;
+
+                    try {
+                        if( ( token.type == Parser::Token::ShortOpt && arg.hasShortName( token.data ) ) ||
+                            ( token.type == Parser::Token::LongOpt && arg.hasLongName( token.data ) ) ) {
+                            if( arg.takesArg() ) {
+                                if( i == tokens.size()-1 || tokens[i+1].type != Parser::Token::Positional )
+                                    errors.push_back( "Expected argument to option: " + token.data );
+                                else
+                                    arg.boundField.set( config, tokens[++i].data );
+                            }
+                            else {
+                                arg.boundField.set( config, "true" );
+                            }
+                            break;
+                        }
+                    }
+                    catch( std::exception& ex ) {
+                        errors.push_back( std::string( ex.what() ) + "\n- while parsing: (" + arg.commands() + ")" );
+                    }
+                }
+                if( it == itEnd ) {
+                    if( token.type == Parser::Token::Positional || !m_throwOnUnrecognisedTokens )
+                        unusedTokens.push_back( token );
+                    else if( errors.empty() && m_throwOnUnrecognisedTokens )
+                        errors.push_back( "unrecognised option: " + token.data );
+                }
+            }
+            if( !errors.empty() ) {
+                std::ostringstream oss;
+                for( std::vector<std::string>::const_iterator it = errors.begin(), itEnd = errors.end();
+                        it != itEnd;
+                        ++it ) {
+                    if( it != errors.begin() )
+                        oss << "\n";
+                    oss << *it;
+                }
+                throw std::runtime_error( oss.str() );
+            }
+            return unusedTokens;
+        }
+        std::vector<Parser::Token> populateFixedArgs( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
+            std::vector<Parser::Token> unusedTokens;
+            int position = 1;
+            for( std::size_t i = 0; i < tokens.size(); ++i ) {
+                Parser::Token const& token = tokens[i];
+                typename std::map<int, Arg>::const_iterator it = m_positionalArgs.find( position );
+                if( it != m_positionalArgs.end() )
+                    it->second.boundField.set( config, token.data );
+                else
+                    unusedTokens.push_back( token );
+                if( token.type == Parser::Token::Positional )
+                    position++;
+            }
+            return unusedTokens;
+        }
+        std::vector<Parser::Token> populateFloatingArgs( std::vector<Parser::Token> const& tokens, ConfigT& config ) const {
+            if( !m_floatingArg.get() )
+                return tokens;
+            std::vector<Parser::Token> unusedTokens;
+            for( std::size_t i = 0; i < tokens.size(); ++i ) {
+                Parser::Token const& token = tokens[i];
+                if( token.type == Parser::Token::Positional )
+                    m_floatingArg->boundField.set( config, token.data );
+                else
+                    unusedTokens.push_back( token );
+            }
+            return unusedTokens;
+        }
+
+        void validate() const
+        {
+            if( m_options.empty() && m_positionalArgs.empty() && !m_floatingArg.get() )
+                throw std::logic_error( "No options or arguments specified" );
+
+            for( typename std::vector<Arg>::const_iterator  it = m_options.begin(),
+                                                            itEnd = m_options.end();
+                    it != itEnd; ++it )
+                it->validate();
+        }
+
+    private:
+        Detail::BoundArgFunction<ConfigT> m_boundProcessName;
+        std::vector<Arg> m_options;
+        std::map<int, Arg> m_positionalArgs;
+        ArgAutoPtr m_floatingArg;
+        int m_highestSpecifiedArgPosition;
+        bool m_throwOnUnrecognisedTokens;
+    };
+
+} // end namespace Clara
+
+STITCH_CLARA_CLOSE_NAMESPACE
+#undef STITCH_CLARA_OPEN_NAMESPACE
+#undef STITCH_CLARA_CLOSE_NAMESPACE
+
+#endif // TWOBLUECUBES_CLARA_H_INCLUDED
+#undef STITCH_CLARA_OPEN_NAMESPACE
+
+// Restore Clara's value for console width, if present
+#ifdef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#define CLARA_CONFIG_CONSOLE_WIDTH CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#undef CATCH_TEMP_CLARA_CONFIG_CONSOLE_WIDTH
+#endif
+
+#include <fstream>
+#include <ctime>
+
+namespace Catch {
+
+    inline void abortAfterFirst( ConfigData& config ) { config.abortAfter = 1; }
+    inline void abortAfterX( ConfigData& config, int x ) {
+        if( x < 1 )
+            throw std::runtime_error( "Value after -x or --abortAfter must be greater than zero" );
+        config.abortAfter = x;
+    }
+    inline void addTestOrTags( ConfigData& config, std::string const& _testSpec ) { config.testsOrTags.push_back( _testSpec ); }
+    inline void addSectionToRun( ConfigData& config, std::string const& sectionName ) { config.sectionsToRun.push_back( sectionName ); }
+    inline void addReporterName( ConfigData& config, std::string const& _reporterName ) { config.reporterNames.push_back( _reporterName ); }
+
+    inline void addWarning( ConfigData& config, std::string const& _warning ) {
+        if( _warning == "NoAssertions" )
+            config.warnings = static_cast<WarnAbout::What>( config.warnings | WarnAbout::NoAssertions );
+        else
+            throw std::runtime_error( "Unrecognised warning: '" + _warning + '\'' );
+    }
+    inline void setOrder( ConfigData& config, std::string const& order ) {
+        if( startsWith( "declared", order ) )
+            config.runOrder = RunTests::InDeclarationOrder;
+        else if( startsWith( "lexical", order ) )
+            config.runOrder = RunTests::InLexicographicalOrder;
+        else if( startsWith( "random", order ) )
+            config.runOrder = RunTests::InRandomOrder;
+        else
+            throw std::runtime_error( "Unrecognised ordering: '" + order + '\'' );
+    }
+    inline void setRngSeed( ConfigData& config, std::string const& seed ) {
+        if( seed == "time" ) {
+            config.rngSeed = static_cast<unsigned int>( std::time(0) );
+        }
+        else {
+            std::stringstream ss;
+            ss << seed;
+            ss >> config.rngSeed;
+            if( ss.fail() )
+                throw std::runtime_error( "Argument to --rng-seed should be the word 'time' or a number" );
+        }
+    }
+    inline void setVerbosity( ConfigData& config, int level ) {
+        // !TBD: accept strings?
+        config.verbosity = static_cast<Verbosity::Level>( level );
+    }
+    inline void setShowDurations( ConfigData& config, bool _showDurations ) {
+        config.showDurations = _showDurations
+            ? ShowDurations::Always
+            : ShowDurations::Never;
+    }
+    inline void setUseColour( ConfigData& config, std::string const& value ) {
+        std::string mode = toLower( value );
+
+        if( mode == "yes" )
+            config.useColour = UseColour::Yes;
+        else if( mode == "no" )
+            config.useColour = UseColour::No;
+        else if( mode == "auto" )
+            config.useColour = UseColour::Auto;
+        else
+            throw std::runtime_error( "colour mode must be one of: auto, yes or no" );
+    }
+    inline void setWaitForKeypress( ConfigData& config, std::string const& keypress ) {
+        std::string keypressLc = toLower( keypress );
+        if( keypressLc == "start" )
+            config.waitForKeypress = WaitForKeypress::BeforeStart;
+        else if( keypressLc == "exit" )
+            config.waitForKeypress = WaitForKeypress::BeforeExit;
+        else if( keypressLc == "both" )
+            config.waitForKeypress = WaitForKeypress::BeforeStartAndExit;
+        else
+            throw std::runtime_error( "keypress argument must be one of: start, exit or both. '" + keypress + "' not recognised" );
+    };
+
+    inline void forceColour( ConfigData& config ) {
+        config.useColour = UseColour::Yes;
+    }
+    inline void loadTestNamesFromFile( ConfigData& config, std::string const& _filename ) {
+        std::ifstream f( _filename.c_str() );
+        if( !f.is_open() )
+            throw std::domain_error( "Unable to load input file: " + _filename );
+
+        std::string line;
+        while( std::getline( f, line ) ) {
+            line = trim(line);
+            if( !line.empty() && !startsWith( line, '#' ) ) {
+                if( !startsWith( line, '"' ) )
+                    line = '"' + line + '"';
+                addTestOrTags( config, line + ',' );
+            }
+        }
+    }
+
+    inline Clara::CommandLine<ConfigData> makeCommandLineParser() {
+
+        using namespace Clara;
+        CommandLine<ConfigData> cli;
+
+        cli.bindProcessName( &ConfigData::processName );
+
+        cli["-?"]["-h"]["--help"]
+            .describe( "display usage information" )
+            .bind( &ConfigData::showHelp );
+
+        cli["-l"]["--list-tests"]
+            .describe( "list all/matching test cases" )
+            .bind( &ConfigData::listTests );
+
+        cli["-t"]["--list-tags"]
+            .describe( "list all/matching tags" )
+            .bind( &ConfigData::listTags );
+
+        cli["-s"]["--success"]
+            .describe( "include successful tests in output" )
+            .bind( &ConfigData::showSuccessfulTests );
+
+        cli["-b"]["--break"]
+            .describe( "break into debugger on failure" )
+            .bind( &ConfigData::shouldDebugBreak );
+
+        cli["-e"]["--nothrow"]
+            .describe( "skip exception tests" )
+            .bind( &ConfigData::noThrow );
+
+        cli["-i"]["--invisibles"]
+            .describe( "show invisibles (tabs, newlines)" )
+            .bind( &ConfigData::showInvisibles );
+
+        cli["-o"]["--out"]
+            .describe( "output filename" )
+            .bind( &ConfigData::outputFilename, "filename" );
+
+        cli["-r"]["--reporter"]
+//            .placeholder( "name[:filename]" )
+            .describe( "reporter to use (defaults to console)" )
+            .bind( &addReporterName, "name" );
+
+        cli["-n"]["--name"]
+            .describe( "suite name" )
+            .bind( &ConfigData::name, "name" );
+
+        cli["-a"]["--abort"]
+            .describe( "abort at first failure" )
+            .bind( &abortAfterFirst );
+
+        cli["-x"]["--abortx"]
+            .describe( "abort after x failures" )
+            .bind( &abortAfterX, "no. failures" );
+
+        cli["-w"]["--warn"]
+            .describe( "enable warnings" )
+            .bind( &addWarning, "warning name" );
+
+// - needs updating if reinstated
+//        cli.into( &setVerbosity )
+//            .describe( "level of verbosity (0=no output)" )
+//            .shortOpt( "v")
+//            .longOpt( "verbosity" )
+//            .placeholder( "level" );
+
+        cli[_]
+            .describe( "which test or tests to use" )
+            .bind( &addTestOrTags, "test name, pattern or tags" );
+
+        cli["-d"]["--durations"]
+            .describe( "show test durations" )
+            .bind( &setShowDurations, "yes|no" );
+
+        cli["-f"]["--input-file"]
+            .describe( "load test names to run from a file" )
+            .bind( &loadTestNamesFromFile, "filename" );
+
+        cli["-#"]["--filenames-as-tags"]
+            .describe( "adds a tag for the filename" )
+            .bind( &ConfigData::filenamesAsTags );
+
+        cli["-c"]["--section"]
+                .describe( "specify section to run" )
+                .bind( &addSectionToRun, "section name" );
+
+        // Less common commands which don't have a short form
+        cli["--list-test-names-only"]
+            .describe( "list all/matching test cases names only" )
+            .bind( &ConfigData::listTestNamesOnly );
+
+        cli["--list-extra-info"]
+            .describe( "list all/matching test cases with more info" )
+            .bind( &ConfigData::listExtraInfo );
+
+        cli["--list-reporters"]
+            .describe( "list all reporters" )
+            .bind( &ConfigData::listReporters );
+
+        cli["--order"]
+            .describe( "test case order (defaults to decl)" )
+            .bind( &setOrder, "decl|lex|rand" );
+
+        cli["--rng-seed"]
+            .describe( "set a specific seed for random numbers" )
+            .bind( &setRngSeed, "'time'|number" );
+
+        cli["--force-colour"]
+            .describe( "force colourised output (deprecated)" )
+            .bind( &forceColour );
+
+        cli["--use-colour"]
+            .describe( "should output be colourised" )
+            .bind( &setUseColour, "yes|no" );
+
+        cli["--libidentify"]
+            .describe( "report name and version according to libidentify standard" )
+            .bind( &ConfigData::libIdentify );
+
+        cli["--wait-for-keypress"]
+                .describe( "waits for a keypress before exiting" )
+                .bind( &setWaitForKeypress, "start|exit|both" );
+
+        return cli;
+    }
+
+} // end namespace Catch
+
+// #included from: internal/catch_list.hpp
+#define TWOBLUECUBES_CATCH_LIST_HPP_INCLUDED
+
+// #included from: catch_text.h
+#define TWOBLUECUBES_CATCH_TEXT_H_INCLUDED
+
+#define TBC_TEXT_FORMAT_CONSOLE_WIDTH CATCH_CONFIG_CONSOLE_WIDTH
+
+#define CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE Catch
+// #included from: ../external/tbc_text_format.h
+// Only use header guard if we are not using an outer namespace
+#ifndef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+# ifdef TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED
+#  ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#   define TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#  endif
+# else
+#  define TWOBLUECUBES_TEXT_FORMAT_H_INCLUDED
+# endif
+#endif
+#ifndef TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#include <string>
+#include <vector>
+#include <sstream>
+
+// Use optional outer namespace
+#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+namespace CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE {
+#endif
+
+namespace Tbc {
+
+#ifdef TBC_TEXT_FORMAT_CONSOLE_WIDTH
+    const unsigned int consoleWidth = TBC_TEXT_FORMAT_CONSOLE_WIDTH;
+#else
+    const unsigned int consoleWidth = 80;
+#endif
+
+    struct TextAttributes {
+        TextAttributes()
+        :   initialIndent( std::string::npos ),
+            indent( 0 ),
+            width( consoleWidth-1 )
+        {}
+
+        TextAttributes& setInitialIndent( std::size_t _value )  { initialIndent = _value; return *this; }
+        TextAttributes& setIndent( std::size_t _value )         { indent = _value; return *this; }
+        TextAttributes& setWidth( std::size_t _value )          { width = _value; return *this; }
+
+        std::size_t initialIndent;  // indent of first line, or npos
+        std::size_t indent;         // indent of subsequent lines, or all if initialIndent is npos
+        std::size_t width;          // maximum width of text, including indent. Longer text will wrap
+    };
+
+    class Text {
+    public:
+        Text( std::string const& _str, TextAttributes const& _attr = TextAttributes() )
+        : attr( _attr )
+        {
+            const std::string wrappableBeforeChars = "[({<\t";
+            const std::string wrappableAfterChars = "])}>-,./|\\";
+            const std::string wrappableInsteadOfChars = " \n\r";
+            std::string indent = _attr.initialIndent != std::string::npos
+                ? std::string( _attr.initialIndent, ' ' )
+                : std::string( _attr.indent, ' ' );
+
+            typedef std::string::const_iterator iterator;
+            iterator it = _str.begin();
+            const iterator strEnd = _str.end();
+
+            while( it != strEnd ) {
+
+                if( lines.size() >= 1000 ) {
+                    lines.push_back( "... message truncated due to excessive size" );
+                    return;
+                }
+
+                std::string suffix;
+                std::size_t width = (std::min)( static_cast<size_t>( strEnd-it ), _attr.width-static_cast<size_t>( indent.size() ) );
+                iterator itEnd = it+width;
+                iterator itNext = _str.end();
+
+                iterator itNewLine = std::find( it, itEnd, '\n' );
+                if( itNewLine != itEnd )
+                    itEnd = itNewLine;
+
+                if( itEnd != strEnd  ) {
+                    bool foundWrapPoint = false;
+                    iterator findIt = itEnd;
+                    do {
+                        if( wrappableAfterChars.find( *findIt ) != std::string::npos && findIt != itEnd ) {
+                            itEnd = findIt+1;
+                            itNext = findIt+1;
+                            foundWrapPoint = true;
+                        }
+                        else if( findIt > it && wrappableBeforeChars.find( *findIt ) != std::string::npos ) {
+                            itEnd = findIt;
+                            itNext = findIt;
+                            foundWrapPoint = true;
+                        }
+                        else if( wrappableInsteadOfChars.find( *findIt ) != std::string::npos ) {
+                            itNext = findIt+1;
+                            itEnd = findIt;
+                            foundWrapPoint = true;
+                        }
+                        if( findIt == it )
+                            break;
+                        else
+                            --findIt;
+                    }
+                    while( !foundWrapPoint );
+
+                    if( !foundWrapPoint ) {
+                        // No good wrap char, so we'll break mid word and add a hyphen
+                        --itEnd;
+                        itNext = itEnd;
+                        suffix = "-";
+                    }
+                    else {
+                        while( itEnd > it && wrappableInsteadOfChars.find( *(itEnd-1) ) != std::string::npos )
+                            --itEnd;
+                    }
+                }
+                lines.push_back( indent + std::string( it, itEnd ) + suffix );
+
+                if( indent.size() != _attr.indent )
+                    indent = std::string( _attr.indent, ' ' );
+                it = itNext;
+            }
+        }
+
+        typedef std::vector<std::string>::const_iterator const_iterator;
+
+        const_iterator begin() const { return lines.begin(); }
+        const_iterator end() const { return lines.end(); }
+        std::string const& last() const { return lines.back(); }
+        std::size_t size() const { return lines.size(); }
+        std::string const& operator[]( std::size_t _index ) const { return lines[_index]; }
+        std::string toString() const {
+            std::ostringstream oss;
+            oss << *this;
+            return oss.str();
+        }
+
+        inline friend std::ostream& operator << ( std::ostream& _stream, Text const& _text ) {
+            for( Text::const_iterator it = _text.begin(), itEnd = _text.end();
+                it != itEnd; ++it ) {
+                if( it != _text.begin() )
+                    _stream << "\n";
+                _stream << *it;
+            }
+            return _stream;
+        }
+
+    private:
+        std::string str;
+        TextAttributes attr;
+        std::vector<std::string> lines;
+    };
+
+} // end namespace Tbc
+
+#ifdef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+} // end outer namespace
+#endif
+
+#endif // TWOBLUECUBES_TEXT_FORMAT_H_ALREADY_INCLUDED
+#undef CLICHE_TBC_TEXT_FORMAT_OUTER_NAMESPACE
+
+namespace Catch {
+    using Tbc::Text;
+    using Tbc::TextAttributes;
+}
+
+// #included from: catch_console_colour.hpp
+#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED
+
+namespace Catch {
+
+    struct Colour {
+        enum Code {
+            None = 0,
+
+            White,
+            Red,
+            Green,
+            Blue,
+            Cyan,
+            Yellow,
+            Grey,
+
+            Bright = 0x10,
+
+            BrightRed = Bright | Red,
+            BrightGreen = Bright | Green,
+            LightGrey = Bright | Grey,
+            BrightWhite = Bright | White,
+
+            // By intention
+            FileName = LightGrey,
+            Warning = Yellow,
+            ResultError = BrightRed,
+            ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
+
+            Error = BrightRed,
+            Success = Green,
+
+            OriginalExpression = Cyan,
+            ReconstructedExpression = Yellow,
+
+            SecondaryText = LightGrey,
+            Headers = White
+        };
+
+        // Use constructed object for RAII guard
+        Colour( Code _colourCode );
+        Colour( Colour const& other );
+        ~Colour();
+
+        // Use static method for one-shot changes
+        static void use( Code _colourCode );
+
+    private:
+        bool m_moved;
+    };
+
+    inline std::ostream& operator << ( std::ostream& os, Colour const& ) { return os; }
+
+} // end namespace Catch
+
+// #included from: catch_interfaces_reporter.h
+#define TWOBLUECUBES_CATCH_INTERFACES_REPORTER_H_INCLUDED
+
+#include <string>
+#include <ostream>
+#include <map>
+
+namespace Catch
+{
+    struct ReporterConfig {
+        explicit ReporterConfig( Ptr<IConfig const> const& _fullConfig )
+        :   m_stream( &_fullConfig->stream() ), m_fullConfig( _fullConfig ) {}
+
+        ReporterConfig( Ptr<IConfig const> const& _fullConfig, std::ostream& _stream )
+        :   m_stream( &_stream ), m_fullConfig( _fullConfig ) {}
+
+        std::ostream& stream() const    { return *m_stream; }
+        Ptr<IConfig const> fullConfig() const { return m_fullConfig; }
+
+    private:
+        std::ostream* m_stream;
+        Ptr<IConfig const> m_fullConfig;
+    };
+
+    struct ReporterPreferences {
+        ReporterPreferences()
+        : shouldRedirectStdOut( false )
+        {}
+
+        bool shouldRedirectStdOut;
+    };
+
+    template<typename T>
+    struct LazyStat : Option<T> {
+        LazyStat() : used( false ) {}
+        LazyStat& operator=( T const& _value ) {
+            Option<T>::operator=( _value );
+            used = false;
+            return *this;
+        }
+        void reset() {
+            Option<T>::reset();
+            used = false;
+        }
+        bool used;
+    };
+
+    struct TestRunInfo {
+        TestRunInfo( std::string const& _name ) : name( _name ) {}
+        std::string name;
+    };
+    struct GroupInfo {
+        GroupInfo(  std::string const& _name,
+                    std::size_t _groupIndex,
+                    std::size_t _groupsCount )
+        :   name( _name ),
+            groupIndex( _groupIndex ),
+            groupsCounts( _groupsCount )
+        {}
+
+        std::string name;
+        std::size_t groupIndex;
+        std::size_t groupsCounts;
+    };
+
+    struct AssertionStats {
+        AssertionStats( AssertionResult const& _assertionResult,
+                        std::vector<MessageInfo> const& _infoMessages,
+                        Totals const& _totals )
+        :   assertionResult( _assertionResult ),
+            infoMessages( _infoMessages ),
+            totals( _totals )
+        {
+            if( assertionResult.hasMessage() ) {
+                // Copy message into messages list.
+                // !TBD This should have been done earlier, somewhere
+                MessageBuilder builder( assertionResult.getTestMacroName(), assertionResult.getSourceInfo(), assertionResult.getResultType() );
+                builder << assertionResult.getMessage();
+                builder.m_info.message = builder.m_stream.str();
+
+                infoMessages.push_back( builder.m_info );
+            }
+        }
+        virtual ~AssertionStats();
+
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+        AssertionStats( AssertionStats const& )              = default;
+        AssertionStats( AssertionStats && )                  = default;
+        AssertionStats& operator = ( AssertionStats const& ) = default;
+        AssertionStats& operator = ( AssertionStats && )     = default;
+#  endif
+
+        AssertionResult assertionResult;
+        std::vector<MessageInfo> infoMessages;
+        Totals totals;
+    };
+
+    struct SectionStats {
+        SectionStats(   SectionInfo const& _sectionInfo,
+                        Counts const& _assertions,
+                        double _durationInSeconds,
+                        bool _missingAssertions )
+        :   sectionInfo( _sectionInfo ),
+            assertions( _assertions ),
+            durationInSeconds( _durationInSeconds ),
+            missingAssertions( _missingAssertions )
+        {}
+        virtual ~SectionStats();
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+        SectionStats( SectionStats const& )              = default;
+        SectionStats( SectionStats && )                  = default;
+        SectionStats& operator = ( SectionStats const& ) = default;
+        SectionStats& operator = ( SectionStats && )     = default;
+#  endif
+
+        SectionInfo sectionInfo;
+        Counts assertions;
+        double durationInSeconds;
+        bool missingAssertions;
+    };
+
+    struct TestCaseStats {
+        TestCaseStats(  TestCaseInfo const& _testInfo,
+                        Totals const& _totals,
+                        std::string const& _stdOut,
+                        std::string const& _stdErr,
+                        bool _aborting )
+        : testInfo( _testInfo ),
+            totals( _totals ),
+            stdOut( _stdOut ),
+            stdErr( _stdErr ),
+            aborting( _aborting )
+        {}
+        virtual ~TestCaseStats();
+
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+        TestCaseStats( TestCaseStats const& )              = default;
+        TestCaseStats( TestCaseStats && )                  = default;
+        TestCaseStats& operator = ( TestCaseStats const& ) = default;
+        TestCaseStats& operator = ( TestCaseStats && )     = default;
+#  endif
+
+        TestCaseInfo testInfo;
+        Totals totals;
+        std::string stdOut;
+        std::string stdErr;
+        bool aborting;
+    };
+
+    struct TestGroupStats {
+        TestGroupStats( GroupInfo const& _groupInfo,
+                        Totals const& _totals,
+                        bool _aborting )
+        :   groupInfo( _groupInfo ),
+            totals( _totals ),
+            aborting( _aborting )
+        {}
+        TestGroupStats( GroupInfo const& _groupInfo )
+        :   groupInfo( _groupInfo ),
+            aborting( false )
+        {}
+        virtual ~TestGroupStats();
+
+#  ifdef CATCH_CONFIG_CPP11_GENERATED_METHODS
+        TestGroupStats( TestGroupStats const& )              = default;
+        TestGroupStats( TestGroupStats && )                  = default;
+        TestGroupStats& operator = ( TestGroupStats const& ) = default;
+        TestGroupStats& operator = ( TestGroupStats && )     = default;
+#  endif
+
+        GroupInfo groupInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    struct TestRunStats {
+        TestRunStats(   TestRunInfo const& _runInfo,
+                        Totals const& _totals,
+                        bool _aborting )
+        :   runInfo( _runInfo ),
+            totals( _totals ),
+            aborting( _aborting )
+        {}
+        virtual ~TestRunStats();
+
+#  ifndef CATCH_CONFIG_CPP11_GENERATED_METHODS
+        TestRunStats( TestRunStats const& _other )
+        :   runInfo( _other.runInfo ),
+            totals( _other.totals ),
+            aborting( _other.aborting )
+        {}
+#  else
+        TestRunStats( TestRunStats const& )              = default;
+        TestRunStats( TestRunStats && )                  = default;
+        TestRunStats& operator = ( TestRunStats const& ) = default;
+        TestRunStats& operator = ( TestRunStats && )     = default;
+#  endif
+
+        TestRunInfo runInfo;
+        Totals totals;
+        bool aborting;
+    };
+
+    class MultipleReporters;
+
+    struct IStreamingReporter : IShared {
+        virtual ~IStreamingReporter();
+
+        // Implementing class must also provide the following static method:
+        // static std::string getDescription();
+
+        virtual ReporterPreferences getPreferences() const = 0;
+
+        virtual void noMatchingTestCases( std::string const& spec ) = 0;
+
+        virtual void testRunStarting( TestRunInfo const& testRunInfo ) = 0;
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) = 0;
+
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) = 0;
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) = 0;
+
+        virtual void assertionStarting( AssertionInfo const& assertionInfo ) = 0;
+
+        // The return value indicates if the messages buffer should be cleared:
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) = 0;
+
+        virtual void sectionEnded( SectionStats const& sectionStats ) = 0;
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) = 0;
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) = 0;
+        virtual void testRunEnded( TestRunStats const& testRunStats ) = 0;
+
+        virtual void skipTest( TestCaseInfo const& testInfo ) = 0;
+
+        virtual MultipleReporters* tryAsMulti() { return CATCH_NULL; }
+    };
+
+    struct IReporterFactory : IShared {
+        virtual ~IReporterFactory();
+        virtual IStreamingReporter* create( ReporterConfig const& config ) const = 0;
+        virtual std::string getDescription() const = 0;
+    };
+
+    struct IReporterRegistry {
+        typedef std::map<std::string, Ptr<IReporterFactory> > FactoryMap;
+        typedef std::vector<Ptr<IReporterFactory> > Listeners;
+
+        virtual ~IReporterRegistry();
+        virtual IStreamingReporter* create( std::string const& name, Ptr<IConfig const> const& config ) const = 0;
+        virtual FactoryMap const& getFactories() const = 0;
+        virtual Listeners const& getListeners() const = 0;
+    };
+
+    Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingReporter, Ptr<IStreamingReporter> const& additionalReporter );
+
+}
+
+#include <limits>
+#include <algorithm>
+
+namespace Catch {
+
+    inline std::size_t listTests( Config const& config ) {
+
+        TestSpec testSpec = config.testSpec();
+        if( config.testSpec().hasFilters() )
+            Catch::cout() << "Matching test cases:\n";
+        else {
+            Catch::cout() << "All available test cases:\n";
+            testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
+        }
+
+        std::size_t matchedTests = 0;
+        TextAttributes nameAttr, descAttr, tagsAttr;
+        nameAttr.setInitialIndent( 2 ).setIndent( 4 );
+        descAttr.setIndent( 4 );
+        tagsAttr.setIndent( 6 );
+
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
+                it != itEnd;
+                ++it ) {
+            matchedTests++;
+            TestCaseInfo const& testCaseInfo = it->getTestCaseInfo();
+            Colour::Code colour = testCaseInfo.isHidden()
+                ? Colour::SecondaryText
+                : Colour::None;
+            Colour colourGuard( colour );
+
+            Catch::cout() << Text( testCaseInfo.name, nameAttr ) << std::endl;
+            if( config.listExtraInfo() ) {
+                Catch::cout() << "    " << testCaseInfo.lineInfo << std::endl;
+                std::string description = testCaseInfo.description;
+                if( description.empty() )
+                    description = "(NO DESCRIPTION)";
+                Catch::cout() << Text( description, descAttr ) << std::endl;
+            }
+            if( !testCaseInfo.tags.empty() )
+                Catch::cout() << Text( testCaseInfo.tagsAsString, tagsAttr ) << std::endl;
+        }
+
+        if( !config.testSpec().hasFilters() )
+            Catch::cout() << pluralise( matchedTests, "test case" ) << '\n' << std::endl;
+        else
+            Catch::cout() << pluralise( matchedTests, "matching test case" ) << '\n' << std::endl;
+        return matchedTests;
+    }
+
+    inline std::size_t listTestsNamesOnly( Config const& config ) {
+        TestSpec testSpec = config.testSpec();
+        if( !config.testSpec().hasFilters() )
+            testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
+        std::size_t matchedTests = 0;
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
+                it != itEnd;
+                ++it ) {
+            matchedTests++;
+            TestCaseInfo const& testCaseInfo = it->getTestCaseInfo();
+            if( startsWith( testCaseInfo.name, '#' ) )
+               Catch::cout() << '"' << testCaseInfo.name << '"';
+            else
+               Catch::cout() << testCaseInfo.name;
+            if ( config.listExtraInfo() )
+                Catch::cout() << "\t@" << testCaseInfo.lineInfo;
+            Catch::cout() << std::endl;
+        }
+        return matchedTests;
+    }
+
+    struct TagInfo {
+        TagInfo() : count ( 0 ) {}
+        void add( std::string const& spelling ) {
+            ++count;
+            spellings.insert( spelling );
+        }
+        std::string all() const {
+            std::string out;
+            for( std::set<std::string>::const_iterator it = spellings.begin(), itEnd = spellings.end();
+                        it != itEnd;
+                        ++it )
+                out += "[" + *it + "]";
+            return out;
+        }
+        std::set<std::string> spellings;
+        std::size_t count;
+    };
+
+    inline std::size_t listTags( Config const& config ) {
+        TestSpec testSpec = config.testSpec();
+        if( config.testSpec().hasFilters() )
+            Catch::cout() << "Tags for matching test cases:\n";
+        else {
+            Catch::cout() << "All available tags:\n";
+            testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "*" ).testSpec();
+        }
+
+        std::map<std::string, TagInfo> tagCounts;
+
+        std::vector<TestCase> matchedTestCases = filterTests( getAllTestCasesSorted( config ), testSpec, config );
+        for( std::vector<TestCase>::const_iterator it = matchedTestCases.begin(), itEnd = matchedTestCases.end();
+                it != itEnd;
+                ++it ) {
+            for( std::set<std::string>::const_iterator  tagIt = it->getTestCaseInfo().tags.begin(),
+                                                        tagItEnd = it->getTestCaseInfo().tags.end();
+                    tagIt != tagItEnd;
+                    ++tagIt ) {
+                std::string tagName = *tagIt;
+                std::string lcaseTagName = toLower( tagName );
+                std::map<std::string, TagInfo>::iterator countIt = tagCounts.find( lcaseTagName );
+                if( countIt == tagCounts.end() )
+                    countIt = tagCounts.insert( std::make_pair( lcaseTagName, TagInfo() ) ).first;
+                countIt->second.add( tagName );
+            }
+        }
+
+        for( std::map<std::string, TagInfo>::const_iterator countIt = tagCounts.begin(),
+                                                            countItEnd = tagCounts.end();
+                countIt != countItEnd;
+                ++countIt ) {
+            std::ostringstream oss;
+            oss << "  " << std::setw(2) << countIt->second.count << "  ";
+            Text wrapper( countIt->second.all(), TextAttributes()
+                                                    .setInitialIndent( 0 )
+                                                    .setIndent( oss.str().size() )
+                                                    .setWidth( CATCH_CONFIG_CONSOLE_WIDTH-10 ) );
+            Catch::cout() << oss.str() << wrapper << '\n';
+        }
+        Catch::cout() << pluralise( tagCounts.size(), "tag" ) << '\n' << std::endl;
+        return tagCounts.size();
+    }
+
+    inline std::size_t listReporters( Config const& /*config*/ ) {
+        Catch::cout() << "Available reporters:\n";
+        IReporterRegistry::FactoryMap const& factories = getRegistryHub().getReporterRegistry().getFactories();
+        IReporterRegistry::FactoryMap::const_iterator itBegin = factories.begin(), itEnd = factories.end(), it;
+        std::size_t maxNameLen = 0;
+        for(it = itBegin; it != itEnd; ++it )
+            maxNameLen = (std::max)( maxNameLen, it->first.size() );
+
+        for(it = itBegin; it != itEnd; ++it ) {
+            Text wrapper( it->second->getDescription(), TextAttributes()
+                                                        .setInitialIndent( 0 )
+                                                        .setIndent( 7+maxNameLen )
+                                                        .setWidth( CATCH_CONFIG_CONSOLE_WIDTH - maxNameLen-8 ) );
+            Catch::cout() << "  "
+                    << it->first
+                    << ':'
+                    << std::string( maxNameLen - it->first.size() + 2, ' ' )
+                    << wrapper << '\n';
+        }
+        Catch::cout() << std::endl;
+        return factories.size();
+    }
+
+    inline Option<std::size_t> list( Config const& config ) {
+        Option<std::size_t> listedCount;
+        if( config.listTests() || ( config.listExtraInfo() && !config.listTestNamesOnly() ) )
+            listedCount = listedCount.valueOr(0) + listTests( config );
+        if( config.listTestNamesOnly() )
+            listedCount = listedCount.valueOr(0) + listTestsNamesOnly( config );
+        if( config.listTags() )
+            listedCount = listedCount.valueOr(0) + listTags( config );
+        if( config.listReporters() )
+            listedCount = listedCount.valueOr(0) + listReporters( config );
+        return listedCount;
+    }
+
+} // end namespace Catch
+
+// #included from: internal/catch_run_context.hpp
+#define TWOBLUECUBES_CATCH_RUNNER_IMPL_HPP_INCLUDED
+
+// #included from: catch_test_case_tracker.hpp
+#define TWOBLUECUBES_CATCH_TEST_CASE_TRACKER_HPP_INCLUDED
+
+#include <algorithm>
+#include <string>
+#include <assert.h>
+#include <vector>
+#include <stdexcept>
+
+CATCH_INTERNAL_SUPPRESS_ETD_WARNINGS
+
+namespace Catch {
+namespace TestCaseTracking {
+
+    struct NameAndLocation {
+        std::string name;
+        SourceLineInfo location;
+
+        NameAndLocation( std::string const& _name, SourceLineInfo const& _location )
+        :   name( _name ),
+            location( _location )
+        {}
+    };
+
+    struct ITracker : SharedImpl<> {
+        virtual ~ITracker();
+
+        // static queries
+        virtual NameAndLocation const& nameAndLocation() const = 0;
+
+        // dynamic queries
+        virtual bool isComplete() const = 0; // Successfully completed or failed
+        virtual bool isSuccessfullyCompleted() const = 0;
+        virtual bool isOpen() const = 0; // Started but not complete
+        virtual bool hasChildren() const = 0;
+
+        virtual ITracker& parent() = 0;
+
+        // actions
+        virtual void close() = 0; // Successfully complete
+        virtual void fail() = 0;
+        virtual void markAsNeedingAnotherRun() = 0;
+
+        virtual void addChild( Ptr<ITracker> const& child ) = 0;
+        virtual ITracker* findChild( NameAndLocation const& nameAndLocation ) = 0;
+        virtual void openChild() = 0;
+
+        // Debug/ checking
+        virtual bool isSectionTracker() const = 0;
+        virtual bool isIndexTracker() const = 0;
+    };
+
+    class  TrackerContext {
+
+        enum RunState {
+            NotStarted,
+            Executing,
+            CompletedCycle
+        };
+
+        Ptr<ITracker> m_rootTracker;
+        ITracker* m_currentTracker;
+        RunState m_runState;
+
+    public:
+
+        static TrackerContext& instance() {
+            static TrackerContext s_instance;
+            return s_instance;
+        }
+
+        TrackerContext()
+        :   m_currentTracker( CATCH_NULL ),
+            m_runState( NotStarted )
+        {}
+
+        ITracker& startRun();
+
+        void endRun() {
+            m_rootTracker.reset();
+            m_currentTracker = CATCH_NULL;
+            m_runState = NotStarted;
+        }
+
+        void startCycle() {
+            m_currentTracker = m_rootTracker.get();
+            m_runState = Executing;
+        }
+        void completeCycle() {
+            m_runState = CompletedCycle;
+        }
+
+        bool completedCycle() const {
+            return m_runState == CompletedCycle;
+        }
+        ITracker& currentTracker() {
+            return *m_currentTracker;
+        }
+        void setCurrentTracker( ITracker* tracker ) {
+            m_currentTracker = tracker;
+        }
+    };
+
+    class TrackerBase : public ITracker {
+    protected:
+        enum CycleState {
+            NotStarted,
+            Executing,
+            ExecutingChildren,
+            NeedsAnotherRun,
+            CompletedSuccessfully,
+            Failed
+        };
+        class TrackerHasName {
+            NameAndLocation m_nameAndLocation;
+        public:
+            TrackerHasName( NameAndLocation const& nameAndLocation ) : m_nameAndLocation( nameAndLocation ) {}
+            bool operator ()( Ptr<ITracker> const& tracker ) {
+                return
+                    tracker->nameAndLocation().name == m_nameAndLocation.name &&
+                    tracker->nameAndLocation().location == m_nameAndLocation.location;
+            }
+        };
+        typedef std::vector<Ptr<ITracker> > Children;
+        NameAndLocation m_nameAndLocation;
+        TrackerContext& m_ctx;
+        ITracker* m_parent;
+        Children m_children;
+        CycleState m_runState;
+    public:
+        TrackerBase( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+        :   m_nameAndLocation( nameAndLocation ),
+            m_ctx( ctx ),
+            m_parent( parent ),
+            m_runState( NotStarted )
+        {}
+        virtual ~TrackerBase();
+
+        virtual NameAndLocation const& nameAndLocation() const CATCH_OVERRIDE {
+            return m_nameAndLocation;
+        }
+        virtual bool isComplete() const CATCH_OVERRIDE {
+            return m_runState == CompletedSuccessfully || m_runState == Failed;
+        }
+        virtual bool isSuccessfullyCompleted() const CATCH_OVERRIDE {
+            return m_runState == CompletedSuccessfully;
+        }
+        virtual bool isOpen() const CATCH_OVERRIDE {
+            return m_runState != NotStarted && !isComplete();
+        }
+        virtual bool hasChildren() const CATCH_OVERRIDE {
+            return !m_children.empty();
+        }
+
+        virtual void addChild( Ptr<ITracker> const& child ) CATCH_OVERRIDE {
+            m_children.push_back( child );
+        }
+
+        virtual ITracker* findChild( NameAndLocation const& nameAndLocation ) CATCH_OVERRIDE {
+            Children::const_iterator it = std::find_if( m_children.begin(), m_children.end(), TrackerHasName( nameAndLocation ) );
+            return( it != m_children.end() )
+                ? it->get()
+                : CATCH_NULL;
+        }
+        virtual ITracker& parent() CATCH_OVERRIDE {
+            assert( m_parent ); // Should always be non-null except for root
+            return *m_parent;
+        }
+
+        virtual void openChild() CATCH_OVERRIDE {
+            if( m_runState != ExecutingChildren ) {
+                m_runState = ExecutingChildren;
+                if( m_parent )
+                    m_parent->openChild();
+            }
+        }
+
+        virtual bool isSectionTracker() const CATCH_OVERRIDE { return false; }
+        virtual bool isIndexTracker() const CATCH_OVERRIDE { return false; }
+
+        void open() {
+            m_runState = Executing;
+            moveToThis();
+            if( m_parent )
+                m_parent->openChild();
+        }
+
+        virtual void close() CATCH_OVERRIDE {
+
+            // Close any still open children (e.g. generators)
+            while( &m_ctx.currentTracker() != this )
+                m_ctx.currentTracker().close();
+
+            switch( m_runState ) {
+                case NotStarted:
+                case CompletedSuccessfully:
+                case Failed:
+                    throw std::logic_error( "Illogical state" );
+
+                case NeedsAnotherRun:
+                    break;;
+
+                case Executing:
+                    m_runState = CompletedSuccessfully;
+                    break;
+                case ExecutingChildren:
+                    if( m_children.empty() || m_children.back()->isComplete() )
+                        m_runState = CompletedSuccessfully;
+                    break;
+
+                default:
+                    throw std::logic_error( "Unexpected state" );
+            }
+            moveToParent();
+            m_ctx.completeCycle();
+        }
+        virtual void fail() CATCH_OVERRIDE {
+            m_runState = Failed;
+            if( m_parent )
+                m_parent->markAsNeedingAnotherRun();
+            moveToParent();
+            m_ctx.completeCycle();
+        }
+        virtual void markAsNeedingAnotherRun() CATCH_OVERRIDE {
+            m_runState = NeedsAnotherRun;
+        }
+    private:
+        void moveToParent() {
+            assert( m_parent );
+            m_ctx.setCurrentTracker( m_parent );
+        }
+        void moveToThis() {
+            m_ctx.setCurrentTracker( this );
+        }
+    };
+
+    class SectionTracker : public TrackerBase {
+        std::vector<std::string> m_filters;
+    public:
+        SectionTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent )
+        :   TrackerBase( nameAndLocation, ctx, parent )
+        {
+            if( parent ) {
+                while( !parent->isSectionTracker() )
+                    parent = &parent->parent();
+
+                SectionTracker& parentSection = static_cast<SectionTracker&>( *parent );
+                addNextFilters( parentSection.m_filters );
+            }
+        }
+        virtual ~SectionTracker();
+
+        virtual bool isSectionTracker() const CATCH_OVERRIDE { return true; }
+
+        static SectionTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation ) {
+            SectionTracker* section = CATCH_NULL;
+
+            ITracker& currentTracker = ctx.currentTracker();
+            if( ITracker* childTracker = currentTracker.findChild( nameAndLocation ) ) {
+                assert( childTracker );
+                assert( childTracker->isSectionTracker() );
+                section = static_cast<SectionTracker*>( childTracker );
+            }
+            else {
+                section = new SectionTracker( nameAndLocation, ctx, &currentTracker );
+                currentTracker.addChild( section );
+            }
+            if( !ctx.completedCycle() )
+                section->tryOpen();
+            return *section;
+        }
+
+        void tryOpen() {
+            if( !isComplete() && (m_filters.empty() || m_filters[0].empty() ||  m_filters[0] == m_nameAndLocation.name ) )
+                open();
+        }
+
+        void addInitialFilters( std::vector<std::string> const& filters ) {
+            if( !filters.empty() ) {
+                m_filters.push_back(""); // Root - should never be consulted
+                m_filters.push_back(""); // Test Case - not a section filter
+                m_filters.insert( m_filters.end(), filters.begin(), filters.end() );
+            }
+        }
+        void addNextFilters( std::vector<std::string> const& filters ) {
+            if( filters.size() > 1 )
+                m_filters.insert( m_filters.end(), ++filters.begin(), filters.end() );
+        }
+    };
+
+    class IndexTracker : public TrackerBase {
+        int m_size;
+        int m_index;
+    public:
+        IndexTracker( NameAndLocation const& nameAndLocation, TrackerContext& ctx, ITracker* parent, int size )
+        :   TrackerBase( nameAndLocation, ctx, parent ),
+            m_size( size ),
+            m_index( -1 )
+        {}
+        virtual ~IndexTracker();
+
+        virtual bool isIndexTracker() const CATCH_OVERRIDE { return true; }
+
+        static IndexTracker& acquire( TrackerContext& ctx, NameAndLocation const& nameAndLocation, int size ) {
+            IndexTracker* tracker = CATCH_NULL;
+
+            ITracker& currentTracker = ctx.currentTracker();
+            if( ITracker* childTracker = currentTracker.findChild( nameAndLocation ) ) {
+                assert( childTracker );
+                assert( childTracker->isIndexTracker() );
+                tracker = static_cast<IndexTracker*>( childTracker );
+            }
+            else {
+                tracker = new IndexTracker( nameAndLocation, ctx, &currentTracker, size );
+                currentTracker.addChild( tracker );
+            }
+
+            if( !ctx.completedCycle() && !tracker->isComplete() ) {
+                if( tracker->m_runState != ExecutingChildren && tracker->m_runState != NeedsAnotherRun )
+                    tracker->moveNext();
+                tracker->open();
+            }
+
+            return *tracker;
+        }
+
+        int index() const { return m_index; }
+
+        void moveNext() {
+            m_index++;
+            m_children.clear();
+        }
+
+        virtual void close() CATCH_OVERRIDE {
+            TrackerBase::close();
+            if( m_runState == CompletedSuccessfully && m_index < m_size-1 )
+                m_runState = Executing;
+        }
+    };
+
+    inline ITracker& TrackerContext::startRun() {
+        m_rootTracker = new SectionTracker( NameAndLocation( "{root}", CATCH_INTERNAL_LINEINFO ), *this, CATCH_NULL );
+        m_currentTracker = CATCH_NULL;
+        m_runState = Executing;
+        return *m_rootTracker;
+    }
+
+} // namespace TestCaseTracking
+
+using TestCaseTracking::ITracker;
+using TestCaseTracking::TrackerContext;
+using TestCaseTracking::SectionTracker;
+using TestCaseTracking::IndexTracker;
+
+} // namespace Catch
+
+CATCH_INTERNAL_UNSUPPRESS_ETD_WARNINGS
+
+// #included from: catch_fatal_condition.hpp
+#define TWOBLUECUBES_CATCH_FATAL_CONDITION_H_INCLUDED
+
+namespace Catch {
+
+    // Report the error condition
+    inline void reportFatal( std::string const& message ) {
+        IContext& context = Catch::getCurrentContext();
+        IResultCapture* resultCapture = context.getResultCapture();
+        resultCapture->handleFatalErrorCondition( message );
+    }
+
+} // namespace Catch
+
+#if defined ( CATCH_PLATFORM_WINDOWS ) /////////////////////////////////////////
+// #included from: catch_windows_h_proxy.h
+
+#define TWOBLUECUBES_CATCH_WINDOWS_H_PROXY_H_INCLUDED
+
+#ifdef CATCH_DEFINES_NOMINMAX
+#  define NOMINMAX
+#endif
+#ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef __AFXDLL
+#include <AfxWin.h>
+#else
+#include <windows.h>
+#endif
+
+#ifdef CATCH_DEFINES_NOMINMAX
+#  undef NOMINMAX
+#endif
+#ifdef CATCH_DEFINES_WIN32_LEAN_AND_MEAN
+#  undef WIN32_LEAN_AND_MEAN
+#endif
+
+
+#  if !defined ( CATCH_CONFIG_WINDOWS_SEH )
+
+namespace Catch {
+    struct FatalConditionHandler {
+        void reset() {}
+    };
+}
+
+#  else // CATCH_CONFIG_WINDOWS_SEH is defined
+
+namespace Catch {
+
+    struct SignalDefs { DWORD id; const char* name; };
+    extern SignalDefs signalDefs[];
+    // There is no 1-1 mapping between signals and windows exceptions.
+    // Windows can easily distinguish between SO and SigSegV,
+    // but SigInt, SigTerm, etc are handled differently.
+    SignalDefs signalDefs[] = {
+        { EXCEPTION_ILLEGAL_INSTRUCTION,  "SIGILL - Illegal instruction signal" },
+        { EXCEPTION_STACK_OVERFLOW, "SIGSEGV - Stack overflow" },
+        { EXCEPTION_ACCESS_VIOLATION, "SIGSEGV - Segmentation violation signal" },
+        { EXCEPTION_INT_DIVIDE_BY_ZERO, "Divide by zero error" },
+    };
+
+    struct FatalConditionHandler {
+
+        static LONG CALLBACK handleVectoredException(PEXCEPTION_POINTERS ExceptionInfo) {
+            for (int i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
+                if (ExceptionInfo->ExceptionRecord->ExceptionCode == signalDefs[i].id) {
+                    reportFatal(signalDefs[i].name);
+                }
+            }
+            // If its not an exception we care about, pass it along.
+            // This stops us from eating debugger breaks etc.
+            return EXCEPTION_CONTINUE_SEARCH;
+        }
+
+        FatalConditionHandler() {
+            isSet = true;
+            // 32k seems enough for Catch to handle stack overflow,
+            // but the value was found experimentally, so there is no strong guarantee
+            guaranteeSize = 32 * 1024;
+            exceptionHandlerHandle = CATCH_NULL;
+            // Register as first handler in current chain
+            exceptionHandlerHandle = AddVectoredExceptionHandler(1, handleVectoredException);
+            // Pass in guarantee size to be filled
+            SetThreadStackGuarantee(&guaranteeSize);
+        }
+
+        static void reset() {
+            if (isSet) {
+                // Unregister handler and restore the old guarantee
+                RemoveVectoredExceptionHandler(exceptionHandlerHandle);
+                SetThreadStackGuarantee(&guaranteeSize);
+                exceptionHandlerHandle = CATCH_NULL;
+                isSet = false;
+            }
+        }
+
+        ~FatalConditionHandler() {
+            reset();
+        }
+    private:
+        static bool isSet;
+        static ULONG guaranteeSize;
+        static PVOID exceptionHandlerHandle;
+    };
+
+    bool FatalConditionHandler::isSet = false;
+    ULONG FatalConditionHandler::guaranteeSize = 0;
+    PVOID FatalConditionHandler::exceptionHandlerHandle = CATCH_NULL;
+
+} // namespace Catch
+
+#  endif // CATCH_CONFIG_WINDOWS_SEH
+
+#else // Not Windows - assumed to be POSIX compatible //////////////////////////
+
+#  if !defined(CATCH_CONFIG_POSIX_SIGNALS)
+
+namespace Catch {
+    struct FatalConditionHandler {
+        void reset() {}
+    };
+}
+
+#  else // CATCH_CONFIG_POSIX_SIGNALS is defined
+
+#include <signal.h>
+
+namespace Catch {
+
+    struct SignalDefs {
+        int id;
+        const char* name;
+    };
+    extern SignalDefs signalDefs[];
+    SignalDefs signalDefs[] = {
+            { SIGINT,  "SIGINT - Terminal interrupt signal" },
+            { SIGILL,  "SIGILL - Illegal instruction signal" },
+            { SIGFPE,  "SIGFPE - Floating point error signal" },
+            { SIGSEGV, "SIGSEGV - Segmentation violation signal" },
+            { SIGTERM, "SIGTERM - Termination request signal" },
+            { SIGABRT, "SIGABRT - Abort (abnormal termination) signal" }
+    };
+
+    struct FatalConditionHandler {
+
+        static bool isSet;
+        static struct sigaction oldSigActions [sizeof(signalDefs)/sizeof(SignalDefs)];
+        static stack_t oldSigStack;
+        static char altStackMem[SIGSTKSZ];
+
+        static void handleSignal( int sig ) {
+            std::string name = "<unknown signal>";
+            for (std::size_t i = 0; i < sizeof(signalDefs) / sizeof(SignalDefs); ++i) {
+                SignalDefs &def = signalDefs[i];
+                if (sig == def.id) {
+                    name = def.name;
+                    break;
+                }
+            }
+            reset();
+            reportFatal(name);
+            raise( sig );
+        }
+
+        FatalConditionHandler() {
+            isSet = true;
+            stack_t sigStack;
+            sigStack.ss_sp = altStackMem;
+            sigStack.ss_size = SIGSTKSZ;
+            sigStack.ss_flags = 0;
+            sigaltstack(&sigStack, &oldSigStack);
+            struct sigaction sa = { 0 };
+
+            sa.sa_handler = handleSignal;
+            sa.sa_flags = SA_ONSTACK;
+            for (std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i) {
+                sigaction(signalDefs[i].id, &sa, &oldSigActions[i]);
+            }
+        }
+
+        ~FatalConditionHandler() {
+            reset();
+        }
+        static void reset() {
+            if( isSet ) {
+                // Set signals back to previous values -- hopefully nobody overwrote them in the meantime
+                for( std::size_t i = 0; i < sizeof(signalDefs)/sizeof(SignalDefs); ++i ) {
+                    sigaction(signalDefs[i].id, &oldSigActions[i], CATCH_NULL);
+                }
+                // Return the old stack
+                sigaltstack(&oldSigStack, CATCH_NULL);
+                isSet = false;
+            }
+        }
+    };
+
+    bool FatalConditionHandler::isSet = false;
+    struct sigaction FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] = {};
+    stack_t FatalConditionHandler::oldSigStack = {};
+    char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
+
+} // namespace Catch
+
+#  endif // CATCH_CONFIG_POSIX_SIGNALS
+
+#endif // not Windows
+
+#include <cassert>
+#include <set>
+#include <string>
+
+namespace Catch {
+
+    class StreamRedirect {
+
+    public:
+        StreamRedirect( std::ostream& stream, std::string& targetString )
+        :   m_stream( stream ),
+            m_prevBuf( stream.rdbuf() ),
+            m_targetString( targetString )
+        {
+            stream.rdbuf( m_oss.rdbuf() );
+        }
+
+        ~StreamRedirect() {
+            m_targetString += m_oss.str();
+            m_stream.rdbuf( m_prevBuf );
+        }
+
+    private:
+        std::ostream& m_stream;
+        std::streambuf* m_prevBuf;
+        std::ostringstream m_oss;
+        std::string& m_targetString;
+    };
+
+    // StdErr has two constituent streams in C++, std::cerr and std::clog
+    // This means that we need to redirect 2 streams into 1 to keep proper
+    // order of writes and cannot use StreamRedirect on its own
+    class StdErrRedirect {
+    public:
+        StdErrRedirect(std::string& targetString)
+        :m_cerrBuf( cerr().rdbuf() ), m_clogBuf(clog().rdbuf()),
+        m_targetString(targetString){
+            cerr().rdbuf(m_oss.rdbuf());
+            clog().rdbuf(m_oss.rdbuf());
+        }
+        ~StdErrRedirect() {
+            m_targetString += m_oss.str();
+            cerr().rdbuf(m_cerrBuf);
+            clog().rdbuf(m_clogBuf);
+        }
+    private:
+        std::streambuf* m_cerrBuf;
+        std::streambuf* m_clogBuf;
+        std::ostringstream m_oss;
+        std::string& m_targetString;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class RunContext : public IResultCapture, public IRunner {
+
+        RunContext( RunContext const& );
+        void operator =( RunContext const& );
+
+    public:
+
+        explicit RunContext( Ptr<IConfig const> const& _config, Ptr<IStreamingReporter> const& reporter )
+        :   m_runInfo( _config->name() ),
+            m_context( getCurrentMutableContext() ),
+            m_activeTestCase( CATCH_NULL ),
+            m_config( _config ),
+            m_reporter( reporter ),
+            m_shouldReportUnexpected ( true )
+        {
+            m_context.setRunner( this );
+            m_context.setConfig( m_config );
+            m_context.setResultCapture( this );
+            m_reporter->testRunStarting( m_runInfo );
+        }
+
+        virtual ~RunContext() {
+            m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) );
+        }
+
+        void testGroupStarting( std::string const& testSpec, std::size_t groupIndex, std::size_t groupsCount ) {
+            m_reporter->testGroupStarting( GroupInfo( testSpec, groupIndex, groupsCount ) );
+        }
+        void testGroupEnded( std::string const& testSpec, Totals const& totals, std::size_t groupIndex, std::size_t groupsCount ) {
+            m_reporter->testGroupEnded( TestGroupStats( GroupInfo( testSpec, groupIndex, groupsCount ), totals, aborting() ) );
+        }
+
+        Totals runTest( TestCase const& testCase ) {
+            Totals prevTotals = m_totals;
+
+            std::string redirectedCout;
+            std::string redirectedCerr;
+
+            TestCaseInfo testInfo = testCase.getTestCaseInfo();
+
+            m_reporter->testCaseStarting( testInfo );
+
+            m_activeTestCase = &testCase;
+
+            do {
+                ITracker& rootTracker = m_trackerContext.startRun();
+                assert( rootTracker.isSectionTracker() );
+                static_cast<SectionTracker&>( rootTracker ).addInitialFilters( m_config->getSectionsToRun() );
+                do {
+                    m_trackerContext.startCycle();
+                    m_testCaseTracker = &SectionTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( testInfo.name, testInfo.lineInfo ) );
+                    runCurrentTest( redirectedCout, redirectedCerr );
+                }
+                while( !m_testCaseTracker->isSuccessfullyCompleted() && !aborting() );
+            }
+            // !TBD: deprecated - this will be replaced by indexed trackers
+            while( getCurrentContext().advanceGeneratorsForCurrentTest() && !aborting() );
+
+            Totals deltaTotals = m_totals.delta( prevTotals );
+            if( testInfo.expectedToFail() && deltaTotals.testCases.passed > 0 ) {
+                deltaTotals.assertions.failed++;
+                deltaTotals.testCases.passed--;
+                deltaTotals.testCases.failed++;
+            }
+            m_totals.testCases += deltaTotals.testCases;
+            m_reporter->testCaseEnded( TestCaseStats(   testInfo,
+                                                        deltaTotals,
+                                                        redirectedCout,
+                                                        redirectedCerr,
+                                                        aborting() ) );
+
+            m_activeTestCase = CATCH_NULL;
+            m_testCaseTracker = CATCH_NULL;
+
+            return deltaTotals;
+        }
+
+        Ptr<IConfig const> config() const {
+            return m_config;
+        }
+
+    private: // IResultCapture
+
+        virtual void assertionEnded( AssertionResult const& result ) {
+            if( result.getResultType() == ResultWas::Ok ) {
+                m_totals.assertions.passed++;
+            }
+            else if( !result.isOk() ) {
+                if( m_activeTestCase->getTestCaseInfo().okToFail() )
+                    m_totals.assertions.failedButOk++;
+                else
+                    m_totals.assertions.failed++;
+            }
+
+            // We have no use for the return value (whether messages should be cleared), because messages were made scoped
+            // and should be let to clear themselves out.
+            static_cast<void>(m_reporter->assertionEnded(AssertionStats(result, m_messages, m_totals)));
+
+            // Reset working state
+            m_lastAssertionInfo = AssertionInfo( "", m_lastAssertionInfo.lineInfo, "{Unknown expression after the reported line}" , m_lastAssertionInfo.resultDisposition );
+            m_lastResult = result;
+        }
+
+        virtual bool lastAssertionPassed()
+        {
+            return m_totals.assertions.passed == (m_prevPassed + 1);
+        }
+
+        virtual void assertionPassed()
+        {
+            m_totals.assertions.passed++;
+            m_lastAssertionInfo.capturedExpression = "{Unknown expression after the reported line}";
+            m_lastAssertionInfo.macroName = "";
+        }
+
+        virtual void assertionRun()
+        {
+            m_prevPassed = m_totals.assertions.passed;
+        }
+
+        virtual bool sectionStarted (
+            SectionInfo const& sectionInfo,
+            Counts& assertions
+        )
+        {
+            ITracker& sectionTracker = SectionTracker::acquire( m_trackerContext, TestCaseTracking::NameAndLocation( sectionInfo.name, sectionInfo.lineInfo ) );
+            if( !sectionTracker.isOpen() )
+                return false;
+            m_activeSections.push_back( &sectionTracker );
+
+            m_lastAssertionInfo.lineInfo = sectionInfo.lineInfo;
+
+            m_reporter->sectionStarting( sectionInfo );
+
+            assertions = m_totals.assertions;
+
+            return true;
+        }
+        bool testForMissingAssertions( Counts& assertions ) {
+            if( assertions.total() != 0 )
+                return false;
+            if( !m_config->warnAboutMissingAssertions() )
+                return false;
+            if( m_trackerContext.currentTracker().hasChildren() )
+                return false;
+            m_totals.assertions.failed++;
+            assertions.failed++;
+            return true;
+        }
+
+        virtual void sectionEnded( SectionEndInfo const& endInfo ) {
+            Counts assertions = m_totals.assertions - endInfo.prevAssertions;
+            bool missingAssertions = testForMissingAssertions( assertions );
+
+            if( !m_activeSections.empty() ) {
+                m_activeSections.back()->close();
+                m_activeSections.pop_back();
+            }
+
+            m_reporter->sectionEnded( SectionStats( endInfo.sectionInfo, assertions, endInfo.durationInSeconds, missingAssertions ) );
+            m_messages.clear();
+        }
+
+        virtual void sectionEndedEarly( SectionEndInfo const& endInfo ) {
+            if( m_unfinishedSections.empty() )
+                m_activeSections.back()->fail();
+            else
+                m_activeSections.back()->close();
+            m_activeSections.pop_back();
+
+            m_unfinishedSections.push_back( endInfo );
+        }
+
+        virtual void pushScopedMessage( MessageInfo const& message ) {
+            m_messages.push_back( message );
+        }
+
+        virtual void popScopedMessage( MessageInfo const& message ) {
+            m_messages.erase( std::remove( m_messages.begin(), m_messages.end(), message ), m_messages.end() );
+        }
+
+        virtual std::string getCurrentTestName() const {
+            return m_activeTestCase
+                ? m_activeTestCase->getTestCaseInfo().name
+                : std::string();
+        }
+
+        virtual const AssertionResult* getLastResult() const {
+            return &m_lastResult;
+        }
+
+        virtual void exceptionEarlyReported() {
+            m_shouldReportUnexpected = false;
+        }
+
+        virtual void handleFatalErrorCondition( std::string const& message ) {
+            // Don't rebuild the result -- the stringification itself can cause more fatal errors
+            // Instead, fake a result data.
+            AssertionResultData tempResult;
+            tempResult.resultType = ResultWas::FatalErrorCondition;
+            tempResult.message = message;
+            AssertionResult result(m_lastAssertionInfo, tempResult);
+
+            getResultCapture().assertionEnded(result);
+
+            handleUnfinishedSections();
+
+            // Recreate section for test case (as we will lose the one that was in scope)
+            TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+            SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description );
+
+            Counts assertions;
+            assertions.failed = 1;
+            SectionStats testCaseSectionStats( testCaseSection, assertions, 0, false );
+            m_reporter->sectionEnded( testCaseSectionStats );
+
+            TestCaseInfo testInfo = m_activeTestCase->getTestCaseInfo();
+
+            Totals deltaTotals;
+            deltaTotals.testCases.failed = 1;
+            deltaTotals.assertions.failed = 1;
+            m_reporter->testCaseEnded( TestCaseStats(   testInfo,
+                                                        deltaTotals,
+                                                        std::string(),
+                                                        std::string(),
+                                                        false ) );
+            m_totals.testCases.failed++;
+            testGroupEnded( std::string(), m_totals, 1, 1 );
+            m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, false ) );
+        }
+
+    public:
+        // !TBD We need to do this another way!
+        bool aborting() const {
+            return m_totals.assertions.failed == static_cast<std::size_t>( m_config->abortAfter() );
+        }
+
+    private:
+
+        void runCurrentTest( std::string& redirectedCout, std::string& redirectedCerr ) {
+            TestCaseInfo const& testCaseInfo = m_activeTestCase->getTestCaseInfo();
+            SectionInfo testCaseSection( testCaseInfo.lineInfo, testCaseInfo.name, testCaseInfo.description );
+            m_reporter->sectionStarting( testCaseSection );
+            Counts prevAssertions = m_totals.assertions;
+            double duration = 0;
+            m_shouldReportUnexpected = true;
+            try {
+                m_lastAssertionInfo = AssertionInfo( "TEST_CASE", testCaseInfo.lineInfo, "", ResultDisposition::Normal );
+
+                seedRng( *m_config );
+
+                Timer timer;
+                timer.start();
+                if( m_reporter->getPreferences().shouldRedirectStdOut ) {
+                    StreamRedirect coutRedir( Catch::cout(), redirectedCout );
+                    StdErrRedirect errRedir( redirectedCerr );
+                    invokeActiveTestCase();
+                }
+                else {
+                    invokeActiveTestCase();
+                }
+                duration = timer.getElapsedSeconds();
+            }
+            catch( TestFailureException& ) {
+                // This just means the test was aborted due to failure
+            }
+            catch(...) {
+                // Under CATCH_CONFIG_FAST_COMPILE, unexpected exceptions under REQUIRE assertions
+                // are reported without translation at the point of origin.
+                if (m_shouldReportUnexpected) {
+                    makeUnexpectedResultBuilder().useActiveException();
+                }
+            }
+            m_testCaseTracker->close();
+            handleUnfinishedSections();
+            m_messages.clear();
+
+            Counts assertions = m_totals.assertions - prevAssertions;
+            bool missingAssertions = testForMissingAssertions( assertions );
+
+            SectionStats testCaseSectionStats( testCaseSection, assertions, duration, missingAssertions );
+            m_reporter->sectionEnded( testCaseSectionStats );
+        }
+
+        void invokeActiveTestCase() {
+            FatalConditionHandler fatalConditionHandler; // Handle signals
+            m_activeTestCase->invoke();
+            fatalConditionHandler.reset();
+        }
+
+    private:
+
+        ResultBuilder makeUnexpectedResultBuilder() const {
+            return ResultBuilder(   m_lastAssertionInfo.macroName,
+                                    m_lastAssertionInfo.lineInfo,
+                                    m_lastAssertionInfo.capturedExpression,
+                                    m_lastAssertionInfo.resultDisposition );
+        }
+
+        void handleUnfinishedSections() {
+            // If sections ended prematurely due to an exception we stored their
+            // infos here so we can tear them down outside the unwind process.
+            for( std::vector<SectionEndInfo>::const_reverse_iterator it = m_unfinishedSections.rbegin(),
+                        itEnd = m_unfinishedSections.rend();
+                    it != itEnd;
+                    ++it )
+                sectionEnded( *it );
+            m_unfinishedSections.clear();
+        }
+
+        TestRunInfo m_runInfo;
+        IMutableContext& m_context;
+        TestCase const* m_activeTestCase;
+        ITracker* m_testCaseTracker;
+        ITracker* m_currentSectionTracker;
+        AssertionResult m_lastResult;
+
+        Ptr<IConfig const> m_config;
+        Totals m_totals;
+        Ptr<IStreamingReporter> m_reporter;
+        std::vector<MessageInfo> m_messages;
+        AssertionInfo m_lastAssertionInfo;
+        std::vector<SectionEndInfo> m_unfinishedSections;
+        std::vector<ITracker*> m_activeSections;
+        TrackerContext m_trackerContext;
+        size_t m_prevPassed;
+        bool m_shouldReportUnexpected;
+    };
+
+    IResultCapture& getResultCapture() {
+        if( IResultCapture* capture = getCurrentContext().getResultCapture() )
+            return *capture;
+        else
+            throw std::logic_error( "No result capture instance" );
+    }
+
+} // end namespace Catch
+
+// #included from: internal/catch_version.h
+#define TWOBLUECUBES_CATCH_VERSION_H_INCLUDED
+
+namespace Catch {
+
+    // Versioning information
+    struct Version {
+        Version(    unsigned int _majorVersion,
+                    unsigned int _minorVersion,
+                    unsigned int _patchNumber,
+                    char const * const _branchName,
+                    unsigned int _buildNumber );
+
+        unsigned int const majorVersion;
+        unsigned int const minorVersion;
+        unsigned int const patchNumber;
+
+        // buildNumber is only used if branchName is not null
+        char const * const branchName;
+        unsigned int const buildNumber;
+
+        friend std::ostream& operator << ( std::ostream& os, Version const& version );
+
+    private:
+        void operator=( Version const& );
+    };
+
+    inline Version libraryVersion();
+}
+
+#include <fstream>
+#include <stdlib.h>
+#include <limits>
+
+namespace Catch {
+
+    Ptr<IStreamingReporter> createReporter( std::string const& reporterName, Ptr<Config> const& config ) {
+        Ptr<IStreamingReporter> reporter = getRegistryHub().getReporterRegistry().create( reporterName, config.get() );
+        if( !reporter ) {
+            std::ostringstream oss;
+            oss << "No reporter registered with name: '" << reporterName << "'";
+            throw std::domain_error( oss.str() );
+        }
+        return reporter;
+    }
+
+#if !defined(CATCH_CONFIG_DEFAULT_REPORTER)
+#define CATCH_CONFIG_DEFAULT_REPORTER "console"
+#endif
+
+    Ptr<IStreamingReporter> makeReporter( Ptr<Config> const& config ) {
+        std::vector<std::string> reporters = config->getReporterNames();
+        if( reporters.empty() )
+            reporters.push_back( CATCH_CONFIG_DEFAULT_REPORTER );
+
+        Ptr<IStreamingReporter> reporter;
+        for( std::vector<std::string>::const_iterator it = reporters.begin(), itEnd = reporters.end();
+                it != itEnd;
+                ++it )
+            reporter = addReporter( reporter, createReporter( *it, config ) );
+        return reporter;
+    }
+    Ptr<IStreamingReporter> addListeners( Ptr<IConfig const> const& config, Ptr<IStreamingReporter> reporters ) {
+        IReporterRegistry::Listeners listeners = getRegistryHub().getReporterRegistry().getListeners();
+        for( IReporterRegistry::Listeners::const_iterator it = listeners.begin(), itEnd = listeners.end();
+                it != itEnd;
+                ++it )
+            reporters = addReporter(reporters, (*it)->create( ReporterConfig( config ) ) );
+        return reporters;
+    }
+
+    Totals runTests( Ptr<Config> const& config ) {
+
+        Ptr<IConfig const> iconfig = config.get();
+
+        Ptr<IStreamingReporter> reporter = makeReporter( config );
+        reporter = addListeners( iconfig, reporter );
+
+        RunContext context( iconfig, reporter );
+
+        Totals totals;
+
+        context.testGroupStarting( config->name(), 1, 1 );
+
+        TestSpec testSpec = config->testSpec();
+        if( !testSpec.hasFilters() )
+            testSpec = TestSpecParser( ITagAliasRegistry::get() ).parse( "~[.]" ).testSpec(); // All not hidden tests
+
+        std::vector<TestCase> const& allTestCases = getAllTestCasesSorted( *iconfig );
+        for( std::vector<TestCase>::const_iterator it = allTestCases.begin(), itEnd = allTestCases.end();
+                it != itEnd;
+                ++it ) {
+            if( !context.aborting() && matchTest( *it, testSpec, *iconfig ) )
+                totals += context.runTest( *it );
+            else
+                reporter->skipTest( *it );
+        }
+
+        context.testGroupEnded( iconfig->name(), totals, 1, 1 );
+        return totals;
+    }
+
+    void applyFilenamesAsTags( IConfig const& config ) {
+        std::vector<TestCase> const& tests = getAllTestCasesSorted( config );
+        for(std::size_t i = 0; i < tests.size(); ++i ) {
+            TestCase& test = const_cast<TestCase&>( tests[i] );
+            std::set<std::string> tags = test.tags;
+
+            std::string filename = test.lineInfo.file;
+            std::string::size_type lastSlash = filename.find_last_of( "\\/" );
+            if( lastSlash != std::string::npos )
+                filename = filename.substr( lastSlash+1 );
+
+            std::string::size_type lastDot = filename.find_last_of( '.' );
+            if( lastDot != std::string::npos )
+                filename = filename.substr( 0, lastDot );
+
+            tags.insert( '#' + filename );
+            setTags( test, tags );
+        }
+    }
+
+    class Session : NonCopyable {
+        static bool alreadyInstantiated;
+
+    public:
+
+        struct OnUnusedOptions { enum DoWhat { Ignore, Fail }; };
+
+        Session()
+        : m_cli( makeCommandLineParser() ) {
+            if( alreadyInstantiated ) {
+                std::string msg = "Only one instance of Catch::Session can ever be used";
+                Catch::cerr() << msg << std::endl;
+                throw std::logic_error( msg );
+            }
+            alreadyInstantiated = true;
+        }
+        ~Session() {
+            Catch::cleanUp();
+        }
+
+        void showHelp( std::string const& processName ) {
+            Catch::cout() << "\nCatch v" << libraryVersion() << "\n";
+
+            m_cli.usage( Catch::cout(), processName );
+            Catch::cout() << "For more detail usage please see the project docs\n" << std::endl;
+        }
+        void libIdentify() {
+            Catch::cout()
+                    << std::left << std::setw(16) << "description: " << "A Catch test executable\n"
+                    << std::left << std::setw(16) << "category: " << "testframework\n"
+                    << std::left << std::setw(16) << "framework: " << "Catch Test\n"
+                    << std::left << std::setw(16) << "version: " << libraryVersion() << std::endl;
+        }
+
+        int applyCommandLine( int argc, char const* const* const argv, OnUnusedOptions::DoWhat unusedOptionBehaviour = OnUnusedOptions::Fail ) {
+            try {
+                m_cli.setThrowOnUnrecognisedTokens( unusedOptionBehaviour == OnUnusedOptions::Fail );
+                m_unusedTokens = m_cli.parseInto( Clara::argsToVector( argc, argv ), m_configData );
+                if( m_configData.showHelp )
+                    showHelp( m_configData.processName );
+                if( m_configData.libIdentify )
+                    libIdentify();
+                m_config.reset();
+            }
+            catch( std::exception& ex ) {
+                {
+                    Colour colourGuard( Colour::Red );
+                    Catch::cerr()
+                        << "\nError(s) in input:\n"
+                        << Text( ex.what(), TextAttributes().setIndent(2) )
+                        << "\n\n";
+                }
+                m_cli.usage( Catch::cout(), m_configData.processName );
+                return (std::numeric_limits<int>::max)();
+            }
+            return 0;
+        }
+
+        void useConfigData( ConfigData const& _configData ) {
+            m_configData = _configData;
+            m_config.reset();
+        }
+
+        int run( int argc, char const* const* const argv ) {
+
+            int returnCode = applyCommandLine( argc, argv );
+            if( returnCode == 0 )
+                returnCode = run();
+            return returnCode;
+        }
+
+    #if defined(WIN32) && defined(UNICODE)
+        int run( int argc, wchar_t const* const* const argv ) {
+
+            char **utf8Argv = new char *[ argc ];
+
+            for ( int i = 0; i < argc; ++i ) {
+                int bufSize = WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, NULL, 0, NULL, NULL );
+
+                utf8Argv[ i ] = new char[ bufSize ];
+
+                WideCharToMultiByte( CP_UTF8, 0, argv[i], -1, utf8Argv[i], bufSize, NULL, NULL );
+            }
+
+            int returnCode = applyCommandLine( argc, utf8Argv );
+            if( returnCode == 0 )
+                returnCode = run();
+
+            for ( int i = 0; i < argc; ++i )
+                delete [] utf8Argv[ i ];
+
+            delete [] utf8Argv;
+
+            return returnCode;
+        }
+    #endif
+
+        int run() {
+            if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeStart ) != 0 ) {
+                Catch::cout() << "...waiting for enter/ return before starting" << std::endl;
+                static_cast<void>(std::getchar());
+            }
+            int exitCode = runInternal();
+            if( ( m_configData.waitForKeypress & WaitForKeypress::BeforeExit ) != 0 ) {
+                Catch::cout() << "...waiting for enter/ return before exiting, with code: " << exitCode << std::endl;
+                static_cast<void>(std::getchar());
+            }
+            return exitCode;
+        }
+
+        Clara::CommandLine<ConfigData> const& cli() const {
+            return m_cli;
+        }
+        std::vector<Clara::Parser::Token> const& unusedTokens() const {
+            return m_unusedTokens;
+        }
+        ConfigData& configData() {
+            return m_configData;
+        }
+        Config& config() {
+            if( !m_config )
+                m_config = new Config( m_configData );
+            return *m_config;
+        }
+    private:
+
+        int runInternal() {
+            if( m_configData.showHelp || m_configData.libIdentify )
+                return 0;
+
+            try
+            {
+                config(); // Force config to be constructed
+
+                seedRng( *m_config );
+
+                if( m_configData.filenamesAsTags )
+                    applyFilenamesAsTags( *m_config );
+
+                // Handle list request
+                if( Option<std::size_t> listed = list( config() ) )
+                    return static_cast<int>( *listed );
+
+                return static_cast<int>( runTests( m_config ).assertions.failed );
+            }
+            catch( std::exception& ex ) {
+                Catch::cerr() << ex.what() << std::endl;
+                return (std::numeric_limits<int>::max)();
+            }
+        }
+
+        Clara::CommandLine<ConfigData> m_cli;
+        std::vector<Clara::Parser::Token> m_unusedTokens;
+        ConfigData m_configData;
+        Ptr<Config> m_config;
+    };
+
+    bool Session::alreadyInstantiated = false;
+
+} // end namespace Catch
+
+// #included from: catch_registry_hub.hpp
+#define TWOBLUECUBES_CATCH_REGISTRY_HUB_HPP_INCLUDED
+
+// #included from: catch_test_case_registry_impl.hpp
+#define TWOBLUECUBES_CATCH_TEST_CASE_REGISTRY_IMPL_HPP_INCLUDED
+
+#include <vector>
+#include <set>
+#include <sstream>
+#include <algorithm>
+
+namespace Catch {
+
+    struct RandomNumberGenerator {
+        typedef unsigned int result_type;
+
+        result_type operator()( result_type n ) const { return std::rand() % n; }
+
+#ifdef CATCH_CONFIG_CPP11_SHUFFLE
+        static constexpr result_type (min)() { return 0; }
+        static constexpr result_type (max)() { return 1000000; }
+        result_type operator()() const { return std::rand() % (max)(); }
+#endif
+        template<typename V>
+        static void shuffle( V& vector ) {
+            RandomNumberGenerator rng;
+#ifdef CATCH_CONFIG_CPP11_SHUFFLE
+            std::shuffle( vector.begin(), vector.end(), rng );
+#else
+            std::random_shuffle( vector.begin(), vector.end(), rng );
+#endif
+        }
+    };
+
+    inline std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases ) {
+
+        std::vector<TestCase> sorted = unsortedTestCases;
+
+        switch( config.runOrder() ) {
+            case RunTests::InLexicographicalOrder:
+                std::sort( sorted.begin(), sorted.end() );
+                break;
+            case RunTests::InRandomOrder:
+                {
+                    seedRng( config );
+                    RandomNumberGenerator::shuffle( sorted );
+                }
+                break;
+            case RunTests::InDeclarationOrder:
+                // already in declaration order
+                break;
+        }
+        return sorted;
+    }
+    bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
+        return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() );
+    }
+
+    void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
+        std::set<TestCase> seenFunctions;
+        for( std::vector<TestCase>::const_iterator it = functions.begin(), itEnd = functions.end();
+            it != itEnd;
+            ++it ) {
+            std::pair<std::set<TestCase>::const_iterator, bool> prev = seenFunctions.insert( *it );
+            if( !prev.second ) {
+                std::ostringstream ss;
+
+                ss  << Colour( Colour::Red )
+                    << "error: TEST_CASE( \"" << it->name << "\" ) already defined.\n"
+                    << "\tFirst seen at " << prev.first->getTestCaseInfo().lineInfo << '\n'
+                    << "\tRedefined at " << it->getTestCaseInfo().lineInfo << std::endl;
+
+                throw std::runtime_error(ss.str());
+            }
+        }
+    }
+
+    std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config ) {
+        std::vector<TestCase> filtered;
+        filtered.reserve( testCases.size() );
+        for( std::vector<TestCase>::const_iterator it = testCases.begin(), itEnd = testCases.end();
+                it != itEnd;
+                ++it )
+            if( matchTest( *it, testSpec, config ) )
+                filtered.push_back( *it );
+        return filtered;
+    }
+    std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config ) {
+        return getRegistryHub().getTestCaseRegistry().getAllTestsSorted( config );
+    }
+
+    class TestRegistry : public ITestCaseRegistry {
+    public:
+        TestRegistry()
+        :   m_currentSortOrder( RunTests::InDeclarationOrder ),
+            m_unnamedCount( 0 )
+        {}
+        virtual ~TestRegistry();
+
+        virtual void registerTest( TestCase const& testCase ) {
+            std::string name = testCase.getTestCaseInfo().name;
+            if( name.empty() ) {
+                std::ostringstream oss;
+                oss << "Anonymous test case " << ++m_unnamedCount;
+                return registerTest( testCase.withName( oss.str() ) );
+            }
+            m_functions.push_back( testCase );
+        }
+
+        virtual std::vector<TestCase> const& getAllTests() const {
+            return m_functions;
+        }
+        virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const {
+            if( m_sortedFunctions.empty() )
+                enforceNoDuplicateTestCases( m_functions );
+
+            if(  m_currentSortOrder != config.runOrder() || m_sortedFunctions.empty() ) {
+                m_sortedFunctions = sortTests( config, m_functions );
+                m_currentSortOrder = config.runOrder();
+            }
+            return m_sortedFunctions;
+        }
+
+    private:
+        std::vector<TestCase> m_functions;
+        mutable RunTests::InWhatOrder m_currentSortOrder;
+        mutable std::vector<TestCase> m_sortedFunctions;
+        size_t m_unnamedCount;
+        std::ios_base::Init m_ostreamInit; // Forces cout/ cerr to be initialised
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class FreeFunctionTestCase : public SharedImpl<ITestCase> {
+    public:
+
+        FreeFunctionTestCase( TestFunction fun ) : m_fun( fun ) {}
+
+        virtual void invoke() const {
+            m_fun();
+        }
+
+    private:
+        virtual ~FreeFunctionTestCase();
+
+        TestFunction m_fun;
+    };
+
+    inline std::string extractClassName( std::string const& classOrQualifiedMethodName ) {
+        std::string className = classOrQualifiedMethodName;
+        if( startsWith( className, '&' ) )
+        {
+            std::size_t lastColons = className.rfind( "::" );
+            std::size_t penultimateColons = className.rfind( "::", lastColons-1 );
+            if( penultimateColons == std::string::npos )
+                penultimateColons = 1;
+            className = className.substr( penultimateColons, lastColons-penultimateColons );
+        }
+        return className;
+    }
+
+    void registerTestCase
+        (   ITestCase* testCase,
+            char const* classOrQualifiedMethodName,
+            NameAndDesc const& nameAndDesc,
+            SourceLineInfo const& lineInfo ) {
+
+        getMutableRegistryHub().registerTest
+            ( makeTestCase
+                (   testCase,
+                    extractClassName( classOrQualifiedMethodName ),
+                    nameAndDesc.name,
+                    nameAndDesc.description,
+                    lineInfo ) );
+    }
+    void registerTestCaseFunction
+        (   TestFunction function,
+            SourceLineInfo const& lineInfo,
+            NameAndDesc const& nameAndDesc ) {
+        registerTestCase( new FreeFunctionTestCase( function ), "", nameAndDesc, lineInfo );
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    AutoReg::AutoReg
+        (   TestFunction function,
+            SourceLineInfo const& lineInfo,
+            NameAndDesc const& nameAndDesc ) {
+        registerTestCaseFunction( function, lineInfo, nameAndDesc );
+    }
+
+    AutoReg::~AutoReg() {}
+
+} // end namespace Catch
+
+// #included from: catch_reporter_registry.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_REGISTRY_HPP_INCLUDED
+
+#include <map>
+
+namespace Catch {
+
+    class ReporterRegistry : public IReporterRegistry {
+
+    public:
+
+        virtual ~ReporterRegistry() CATCH_OVERRIDE {}
+
+        virtual IStreamingReporter* create( std::string const& name, Ptr<IConfig const> const& config ) const CATCH_OVERRIDE {
+            FactoryMap::const_iterator it =  m_factories.find( name );
+            if( it == m_factories.end() )
+                return CATCH_NULL;
+            return it->second->create( ReporterConfig( config ) );
+        }
+
+        void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) {
+            m_factories.insert( std::make_pair( name, factory ) );
+        }
+        void registerListener( Ptr<IReporterFactory> const& factory ) {
+            m_listeners.push_back( factory );
+        }
+
+        virtual FactoryMap const& getFactories() const CATCH_OVERRIDE {
+            return m_factories;
+        }
+        virtual Listeners const& getListeners() const CATCH_OVERRIDE {
+            return m_listeners;
+        }
+
+    private:
+        FactoryMap m_factories;
+        Listeners m_listeners;
+    };
+}
+
+// #included from: catch_exception_translator_registry.hpp
+#define TWOBLUECUBES_CATCH_EXCEPTION_TRANSLATOR_REGISTRY_HPP_INCLUDED
+
+#ifdef __OBJC__
+#import "Foundation/Foundation.h"
+#endif
+
+namespace Catch {
+
+    class ExceptionTranslatorRegistry : public IExceptionTranslatorRegistry {
+    public:
+        ~ExceptionTranslatorRegistry() {
+            deleteAll( m_translators );
+        }
+
+        virtual void registerTranslator( const IExceptionTranslator* translator ) {
+            m_translators.push_back( translator );
+        }
+
+        virtual std::string translateActiveException() const {
+            try {
+#ifdef __OBJC__
+                // In Objective-C try objective-c exceptions first
+                @try {
+                    return tryTranslators();
+                }
+                @catch (NSException *exception) {
+                    return Catch::toString( [exception description] );
+                }
+#else
+                return tryTranslators();
+#endif
+            }
+            catch( TestFailureException& ) {
+                throw;
+            }
+            catch( std::exception& ex ) {
+                return ex.what();
+            }
+            catch( std::string& msg ) {
+                return msg;
+            }
+            catch( const char* msg ) {
+                return msg;
+            }
+            catch(...) {
+                return "Unknown exception";
+            }
+        }
+
+        std::string tryTranslators() const {
+            if( m_translators.empty() )
+                throw;
+            else
+                return m_translators[0]->translate( m_translators.begin()+1, m_translators.end() );
+        }
+
+    private:
+        std::vector<const IExceptionTranslator*> m_translators;
+    };
+}
+
+// #included from: catch_tag_alias_registry.h
+#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_H_INCLUDED
+
+#include <map>
+
+namespace Catch {
+
+    class TagAliasRegistry : public ITagAliasRegistry {
+    public:
+        virtual ~TagAliasRegistry();
+        virtual Option<TagAlias> find( std::string const& alias ) const;
+        virtual std::string expandAliases( std::string const& unexpandedTestSpec ) const;
+        void add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo );
+
+    private:
+        std::map<std::string, TagAlias> m_registry;
+    };
+
+} // end namespace Catch
+
+namespace Catch {
+
+    namespace {
+
+        class RegistryHub : public IRegistryHub, public IMutableRegistryHub {
+
+            RegistryHub( RegistryHub const& );
+            void operator=( RegistryHub const& );
+
+        public: // IRegistryHub
+            RegistryHub() {
+            }
+            virtual IReporterRegistry const& getReporterRegistry() const CATCH_OVERRIDE {
+                return m_reporterRegistry;
+            }
+            virtual ITestCaseRegistry const& getTestCaseRegistry() const CATCH_OVERRIDE {
+                return m_testCaseRegistry;
+            }
+            virtual IExceptionTranslatorRegistry& getExceptionTranslatorRegistry() CATCH_OVERRIDE {
+                return m_exceptionTranslatorRegistry;
+            }
+            virtual ITagAliasRegistry const& getTagAliasRegistry() const CATCH_OVERRIDE {
+                return m_tagAliasRegistry;
+            }
+
+        public: // IMutableRegistryHub
+            virtual void registerReporter( std::string const& name, Ptr<IReporterFactory> const& factory ) CATCH_OVERRIDE {
+                m_reporterRegistry.registerReporter( name, factory );
+            }
+            virtual void registerListener( Ptr<IReporterFactory> const& factory ) CATCH_OVERRIDE {
+                m_reporterRegistry.registerListener( factory );
+            }
+            virtual void registerTest( TestCase const& testInfo ) CATCH_OVERRIDE {
+                m_testCaseRegistry.registerTest( testInfo );
+            }
+            virtual void registerTranslator( const IExceptionTranslator* translator ) CATCH_OVERRIDE {
+                m_exceptionTranslatorRegistry.registerTranslator( translator );
+            }
+            virtual void registerTagAlias( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) CATCH_OVERRIDE {
+                m_tagAliasRegistry.add( alias, tag, lineInfo );
+            }
+
+        private:
+            TestRegistry m_testCaseRegistry;
+            ReporterRegistry m_reporterRegistry;
+            ExceptionTranslatorRegistry m_exceptionTranslatorRegistry;
+            TagAliasRegistry m_tagAliasRegistry;
+        };
+
+        // Single, global, instance
+        inline RegistryHub*& getTheRegistryHub() {
+            static RegistryHub* theRegistryHub = CATCH_NULL;
+            if( !theRegistryHub )
+                theRegistryHub = new RegistryHub();
+            return theRegistryHub;
+        }
+    }
+
+    IRegistryHub& getRegistryHub() {
+        return *getTheRegistryHub();
+    }
+    IMutableRegistryHub& getMutableRegistryHub() {
+        return *getTheRegistryHub();
+    }
+    void cleanUp() {
+        delete getTheRegistryHub();
+        getTheRegistryHub() = CATCH_NULL;
+        cleanUpContext();
+    }
+    std::string translateActiveException() {
+        return getRegistryHub().getExceptionTranslatorRegistry().translateActiveException();
+    }
+
+} // end namespace Catch
+
+// #included from: catch_notimplemented_exception.hpp
+#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_HPP_INCLUDED
+
+#include <sstream>
+
+namespace Catch {
+
+    NotImplementedException::NotImplementedException( SourceLineInfo const& lineInfo )
+    :   m_lineInfo( lineInfo ) {
+        std::ostringstream oss;
+        oss << lineInfo << ": function ";
+        oss << "not implemented";
+        m_what = oss.str();
+    }
+
+    const char* NotImplementedException::what() const CATCH_NOEXCEPT {
+        return m_what.c_str();
+    }
+
+} // end namespace Catch
+
+// #included from: catch_context_impl.hpp
+#define TWOBLUECUBES_CATCH_CONTEXT_IMPL_HPP_INCLUDED
+
+// #included from: catch_stream.hpp
+#define TWOBLUECUBES_CATCH_STREAM_HPP_INCLUDED
+
+#include <stdexcept>
+#include <cstdio>
+#include <iostream>
+
+namespace Catch {
+
+    template<typename WriterF, size_t bufferSize=256>
+    class StreamBufImpl : public StreamBufBase {
+        char data[bufferSize];
+        WriterF m_writer;
+
+    public:
+        StreamBufImpl() {
+            setp( data, data + sizeof(data) );
+        }
+
+        ~StreamBufImpl() CATCH_NOEXCEPT {
+            sync();
+        }
+
+    private:
+        int overflow( int c ) {
+            sync();
+
+            if( c != EOF ) {
+                if( pbase() == epptr() )
+                    m_writer( std::string( 1, static_cast<char>( c ) ) );
+                else
+                    sputc( static_cast<char>( c ) );
+            }
+            return 0;
+        }
+
+        int sync() {
+            if( pbase() != pptr() ) {
+                m_writer( std::string( pbase(), static_cast<std::string::size_type>( pptr() - pbase() ) ) );
+                setp( pbase(), epptr() );
+            }
+            return 0;
+        }
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    FileStream::FileStream( std::string const& filename ) {
+        m_ofs.open( filename.c_str() );
+        if( m_ofs.fail() ) {
+            std::ostringstream oss;
+            oss << "Unable to open file: '" << filename << '\'';
+            throw std::domain_error( oss.str() );
+        }
+    }
+
+    std::ostream& FileStream::stream() const {
+        return m_ofs;
+    }
+
+    struct OutputDebugWriter {
+
+        void operator()( std::string const&str ) {
+            writeToDebugConsole( str );
+        }
+    };
+
+    DebugOutStream::DebugOutStream()
+    :   m_streamBuf( new StreamBufImpl<OutputDebugWriter>() ),
+        m_os( m_streamBuf.get() )
+    {}
+
+    std::ostream& DebugOutStream::stream() const {
+        return m_os;
+    }
+
+    // Store the streambuf from cout up-front because
+    // cout may get redirected when running tests
+    CoutStream::CoutStream()
+    :   m_os( Catch::cout().rdbuf() )
+    {}
+
+    std::ostream& CoutStream::stream() const {
+        return m_os;
+    }
+
+#ifndef CATCH_CONFIG_NOSTDOUT // If you #define this you must implement these functions
+    std::ostream& cout() {
+        return std::cout;
+    }
+    std::ostream& cerr() {
+        return std::cerr;
+    }
+    std::ostream& clog() {
+        return std::clog;
+    }
+#endif
+}
+
+namespace Catch {
+
+    class Context : public IMutableContext {
+
+        Context() : m_config( CATCH_NULL ), m_runner( CATCH_NULL ), m_resultCapture( CATCH_NULL ) {}
+        Context( Context const& );
+        void operator=( Context const& );
+
+    public:
+        virtual ~Context() {
+            deleteAllValues( m_generatorsByTestName );
+        }
+
+    public: // IContext
+        virtual IResultCapture* getResultCapture() {
+            return m_resultCapture;
+        }
+        virtual IRunner* getRunner() {
+            return m_runner;
+        }
+        virtual size_t getGeneratorIndex( std::string const& fileInfo, size_t totalSize ) {
+            return getGeneratorsForCurrentTest()
+            .getGeneratorInfo( fileInfo, totalSize )
+            .getCurrentIndex();
+        }
+        virtual bool advanceGeneratorsForCurrentTest() {
+            IGeneratorsForTest* generators = findGeneratorsForCurrentTest();
+            return generators && generators->moveNext();
+        }
+
+        virtual Ptr<IConfig const> getConfig() const {
+            return m_config;
+        }
+
+    public: // IMutableContext
+        virtual void setResultCapture( IResultCapture* resultCapture ) {
+            m_resultCapture = resultCapture;
+        }
+        virtual void setRunner( IRunner* runner ) {
+            m_runner = runner;
+        }
+        virtual void setConfig( Ptr<IConfig const> const& config ) {
+            m_config = config;
+        }
+
+        friend IMutableContext& getCurrentMutableContext();
+
+    private:
+        IGeneratorsForTest* findGeneratorsForCurrentTest() {
+            std::string testName = getResultCapture()->getCurrentTestName();
+
+            std::map<std::string, IGeneratorsForTest*>::const_iterator it =
+                m_generatorsByTestName.find( testName );
+            return it != m_generatorsByTestName.end()
+                ? it->second
+                : CATCH_NULL;
+        }
+
+        IGeneratorsForTest& getGeneratorsForCurrentTest() {
+            IGeneratorsForTest* generators = findGeneratorsForCurrentTest();
+            if( !generators ) {
+                std::string testName = getResultCapture()->getCurrentTestName();
+                generators = createGeneratorsForTest();
+                m_generatorsByTestName.insert( std::make_pair( testName, generators ) );
+            }
+            return *generators;
+        }
+
+    private:
+        Ptr<IConfig const> m_config;
+        IRunner* m_runner;
+        IResultCapture* m_resultCapture;
+        std::map<std::string, IGeneratorsForTest*> m_generatorsByTestName;
+    };
+
+    namespace {
+        Context* currentContext = CATCH_NULL;
+    }
+    IMutableContext& getCurrentMutableContext() {
+        if( !currentContext )
+            currentContext = new Context();
+        return *currentContext;
+    }
+    IContext& getCurrentContext() {
+        return getCurrentMutableContext();
+    }
+
+    void cleanUpContext() {
+        delete currentContext;
+        currentContext = CATCH_NULL;
+    }
+}
+
+// #included from: catch_console_colour_impl.hpp
+#define TWOBLUECUBES_CATCH_CONSOLE_COLOUR_IMPL_HPP_INCLUDED
+
+// #included from: catch_errno_guard.hpp
+#define TWOBLUECUBES_CATCH_ERRNO_GUARD_HPP_INCLUDED
+
+#include <cerrno>
+
+namespace Catch {
+
+    class ErrnoGuard {
+    public:
+        ErrnoGuard():m_oldErrno(errno){}
+        ~ErrnoGuard() { errno = m_oldErrno; }
+    private:
+        int m_oldErrno;
+    };
+
+}
+
+namespace Catch {
+    namespace {
+
+        struct IColourImpl {
+            virtual ~IColourImpl() {}
+            virtual void use( Colour::Code _colourCode ) = 0;
+        };
+
+        struct NoColourImpl : IColourImpl {
+            void use( Colour::Code ) {}
+
+            static IColourImpl* instance() {
+                static NoColourImpl s_instance;
+                return &s_instance;
+            }
+        };
+
+    } // anon namespace
+} // namespace Catch
+
+#if !defined( CATCH_CONFIG_COLOUR_NONE ) && !defined( CATCH_CONFIG_COLOUR_WINDOWS ) && !defined( CATCH_CONFIG_COLOUR_ANSI )
+#   ifdef CATCH_PLATFORM_WINDOWS
+#       define CATCH_CONFIG_COLOUR_WINDOWS
+#   else
+#       define CATCH_CONFIG_COLOUR_ANSI
+#   endif
+#endif
+
+#if defined ( CATCH_CONFIG_COLOUR_WINDOWS ) /////////////////////////////////////////
+
+namespace Catch {
+namespace {
+
+    class Win32ColourImpl : public IColourImpl {
+    public:
+        Win32ColourImpl() : stdoutHandle( GetStdHandle(STD_OUTPUT_HANDLE) )
+        {
+            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
+            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
+        }
+
+        virtual void use( Colour::Code _colourCode ) {
+            switch( _colourCode ) {
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
+                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
+                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
+                case Colour::Blue:      return setTextAttribute( FOREGROUND_BLUE );
+                case Colour::Cyan:      return setTextAttribute( FOREGROUND_BLUE | FOREGROUND_GREEN );
+                case Colour::Yellow:    return setTextAttribute( FOREGROUND_RED | FOREGROUND_GREEN );
+                case Colour::Grey:      return setTextAttribute( 0 );
+
+                case Colour::LightGrey:     return setTextAttribute( FOREGROUND_INTENSITY );
+                case Colour::BrightRed:     return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_RED );
+                case Colour::BrightGreen:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN );
+                case Colour::BrightWhite:   return setTextAttribute( FOREGROUND_INTENSITY | FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
+
+                case Colour::Bright: throw std::logic_error( "not a colour" );
+            }
+        }
+
+    private:
+        void setTextAttribute( WORD _textAttribute ) {
+            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
+        }
+        HANDLE stdoutHandle;
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
+    };
+
+    IColourImpl* platformColourInstance() {
+        static Win32ColourImpl s_instance;
+
+        Ptr<IConfig const> config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = !isDebuggerActive()
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
+            ? &s_instance
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#elif defined( CATCH_CONFIG_COLOUR_ANSI ) //////////////////////////////////////
+
+#include <unistd.h>
+
+namespace Catch {
+namespace {
+
+    // use POSIX/ ANSI console terminal codes
+    // Thanks to Adam Strzelecki for original contribution
+    // (http://github.com/nanoant)
+    // https://github.com/philsquared/Catch/pull/131
+    class PosixColourImpl : public IColourImpl {
+    public:
+        virtual void use( Colour::Code _colourCode ) {
+            switch( _colourCode ) {
+                case Colour::None:
+                case Colour::White:     return setColour( "[0m" );
+                case Colour::Red:       return setColour( "[0;31m" );
+                case Colour::Green:     return setColour( "[0;32m" );
+                case Colour::Blue:      return setColour( "[0;34m" );
+                case Colour::Cyan:      return setColour( "[0;36m" );
+                case Colour::Yellow:    return setColour( "[0;33m" );
+                case Colour::Grey:      return setColour( "[1;30m" );
+
+                case Colour::LightGrey:     return setColour( "[0;37m" );
+                case Colour::BrightRed:     return setColour( "[1;31m" );
+                case Colour::BrightGreen:   return setColour( "[1;32m" );
+                case Colour::BrightWhite:   return setColour( "[1;37m" );
+
+                case Colour::Bright: throw std::logic_error( "not a colour" );
+            }
+        }
+        static IColourImpl* instance() {
+            static PosixColourImpl s_instance;
+            return &s_instance;
+        }
+
+    private:
+        void setColour( const char* _escapeCode ) {
+            Catch::cout() << '\033' << _escapeCode;
+        }
+    };
+
+    IColourImpl* platformColourInstance() {
+        ErrnoGuard guard;
+        Ptr<IConfig const> config = getCurrentContext().getConfig();
+        UseColour::YesOrNo colourMode = config
+            ? config->useColour()
+            : UseColour::Auto;
+        if( colourMode == UseColour::Auto )
+            colourMode = (!isDebuggerActive() && isatty(STDOUT_FILENO) )
+                ? UseColour::Yes
+                : UseColour::No;
+        return colourMode == UseColour::Yes
+            ? PosixColourImpl::instance()
+            : NoColourImpl::instance();
+    }
+
+} // end anon namespace
+} // end namespace Catch
+
+#else  // not Windows or ANSI ///////////////////////////////////////////////
+
+namespace Catch {
+
+    static IColourImpl* platformColourInstance() { return NoColourImpl::instance(); }
+
+} // end namespace Catch
+
+#endif // Windows/ ANSI/ None
+
+namespace Catch {
+
+    Colour::Colour( Code _colourCode ) : m_moved( false ) { use( _colourCode ); }
+    Colour::Colour( Colour const& _other ) : m_moved( false ) { const_cast<Colour&>( _other ).m_moved = true; }
+    Colour::~Colour(){ if( !m_moved ) use( None ); }
+
+    void Colour::use( Code _colourCode ) {
+        static IColourImpl* impl = platformColourInstance();
+        impl->use( _colourCode );
+    }
+
+} // end namespace Catch
+
+// #included from: catch_generators_impl.hpp
+#define TWOBLUECUBES_CATCH_GENERATORS_IMPL_HPP_INCLUDED
+
+#include <vector>
+#include <string>
+#include <map>
+
+namespace Catch {
+
+    struct GeneratorInfo : IGeneratorInfo {
+
+        GeneratorInfo( std::size_t size )
+        :   m_size( size ),
+            m_currentIndex( 0 )
+        {}
+
+        bool moveNext() {
+            if( ++m_currentIndex == m_size ) {
+                m_currentIndex = 0;
+                return false;
+            }
+            return true;
+        }
+
+        std::size_t getCurrentIndex() const {
+            return m_currentIndex;
+        }
+
+        std::size_t m_size;
+        std::size_t m_currentIndex;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+
+    class GeneratorsForTest : public IGeneratorsForTest {
+
+    public:
+        ~GeneratorsForTest() {
+            deleteAll( m_generatorsInOrder );
+        }
+
+        IGeneratorInfo& getGeneratorInfo( std::string const& fileInfo, std::size_t size ) {
+            std::map<std::string, IGeneratorInfo*>::const_iterator it = m_generatorsByName.find( fileInfo );
+            if( it == m_generatorsByName.end() ) {
+                IGeneratorInfo* info = new GeneratorInfo( size );
+                m_generatorsByName.insert( std::make_pair( fileInfo, info ) );
+                m_generatorsInOrder.push_back( info );
+                return *info;
+            }
+            return *it->second;
+        }
+
+        bool moveNext() {
+            std::vector<IGeneratorInfo*>::const_iterator it = m_generatorsInOrder.begin();
+            std::vector<IGeneratorInfo*>::const_iterator itEnd = m_generatorsInOrder.end();
+            for(; it != itEnd; ++it ) {
+                if( (*it)->moveNext() )
+                    return true;
+            }
+            return false;
+        }
+
+    private:
+        std::map<std::string, IGeneratorInfo*> m_generatorsByName;
+        std::vector<IGeneratorInfo*> m_generatorsInOrder;
+    };
+
+    IGeneratorsForTest* createGeneratorsForTest()
+    {
+        return new GeneratorsForTest();
+    }
+
+} // end namespace Catch
+
+// #included from: catch_assertionresult.hpp
+#define TWOBLUECUBES_CATCH_ASSERTIONRESULT_HPP_INCLUDED
+
+namespace Catch {
+
+    AssertionInfo::AssertionInfo():macroName(""), capturedExpression(""), resultDisposition(ResultDisposition::Normal), secondArg(""){}
+
+    AssertionInfo::AssertionInfo(   char const * _macroName,
+                                    SourceLineInfo const& _lineInfo,
+                                    char const * _capturedExpression,
+                                    ResultDisposition::Flags _resultDisposition,
+                                    char const * _secondArg)
+    :   macroName( _macroName ),
+        lineInfo( _lineInfo ),
+        capturedExpression( _capturedExpression ),
+        resultDisposition( _resultDisposition ),
+        secondArg( _secondArg )
+    {}
+
+    AssertionResult::AssertionResult() {}
+
+    AssertionResult::AssertionResult( AssertionInfo const& info, AssertionResultData const& data )
+    :   m_info( info ),
+        m_resultData( data )
+    {}
+
+    AssertionResult::~AssertionResult() {}
+
+    // Result was a success
+    bool AssertionResult::succeeded() const {
+        return Catch::isOk( m_resultData.resultType );
+    }
+
+    // Result was a success, or failure is suppressed
+    bool AssertionResult::isOk() const {
+        return Catch::isOk( m_resultData.resultType ) || shouldSuppressFailure( m_info.resultDisposition );
+    }
+
+    ResultWas::OfType AssertionResult::getResultType() const {
+        return m_resultData.resultType;
+    }
+
+    bool AssertionResult::hasExpression() const {
+        return m_info.capturedExpression[0] != 0;
+    }
+
+    bool AssertionResult::hasMessage() const {
+        return !m_resultData.message.empty();
+    }
+
+    std::string capturedExpressionWithSecondArgument( char const * capturedExpression, char const * secondArg ) {
+        return (secondArg[0] == 0 || secondArg[0] == '"' && secondArg[1] == '"')
+            ? capturedExpression
+            : std::string(capturedExpression) + ", " + secondArg;
+    }
+
+    std::string AssertionResult::getExpression() const {
+        if( isFalseTest( m_info.resultDisposition ) )
+            return "!(" + capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg) + ")";
+        else
+            return capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg);
+    }
+    std::string AssertionResult::getExpressionInMacro() const {
+        if( m_info.macroName[0] == 0 )
+            return capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg);
+        else
+            return std::string(m_info.macroName) + "( " + capturedExpressionWithSecondArgument(m_info.capturedExpression, m_info.secondArg) + " )";
+    }
+
+    bool AssertionResult::hasExpandedExpression() const {
+        return hasExpression() && getExpandedExpression() != getExpression();
+    }
+
+    std::string AssertionResult::getExpandedExpression() const {
+        return m_resultData.reconstructExpression();
+    }
+
+    std::string AssertionResult::getMessage() const {
+        return m_resultData.message;
+    }
+    SourceLineInfo AssertionResult::getSourceInfo() const {
+        return m_info.lineInfo;
+    }
+
+    std::string AssertionResult::getTestMacroName() const {
+        return m_info.macroName;
+    }
+
+    void AssertionResult::discardDecomposedExpression() const {
+        m_resultData.decomposedExpression = CATCH_NULL;
+    }
+
+    void AssertionResult::expandDecomposedExpression() const {
+        m_resultData.reconstructExpression();
+    }
+
+} // end namespace Catch
+
+// #included from: catch_test_case_info.hpp
+#define TWOBLUECUBES_CATCH_TEST_CASE_INFO_HPP_INCLUDED
+
+#include <cctype>
+
+namespace Catch {
+
+    inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
+        if( startsWith( tag, '.' ) ||
+            tag == "hide" ||
+            tag == "!hide" )
+            return TestCaseInfo::IsHidden;
+        else if( tag == "!throws" )
+            return TestCaseInfo::Throws;
+        else if( tag == "!shouldfail" )
+            return TestCaseInfo::ShouldFail;
+        else if( tag == "!mayfail" )
+            return TestCaseInfo::MayFail;
+        else if( tag == "!nonportable" )
+            return TestCaseInfo::NonPortable;
+        else
+            return TestCaseInfo::None;
+    }
+    inline bool isReservedTag( std::string const& tag ) {
+        return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !std::isalnum( tag[0] );
+    }
+    inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
+        if( isReservedTag( tag ) ) {
+            std::ostringstream ss;
+            ss << Colour(Colour::Red)
+               << "Tag name [" << tag << "] not allowed.\n"
+               << "Tag names starting with non alpha-numeric characters are reserved\n"
+               << Colour(Colour::FileName)
+               << _lineInfo << '\n';
+            throw std::runtime_error(ss.str());
+        }
+    }
+
+    TestCase makeTestCase(  ITestCase* _testCase,
+                            std::string const& _className,
+                            std::string const& _name,
+                            std::string const& _descOrTags,
+                            SourceLineInfo const& _lineInfo )
+    {
+        bool isHidden( startsWith( _name, "./" ) ); // Legacy support
+
+        // Parse out tags
+        std::set<std::string> tags;
+        std::string desc, tag;
+        bool inTag = false;
+        for( std::size_t i = 0; i < _descOrTags.size(); ++i ) {
+            char c = _descOrTags[i];
+            if( !inTag ) {
+                if( c == '[' )
+                    inTag = true;
+                else
+                    desc += c;
+            }
+            else {
+                if( c == ']' ) {
+                    TestCaseInfo::SpecialProperties prop = parseSpecialTag( tag );
+                    if( prop == TestCaseInfo::IsHidden )
+                        isHidden = true;
+                    else if( prop == TestCaseInfo::None )
+                        enforceNotReservedTag( tag, _lineInfo );
+
+                    tags.insert( tag );
+                    tag.clear();
+                    inTag = false;
+                }
+                else
+                    tag += c;
+            }
+        }
+        if( isHidden ) {
+            tags.insert( "hide" );
+            tags.insert( "." );
+        }
+
+        TestCaseInfo info( _name, _className, desc, tags, _lineInfo );
+        return TestCase( _testCase, info );
+    }
+
+    void setTags( TestCaseInfo& testCaseInfo, std::set<std::string> const& tags )
+    {
+        testCaseInfo.tags = tags;
+        testCaseInfo.lcaseTags.clear();
+
+        std::ostringstream oss;
+        for( std::set<std::string>::const_iterator it = tags.begin(), itEnd = tags.end(); it != itEnd; ++it ) {
+            oss << '[' << *it << ']';
+            std::string lcaseTag = toLower( *it );
+            testCaseInfo.properties = static_cast<TestCaseInfo::SpecialProperties>( testCaseInfo.properties | parseSpecialTag( lcaseTag ) );
+            testCaseInfo.lcaseTags.insert( lcaseTag );
+        }
+        testCaseInfo.tagsAsString = oss.str();
+    }
+
+    TestCaseInfo::TestCaseInfo( std::string const& _name,
+                                std::string const& _className,
+                                std::string const& _description,
+                                std::set<std::string> const& _tags,
+                                SourceLineInfo const& _lineInfo )
+    :   name( _name ),
+        className( _className ),
+        description( _description ),
+        lineInfo( _lineInfo ),
+        properties( None )
+    {
+        setTags( *this, _tags );
+    }
+
+    TestCaseInfo::TestCaseInfo( TestCaseInfo const& other )
+    :   name( other.name ),
+        className( other.className ),
+        description( other.description ),
+        tags( other.tags ),
+        lcaseTags( other.lcaseTags ),
+        tagsAsString( other.tagsAsString ),
+        lineInfo( other.lineInfo ),
+        properties( other.properties )
+    {}
+
+    bool TestCaseInfo::isHidden() const {
+        return ( properties & IsHidden ) != 0;
+    }
+    bool TestCaseInfo::throws() const {
+        return ( properties & Throws ) != 0;
+    }
+    bool TestCaseInfo::okToFail() const {
+        return ( properties & (ShouldFail | MayFail ) ) != 0;
+    }
+    bool TestCaseInfo::expectedToFail() const {
+        return ( properties & (ShouldFail ) ) != 0;
+    }
+
+    TestCase::TestCase( ITestCase* testCase, TestCaseInfo const& info ) : TestCaseInfo( info ), test( testCase ) {}
+
+    TestCase::TestCase( TestCase const& other )
+    :   TestCaseInfo( other ),
+        test( other.test )
+    {}
+
+    TestCase TestCase::withName( std::string const& _newName ) const {
+        TestCase other( *this );
+        other.name = _newName;
+        return other;
+    }
+
+    void TestCase::swap( TestCase& other ) {
+        test.swap( other.test );
+        name.swap( other.name );
+        className.swap( other.className );
+        description.swap( other.description );
+        tags.swap( other.tags );
+        lcaseTags.swap( other.lcaseTags );
+        tagsAsString.swap( other.tagsAsString );
+        std::swap( TestCaseInfo::properties, static_cast<TestCaseInfo&>( other ).properties );
+        std::swap( lineInfo, other.lineInfo );
+    }
+
+    void TestCase::invoke() const {
+        test->invoke();
+    }
+
+    bool TestCase::operator == ( TestCase const& other ) const {
+        return  test.get() == other.test.get() &&
+                name == other.name &&
+                className == other.className;
+    }
+
+    bool TestCase::operator < ( TestCase const& other ) const {
+        return name < other.name;
+    }
+    TestCase& TestCase::operator = ( TestCase const& other ) {
+        TestCase temp( other );
+        swap( temp );
+        return *this;
+    }
+
+    TestCaseInfo const& TestCase::getTestCaseInfo() const
+    {
+        return *this;
+    }
+
+} // end namespace Catch
+
+// #included from: catch_version.hpp
+#define TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
+
+namespace Catch {
+
+    Version::Version
+        (   unsigned int _majorVersion,
+            unsigned int _minorVersion,
+            unsigned int _patchNumber,
+            char const * const _branchName,
+            unsigned int _buildNumber )
+    :   majorVersion( _majorVersion ),
+        minorVersion( _minorVersion ),
+        patchNumber( _patchNumber ),
+        branchName( _branchName ),
+        buildNumber( _buildNumber )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, Version const& version ) {
+        os  << version.majorVersion << '.'
+            << version.minorVersion << '.'
+            << version.patchNumber;
+        // branchName is never null -> 0th char is \0 if it is empty
+        if (version.branchName[0]) {
+            os << '-' << version.branchName
+               << '.' << version.buildNumber;
+        }
+        return os;
+    }
+
+    inline Version libraryVersion() {
+        static Version version( 1, 12, 2, "", 0 );
+        return version;
+    }
+
+}
+
+// #included from: catch_message.hpp
+#define TWOBLUECUBES_CATCH_MESSAGE_HPP_INCLUDED
+
+namespace Catch {
+
+    MessageInfo::MessageInfo(   std::string const& _macroName,
+                                SourceLineInfo const& _lineInfo,
+                                ResultWas::OfType _type )
+    :   macroName( _macroName ),
+        lineInfo( _lineInfo ),
+        type( _type ),
+        sequence( ++globalCount )
+    {}
+
+    // This may need protecting if threading support is added
+    unsigned int MessageInfo::globalCount = 0;
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    ScopedMessage::ScopedMessage( MessageBuilder const& builder )
+    : m_info( builder.m_info )
+    {
+        m_info.message = builder.m_stream.str();
+        getResultCapture().pushScopedMessage( m_info );
+    }
+    ScopedMessage::ScopedMessage( ScopedMessage const& other )
+    : m_info( other.m_info )
+    {}
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4996) // std::uncaught_exception is deprecated in C++17
+#endif
+    ScopedMessage::~ScopedMessage() {
+        if ( !std::uncaught_exception() ){
+            getResultCapture().popScopedMessage(m_info);
+        }
+    }
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+} // end namespace Catch
+
+// #included from: catch_legacy_reporter_adapter.hpp
+#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_HPP_INCLUDED
+
+// #included from: catch_legacy_reporter_adapter.h
+#define TWOBLUECUBES_CATCH_LEGACY_REPORTER_ADAPTER_H_INCLUDED
+
+namespace Catch
+{
+    // Deprecated
+    struct IReporter : IShared {
+        virtual ~IReporter();
+
+        virtual bool shouldRedirectStdout() const = 0;
+
+        virtual void StartTesting() = 0;
+        virtual void EndTesting( Totals const& totals ) = 0;
+        virtual void StartGroup( std::string const& groupName ) = 0;
+        virtual void EndGroup( std::string const& groupName, Totals const& totals ) = 0;
+        virtual void StartTestCase( TestCaseInfo const& testInfo ) = 0;
+        virtual void EndTestCase( TestCaseInfo const& testInfo, Totals const& totals, std::string const& stdOut, std::string const& stdErr ) = 0;
+        virtual void StartSection( std::string const& sectionName, std::string const& description ) = 0;
+        virtual void EndSection( std::string const& sectionName, Counts const& assertions ) = 0;
+        virtual void NoAssertionsInSection( std::string const& sectionName ) = 0;
+        virtual void NoAssertionsInTestCase( std::string const& testName ) = 0;
+        virtual void Aborted() = 0;
+        virtual void Result( AssertionResult const& result ) = 0;
+    };
+
+    class LegacyReporterAdapter : public SharedImpl<IStreamingReporter>
+    {
+    public:
+        LegacyReporterAdapter( Ptr<IReporter> const& legacyReporter );
+        virtual ~LegacyReporterAdapter();
+
+        virtual ReporterPreferences getPreferences() const;
+        virtual void noMatchingTestCases( std::string const& );
+        virtual void testRunStarting( TestRunInfo const& );
+        virtual void testGroupStarting( GroupInfo const& groupInfo );
+        virtual void testCaseStarting( TestCaseInfo const& testInfo );
+        virtual void sectionStarting( SectionInfo const& sectionInfo );
+        virtual void assertionStarting( AssertionInfo const& );
+        virtual bool assertionEnded( AssertionStats const& assertionStats );
+        virtual void sectionEnded( SectionStats const& sectionStats );
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats );
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats );
+        virtual void testRunEnded( TestRunStats const& testRunStats );
+        virtual void skipTest( TestCaseInfo const& );
+
+    private:
+        Ptr<IReporter> m_legacyReporter;
+    };
+}
+
+namespace Catch
+{
+    LegacyReporterAdapter::LegacyReporterAdapter( Ptr<IReporter> const& legacyReporter )
+    :   m_legacyReporter( legacyReporter )
+    {}
+    LegacyReporterAdapter::~LegacyReporterAdapter() {}
+
+    ReporterPreferences LegacyReporterAdapter::getPreferences() const {
+        ReporterPreferences prefs;
+        prefs.shouldRedirectStdOut = m_legacyReporter->shouldRedirectStdout();
+        return prefs;
+    }
+
+    void LegacyReporterAdapter::noMatchingTestCases( std::string const& ) {}
+    void LegacyReporterAdapter::testRunStarting( TestRunInfo const& ) {
+        m_legacyReporter->StartTesting();
+    }
+    void LegacyReporterAdapter::testGroupStarting( GroupInfo const& groupInfo ) {
+        m_legacyReporter->StartGroup( groupInfo.name );
+    }
+    void LegacyReporterAdapter::testCaseStarting( TestCaseInfo const& testInfo ) {
+        m_legacyReporter->StartTestCase( testInfo );
+    }
+    void LegacyReporterAdapter::sectionStarting( SectionInfo const& sectionInfo ) {
+        m_legacyReporter->StartSection( sectionInfo.name, sectionInfo.description );
+    }
+    void LegacyReporterAdapter::assertionStarting( AssertionInfo const& ) {
+        // Not on legacy interface
+    }
+
+    bool LegacyReporterAdapter::assertionEnded( AssertionStats const& assertionStats ) {
+        if( assertionStats.assertionResult.getResultType() != ResultWas::Ok ) {
+            for( std::vector<MessageInfo>::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end();
+                    it != itEnd;
+                    ++it ) {
+                if( it->type == ResultWas::Info ) {
+                    ResultBuilder rb( it->macroName.c_str(), it->lineInfo, "", ResultDisposition::Normal );
+                    rb << it->message;
+                    rb.setResultType( ResultWas::Info );
+                    AssertionResult result = rb.build();
+                    m_legacyReporter->Result( result );
+                }
+            }
+        }
+        m_legacyReporter->Result( assertionStats.assertionResult );
+        return true;
+    }
+    void LegacyReporterAdapter::sectionEnded( SectionStats const& sectionStats ) {
+        if( sectionStats.missingAssertions )
+            m_legacyReporter->NoAssertionsInSection( sectionStats.sectionInfo.name );
+        m_legacyReporter->EndSection( sectionStats.sectionInfo.name, sectionStats.assertions );
+    }
+    void LegacyReporterAdapter::testCaseEnded( TestCaseStats const& testCaseStats ) {
+        m_legacyReporter->EndTestCase
+            (   testCaseStats.testInfo,
+                testCaseStats.totals,
+                testCaseStats.stdOut,
+                testCaseStats.stdErr );
+    }
+    void LegacyReporterAdapter::testGroupEnded( TestGroupStats const& testGroupStats ) {
+        if( testGroupStats.aborting )
+            m_legacyReporter->Aborted();
+        m_legacyReporter->EndGroup( testGroupStats.groupInfo.name, testGroupStats.totals );
+    }
+    void LegacyReporterAdapter::testRunEnded( TestRunStats const& testRunStats ) {
+        m_legacyReporter->EndTesting( testRunStats.totals );
+    }
+    void LegacyReporterAdapter::skipTest( TestCaseInfo const& ) {
+    }
+}
+
+// #included from: catch_timer.hpp
+
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++11-long-long"
+#endif
+
+#ifdef CATCH_PLATFORM_WINDOWS
+
+#else
+
+#include <sys/time.h>
+
+#endif
+
+namespace Catch {
+
+    namespace {
+#ifdef CATCH_PLATFORM_WINDOWS
+        UInt64 getCurrentTicks() {
+            static UInt64 hz=0, hzo=0;
+            if (!hz) {
+                QueryPerformanceFrequency( reinterpret_cast<LARGE_INTEGER*>( &hz ) );
+                QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &hzo ) );
+            }
+            UInt64 t;
+            QueryPerformanceCounter( reinterpret_cast<LARGE_INTEGER*>( &t ) );
+            return ((t-hzo)*1000000)/hz;
+        }
+#else
+        UInt64 getCurrentTicks() {
+            timeval t;
+            gettimeofday(&t,CATCH_NULL);
+            return static_cast<UInt64>( t.tv_sec ) * 1000000ull + static_cast<UInt64>( t.tv_usec );
+        }
+#endif
+    }
+
+    void Timer::start() {
+        m_ticks = getCurrentTicks();
+    }
+    unsigned int Timer::getElapsedMicroseconds() const {
+        return static_cast<unsigned int>(getCurrentTicks() - m_ticks);
+    }
+    unsigned int Timer::getElapsedMilliseconds() const {
+        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+    }
+    double Timer::getElapsedSeconds() const {
+        return getElapsedMicroseconds()/1000000.0;
+    }
+
+} // namespace Catch
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+// #included from: catch_common.hpp
+#define TWOBLUECUBES_CATCH_COMMON_HPP_INCLUDED
+
+#include <cstring>
+#include <cctype>
+
+namespace Catch {
+
+    bool startsWith( std::string const& s, std::string const& prefix ) {
+        return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+    }
+    bool startsWith( std::string const& s, char prefix ) {
+        return !s.empty() && s[0] == prefix;
+    }
+    bool endsWith( std::string const& s, std::string const& suffix ) {
+        return s.size() >= suffix.size() && std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
+    }
+    bool endsWith( std::string const& s, char suffix ) {
+        return !s.empty() && s[s.size()-1] == suffix;
+    }
+    bool contains( std::string const& s, std::string const& infix ) {
+        return s.find( infix ) != std::string::npos;
+    }
+    char toLowerCh(char c) {
+        return static_cast<char>( std::tolower( c ) );
+    }
+    void toLowerInPlace( std::string& s ) {
+        std::transform( s.begin(), s.end(), s.begin(), toLowerCh );
+    }
+    std::string toLower( std::string const& s ) {
+        std::string lc = s;
+        toLowerInPlace( lc );
+        return lc;
+    }
+    std::string trim( std::string const& str ) {
+        static char const* whitespaceChars = "\n\r\t ";
+        std::string::size_type start = str.find_first_not_of( whitespaceChars );
+        std::string::size_type end = str.find_last_not_of( whitespaceChars );
+
+        return start != std::string::npos ? str.substr( start, 1+end-start ) : std::string();
+    }
+
+    bool replaceInPlace( std::string& str, std::string const& replaceThis, std::string const& withThis ) {
+        bool replaced = false;
+        std::size_t i = str.find( replaceThis );
+        while( i != std::string::npos ) {
+            replaced = true;
+            str = str.substr( 0, i ) + withThis + str.substr( i+replaceThis.size() );
+            if( i < str.size()-withThis.size() )
+                i = str.find( replaceThis, i+withThis.size() );
+            else
+                i = std::string::npos;
+        }
+        return replaced;
+    }
+
+    pluralise::pluralise( std::size_t count, std::string const& label )
+    :   m_count( count ),
+        m_label( label )
+    {}
+
+    std::ostream& operator << ( std::ostream& os, pluralise const& pluraliser ) {
+        os << pluraliser.m_count << ' ' << pluraliser.m_label;
+        if( pluraliser.m_count != 1 )
+            os << 's';
+        return os;
+    }
+
+    SourceLineInfo::SourceLineInfo() : file(""), line( 0 ){}
+    SourceLineInfo::SourceLineInfo( char const* _file, std::size_t _line )
+    :   file( _file ),
+        line( _line )
+    {}
+    bool SourceLineInfo::empty() const {
+        return file[0] == '\0';
+    }
+    bool SourceLineInfo::operator == ( SourceLineInfo const& other ) const {
+        return line == other.line && (file == other.file || std::strcmp(file, other.file) == 0);
+    }
+    bool SourceLineInfo::operator < ( SourceLineInfo const& other ) const {
+        return line < other.line || ( line == other.line && (std::strcmp(file, other.file) < 0));
+    }
+
+    void seedRng( IConfig const& config ) {
+        if( config.rngSeed() != 0 )
+            std::srand( config.rngSeed() );
+    }
+    unsigned int rngSeed() {
+        return getCurrentContext().getConfig()->rngSeed();
+    }
+
+    std::ostream& operator << ( std::ostream& os, SourceLineInfo const& info ) {
+#ifndef __GNUG__
+        os << info.file << '(' << info.line << ')';
+#else
+        os << info.file << ':' << info.line;
+#endif
+        return os;
+    }
+
+    void throwLogicError( std::string const& message, SourceLineInfo const& locationInfo ) {
+        std::ostringstream oss;
+        oss << locationInfo << ": Internal Catch error: '" << message << '\'';
+        if( alwaysTrue() )
+            throw std::logic_error( oss.str() );
+    }
+}
+
+// #included from: catch_section.hpp
+#define TWOBLUECUBES_CATCH_SECTION_HPP_INCLUDED
+
+namespace Catch {
+
+    SectionInfo::SectionInfo
+        (   SourceLineInfo const& _lineInfo,
+            std::string const& _name,
+            std::string const& _description )
+    :   name( _name ),
+        description( _description ),
+        lineInfo( _lineInfo )
+    {}
+
+    Section::Section( SectionInfo const& info )
+    :   m_info( info ),
+        m_sectionIncluded( getResultCapture().sectionStarted( m_info, m_assertions ) )
+    {
+        m_timer.start();
+    }
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4996) // std::uncaught_exception is deprecated in C++17
+#endif
+    Section::~Section() {
+        if( m_sectionIncluded ) {
+            SectionEndInfo endInfo( m_info, m_assertions, m_timer.getElapsedSeconds() );
+            if( std::uncaught_exception() )
+                getResultCapture().sectionEndedEarly( endInfo );
+            else
+                getResultCapture().sectionEnded( endInfo );
+        }
+    }
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
+    // This indicates whether the section should be executed or not
+    Section::operator bool() const {
+        return m_sectionIncluded;
+    }
+
+} // end namespace Catch
+
+// #included from: catch_debugger.hpp
+#define TWOBLUECUBES_CATCH_DEBUGGER_HPP_INCLUDED
+
+#ifdef CATCH_PLATFORM_MAC
+
+    #include <assert.h>
+    #include <stdbool.h>
+    #include <sys/types.h>
+    #include <unistd.h>
+    #include <sys/sysctl.h>
+
+    namespace Catch{
+
+        // The following function is taken directly from the following technical note:
+        // http://developer.apple.com/library/mac/#qa/qa2004/qa1361.html
+
+        // Returns true if the current process is being debugged (either
+        // running under the debugger or has a debugger attached post facto).
+        bool isDebuggerActive(){
+
+            int                 mib[4];
+            struct kinfo_proc   info;
+            size_t              size;
+
+            // Initialize the flags so that, if sysctl fails for some bizarre
+            // reason, we get a predictable result.
+
+            info.kp_proc.p_flag = 0;
+
+            // Initialize mib, which tells sysctl the info we want, in this case
+            // we're looking for information about a specific process ID.
+
+            mib[0] = CTL_KERN;
+            mib[1] = KERN_PROC;
+            mib[2] = KERN_PROC_PID;
+            mib[3] = getpid();
+
+            // Call sysctl.
+
+            size = sizeof(info);
+            if( sysctl(mib, sizeof(mib) / sizeof(*mib), &info, &size, CATCH_NULL, 0) != 0 ) {
+                Catch::cerr() << "\n** Call to sysctl failed - unable to determine if debugger is active **\n" << std::endl;
+                return false;
+            }
+
+            // We're being debugged if the P_TRACED flag is set.
+
+            return ( (info.kp_proc.p_flag & P_TRACED) != 0 );
+        }
+    } // namespace Catch
+
+#elif defined(CATCH_PLATFORM_LINUX)
+    #include <fstream>
+    #include <string>
+
+    namespace Catch{
+        // The standard POSIX way of detecting a debugger is to attempt to
+        // ptrace() the process, but this needs to be done from a child and not
+        // this process itself to still allow attaching to this process later
+        // if wanted, so is rather heavy. Under Linux we have the PID of the
+        // "debugger" (which doesn't need to be gdb, of course, it could also
+        // be strace, for example) in /proc/$PID/status, so just get it from
+        // there instead.
+        bool isDebuggerActive(){
+            // Libstdc++ has a bug, where std::ifstream sets errno to 0
+            // This way our users can properly assert over errno values
+            ErrnoGuard guard;
+            std::ifstream in("/proc/self/status");
+            for( std::string line; std::getline(in, line); ) {
+                static const int PREFIX_LEN = 11;
+                if( line.compare(0, PREFIX_LEN, "TracerPid:\t") == 0 ) {
+                    // We're traced if the PID is not 0 and no other PID starts
+                    // with 0 digit, so it's enough to check for just a single
+                    // character.
+                    return line.length() > PREFIX_LEN && line[PREFIX_LEN] != '0';
+                }
+            }
+
+            return false;
+        }
+    } // namespace Catch
+#elif defined(_MSC_VER)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#elif defined(__MINGW32__)
+    extern "C" __declspec(dllimport) int __stdcall IsDebuggerPresent();
+    namespace Catch {
+        bool isDebuggerActive() {
+            return IsDebuggerPresent() != 0;
+        }
+    }
+#else
+    namespace Catch {
+       inline bool isDebuggerActive() { return false; }
+    }
+#endif // Platform
+
+#ifdef CATCH_PLATFORM_WINDOWS
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            ::OutputDebugStringA( text.c_str() );
+        }
+    }
+#else
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            // !TBD: Need a version for Mac/ XCode and other IDEs
+            Catch::cout() << text;
+        }
+    }
+#endif // Platform
+
+// #included from: catch_tostring.hpp
+#define TWOBLUECUBES_CATCH_TOSTRING_HPP_INCLUDED
+
+namespace Catch {
+
+namespace Detail {
+
+    const std::string unprintableString = "{?}";
+
+    namespace {
+        const int hexThreshold = 255;
+
+        struct Endianness {
+            enum Arch { Big, Little };
+
+            static Arch which() {
+                union _{
+                    int asInt;
+                    char asChar[sizeof (int)];
+                } u;
+
+                u.asInt = 1;
+                return ( u.asChar[sizeof(int)-1] == 1 ) ? Big : Little;
+            }
+        };
+    }
+
+    std::string rawMemoryToString( const void *object, std::size_t size )
+    {
+        // Reverse order for little endian architectures
+        int i = 0, end = static_cast<int>( size ), inc = 1;
+        if( Endianness::which() == Endianness::Little ) {
+            i = end-1;
+            end = inc = -1;
+        }
+
+        unsigned char const *bytes = static_cast<unsigned char const *>(object);
+        std::ostringstream os;
+        os << "0x" << std::setfill('0') << std::hex;
+        for( ; i != end; i += inc )
+             os << std::setw(2) << static_cast<unsigned>(bytes[i]);
+       return os.str();
+    }
+}
+
+std::string toString( std::string const& value ) {
+    std::string s = value;
+    if( getCurrentContext().getConfig()->showInvisibles() ) {
+        for(size_t i = 0; i < s.size(); ++i ) {
+            std::string subs;
+            switch( s[i] ) {
+            case '\n': subs = "\\n"; break;
+            case '\t': subs = "\\t"; break;
+            default: break;
+            }
+            if( !subs.empty() ) {
+                s = s.substr( 0, i ) + subs + s.substr( i+1 );
+                ++i;
+            }
+        }
+    }
+    return '"' + s + '"';
+}
+std::string toString( std::wstring const& value ) {
+
+    std::string s;
+    s.reserve( value.size() );
+    for(size_t i = 0; i < value.size(); ++i )
+        s += value[i] <= 0xff ? static_cast<char>( value[i] ) : '?';
+    return Catch::toString( s );
+}
+
+std::string toString( const char* const value ) {
+    return value ? Catch::toString( std::string( value ) ) : std::string( "{null string}" );
+}
+
+std::string toString( char* const value ) {
+    return Catch::toString( static_cast<const char*>( value ) );
+}
+
+std::string toString( const wchar_t* const value )
+{
+    return value ? Catch::toString( std::wstring(value) ) : std::string( "{null string}" );
+}
+
+std::string toString( wchar_t* const value )
+{
+    return Catch::toString( static_cast<const wchar_t*>( value ) );
+}
+
+std::string toString( int value ) {
+    std::ostringstream oss;
+    oss << value;
+    if( value > Detail::hexThreshold )
+        oss << " (0x" << std::hex << value << ')';
+    return oss.str();
+}
+
+std::string toString( unsigned long value ) {
+    std::ostringstream oss;
+    oss << value;
+    if( value > Detail::hexThreshold )
+        oss << " (0x" << std::hex << value << ')';
+    return oss.str();
+}
+
+std::string toString( unsigned int value ) {
+    return Catch::toString( static_cast<unsigned long>( value ) );
+}
+
+template<typename T>
+std::string fpToString( T value, int precision ) {
+    std::ostringstream oss;
+    oss << std::setprecision( precision )
+        << std::fixed
+        << value;
+    std::string d = oss.str();
+    std::size_t i = d.find_last_not_of( '0' );
+    if( i != std::string::npos && i != d.size()-1 ) {
+        if( d[i] == '.' )
+            i++;
+        d = d.substr( 0, i+1 );
+    }
+    return d;
+}
+
+std::string toString( const double value ) {
+    return fpToString( value, 10 );
+}
+std::string toString( const float value ) {
+    return fpToString( value, 5 ) + 'f';
+}
+
+std::string toString( bool value ) {
+    return value ? "true" : "false";
+}
+
+std::string toString( char value ) {
+    if ( value == '\r' )
+        return "'\\r'";
+    if ( value == '\f' )
+        return "'\\f'";
+    if ( value == '\n' )
+        return "'\\n'";
+    if ( value == '\t' )
+        return "'\\t'";
+    if ( '\0' <= value && value < ' ' )
+        return toString( static_cast<unsigned int>( value ) );
+    char chstr[] = "' '";
+    chstr[1] = value;
+    return chstr;
+}
+
+std::string toString( signed char value ) {
+    return toString( static_cast<char>( value ) );
+}
+
+std::string toString( unsigned char value ) {
+    return toString( static_cast<char>( value ) );
+}
+
+#ifdef CATCH_CONFIG_CPP11_LONG_LONG
+std::string toString( long long value ) {
+    std::ostringstream oss;
+    oss << value;
+    if( value > Detail::hexThreshold )
+        oss << " (0x" << std::hex << value << ')';
+    return oss.str();
+}
+std::string toString( unsigned long long value ) {
+    std::ostringstream oss;
+    oss << value;
+    if( value > Detail::hexThreshold )
+        oss << " (0x" << std::hex << value << ')';
+    return oss.str();
+}
+#endif
+
+#ifdef CATCH_CONFIG_CPP11_NULLPTR
+std::string toString( std::nullptr_t ) {
+    return "nullptr";
+}
+#endif
+
+#ifdef __OBJC__
+    std::string toString( NSString const * const& nsstring ) {
+        if( !nsstring )
+            return "nil";
+        return "@" + toString([nsstring UTF8String]);
+    }
+    std::string toString( NSString * CATCH_ARC_STRONG & nsstring ) {
+        if( !nsstring )
+            return "nil";
+        return "@" + toString([nsstring UTF8String]);
+    }
+    std::string toString( NSObject* const& nsObject ) {
+        return toString( [nsObject description] );
+    }
+#endif
+
+} // end namespace Catch
+
+// #included from: catch_result_builder.hpp
+#define TWOBLUECUBES_CATCH_RESULT_BUILDER_HPP_INCLUDED
+
+#include <cassert>
+
+namespace Catch {
+
+    ResultBuilder::ResultBuilder(   char const* macroName,
+                                    SourceLineInfo const& lineInfo,
+                                    char const* capturedExpression,
+                                    ResultDisposition::Flags resultDisposition,
+                                    char const* secondArg )
+    :   m_assertionInfo( macroName, lineInfo, capturedExpression, resultDisposition, secondArg ),
+        m_shouldDebugBreak( false ),
+        m_shouldThrow( false ),
+        m_guardException( false ),
+        m_usedStream( false )
+    {}
+
+    ResultBuilder::~ResultBuilder() {
+#if defined(CATCH_CONFIG_FAST_COMPILE)
+        if ( m_guardException ) {
+            stream().oss << "Exception translation was disabled by CATCH_CONFIG_FAST_COMPILE";
+            captureResult( ResultWas::ThrewException );
+            getCurrentContext().getResultCapture()->exceptionEarlyReported();
+        }
+#endif
+    }
+
+    ResultBuilder& ResultBuilder::setResultType( ResultWas::OfType result ) {
+        m_data.resultType = result;
+        return *this;
+    }
+    ResultBuilder& ResultBuilder::setResultType( bool result ) {
+        m_data.resultType = result ? ResultWas::Ok : ResultWas::ExpressionFailed;
+        return *this;
+    }
+
+    void ResultBuilder::endExpression( DecomposedExpression const& expr ) {
+        // Flip bool results if FalseTest flag is set
+        if( isFalseTest( m_assertionInfo.resultDisposition ) ) {
+            m_data.negate( expr.isBinaryExpression() );
+        }
+
+        getResultCapture().assertionRun();
+
+        if(getCurrentContext().getConfig()->includeSuccessfulResults() || m_data.resultType != ResultWas::Ok)
+        {
+            AssertionResult result = build( expr );
+            handleResult( result );
+        }
+        else
+            getResultCapture().assertionPassed();
+    }
+
+    void ResultBuilder::useActiveException( ResultDisposition::Flags resultDisposition ) {
+        m_assertionInfo.resultDisposition = resultDisposition;
+        stream().oss << Catch::translateActiveException();
+        captureResult( ResultWas::ThrewException );
+    }
+
+    void ResultBuilder::captureResult( ResultWas::OfType resultType ) {
+        setResultType( resultType );
+        captureExpression();
+    }
+
+    void ResultBuilder::captureExpectedException( std::string const& expectedMessage ) {
+        if( expectedMessage.empty() )
+            captureExpectedException( Matchers::Impl::MatchAllOf<std::string>() );
+        else
+            captureExpectedException( Matchers::Equals( expectedMessage ) );
+    }
+
+    void ResultBuilder::captureExpectedException( Matchers::Impl::MatcherBase<std::string> const& matcher ) {
+
+        assert( !isFalseTest( m_assertionInfo.resultDisposition ) );
+        AssertionResultData data = m_data;
+        data.resultType = ResultWas::Ok;
+        data.reconstructedExpression = capturedExpressionWithSecondArgument(m_assertionInfo.capturedExpression, m_assertionInfo.secondArg);
+
+        std::string actualMessage = Catch::translateActiveException();
+        if( !matcher.match( actualMessage ) ) {
+            data.resultType = ResultWas::ExpressionFailed;
+            data.reconstructedExpression = actualMessage;
+        }
+        AssertionResult result( m_assertionInfo, data );
+        handleResult( result );
+    }
+
+    void ResultBuilder::captureExpression() {
+        AssertionResult result = build();
+        handleResult( result );
+    }
+
+    void ResultBuilder::handleResult( AssertionResult const& result )
+    {
+        getResultCapture().assertionEnded( result );
+
+        if( !result.isOk() ) {
+            if( getCurrentContext().getConfig()->shouldDebugBreak() )
+                m_shouldDebugBreak = true;
+            if( getCurrentContext().getRunner()->aborting() || (m_assertionInfo.resultDisposition & ResultDisposition::Normal) )
+                m_shouldThrow = true;
+        }
+    }
+
+    void ResultBuilder::react() {
+#if defined(CATCH_CONFIG_FAST_COMPILE)
+        if (m_shouldDebugBreak) {
+            ///////////////////////////////////////////////////////////////////
+            // To inspect the state during test, you need to go one level up the callstack
+            // To go back to the test and change execution, jump over the throw statement
+            ///////////////////////////////////////////////////////////////////
+            CATCH_BREAK_INTO_DEBUGGER();
+        }
+#endif
+        if( m_shouldThrow )
+            throw Catch::TestFailureException();
+    }
+
+    bool ResultBuilder::shouldDebugBreak() const { return m_shouldDebugBreak; }
+    bool ResultBuilder::allowThrows() const { return getCurrentContext().getConfig()->allowThrows(); }
+
+    AssertionResult ResultBuilder::build() const
+    {
+        return build( *this );
+    }
+
+    // CAVEAT: The returned AssertionResult stores a pointer to the argument expr,
+    //         a temporary DecomposedExpression, which in turn holds references to
+    //         operands, possibly temporary as well.
+    //         It should immediately be passed to handleResult; if the expression
+    //         needs to be reported, its string expansion must be composed before
+    //         the temporaries are destroyed.
+    AssertionResult ResultBuilder::build( DecomposedExpression const& expr ) const
+    {
+        assert( m_data.resultType != ResultWas::Unknown );
+        AssertionResultData data = m_data;
+
+        if(m_usedStream)
+            data.message = m_stream().oss.str();
+        data.decomposedExpression = &expr; // for lazy reconstruction
+        return AssertionResult( m_assertionInfo, data );
+    }
+
+    void ResultBuilder::reconstructExpression( std::string& dest ) const {
+        dest = capturedExpressionWithSecondArgument(m_assertionInfo.capturedExpression, m_assertionInfo.secondArg);
+    }
+
+    void ResultBuilder::setExceptionGuard() {
+        m_guardException = true;
+    }
+    void ResultBuilder::unsetExceptionGuard() {
+        m_guardException = false;
+    }
+
+} // end namespace Catch
+
+// #included from: catch_tag_alias_registry.hpp
+#define TWOBLUECUBES_CATCH_TAG_ALIAS_REGISTRY_HPP_INCLUDED
+
+namespace Catch {
+
+    TagAliasRegistry::~TagAliasRegistry() {}
+
+    Option<TagAlias> TagAliasRegistry::find( std::string const& alias ) const {
+        std::map<std::string, TagAlias>::const_iterator it = m_registry.find( alias );
+        if( it != m_registry.end() )
+            return it->second;
+        else
+            return Option<TagAlias>();
+    }
+
+    std::string TagAliasRegistry::expandAliases( std::string const& unexpandedTestSpec ) const {
+        std::string expandedTestSpec = unexpandedTestSpec;
+        for( std::map<std::string, TagAlias>::const_iterator it = m_registry.begin(), itEnd = m_registry.end();
+                it != itEnd;
+                ++it ) {
+            std::size_t pos = expandedTestSpec.find( it->first );
+            if( pos != std::string::npos ) {
+                expandedTestSpec =  expandedTestSpec.substr( 0, pos ) +
+                                    it->second.tag +
+                                    expandedTestSpec.substr( pos + it->first.size() );
+            }
+        }
+        return expandedTestSpec;
+    }
+
+    void TagAliasRegistry::add( std::string const& alias, std::string const& tag, SourceLineInfo const& lineInfo ) {
+
+        if( !startsWith( alias, "[@" ) || !endsWith( alias, ']' ) ) {
+            std::ostringstream oss;
+            oss << Colour( Colour::Red )
+                << "error: tag alias, \"" << alias << "\" is not of the form [@alias name].\n"
+                << Colour( Colour::FileName )
+                << lineInfo << '\n';
+            throw std::domain_error( oss.str().c_str() );
+        }
+        if( !m_registry.insert( std::make_pair( alias, TagAlias( tag, lineInfo ) ) ).second ) {
+            std::ostringstream oss;
+            oss << Colour( Colour::Red )
+                << "error: tag alias, \"" << alias << "\" already registered.\n"
+                << "\tFirst seen at "
+                << Colour( Colour::Red ) << find(alias)->lineInfo << '\n'
+                << Colour( Colour::Red ) << "\tRedefined at "
+                << Colour( Colour::FileName) << lineInfo << '\n';
+            throw std::domain_error( oss.str().c_str() );
+        }
+    }
+
+    ITagAliasRegistry::~ITagAliasRegistry() {}
+
+    ITagAliasRegistry const& ITagAliasRegistry::get() {
+        return getRegistryHub().getTagAliasRegistry();
+    }
+
+    RegistrarForTagAliases::RegistrarForTagAliases( char const* alias, char const* tag, SourceLineInfo const& lineInfo ) {
+        getMutableRegistryHub().registerTagAlias( alias, tag, lineInfo );
+    }
+
+} // end namespace Catch
+
+// #included from: catch_matchers_string.hpp
+
+namespace Catch {
+namespace Matchers {
+
+    namespace StdString {
+
+        CasedString::CasedString( std::string const& str, CaseSensitive::Choice caseSensitivity )
+        :   m_caseSensitivity( caseSensitivity ),
+            m_str( adjustString( str ) )
+        {}
+        std::string CasedString::adjustString( std::string const& str ) const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? toLower( str )
+                   : str;
+        }
+        std::string CasedString::caseSensitivitySuffix() const {
+            return m_caseSensitivity == CaseSensitive::No
+                   ? " (case insensitive)"
+                   : std::string();
+        }
+
+        StringMatcherBase::StringMatcherBase( std::string const& operation, CasedString const& comparator )
+        : m_comparator( comparator ),
+          m_operation( operation ) {
+        }
+
+        std::string StringMatcherBase::describe() const {
+            std::string description;
+            description.reserve(5 + m_operation.size() + m_comparator.m_str.size() +
+                                        m_comparator.caseSensitivitySuffix().size());
+            description += m_operation;
+            description += ": \"";
+            description += m_comparator.m_str;
+            description += "\"";
+            description += m_comparator.caseSensitivitySuffix();
+            return description;
+        }
+
+        EqualsMatcher::EqualsMatcher( CasedString const& comparator ) : StringMatcherBase( "equals", comparator ) {}
+
+        bool EqualsMatcher::match( std::string const& source ) const {
+            return m_comparator.adjustString( source ) == m_comparator.m_str;
+        }
+
+        ContainsMatcher::ContainsMatcher( CasedString const& comparator ) : StringMatcherBase( "contains", comparator ) {}
+
+        bool ContainsMatcher::match( std::string const& source ) const {
+            return contains( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        StartsWithMatcher::StartsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "starts with", comparator ) {}
+
+        bool StartsWithMatcher::match( std::string const& source ) const {
+            return startsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+        EndsWithMatcher::EndsWithMatcher( CasedString const& comparator ) : StringMatcherBase( "ends with", comparator ) {}
+
+        bool EndsWithMatcher::match( std::string const& source ) const {
+            return endsWith( m_comparator.adjustString( source ), m_comparator.m_str );
+        }
+
+    } // namespace StdString
+
+    StdString::EqualsMatcher Equals( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EqualsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::ContainsMatcher Contains( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::ContainsMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::EndsWithMatcher EndsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::EndsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+    StdString::StartsWithMatcher StartsWith( std::string const& str, CaseSensitive::Choice caseSensitivity ) {
+        return StdString::StartsWithMatcher( StdString::CasedString( str, caseSensitivity) );
+    }
+
+} // namespace Matchers
+} // namespace Catch
+// #included from: ../reporters/catch_reporter_multi.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_MULTI_HPP_INCLUDED
+
+namespace Catch {
+
+class MultipleReporters : public SharedImpl<IStreamingReporter> {
+    typedef std::vector<Ptr<IStreamingReporter> > Reporters;
+    Reporters m_reporters;
+
+public:
+    void add( Ptr<IStreamingReporter> const& reporter ) {
+        m_reporters.push_back( reporter );
+    }
+
+public: // IStreamingReporter
+
+    virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE {
+        return m_reporters[0]->getPreferences();
+    }
+
+    virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->noMatchingTestCases( spec );
+    }
+
+    virtual void testRunStarting( TestRunInfo const& testRunInfo ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->testRunStarting( testRunInfo );
+    }
+
+    virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->testGroupStarting( groupInfo );
+    }
+
+    virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->testCaseStarting( testInfo );
+    }
+
+    virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->sectionStarting( sectionInfo );
+    }
+
+    virtual void assertionStarting( AssertionInfo const& assertionInfo ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->assertionStarting( assertionInfo );
+    }
+
+    // The return value indicates if the messages buffer should be cleared:
+    virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
+        bool clearBuffer = false;
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            clearBuffer |= (*it)->assertionEnded( assertionStats );
+        return clearBuffer;
+    }
+
+    virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->sectionEnded( sectionStats );
+    }
+
+    virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->testCaseEnded( testCaseStats );
+    }
+
+    virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->testGroupEnded( testGroupStats );
+    }
+
+    virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->testRunEnded( testRunStats );
+    }
+
+    virtual void skipTest( TestCaseInfo const& testInfo ) CATCH_OVERRIDE {
+        for( Reporters::const_iterator it = m_reporters.begin(), itEnd = m_reporters.end();
+                it != itEnd;
+                ++it )
+            (*it)->skipTest( testInfo );
+    }
+
+    virtual MultipleReporters* tryAsMulti() CATCH_OVERRIDE {
+        return this;
+    }
+
+};
+
+Ptr<IStreamingReporter> addReporter( Ptr<IStreamingReporter> const& existingReporter, Ptr<IStreamingReporter> const& additionalReporter ) {
+    Ptr<IStreamingReporter> resultingReporter;
+
+    if( existingReporter ) {
+        MultipleReporters* multi = existingReporter->tryAsMulti();
+        if( !multi ) {
+            multi = new MultipleReporters;
+            resultingReporter = Ptr<IStreamingReporter>( multi );
+            if( existingReporter )
+                multi->add( existingReporter );
+        }
+        else
+            resultingReporter = existingReporter;
+        multi->add( additionalReporter );
+    }
+    else
+        resultingReporter = additionalReporter;
+
+    return resultingReporter;
+}
+
+} // end namespace Catch
+
+// #included from: ../reporters/catch_reporter_xml.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_XML_HPP_INCLUDED
+
+// #included from: catch_reporter_bases.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_BASES_HPP_INCLUDED
+
+#include <cstring>
+#include <cfloat>
+#include <cstdio>
+#include <assert.h>
+
+namespace Catch {
+
+    namespace {
+        // Because formatting using c++ streams is stateful, drop down to C is required
+        // Alternatively we could use stringstream, but its performance is... not good.
+        std::string getFormattedDuration( double duration ) {
+            // Max exponent + 1 is required to represent the whole part
+            // + 1 for decimal point
+            // + 3 for the 3 decimal places
+            // + 1 for null terminator
+            const size_t maxDoubleSize = DBL_MAX_10_EXP + 1 + 1 + 3 + 1;
+            char buffer[maxDoubleSize];
+
+            // Save previous errno, to prevent sprintf from overwriting it
+            ErrnoGuard guard;
+#ifdef _MSC_VER
+            sprintf_s(buffer, "%.3f", duration);
+#else
+            sprintf(buffer, "%.3f", duration);
+#endif
+            return std::string(buffer);
+        }
+    }
+
+    struct StreamingReporterBase : SharedImpl<IStreamingReporter> {
+
+        StreamingReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+        }
+
+        virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE {
+            return m_reporterPrefs;
+        }
+
+        virtual ~StreamingReporterBase() CATCH_OVERRIDE;
+
+        virtual void noMatchingTestCases( std::string const& ) CATCH_OVERRIDE {}
+
+        virtual void testRunStarting( TestRunInfo const& _testRunInfo ) CATCH_OVERRIDE {
+            currentTestRunInfo = _testRunInfo;
+        }
+        virtual void testGroupStarting( GroupInfo const& _groupInfo ) CATCH_OVERRIDE {
+            currentGroupInfo = _groupInfo;
+        }
+
+        virtual void testCaseStarting( TestCaseInfo const& _testInfo ) CATCH_OVERRIDE {
+            currentTestCaseInfo = _testInfo;
+        }
+        virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE {
+            m_sectionStack.push_back( _sectionInfo );
+        }
+
+        virtual void sectionEnded( SectionStats const& /* _sectionStats */ ) CATCH_OVERRIDE {
+            m_sectionStack.pop_back();
+        }
+        virtual void testCaseEnded( TestCaseStats const& /* _testCaseStats */ ) CATCH_OVERRIDE {
+            currentTestCaseInfo.reset();
+        }
+        virtual void testGroupEnded( TestGroupStats const& /* _testGroupStats */ ) CATCH_OVERRIDE {
+            currentGroupInfo.reset();
+        }
+        virtual void testRunEnded( TestRunStats const& /* _testRunStats */ ) CATCH_OVERRIDE {
+            currentTestCaseInfo.reset();
+            currentGroupInfo.reset();
+            currentTestRunInfo.reset();
+        }
+
+        virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE {
+            // Don't do anything with this by default.
+            // It can optionally be overridden in the derived class.
+        }
+
+        Ptr<IConfig const> m_config;
+        std::ostream& stream;
+
+        LazyStat<TestRunInfo> currentTestRunInfo;
+        LazyStat<GroupInfo> currentGroupInfo;
+        LazyStat<TestCaseInfo> currentTestCaseInfo;
+
+        std::vector<SectionInfo> m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+    };
+
+    struct CumulativeReporterBase : SharedImpl<IStreamingReporter> {
+        template<typename T, typename ChildNodeT>
+        struct Node : SharedImpl<> {
+            explicit Node( T const& _value ) : value( _value ) {}
+            virtual ~Node() {}
+
+            typedef std::vector<Ptr<ChildNodeT> > ChildNodes;
+            T value;
+            ChildNodes children;
+        };
+        struct SectionNode : SharedImpl<> {
+            explicit SectionNode( SectionStats const& _stats ) : stats( _stats ) {}
+            virtual ~SectionNode();
+
+            bool operator == ( SectionNode const& other ) const {
+                return stats.sectionInfo.lineInfo == other.stats.sectionInfo.lineInfo;
+            }
+            bool operator == ( Ptr<SectionNode> const& other ) const {
+                return operator==( *other );
+            }
+
+            SectionStats stats;
+            typedef std::vector<Ptr<SectionNode> > ChildSections;
+            typedef std::vector<AssertionStats> Assertions;
+            ChildSections childSections;
+            Assertions assertions;
+            std::string stdOut;
+            std::string stdErr;
+        };
+
+        struct BySectionInfo {
+            BySectionInfo( SectionInfo const& other ) : m_other( other ) {}
+            BySectionInfo( BySectionInfo const& other ) : m_other( other.m_other ) {}
+            bool operator() ( Ptr<SectionNode> const& node ) const {
+                return ((node->stats.sectionInfo.name == m_other.name) &&
+                        (node->stats.sectionInfo.lineInfo == m_other.lineInfo));
+            }
+        private:
+            void operator=( BySectionInfo const& );
+            SectionInfo const& m_other;
+        };
+
+        typedef Node<TestCaseStats, SectionNode> TestCaseNode;
+        typedef Node<TestGroupStats, TestCaseNode> TestGroupNode;
+        typedef Node<TestRunStats, TestGroupNode> TestRunNode;
+
+        CumulativeReporterBase( ReporterConfig const& _config )
+        :   m_config( _config.fullConfig() ),
+            stream( _config.stream() )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = false;
+        }
+        ~CumulativeReporterBase();
+
+        virtual ReporterPreferences getPreferences() const CATCH_OVERRIDE {
+            return m_reporterPrefs;
+        }
+
+        virtual void testRunStarting( TestRunInfo const& ) CATCH_OVERRIDE {}
+        virtual void testGroupStarting( GroupInfo const& ) CATCH_OVERRIDE {}
+
+        virtual void testCaseStarting( TestCaseInfo const& ) CATCH_OVERRIDE {}
+
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
+            SectionStats incompleteStats( sectionInfo, Counts(), 0, false );
+            Ptr<SectionNode> node;
+            if( m_sectionStack.empty() ) {
+                if( !m_rootSection )
+                    m_rootSection = new SectionNode( incompleteStats );
+                node = m_rootSection;
+            }
+            else {
+                SectionNode& parentNode = *m_sectionStack.back();
+                SectionNode::ChildSections::const_iterator it =
+                    std::find_if(   parentNode.childSections.begin(),
+                                    parentNode.childSections.end(),
+                                    BySectionInfo( sectionInfo ) );
+                if( it == parentNode.childSections.end() ) {
+                    node = new SectionNode( incompleteStats );
+                    parentNode.childSections.push_back( node );
+                }
+                else
+                    node = *it;
+            }
+            m_sectionStack.push_back( node );
+            m_deepestSection = node;
+        }
+
+        virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {}
+
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
+            assert( !m_sectionStack.empty() );
+            SectionNode& sectionNode = *m_sectionStack.back();
+            sectionNode.assertions.push_back( assertionStats );
+            // AssertionResult holds a pointer to a temporary DecomposedExpression,
+            // which getExpandedExpression() calls to build the expression string.
+            // Our section stack copy of the assertionResult will likely outlive the
+            // temporary, so it must be expanded or discarded now to avoid calling
+            // a destroyed object later.
+            prepareExpandedExpression( sectionNode.assertions.back().assertionResult );
+            return true;
+        }
+        virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE {
+            assert( !m_sectionStack.empty() );
+            SectionNode& node = *m_sectionStack.back();
+            node.stats = sectionStats;
+            m_sectionStack.pop_back();
+        }
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
+            Ptr<TestCaseNode> node = new TestCaseNode( testCaseStats );
+            assert( m_sectionStack.size() == 0 );
+            node->children.push_back( m_rootSection );
+            m_testCases.push_back( node );
+            m_rootSection.reset();
+
+            assert( m_deepestSection );
+            m_deepestSection->stdOut = testCaseStats.stdOut;
+            m_deepestSection->stdErr = testCaseStats.stdErr;
+        }
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
+            Ptr<TestGroupNode> node = new TestGroupNode( testGroupStats );
+            node->children.swap( m_testCases );
+            m_testGroups.push_back( node );
+        }
+        virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
+            Ptr<TestRunNode> node = new TestRunNode( testRunStats );
+            node->children.swap( m_testGroups );
+            m_testRuns.push_back( node );
+            testRunEndedCumulative();
+        }
+        virtual void testRunEndedCumulative() = 0;
+
+        virtual void skipTest( TestCaseInfo const& ) CATCH_OVERRIDE {}
+
+        virtual void prepareExpandedExpression( AssertionResult& result ) const {
+            if( result.isOk() )
+                result.discardDecomposedExpression();
+            else
+                result.expandDecomposedExpression();
+        }
+
+        Ptr<IConfig const> m_config;
+        std::ostream& stream;
+        std::vector<AssertionStats> m_assertions;
+        std::vector<std::vector<Ptr<SectionNode> > > m_sections;
+        std::vector<Ptr<TestCaseNode> > m_testCases;
+        std::vector<Ptr<TestGroupNode> > m_testGroups;
+
+        std::vector<Ptr<TestRunNode> > m_testRuns;
+
+        Ptr<SectionNode> m_rootSection;
+        Ptr<SectionNode> m_deepestSection;
+        std::vector<Ptr<SectionNode> > m_sectionStack;
+        ReporterPreferences m_reporterPrefs;
+
+    };
+
+    template<char C>
+    char const* getLineOfChars() {
+        static char line[CATCH_CONFIG_CONSOLE_WIDTH] = {0};
+        if( !*line ) {
+            std::memset( line, C, CATCH_CONFIG_CONSOLE_WIDTH-1 );
+            line[CATCH_CONFIG_CONSOLE_WIDTH-1] = 0;
+        }
+        return line;
+    }
+
+    struct TestEventListenerBase : StreamingReporterBase {
+        TestEventListenerBase( ReporterConfig const& _config )
+        :   StreamingReporterBase( _config )
+        {}
+
+        virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {}
+        virtual bool assertionEnded( AssertionStats const& ) CATCH_OVERRIDE {
+            return false;
+        }
+    };
+
+} // end namespace Catch
+
+// #included from: ../internal/catch_reporter_registrars.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_REGISTRARS_HPP_INCLUDED
+
+namespace Catch {
+
+    template<typename T>
+    class LegacyReporterRegistrar {
+
+        class ReporterFactory : public IReporterFactory {
+            virtual IStreamingReporter* create( ReporterConfig const& config ) const {
+                return new LegacyReporterAdapter( new T( config ) );
+            }
+
+            virtual std::string getDescription() const {
+                return T::getDescription();
+            }
+        };
+
+    public:
+
+        LegacyReporterRegistrar( std::string const& name ) {
+            getMutableRegistryHub().registerReporter( name, new ReporterFactory() );
+        }
+    };
+
+    template<typename T>
+    class ReporterRegistrar {
+
+        class ReporterFactory : public SharedImpl<IReporterFactory> {
+
+            // *** Please Note ***:
+            // - If you end up here looking at a compiler error because it's trying to register
+            // your custom reporter class be aware that the native reporter interface has changed
+            // to IStreamingReporter. The "legacy" interface, IReporter, is still supported via
+            // an adapter. Just use REGISTER_LEGACY_REPORTER to take advantage of the adapter.
+            // However please consider updating to the new interface as the old one is now
+            // deprecated and will probably be removed quite soon!
+            // Please contact me via github if you have any questions at all about this.
+            // In fact, ideally, please contact me anyway to let me know you've hit this - as I have
+            // no idea who is actually using custom reporters at all (possibly no-one!).
+            // The new interface is designed to minimise exposure to interface changes in the future.
+            virtual IStreamingReporter* create( ReporterConfig const& config ) const {
+                return new T( config );
+            }
+
+            virtual std::string getDescription() const {
+                return T::getDescription();
+            }
+        };
+
+    public:
+
+        ReporterRegistrar( std::string const& name ) {
+            getMutableRegistryHub().registerReporter( name, new ReporterFactory() );
+        }
+    };
+
+    template<typename T>
+    class ListenerRegistrar {
+
+        class ListenerFactory : public SharedImpl<IReporterFactory> {
+
+            virtual IStreamingReporter* create( ReporterConfig const& config ) const {
+                return new T( config );
+            }
+            virtual std::string getDescription() const {
+                return std::string();
+            }
+        };
+
+    public:
+
+        ListenerRegistrar() {
+            getMutableRegistryHub().registerListener( new ListenerFactory() );
+        }
+    };
+}
+
+#define INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) \
+    namespace{ Catch::LegacyReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
+
+#define INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType ) \
+    namespace{ Catch::ReporterRegistrar<reporterType> catch_internal_RegistrarFor##reporterType( name ); }
+
+// Deprecated - use the form without INTERNAL_
+#define INTERNAL_CATCH_REGISTER_LISTENER( listenerType ) \
+    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; }
+
+#define CATCH_REGISTER_LISTENER( listenerType ) \
+    namespace{ Catch::ListenerRegistrar<listenerType> catch_internal_RegistrarFor##listenerType; }
+
+// #included from: ../internal/catch_xmlwriter.hpp
+#define TWOBLUECUBES_CATCH_XMLWRITER_HPP_INCLUDED
+
+#include <sstream>
+#include <string>
+#include <vector>
+#include <iomanip>
+
+namespace Catch {
+
+    class XmlEncode {
+    public:
+        enum ForWhat { ForTextNodes, ForAttributes };
+
+        XmlEncode( std::string const& str, ForWhat forWhat = ForTextNodes )
+        :   m_str( str ),
+            m_forWhat( forWhat )
+        {}
+
+        void encodeTo( std::ostream& os ) const {
+
+            // Apostrophe escaping not necessary if we always use " to write attributes
+            // (see: http://www.w3.org/TR/xml/#syntax)
+
+            for( std::size_t i = 0; i < m_str.size(); ++ i ) {
+                char c = m_str[i];
+                switch( c ) {
+                    case '<':   os << "&lt;"; break;
+                    case '&':   os << "&amp;"; break;
+
+                    case '>':
+                        // See: http://www.w3.org/TR/xml/#syntax
+                        if( i > 2 && m_str[i-1] == ']' && m_str[i-2] == ']' )
+                            os << "&gt;";
+                        else
+                            os << c;
+                        break;
+
+                    case '\"':
+                        if( m_forWhat == ForAttributes )
+                            os << "&quot;";
+                        else
+                            os << c;
+                        break;
+
+                    default:
+                        // Escape control chars - based on contribution by @espenalb in PR #465 and
+                        // by @mrpi PR #588
+                        if ( ( c >= 0 && c < '\x09' ) || ( c > '\x0D' && c < '\x20') || c=='\x7F' ) {
+                            // see http://stackoverflow.com/questions/404107/why-are-control-characters-illegal-in-xml-1-0
+                            os << "\\x" << std::uppercase << std::hex << std::setfill('0') << std::setw(2)
+                               << static_cast<int>( c );
+                        }
+                        else
+                            os << c;
+                }
+            }
+        }
+
+        friend std::ostream& operator << ( std::ostream& os, XmlEncode const& xmlEncode ) {
+            xmlEncode.encodeTo( os );
+            return os;
+        }
+
+    private:
+        std::string m_str;
+        ForWhat m_forWhat;
+    };
+
+    class XmlWriter {
+    public:
+
+        class ScopedElement {
+        public:
+            ScopedElement( XmlWriter* writer )
+            :   m_writer( writer )
+            {}
+
+            ScopedElement( ScopedElement const& other )
+            :   m_writer( other.m_writer ){
+                other.m_writer = CATCH_NULL;
+            }
+
+            ~ScopedElement() {
+                if( m_writer )
+                    m_writer->endElement();
+            }
+
+            ScopedElement& writeText( std::string const& text, bool indent = true ) {
+                m_writer->writeText( text, indent );
+                return *this;
+            }
+
+            template<typename T>
+            ScopedElement& writeAttribute( std::string const& name, T const& attribute ) {
+                m_writer->writeAttribute( name, attribute );
+                return *this;
+            }
+
+        private:
+            mutable XmlWriter* m_writer;
+        };
+
+        XmlWriter()
+        :   m_tagIsOpen( false ),
+            m_needsNewline( false ),
+            m_os( Catch::cout() )
+        {
+            writeDeclaration();
+        }
+
+        XmlWriter( std::ostream& os )
+        :   m_tagIsOpen( false ),
+            m_needsNewline( false ),
+            m_os( os )
+        {
+            writeDeclaration();
+        }
+
+        ~XmlWriter() {
+            while( !m_tags.empty() )
+                endElement();
+        }
+
+        XmlWriter& startElement( std::string const& name ) {
+            ensureTagClosed();
+            newlineIfNecessary();
+            m_os << m_indent << '<' << name;
+            m_tags.push_back( name );
+            m_indent += "  ";
+            m_tagIsOpen = true;
+            return *this;
+        }
+
+        ScopedElement scopedElement( std::string const& name ) {
+            ScopedElement scoped( this );
+            startElement( name );
+            return scoped;
+        }
+
+        XmlWriter& endElement() {
+            newlineIfNecessary();
+            m_indent = m_indent.substr( 0, m_indent.size()-2 );
+            if( m_tagIsOpen ) {
+                m_os << "/>";
+                m_tagIsOpen = false;
+            }
+            else {
+                m_os << m_indent << "</" << m_tags.back() << ">";
+            }
+            m_os << std::endl;
+            m_tags.pop_back();
+            return *this;
+        }
+
+        XmlWriter& writeAttribute( std::string const& name, std::string const& attribute ) {
+            if( !name.empty() && !attribute.empty() )
+                m_os << ' ' << name << "=\"" << XmlEncode( attribute, XmlEncode::ForAttributes ) << '"';
+            return *this;
+        }
+
+        XmlWriter& writeAttribute( std::string const& name, bool attribute ) {
+            m_os << ' ' << name << "=\"" << ( attribute ? "true" : "false" ) << '"';
+            return *this;
+        }
+
+        template<typename T>
+        XmlWriter& writeAttribute( std::string const& name, T const& attribute ) {
+            std::ostringstream oss;
+            oss << attribute;
+            return writeAttribute( name, oss.str() );
+        }
+
+        XmlWriter& writeText( std::string const& text, bool indent = true ) {
+            if( !text.empty() ){
+                bool tagWasOpen = m_tagIsOpen;
+                ensureTagClosed();
+                if( tagWasOpen && indent )
+                    m_os << m_indent;
+                m_os << XmlEncode( text );
+                m_needsNewline = true;
+            }
+            return *this;
+        }
+
+        XmlWriter& writeComment( std::string const& text ) {
+            ensureTagClosed();
+            m_os << m_indent << "<!--" << text << "-->";
+            m_needsNewline = true;
+            return *this;
+        }
+
+        void writeStylesheetRef( std::string const& url ) {
+            m_os << "<?xml-stylesheet type=\"text/xsl\" href=\"" << url << "\"?>\n";
+        }
+
+        XmlWriter& writeBlankLine() {
+            ensureTagClosed();
+            m_os << '\n';
+            return *this;
+        }
+
+        void ensureTagClosed() {
+            if( m_tagIsOpen ) {
+                m_os << ">" << std::endl;
+                m_tagIsOpen = false;
+            }
+        }
+
+    private:
+        XmlWriter( XmlWriter const& );
+        void operator=( XmlWriter const& );
+
+        void writeDeclaration() {
+            m_os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+        }
+
+        void newlineIfNecessary() {
+            if( m_needsNewline ) {
+                m_os << std::endl;
+                m_needsNewline = false;
+            }
+        }
+
+        bool m_tagIsOpen;
+        bool m_needsNewline;
+        std::vector<std::string> m_tags;
+        std::string m_indent;
+        std::ostream& m_os;
+    };
+
+}
+
+namespace Catch {
+    class XmlReporter : public StreamingReporterBase {
+    public:
+        XmlReporter( ReporterConfig const& _config )
+        :   StreamingReporterBase( _config ),
+            m_xml(_config.stream()),
+            m_sectionDepth( 0 )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = true;
+        }
+
+        virtual ~XmlReporter() CATCH_OVERRIDE;
+
+        static std::string getDescription() {
+            return "Reports test results as an XML document";
+        }
+
+        virtual std::string getStylesheetRef() const {
+            return std::string();
+        }
+
+        void writeSourceInfo( SourceLineInfo const& sourceInfo ) {
+            m_xml
+                .writeAttribute( "filename", sourceInfo.file )
+                .writeAttribute( "line", sourceInfo.line );
+        }
+
+    public: // StreamingReporterBase
+
+        virtual void noMatchingTestCases( std::string const& s ) CATCH_OVERRIDE {
+            StreamingReporterBase::noMatchingTestCases( s );
+        }
+
+        virtual void testRunStarting( TestRunInfo const& testInfo ) CATCH_OVERRIDE {
+            StreamingReporterBase::testRunStarting( testInfo );
+            std::string stylesheetRef = getStylesheetRef();
+            if( !stylesheetRef.empty() )
+                m_xml.writeStylesheetRef( stylesheetRef );
+            m_xml.startElement( "Catch" );
+            if( !m_config->name().empty() )
+                m_xml.writeAttribute( "name", m_config->name() );
+        }
+
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
+            StreamingReporterBase::testGroupStarting( groupInfo );
+            m_xml.startElement( "Group" )
+                .writeAttribute( "name", groupInfo.name );
+        }
+
+        virtual void testCaseStarting( TestCaseInfo const& testInfo ) CATCH_OVERRIDE {
+            StreamingReporterBase::testCaseStarting(testInfo);
+            m_xml.startElement( "TestCase" )
+                .writeAttribute( "name", trim( testInfo.name ) )
+                .writeAttribute( "description", testInfo.description )
+                .writeAttribute( "tags", testInfo.tagsAsString );
+
+            writeSourceInfo( testInfo.lineInfo );
+
+            if ( m_config->showDurations() == ShowDurations::Always )
+                m_testCaseTimer.start();
+            m_xml.ensureTagClosed();
+        }
+
+        virtual void sectionStarting( SectionInfo const& sectionInfo ) CATCH_OVERRIDE {
+            StreamingReporterBase::sectionStarting( sectionInfo );
+            if( m_sectionDepth++ > 0 ) {
+                m_xml.startElement( "Section" )
+                    .writeAttribute( "name", trim( sectionInfo.name ) )
+                    .writeAttribute( "description", sectionInfo.description );
+                writeSourceInfo( sectionInfo.lineInfo );
+                m_xml.ensureTagClosed();
+            }
+        }
+
+        virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE { }
+
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
+
+            AssertionResult const& result = assertionStats.assertionResult;
+
+            bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+            if( includeResults || result.getResultType() == ResultWas::Warning ) {
+                // Print any info messages in <Info> tags.
+                for( std::vector<MessageInfo>::const_iterator it = assertionStats.infoMessages.begin(), itEnd = assertionStats.infoMessages.end();
+                     it != itEnd;
+                     ++it ) {
+                    if( it->type == ResultWas::Info && includeResults ) {
+                        m_xml.scopedElement( "Info" )
+                                .writeText( it->message );
+                    } else if ( it->type == ResultWas::Warning ) {
+                        m_xml.scopedElement( "Warning" )
+                                .writeText( it->message );
+                    }
+                }
+            }
+
+            // Drop out if result was successful but we're not printing them.
+            if( !includeResults && result.getResultType() != ResultWas::Warning )
+                return true;
+
+            // Print the expression if there is one.
+            if( result.hasExpression() ) {
+                m_xml.startElement( "Expression" )
+                    .writeAttribute( "success", result.succeeded() )
+                    .writeAttribute( "type", result.getTestMacroName() );
+
+                writeSourceInfo( result.getSourceInfo() );
+
+                m_xml.scopedElement( "Original" )
+                    .writeText( result.getExpression() );
+                m_xml.scopedElement( "Expanded" )
+                    .writeText( result.getExpandedExpression() );
+            }
+
+            // And... Print a result applicable to each result type.
+            switch( result.getResultType() ) {
+                case ResultWas::ThrewException:
+                    m_xml.startElement( "Exception" );
+                    writeSourceInfo( result.getSourceInfo() );
+                    m_xml.writeText( result.getMessage() );
+                    m_xml.endElement();
+                    break;
+                case ResultWas::FatalErrorCondition:
+                    m_xml.startElement( "FatalErrorCondition" );
+                    writeSourceInfo( result.getSourceInfo() );
+                    m_xml.writeText( result.getMessage() );
+                    m_xml.endElement();
+                    break;
+                case ResultWas::Info:
+                    m_xml.scopedElement( "Info" )
+                        .writeText( result.getMessage() );
+                    break;
+                case ResultWas::Warning:
+                    // Warning will already have been written
+                    break;
+                case ResultWas::ExplicitFailure:
+                    m_xml.startElement( "Failure" );
+                    writeSourceInfo( result.getSourceInfo() );
+                    m_xml.writeText( result.getMessage() );
+                    m_xml.endElement();
+                    break;
+                default:
+                    break;
+            }
+
+            if( result.hasExpression() )
+                m_xml.endElement();
+
+            return true;
+        }
+
+        virtual void sectionEnded( SectionStats const& sectionStats ) CATCH_OVERRIDE {
+            StreamingReporterBase::sectionEnded( sectionStats );
+            if( --m_sectionDepth > 0 ) {
+                XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResults" );
+                e.writeAttribute( "successes", sectionStats.assertions.passed );
+                e.writeAttribute( "failures", sectionStats.assertions.failed );
+                e.writeAttribute( "expectedFailures", sectionStats.assertions.failedButOk );
+
+                if ( m_config->showDurations() == ShowDurations::Always )
+                    e.writeAttribute( "durationInSeconds", sectionStats.durationInSeconds );
+
+                m_xml.endElement();
+            }
+        }
+
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
+            StreamingReporterBase::testCaseEnded( testCaseStats );
+            XmlWriter::ScopedElement e = m_xml.scopedElement( "OverallResult" );
+            e.writeAttribute( "success", testCaseStats.totals.assertions.allOk() );
+
+            if ( m_config->showDurations() == ShowDurations::Always )
+                e.writeAttribute( "durationInSeconds", m_testCaseTimer.getElapsedSeconds() );
+
+            if( !testCaseStats.stdOut.empty() )
+                m_xml.scopedElement( "StdOut" ).writeText( trim( testCaseStats.stdOut ), false );
+            if( !testCaseStats.stdErr.empty() )
+                m_xml.scopedElement( "StdErr" ).writeText( trim( testCaseStats.stdErr ), false );
+
+            m_xml.endElement();
+        }
+
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
+            StreamingReporterBase::testGroupEnded( testGroupStats );
+            // TODO: Check testGroupStats.aborting and act accordingly.
+            m_xml.scopedElement( "OverallResults" )
+                .writeAttribute( "successes", testGroupStats.totals.assertions.passed )
+                .writeAttribute( "failures", testGroupStats.totals.assertions.failed )
+                .writeAttribute( "expectedFailures", testGroupStats.totals.assertions.failedButOk );
+            m_xml.endElement();
+        }
+
+        virtual void testRunEnded( TestRunStats const& testRunStats ) CATCH_OVERRIDE {
+            StreamingReporterBase::testRunEnded( testRunStats );
+            m_xml.scopedElement( "OverallResults" )
+                .writeAttribute( "successes", testRunStats.totals.assertions.passed )
+                .writeAttribute( "failures", testRunStats.totals.assertions.failed )
+                .writeAttribute( "expectedFailures", testRunStats.totals.assertions.failedButOk );
+            m_xml.endElement();
+        }
+
+    private:
+        Timer m_testCaseTimer;
+        XmlWriter m_xml;
+        int m_sectionDepth;
+    };
+
+     INTERNAL_CATCH_REGISTER_REPORTER( "xml", XmlReporter )
+
+} // end namespace Catch
+
+// #included from: ../reporters/catch_reporter_junit.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_JUNIT_HPP_INCLUDED
+
+#include <assert.h>
+
+namespace Catch {
+
+    namespace {
+        std::string getCurrentTimestamp() {
+            // Beware, this is not reentrant because of backward compatibility issues
+            // Also, UTC only, again because of backward compatibility (%z is C++11)
+            time_t rawtime;
+            std::time(&rawtime);
+            const size_t timeStampSize = sizeof("2017-01-16T17:06:45Z");
+
+#ifdef _MSC_VER
+            std::tm timeInfo = {};
+            gmtime_s(&timeInfo, &rawtime);
+#else
+            std::tm* timeInfo;
+            timeInfo = std::gmtime(&rawtime);
+#endif
+
+            char timeStamp[timeStampSize];
+            const char * const fmt = "%Y-%m-%dT%H:%M:%SZ";
+
+#ifdef _MSC_VER
+            std::strftime(timeStamp, timeStampSize, fmt, &timeInfo);
+#else
+            std::strftime(timeStamp, timeStampSize, fmt, timeInfo);
+#endif
+            return std::string(timeStamp);
+        }
+
+    }
+
+    class JunitReporter : public CumulativeReporterBase {
+    public:
+        JunitReporter( ReporterConfig const& _config )
+        :   CumulativeReporterBase( _config ),
+            xml( _config.stream() ),
+            unexpectedExceptions( 0 ),
+            m_okToFail( false )
+        {
+            m_reporterPrefs.shouldRedirectStdOut = true;
+        }
+
+        virtual ~JunitReporter() CATCH_OVERRIDE;
+
+        static std::string getDescription() {
+            return "Reports test results in an XML format that looks like Ant's junitreport target";
+        }
+
+        virtual void noMatchingTestCases( std::string const& /*spec*/ ) CATCH_OVERRIDE {}
+
+        virtual void testRunStarting( TestRunInfo const& runInfo ) CATCH_OVERRIDE {
+            CumulativeReporterBase::testRunStarting( runInfo );
+            xml.startElement( "testsuites" );
+        }
+
+        virtual void testGroupStarting( GroupInfo const& groupInfo ) CATCH_OVERRIDE {
+            suiteTimer.start();
+            stdOutForSuite.str("");
+            stdErrForSuite.str("");
+            unexpectedExceptions = 0;
+            CumulativeReporterBase::testGroupStarting( groupInfo );
+        }
+
+        virtual void testCaseStarting( TestCaseInfo const& testCaseInfo ) CATCH_OVERRIDE {
+            m_okToFail = testCaseInfo.okToFail();
+        }
+        virtual bool assertionEnded( AssertionStats const& assertionStats ) CATCH_OVERRIDE {
+            if( assertionStats.assertionResult.getResultType() == ResultWas::ThrewException && !m_okToFail )
+                unexpectedExceptions++;
+            return CumulativeReporterBase::assertionEnded( assertionStats );
+        }
+
+        virtual void testCaseEnded( TestCaseStats const& testCaseStats ) CATCH_OVERRIDE {
+            stdOutForSuite << testCaseStats.stdOut;
+            stdErrForSuite << testCaseStats.stdErr;
+            CumulativeReporterBase::testCaseEnded( testCaseStats );
+        }
+
+        virtual void testGroupEnded( TestGroupStats const& testGroupStats ) CATCH_OVERRIDE {
+            double suiteTime = suiteTimer.getElapsedSeconds();
+            CumulativeReporterBase::testGroupEnded( testGroupStats );
+            writeGroup( *m_testGroups.back(), suiteTime );
+        }
+
+        virtual void testRunEndedCumulative() CATCH_OVERRIDE {
+            xml.endElement();
+        }
+
+        void writeGroup( TestGroupNode const& groupNode, double suiteTime ) {
+            XmlWriter::ScopedElement e = xml.scopedElement( "testsuite" );
+            TestGroupStats const& stats = groupNode.value;
+            xml.writeAttribute( "name", stats.groupInfo.name );
+            xml.writeAttribute( "errors", unexpectedExceptions );
+            xml.writeAttribute( "failures", stats.totals.assertions.failed-unexpectedExceptions );
+            xml.writeAttribute( "tests", stats.totals.assertions.total() );
+            xml.writeAttribute( "hostname", "tbd" ); // !TBD
+            if( m_config->showDurations() == ShowDurations::Never )
+                xml.writeAttribute( "time", "" );
+            else
+                xml.writeAttribute( "time", suiteTime );
+            xml.writeAttribute( "timestamp", getCurrentTimestamp() );
+
+            // Write test cases
+            for( TestGroupNode::ChildNodes::const_iterator
+                    it = groupNode.children.begin(), itEnd = groupNode.children.end();
+                    it != itEnd;
+                    ++it )
+                writeTestCase( **it );
+
+            xml.scopedElement( "system-out" ).writeText( trim( stdOutForSuite.str() ), false );
+            xml.scopedElement( "system-err" ).writeText( trim( stdErrForSuite.str() ), false );
+        }
+
+        void writeTestCase( TestCaseNode const& testCaseNode ) {
+            TestCaseStats const& stats = testCaseNode.value;
+
+            // All test cases have exactly one section - which represents the
+            // test case itself. That section may have 0-n nested sections
+            assert( testCaseNode.children.size() == 1 );
+            SectionNode const& rootSection = *testCaseNode.children.front();
+
+            std::string className = stats.testInfo.className;
+
+            if( className.empty() ) {
+                if( rootSection.childSections.empty() )
+                    className = "global";
+            }
+            writeSection( className, "", rootSection );
+        }
+
+        void writeSection(  std::string const& className,
+                            std::string const& rootName,
+                            SectionNode const& sectionNode ) {
+            std::string name = trim( sectionNode.stats.sectionInfo.name );
+            if( !rootName.empty() )
+                name = rootName + '/' + name;
+
+            if( !sectionNode.assertions.empty() ||
+                !sectionNode.stdOut.empty() ||
+                !sectionNode.stdErr.empty() ) {
+                XmlWriter::ScopedElement e = xml.scopedElement( "testcase" );
+                if( className.empty() ) {
+                    xml.writeAttribute( "classname", name );
+                    xml.writeAttribute( "name", "root" );
+                }
+                else {
+                    xml.writeAttribute( "classname", className );
+                    xml.writeAttribute( "name", name );
+                }
+                xml.writeAttribute( "time", Catch::toString( sectionNode.stats.durationInSeconds ) );
+
+                writeAssertions( sectionNode );
+
+                if( !sectionNode.stdOut.empty() )
+                    xml.scopedElement( "system-out" ).writeText( trim( sectionNode.stdOut ), false );
+                if( !sectionNode.stdErr.empty() )
+                    xml.scopedElement( "system-err" ).writeText( trim( sectionNode.stdErr ), false );
+            }
+            for( SectionNode::ChildSections::const_iterator
+                    it = sectionNode.childSections.begin(),
+                    itEnd = sectionNode.childSections.end();
+                    it != itEnd;
+                    ++it )
+                if( className.empty() )
+                    writeSection( name, "", **it );
+                else
+                    writeSection( className, name, **it );
+        }
+
+        void writeAssertions( SectionNode const& sectionNode ) {
+            for( SectionNode::Assertions::const_iterator
+                    it = sectionNode.assertions.begin(), itEnd = sectionNode.assertions.end();
+                    it != itEnd;
+                    ++it )
+                writeAssertion( *it );
+        }
+        void writeAssertion( AssertionStats const& stats ) {
+            AssertionResult const& result = stats.assertionResult;
+            if( !result.isOk() ) {
+                std::string elementName;
+                switch( result.getResultType() ) {
+                    case ResultWas::ThrewException:
+                    case ResultWas::FatalErrorCondition:
+                        elementName = "error";
+                        break;
+                    case ResultWas::ExplicitFailure:
+                        elementName = "failure";
+                        break;
+                    case ResultWas::ExpressionFailed:
+                        elementName = "failure";
+                        break;
+                    case ResultWas::DidntThrowException:
+                        elementName = "failure";
+                        break;
+
+                    // We should never see these here:
+                    case ResultWas::Info:
+                    case ResultWas::Warning:
+                    case ResultWas::Ok:
+                    case ResultWas::Unknown:
+                    case ResultWas::FailureBit:
+                    case ResultWas::Exception:
+                        elementName = "internalError";
+                        break;
+                }
+
+                XmlWriter::ScopedElement e = xml.scopedElement( elementName );
+
+                xml.writeAttribute( "message", result.getExpandedExpression() );
+                xml.writeAttribute( "type", result.getTestMacroName() );
+
+                std::ostringstream oss;
+                if( !result.getMessage().empty() )
+                    oss << result.getMessage() << '\n';
+                for( std::vector<MessageInfo>::const_iterator
+                        it = stats.infoMessages.begin(),
+                        itEnd = stats.infoMessages.end();
+                            it != itEnd;
+                            ++it )
+                    if( it->type == ResultWas::Info )
+                        oss << it->message << '\n';
+
+                oss << "at " << result.getSourceInfo();
+                xml.writeText( oss.str(), false );
+            }
+        }
+
+        XmlWriter xml;
+        Timer suiteTimer;
+        std::ostringstream stdOutForSuite;
+        std::ostringstream stdErrForSuite;
+        unsigned int unexpectedExceptions;
+        bool m_okToFail;
+    };
+
+    INTERNAL_CATCH_REGISTER_REPORTER( "junit", JunitReporter )
+
+} // end namespace Catch
+
+// #included from: ../reporters/catch_reporter_console.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_CONSOLE_HPP_INCLUDED
+
+#include <cassert>
+#include <cfloat>
+#include <cstdio>
+
+namespace Catch {
+
+    struct ConsoleReporter : StreamingReporterBase {
+        ConsoleReporter( ReporterConfig const& _config )
+        :   StreamingReporterBase( _config ),
+            m_headerPrinted( false )
+        {}
+
+        virtual ~ConsoleReporter() CATCH_OVERRIDE;
+        static std::string getDescription() {
+            return "Reports test results as plain lines of text";
+        }
+
+        virtual void noMatchingTestCases( std::string const& spec ) CATCH_OVERRIDE {
+            stream << "No test cases matched '" << spec << '\'' << std::endl;
+        }
+
+        virtual void assertionStarting( AssertionInfo const& ) CATCH_OVERRIDE {
+        }
+
+        virtual bool assertionEnded( AssertionStats const& _assertionStats ) CATCH_OVERRIDE {
+            AssertionResult const& result = _assertionStats.assertionResult;
+
+            bool includeResults = m_config->includeSuccessfulResults() || !result.isOk();
+
+            // Drop out if result was successful but we're not printing them.
+            if( !includeResults && result.getResultType() != ResultWas::Warning )
+                return false;
+
+            lazyPrint();
+
+            AssertionPrinter printer( stream, _assertionStats, includeResults );
+            printer.print();
+            stream << std::endl;
+            return true;
+        }
+
+        virtual void sectionStarting( SectionInfo const& _sectionInfo ) CATCH_OVERRIDE {
+            m_headerPrinted = false;
+            StreamingReporterBase::sectionStarting( _sectionInfo );
+        }
+        virtual void sectionEnded( SectionStats const& _sectionStats ) CATCH_OVERRIDE {
+            if( _sectionStats.missingAssertions ) {
+                lazyPrint();
+                Colour colour( Colour::ResultError );
+                if( m_sectionStack.size() > 1 )
+                    stream << "\nNo assertions in section";
+                else
+                    stream << "\nNo assertions in test case";
+                stream << " '" << _sectionStats.sectionInfo.name << "'\n" << std::endl;
+            }
+            if( m_config->showDurations() == ShowDurations::Always ) {
+                stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+            }
+            if( m_headerPrinted ) {
+                m_headerPrinted = false;
+            }
+            StreamingReporterBase::sectionEnded( _sectionStats );
+        }
+
+        virtual void testCaseEnded( TestCaseStats const& _testCaseStats ) CATCH_OVERRIDE {
+            StreamingReporterBase::testCaseEnded( _testCaseStats );
+            m_headerPrinted = false;
+        }
+        virtual void testGroupEnded( TestGroupStats const& _testGroupStats ) CATCH_OVERRIDE {
+            if( currentGroupInfo.used ) {
+                printSummaryDivider();
+                stream << "Summary for group '" << _testGroupStats.groupInfo.name << "':\n";
+                printTotals( _testGroupStats.totals );
+                stream << '\n' << std::endl;
+            }
+            StreamingReporterBase::testGroupEnded( _testGroupStats );
+        }
+        virtual void testRunEnded( TestRunStats const& _testRunStats ) CATCH_OVERRIDE {
+            printTotalsDivider( _testRunStats.totals );
+            printTotals( _testRunStats.totals );
+            stream << std::endl;
+            StreamingReporterBase::testRunEnded( _testRunStats );
+        }
+
+    private:
+
+        class AssertionPrinter {
+            void operator= ( AssertionPrinter const& );
+        public:
+            AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages )
+            :   stream( _stream ),
+                stats( _stats ),
+                result( _stats.assertionResult ),
+                colour( Colour::None ),
+                message( result.getMessage() ),
+                messages( _stats.infoMessages ),
+                printInfoMessages( _printInfoMessages )
+            {
+                switch( result.getResultType() ) {
+                    case ResultWas::Ok:
+                        colour = Colour::Success;
+                        passOrFail = "PASSED";
+                        //if( result.hasMessage() )
+                        if( _stats.infoMessages.size() == 1 )
+                            messageLabel = "with message";
+                        if( _stats.infoMessages.size() > 1 )
+                            messageLabel = "with messages";
+                        break;
+                    case ResultWas::ExpressionFailed:
+                        if( result.isOk() ) {
+                            colour = Colour::Success;
+                            passOrFail = "FAILED - but was ok";
+                        }
+                        else {
+                            colour = Colour::Error;
+                            passOrFail = "FAILED";
+                        }
+                        if( _stats.infoMessages.size() == 1 )
+                            messageLabel = "with message";
+                        if( _stats.infoMessages.size() > 1 )
+                            messageLabel = "with messages";
+                        break;
+                    case ResultWas::ThrewException:
+                        colour = Colour::Error;
+                        passOrFail = "FAILED";
+                        messageLabel = "due to unexpected exception with ";
+                        if (_stats.infoMessages.size() == 1)
+                            messageLabel += "message";
+                        if (_stats.infoMessages.size() > 1)
+                            messageLabel += "messages";
+                        break;
+                    case ResultWas::FatalErrorCondition:
+                        colour = Colour::Error;
+                        passOrFail = "FAILED";
+                        messageLabel = "due to a fatal error condition";
+                        break;
+                    case ResultWas::DidntThrowException:
+                        colour = Colour::Error;
+                        passOrFail = "FAILED";
+                        messageLabel = "because no exception was thrown where one was expected";
+                        break;
+                    case ResultWas::Info:
+                        messageLabel = "info";
+                        break;
+                    case ResultWas::Warning:
+                        messageLabel = "warning";
+                        break;
+                    case ResultWas::ExplicitFailure:
+                        passOrFail = "FAILED";
+                        colour = Colour::Error;
+                        if( _stats.infoMessages.size() == 1 )
+                            messageLabel = "explicitly with message";
+                        if( _stats.infoMessages.size() > 1 )
+                            messageLabel = "explicitly with messages";
+                        break;
+                    // These cases are here to prevent compiler warnings
+                    case ResultWas::Unknown:
+                    case ResultWas::FailureBit:
+                    case ResultWas::Exception:
+                        passOrFail = "** internal error **";
+                        colour = Colour::Error;
+                        break;
+                }
+            }
+
+            void print() const {
+                printSourceInfo();
+                if( stats.totals.assertions.total() > 0 ) {
+                    if( result.isOk() )
+                        stream << '\n';
+                    printResultType();
+                    printOriginalExpression();
+                    printReconstructedExpression();
+                }
+                else {
+                    stream << '\n';
+                }
+                printMessage();
+            }
+
+        private:
+            void printResultType() const {
+                if( !passOrFail.empty() ) {
+                    Colour colourGuard( colour );
+                    stream << passOrFail << ":\n";
+                }
+            }
+            void printOriginalExpression() const {
+                if( result.hasExpression() ) {
+                    Colour colourGuard( Colour::OriginalExpression );
+                    stream  << "  ";
+                    stream << result.getExpressionInMacro();
+                    stream << '\n';
+                }
+            }
+            void printReconstructedExpression() const {
+                if( result.hasExpandedExpression() ) {
+                    stream << "with expansion:\n";
+                    Colour colourGuard( Colour::ReconstructedExpression );
+                    stream << Text( result.getExpandedExpression(), TextAttributes().setIndent(2) ) << '\n';
+                }
+            }
+            void printMessage() const {
+                if( !messageLabel.empty() )
+                    stream << messageLabel << ':' << '\n';
+                for( std::vector<MessageInfo>::const_iterator it = messages.begin(), itEnd = messages.end();
+                        it != itEnd;
+                        ++it ) {
+                    // If this assertion is a warning ignore any INFO messages
+                    if( printInfoMessages || it->type != ResultWas::Info )
+                        stream << Text( it->message, TextAttributes().setIndent(2) ) << '\n';
+                }
+            }
+            void printSourceInfo() const {
+                Colour colourGuard( Colour::FileName );
+                stream << result.getSourceInfo() << ": ";
+            }
+
+            std::ostream& stream;
+            AssertionStats const& stats;
+            AssertionResult const& result;
+            Colour::Code colour;
+            std::string passOrFail;
+            std::string messageLabel;
+            std::string message;
+            std::vector<MessageInfo> messages;
+            bool printInfoMessages;
+        };
+
+        void lazyPrint() {
+
+            if( !currentTestRunInfo.used )
+                lazyPrintRunInfo();
+            if( !currentGroupInfo.used )
+                lazyPrintGroupInfo();
+
+            if( !m_headerPrinted ) {
+                printTestCaseAndSectionHeader();
+                m_headerPrinted = true;
+            }
+        }
+        void lazyPrintRunInfo() {
+            stream  << '\n' << getLineOfChars<'~'>() << '\n';
+            Colour colour( Colour::SecondaryText );
+            stream  << currentTestRunInfo->name
+                    << " is a Catch v"  << libraryVersion() << " host application.\n"
+                    << "Run with -? for options\n\n";
+
+            if( m_config->rngSeed() != 0 )
+                stream << "Randomness seeded to: " << m_config->rngSeed() << "\n\n";
+
+            currentTestRunInfo.used = true;
+        }
+        void lazyPrintGroupInfo() {
+            if( !currentGroupInfo->name.empty() && currentGroupInfo->groupsCounts > 1 ) {
+                printClosedHeader( "Group: " + currentGroupInfo->name );
+                currentGroupInfo.used = true;
+            }
+        }
+        void printTestCaseAndSectionHeader() {
+            assert( !m_sectionStack.empty() );
+            printOpenHeader( currentTestCaseInfo->name );
+
+            if( m_sectionStack.size() > 1 ) {
+                Colour colourGuard( Colour::Headers );
+
+                std::vector<SectionInfo>::const_iterator
+                    it = m_sectionStack.begin()+1, // Skip first section (test case)
+                    itEnd = m_sectionStack.end();
+                for( ; it != itEnd; ++it )
+                    printHeaderString( it->name, 2 );
+            }
+
+            SourceLineInfo lineInfo = m_sectionStack.back().lineInfo;
+
+            if( !lineInfo.empty() ){
+                stream << getLineOfChars<'-'>() << '\n';
+                Colour colourGuard( Colour::FileName );
+                stream << lineInfo << '\n';
+            }
+            stream << getLineOfChars<'.'>() << '\n' << std::endl;
+        }
+
+        void printClosedHeader( std::string const& _name ) {
+            printOpenHeader( _name );
+            stream << getLineOfChars<'.'>() << '\n';
+        }
+        void printOpenHeader( std::string const& _name ) {
+            stream  << getLineOfChars<'-'>() << '\n';
+            {
+                Colour colourGuard( Colour::Headers );
+                printHeaderString( _name );
+            }
+        }
+
+        // if string has a : in first line will set indent to follow it on
+        // subsequent lines
+        void printHeaderString( std::string const& _string, std::size_t indent = 0 ) {
+            std::size_t i = _string.find( ": " );
+            if( i != std::string::npos )
+                i+=2;
+            else
+                i = 0;
+            stream << Text( _string, TextAttributes()
+                                        .setIndent( indent+i)
+                                        .setInitialIndent( indent ) ) << '\n';
+        }
+
+        struct SummaryColumn {
+
+            SummaryColumn( std::string const& _label, Colour::Code _colour )
+            :   label( _label ),
+                colour( _colour )
+            {}
+            SummaryColumn addRow( std::size_t count ) {
+                std::ostringstream oss;
+                oss << count;
+                std::string row = oss.str();
+                for( std::vector<std::string>::iterator it = rows.begin(); it != rows.end(); ++it ) {
+                    while( it->size() < row.size() )
+                        *it = ' ' + *it;
+                    while( it->size() > row.size() )
+                        row = ' ' + row;
+                }
+                rows.push_back( row );
+                return *this;
+            }
+
+            std::string label;
+            Colour::Code colour;
+            std::vector<std::string> rows;
+
+        };
+
+        void printTotals( Totals const& totals ) {
+            if( totals.testCases.total() == 0 ) {
+                stream << Colour( Colour::Warning ) << "No tests ran\n";
+            }
+            else if( totals.assertions.total() > 0 && totals.testCases.allPassed() ) {
+                stream << Colour( Colour::ResultSuccess ) << "All tests passed";
+                stream << " ("
+                        << pluralise( totals.assertions.passed, "assertion" ) << " in "
+                        << pluralise( totals.testCases.passed, "test case" ) << ')'
+                        << '\n';
+            }
+            else {
+
+                std::vector<SummaryColumn> columns;
+                columns.push_back( SummaryColumn( "", Colour::None )
+                                        .addRow( totals.testCases.total() )
+                                        .addRow( totals.assertions.total() ) );
+                columns.push_back( SummaryColumn( "passed", Colour::Success )
+                                        .addRow( totals.testCases.passed )
+                                        .addRow( totals.assertions.passed ) );
+                columns.push_back( SummaryColumn( "failed", Colour::ResultError )
+                                        .addRow( totals.testCases.failed )
+                                        .addRow( totals.assertions.failed ) );
+                columns.push_back( SummaryColumn( "failed as expected", Colour::ResultExpectedFailure )
+                                        .addRow( totals.testCases.failedButOk )
+                                        .addRow( totals.assertions.failedButOk ) );
+
+                printSummaryRow( "test cases", columns, 0 );
+                printSummaryRow( "assertions", columns, 1 );
+            }
+        }
+        void printSummaryRow( std::string const& label, std::vector<SummaryColumn> const& cols, std::size_t row ) {
+            for( std::vector<SummaryColumn>::const_iterator it = cols.begin(); it != cols.end(); ++it ) {
+                std::string value = it->rows[row];
+                if( it->label.empty() ) {
+                    stream << label << ": ";
+                    if( value != "0" )
+                        stream << value;
+                    else
+                        stream << Colour( Colour::Warning ) << "- none -";
+                }
+                else if( value != "0" ) {
+                    stream  << Colour( Colour::LightGrey ) << " | ";
+                    stream  << Colour( it->colour )
+                            << value << ' ' << it->label;
+                }
+            }
+            stream << '\n';
+        }
+
+        static std::size_t makeRatio( std::size_t number, std::size_t total ) {
+            std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number/ total : 0;
+            return ( ratio == 0 && number > 0 ) ? 1 : ratio;
+        }
+        static std::size_t& findMax( std::size_t& i, std::size_t& j, std::size_t& k ) {
+            if( i > j && i > k )
+                return i;
+            else if( j > k )
+                return j;
+            else
+                return k;
+        }
+
+        void printTotalsDivider( Totals const& totals ) {
+            if( totals.testCases.total() > 0 ) {
+                std::size_t failedRatio = makeRatio( totals.testCases.failed, totals.testCases.total() );
+                std::size_t failedButOkRatio = makeRatio( totals.testCases.failedButOk, totals.testCases.total() );
+                std::size_t passedRatio = makeRatio( totals.testCases.passed, totals.testCases.total() );
+                while( failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH-1 )
+                    findMax( failedRatio, failedButOkRatio, passedRatio )++;
+                while( failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH-1 )
+                    findMax( failedRatio, failedButOkRatio, passedRatio )--;
+
+                stream << Colour( Colour::Error ) << std::string( failedRatio, '=' );
+                stream << Colour( Colour::ResultExpectedFailure ) << std::string( failedButOkRatio, '=' );
+                if( totals.testCases.allPassed() )
+                    stream << Colour( Colour::ResultSuccess ) << std::string( passedRatio, '=' );
+                else
+                    stream << Colour( Colour::Success ) << std::string( passedRatio, '=' );
+            }
+            else {
+                stream << Colour( Colour::Warning ) << std::string( CATCH_CONFIG_CONSOLE_WIDTH-1, '=' );
+            }
+            stream << '\n';
+        }
+        void printSummaryDivider() {
+            stream << getLineOfChars<'-'>() << '\n';
+        }
+
+    private:
+        bool m_headerPrinted;
+    };
+
+    INTERNAL_CATCH_REGISTER_REPORTER( "console", ConsoleReporter )
+
+} // end namespace Catch
+
+// #included from: ../reporters/catch_reporter_compact.hpp
+#define TWOBLUECUBES_CATCH_REPORTER_COMPACT_HPP_INCLUDED
+
+namespace Catch {
+
+    struct CompactReporter : StreamingReporterBase {
+
+        CompactReporter( ReporterConfig const& _config )
+        : StreamingReporterBase( _config )
+        {}
+
+        virtual ~CompactReporter();
+
+        static std::string getDescription() {
+            return "Reports test results on a single line, suitable for IDEs";
+        }
+
+        virtual ReporterPreferences getPreferences() const {
+            ReporterPreferences prefs;
+            prefs.shouldRedirectStdOut = false;
+            return prefs;
+        }
+
+        virtual void noMatchingTestCases( std::string const& spec ) {
+            stream << "No test cases matched '" << spec << '\'' << std::endl;
+        }
+
+        virtual void assertionStarting( AssertionInfo const& ) {}
+
+        virtual bool assertionEnded( AssertionStats const& _assertionStats ) {
+            AssertionResult const& result = _assertionStats.assertionResult;
+
+            bool printInfoMessages = true;
+
+            // Drop out if result was successful and we're not printing those
+            if( !m_config->includeSuccessfulResults() && result.isOk() ) {
+                if( result.getResultType() != ResultWas::Warning )
+                    return false;
+                printInfoMessages = false;
+            }
+
+            AssertionPrinter printer( stream, _assertionStats, printInfoMessages );
+            printer.print();
+
+            stream << std::endl;
+            return true;
+        }
+
+        virtual void sectionEnded(SectionStats const& _sectionStats) CATCH_OVERRIDE {
+            if (m_config->showDurations() == ShowDurations::Always) {
+                stream << getFormattedDuration(_sectionStats.durationInSeconds) << " s: " << _sectionStats.sectionInfo.name << std::endl;
+            }
+        }
+
+        virtual void testRunEnded( TestRunStats const& _testRunStats ) {
+            printTotals( _testRunStats.totals );
+            stream << '\n' << std::endl;
+            StreamingReporterBase::testRunEnded( _testRunStats );
+        }
+
+    private:
+        class AssertionPrinter {
+            void operator= ( AssertionPrinter const& );
+        public:
+            AssertionPrinter( std::ostream& _stream, AssertionStats const& _stats, bool _printInfoMessages )
+            : stream( _stream )
+            , stats( _stats )
+            , result( _stats.assertionResult )
+            , messages( _stats.infoMessages )
+            , itMessage( _stats.infoMessages.begin() )
+            , printInfoMessages( _printInfoMessages )
+            {}
+
+            void print() {
+                printSourceInfo();
+
+                itMessage = messages.begin();
+
+                switch( result.getResultType() ) {
+                    case ResultWas::Ok:
+                        printResultType( Colour::ResultSuccess, passedString() );
+                        printOriginalExpression();
+                        printReconstructedExpression();
+                        if ( ! result.hasExpression() )
+                            printRemainingMessages( Colour::None );
+                        else
+                            printRemainingMessages();
+                        break;
+                    case ResultWas::ExpressionFailed:
+                        if( result.isOk() )
+                            printResultType( Colour::ResultSuccess, failedString() + std::string( " - but was ok" ) );
+                        else
+                            printResultType( Colour::Error, failedString() );
+                        printOriginalExpression();
+                        printReconstructedExpression();
+                        printRemainingMessages();
+                        break;
+                    case ResultWas::ThrewException:
+                        printResultType( Colour::Error, failedString() );
+                        printIssue( "unexpected exception with message:" );
+                        printMessage();
+                        printExpressionWas();
+                        printRemainingMessages();
+                        break;
+                    case ResultWas::FatalErrorCondition:
+                        printResultType( Colour::Error, failedString() );
+                        printIssue( "fatal error condition with message:" );
+                        printMessage();
+                        printExpressionWas();
+                        printRemainingMessages();
+                        break;
+                    case ResultWas::DidntThrowException:
+                        printResultType( Colour::Error, failedString() );
+                        printIssue( "expected exception, got none" );
+                        printExpressionWas();
+                        printRemainingMessages();
+                        break;
+                    case ResultWas::Info:
+                        printResultType( Colour::None, "info" );
+                        printMessage();
+                        printRemainingMessages();
+                        break;
+                    case ResultWas::Warning:
+                        printResultType( Colour::None, "warning" );
+                        printMessage();
+                        printRemainingMessages();
+                        break;
+                    case ResultWas::ExplicitFailure:
+                        printResultType( Colour::Error, failedString() );
+                        printIssue( "explicitly" );
+                        printRemainingMessages( Colour::None );
+                        break;
+                    // These cases are here to prevent compiler warnings
+                    case ResultWas::Unknown:
+                    case ResultWas::FailureBit:
+                    case ResultWas::Exception:
+                        printResultType( Colour::Error, "** internal error **" );
+                        break;
+                }
+            }
+
+        private:
+            // Colour::LightGrey
+
+            static Colour::Code dimColour() { return Colour::FileName; }
+
+#ifdef CATCH_PLATFORM_MAC
+            static const char* failedString() { return "FAILED"; }
+            static const char* passedString() { return "PASSED"; }
+#else
+            static const char* failedString() { return "failed"; }
+            static const char* passedString() { return "passed"; }
+#endif
+
+            void printSourceInfo() const {
+                Colour colourGuard( Colour::FileName );
+                stream << result.getSourceInfo() << ':';
+            }
+
+            void printResultType( Colour::Code colour, std::string const& passOrFail ) const {
+                if( !passOrFail.empty() ) {
+                    {
+                        Colour colourGuard( colour );
+                        stream << ' ' << passOrFail;
+                    }
+                    stream << ':';
+                }
+            }
+
+            void printIssue( std::string const& issue ) const {
+                stream << ' ' << issue;
+            }
+
+            void printExpressionWas() {
+                if( result.hasExpression() ) {
+                    stream << ';';
+                    {
+                        Colour colour( dimColour() );
+                        stream << " expression was:";
+                    }
+                    printOriginalExpression();
+                }
+            }
+
+            void printOriginalExpression() const {
+                if( result.hasExpression() ) {
+                    stream << ' ' << result.getExpression();
+                }
+            }
+
+            void printReconstructedExpression() const {
+                if( result.hasExpandedExpression() ) {
+                    {
+                        Colour colour( dimColour() );
+                        stream << " for: ";
+                    }
+                    stream << result.getExpandedExpression();
+                }
+            }
+
+            void printMessage() {
+                if ( itMessage != messages.end() ) {
+                    stream << " '" << itMessage->message << '\'';
+                    ++itMessage;
+                }
+            }
+
+            void printRemainingMessages( Colour::Code colour = dimColour() ) {
+                if ( itMessage == messages.end() )
+                    return;
+
+                // using messages.end() directly yields compilation error:
+                std::vector<MessageInfo>::const_iterator itEnd = messages.end();
+                const std::size_t N = static_cast<std::size_t>( std::distance( itMessage, itEnd ) );
+
+                {
+                    Colour colourGuard( colour );
+                    stream << " with " << pluralise( N, "message" ) << ':';
+                }
+
+                for(; itMessage != itEnd; ) {
+                    // If this assertion is a warning ignore any INFO messages
+                    if( printInfoMessages || itMessage->type != ResultWas::Info ) {
+                        stream << " '" << itMessage->message << '\'';
+                        if ( ++itMessage != itEnd ) {
+                            Colour colourGuard( dimColour() );
+                            stream << " and";
+                        }
+                    }
+                }
+            }
+
+        private:
+            std::ostream& stream;
+            AssertionStats const& stats;
+            AssertionResult const& result;
+            std::vector<MessageInfo> messages;
+            std::vector<MessageInfo>::const_iterator itMessage;
+            bool printInfoMessages;
+        };
+
+        // Colour, message variants:
+        // - white: No tests ran.
+        // -   red: Failed [both/all] N test cases, failed [both/all] M assertions.
+        // - white: Passed [both/all] N test cases (no assertions).
+        // -   red: Failed N tests cases, failed M assertions.
+        // - green: Passed [both/all] N tests cases with M assertions.
+
+        std::string bothOrAll( std::size_t count ) const {
+            return count == 1 ? std::string() : count == 2 ? "both " : "all " ;
+        }
+
+        void printTotals( const Totals& totals ) const {
+            if( totals.testCases.total() == 0 ) {
+                stream << "No tests ran.";
+            }
+            else if( totals.testCases.failed == totals.testCases.total() ) {
+                Colour colour( Colour::ResultError );
+                const std::string qualify_assertions_failed =
+                    totals.assertions.failed == totals.assertions.total() ?
+                        bothOrAll( totals.assertions.failed ) : std::string();
+                stream <<
+                    "Failed " << bothOrAll( totals.testCases.failed )
+                              << pluralise( totals.testCases.failed, "test case"  ) << ", "
+                    "failed " << qualify_assertions_failed <<
+                                 pluralise( totals.assertions.failed, "assertion" ) << '.';
+            }
+            else if( totals.assertions.total() == 0 ) {
+                stream <<
+                    "Passed " << bothOrAll( totals.testCases.total() )
+                              << pluralise( totals.testCases.total(), "test case" )
+                              << " (no assertions).";
+            }
+            else if( totals.assertions.failed ) {
+                Colour colour( Colour::ResultError );
+                stream <<
+                    "Failed " << pluralise( totals.testCases.failed, "test case"  ) << ", "
+                    "failed " << pluralise( totals.assertions.failed, "assertion" ) << '.';
+            }
+            else {
+                Colour colour( Colour::ResultSuccess );
+                stream <<
+                    "Passed " << bothOrAll( totals.testCases.passed )
+                              << pluralise( totals.testCases.passed, "test case"  ) <<
+                    " with "  << pluralise( totals.assertions.passed, "assertion" ) << '.';
+            }
+        }
+    };
+
+    INTERNAL_CATCH_REGISTER_REPORTER( "compact", CompactReporter )
+
+} // end namespace Catch
+
+namespace Catch {
+    // These are all here to avoid warnings about not having any out of line
+    // virtual methods
+    NonCopyable::~NonCopyable() {}
+    IShared::~IShared() {}
+    IStream::~IStream() CATCH_NOEXCEPT {}
+    FileStream::~FileStream() CATCH_NOEXCEPT {}
+    CoutStream::~CoutStream() CATCH_NOEXCEPT {}
+    DebugOutStream::~DebugOutStream() CATCH_NOEXCEPT {}
+    StreamBufBase::~StreamBufBase() CATCH_NOEXCEPT {}
+    IContext::~IContext() {}
+    IResultCapture::~IResultCapture() {}
+    ITestCase::~ITestCase() {}
+    ITestCaseRegistry::~ITestCaseRegistry() {}
+    IRegistryHub::~IRegistryHub() {}
+    IMutableRegistryHub::~IMutableRegistryHub() {}
+    IExceptionTranslator::~IExceptionTranslator() {}
+    IExceptionTranslatorRegistry::~IExceptionTranslatorRegistry() {}
+    IReporter::~IReporter() {}
+    IReporterFactory::~IReporterFactory() {}
+    IReporterRegistry::~IReporterRegistry() {}
+    IStreamingReporter::~IStreamingReporter() {}
+    AssertionStats::~AssertionStats() {}
+    SectionStats::~SectionStats() {}
+    TestCaseStats::~TestCaseStats() {}
+    TestGroupStats::~TestGroupStats() {}
+    TestRunStats::~TestRunStats() {}
+    CumulativeReporterBase::SectionNode::~SectionNode() {}
+    CumulativeReporterBase::~CumulativeReporterBase() {}
+
+    StreamingReporterBase::~StreamingReporterBase() {}
+    ConsoleReporter::~ConsoleReporter() {}
+    CompactReporter::~CompactReporter() {}
+    IRunner::~IRunner() {}
+    IMutableContext::~IMutableContext() {}
+    IConfig::~IConfig() {}
+    XmlReporter::~XmlReporter() {}
+    JunitReporter::~JunitReporter() {}
+    TestRegistry::~TestRegistry() {}
+    FreeFunctionTestCase::~FreeFunctionTestCase() {}
+    IGeneratorInfo::~IGeneratorInfo() {}
+    IGeneratorsForTest::~IGeneratorsForTest() {}
+    WildcardPattern::~WildcardPattern() {}
+    TestSpec::Pattern::~Pattern() {}
+    TestSpec::NamePattern::~NamePattern() {}
+    TestSpec::TagPattern::~TagPattern() {}
+    TestSpec::ExcludedPattern::~ExcludedPattern() {}
+    Matchers::Impl::MatcherUntypedBase::~MatcherUntypedBase() {}
+
+    void Config::dummy() {}
+
+    namespace TestCaseTracking {
+        ITracker::~ITracker() {}
+        TrackerBase::~TrackerBase() {}
+        SectionTracker::~SectionTracker() {}
+        IndexTracker::~IndexTracker() {}
+    }
+}
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#endif
+
+#ifdef CATCH_CONFIG_MAIN
+// #included from: internal/catch_default_main.hpp
+#define TWOBLUECUBES_CATCH_DEFAULT_MAIN_HPP_INCLUDED
+
+#ifndef __OBJC__
+
+#if defined(WIN32) && defined(_UNICODE) && !defined(DO_NOT_USE_WMAIN)
+// Standard C/C++ Win32 Unicode wmain entry point
+extern "C" int wmain (int argc, wchar_t * argv[], wchar_t * []) {
+#else
+// Standard C/C++ main entry point
+int main (int argc, char * argv[]) {
+#endif
+
+    int result = Catch::Session().run( argc, argv );
+    return ( result < 0xff ? result : 0xff );
+}
+
+#else // __OBJC__
+
+// Objective-C entry point
+int main (int argc, char * const argv[]) {
+#if !CATCH_ARC_ENABLED
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+#endif
+
+    Catch::registerTestMethods();
+    int result = Catch::Session().run( argc, (char* const*)argv );
+
+#if !CATCH_ARC_ENABLED
+    [pool drain];
+#endif
+
+    return ( result < 0xff ? result : 0xff );
+}
+
+#endif // __OBJC__
+
+#endif
+
+#ifdef CLARA_CONFIG_MAIN_NOT_DEFINED
+#  undef CLARA_CONFIG_MAIN
+#endif
+
+//////
+
+// If this config identifier is defined then all CATCH macros are prefixed with CATCH_
+#ifdef CATCH_CONFIG_PREFIX_ALL
+
+#if defined(CATCH_CONFIG_FAST_COMPILE)
+#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr )
+#else
+#define CATCH_REQUIRE( expr ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE", Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( "CATCH_REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr  )
+#endif
+
+#define CATCH_REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", expr )
+#define CATCH_REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define CATCH_REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CATCH_REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#define CATCH_REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CATCH_REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, expr )
+
+#define CATCH_CHECK( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK", Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, expr )
+#define CATCH_CHECKED_IF( expr ) INTERNAL_CATCH_IF( "CATCH_CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( "CATCH_CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( "CATCH_CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr )
+
+#define CATCH_CHECK_THROWS( expr )  INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", expr )
+#define CATCH_CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CATCH_CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CATCH_CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CATCH_CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#define CATCH_CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CATCH_CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, expr )
+
+#define CATCH_CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#if defined(CATCH_CONFIG_FAST_COMPILE)
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT_NO_TRY( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#else
+#define CATCH_REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CATCH_REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif
+
+#define CATCH_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_WARN( msg ) INTERNAL_CATCH_MSG( "CATCH_WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define CATCH_SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( "CATCH_INFO", msg )
+#define CATCH_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << Catch::toString(msg) )
+#define CATCH_SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CATCH_CAPTURE", #msg " := " << Catch::toString(msg) )
+
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+    #define CATCH_TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+    #define CATCH_TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+    #define CATCH_METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+    #define CATCH_REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+    #define CATCH_SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+    #define CATCH_FAIL( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+    #define CATCH_FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+    #define CATCH_SUCCEED( ... ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#else
+    #define CATCH_TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description )
+    #define CATCH_TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description )
+    #define CATCH_METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description )
+    #define CATCH_REGISTER_TEST_CASE( function, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( function, name, description )
+    #define CATCH_SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description )
+    #define CATCH_FAIL( msg ) INTERNAL_CATCH_MSG( "CATCH_FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, msg )
+    #define CATCH_FAIL_CHECK( msg ) INTERNAL_CATCH_MSG( "CATCH_FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, msg )
+    #define CATCH_SUCCEED( msg ) INTERNAL_CATCH_MSG( "CATCH_SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, msg )
+#endif
+#define CATCH_ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" )
+
+#define CATCH_REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType )
+#define CATCH_REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType )
+
+#define CATCH_GENERATE( expr) INTERNAL_CATCH_GENERATE( expr )
+
+// "BDD-style" convenience wrappers
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+#define CATCH_SCENARIO( ... ) CATCH_TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define CATCH_SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#else
+#define CATCH_SCENARIO( name, tags ) CATCH_TEST_CASE( "Scenario: " name, tags )
+#define CATCH_SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags )
+#endif
+#define CATCH_GIVEN( desc )    CATCH_SECTION( std::string( "Given: ") + desc, "" )
+#define CATCH_WHEN( desc )     CATCH_SECTION( std::string( " When: ") + desc, "" )
+#define CATCH_AND_WHEN( desc ) CATCH_SECTION( std::string( "  And: ") + desc, "" )
+#define CATCH_THEN( desc )     CATCH_SECTION( std::string( " Then: ") + desc, "" )
+#define CATCH_AND_THEN( desc ) CATCH_SECTION( std::string( "  And: ") + desc, "" )
+
+// If CATCH_CONFIG_PREFIX_ALL is not defined then the CATCH_ prefix is not required
+#else
+
+#if defined(CATCH_CONFIG_FAST_COMPILE)
+#define REQUIRE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "REQUIRE", Catch::ResultDisposition::Normal, expr )
+#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST_NO_TRY( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr )
+
+#else
+#define REQUIRE( expr ) INTERNAL_CATCH_TEST( "REQUIRE", Catch::ResultDisposition::Normal, expr  )
+#define REQUIRE_FALSE( expr ) INTERNAL_CATCH_TEST( "REQUIRE_FALSE", Catch::ResultDisposition::Normal | Catch::ResultDisposition::FalseTest, expr )
+#endif
+
+#define REQUIRE_THROWS( expr ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS", Catch::ResultDisposition::Normal, "", expr )
+#define REQUIRE_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "REQUIRE_THROWS_AS", exceptionType, Catch::ResultDisposition::Normal, expr )
+#define REQUIRE_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "REQUIRE_THROWS_WITH", Catch::ResultDisposition::Normal, matcher, expr )
+#define REQUIRE_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "REQUIRE_NOTHROW", Catch::ResultDisposition::Normal, expr )
+
+#define CHECK( expr ) INTERNAL_CATCH_TEST( "CHECK", Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_FALSE( expr ) INTERNAL_CATCH_TEST( "CHECK_FALSE", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::FalseTest, expr )
+#define CHECKED_IF( expr ) INTERNAL_CATCH_IF( "CHECKED_IF", Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECKED_ELSE( expr ) INTERNAL_CATCH_ELSE( "CHECKED_ELSE", Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_NOFAIL( expr ) INTERNAL_CATCH_TEST( "CHECK_NOFAIL", Catch::ResultDisposition::ContinueOnFailure | Catch::ResultDisposition::SuppressFail, expr )
+
+#define CHECK_THROWS( expr )  INTERNAL_CATCH_THROWS( "CHECK_THROWS", Catch::ResultDisposition::ContinueOnFailure, "", expr )
+#define CHECK_THROWS_AS( expr, exceptionType ) INTERNAL_CATCH_THROWS_AS( "CHECK_THROWS_AS", exceptionType, Catch::ResultDisposition::ContinueOnFailure, expr )
+#define CHECK_THROWS_WITH( expr, matcher ) INTERNAL_CATCH_THROWS( "CHECK_THROWS_WITH", Catch::ResultDisposition::ContinueOnFailure, matcher, expr )
+#define CHECK_NOTHROW( expr ) INTERNAL_CATCH_NO_THROW( "CHECK_NOTHROW", Catch::ResultDisposition::ContinueOnFailure, expr )
+
+#define CHECK_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "CHECK_THAT", matcher, Catch::ResultDisposition::ContinueOnFailure, arg )
+
+#if defined(CATCH_CONFIG_FAST_COMPILE)
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT_NO_TRY( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#else
+#define REQUIRE_THAT( arg, matcher ) INTERNAL_CHECK_THAT( "REQUIRE_THAT", matcher, Catch::ResultDisposition::Normal, arg )
+#endif
+
+#define INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define WARN( msg ) INTERNAL_CATCH_MSG( "WARN", Catch::ResultWas::Warning, Catch::ResultDisposition::ContinueOnFailure, msg )
+#define SCOPED_INFO( msg ) INTERNAL_CATCH_INFO( "INFO", msg )
+#define CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << Catch::toString(msg) )
+#define SCOPED_CAPTURE( msg ) INTERNAL_CATCH_INFO( "CAPTURE", #msg " := " << Catch::toString(msg) )
+
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE( __VA_ARGS__ )
+#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, __VA_ARGS__ )
+#define METHOD_AS_TEST_CASE( method, ... ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, __VA_ARGS__ )
+#define REGISTER_TEST_CASE( Function, ... ) INTERNAL_CATCH_REGISTER_TESTCASE( Function, __VA_ARGS__ )
+#define SECTION( ... ) INTERNAL_CATCH_SECTION( __VA_ARGS__ )
+#define FAIL( ... ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, __VA_ARGS__ )
+#define FAIL_CHECK( ... ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#define SUCCEED( ... ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, __VA_ARGS__ )
+#else
+#define TEST_CASE( name, description ) INTERNAL_CATCH_TESTCASE( name, description )
+    #define TEST_CASE_METHOD( className, name, description ) INTERNAL_CATCH_TEST_CASE_METHOD( className, name, description )
+    #define METHOD_AS_TEST_CASE( method, name, description ) INTERNAL_CATCH_METHOD_AS_TEST_CASE( method, name, description )
+    #define REGISTER_TEST_CASE( method, name, description ) INTERNAL_CATCH_REGISTER_TESTCASE( method, name, description )
+    #define SECTION( name, description ) INTERNAL_CATCH_SECTION( name, description )
+    #define FAIL( msg ) INTERNAL_CATCH_MSG( "FAIL", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::Normal, msg )
+    #define FAIL_CHECK( msg ) INTERNAL_CATCH_MSG( "FAIL_CHECK", Catch::ResultWas::ExplicitFailure, Catch::ResultDisposition::ContinueOnFailure, msg )
+    #define SUCCEED( msg ) INTERNAL_CATCH_MSG( "SUCCEED", Catch::ResultWas::Ok, Catch::ResultDisposition::ContinueOnFailure, msg )
+#endif
+#define ANON_TEST_CASE() INTERNAL_CATCH_TESTCASE( "", "" )
+
+#define REGISTER_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_REPORTER( name, reporterType )
+#define REGISTER_LEGACY_REPORTER( name, reporterType ) INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( name, reporterType )
+
+#define GENERATE( expr) INTERNAL_CATCH_GENERATE( expr )
+
+#endif
+
+#define CATCH_TRANSLATE_EXCEPTION( signature ) INTERNAL_CATCH_TRANSLATE_EXCEPTION( signature )
+
+// "BDD-style" convenience wrappers
+#ifdef CATCH_CONFIG_VARIADIC_MACROS
+#define SCENARIO( ... ) TEST_CASE( "Scenario: " __VA_ARGS__ )
+#define SCENARIO_METHOD( className, ... ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " __VA_ARGS__ )
+#else
+#define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags )
+#define SCENARIO_METHOD( className, name, tags ) INTERNAL_CATCH_TEST_CASE_METHOD( className, "Scenario: " name, tags )
+#endif
+#define GIVEN( desc )    SECTION( std::string("   Given: ") + desc, "" )
+#define WHEN( desc )     SECTION( std::string("    When: ") + desc, "" )
+#define AND_WHEN( desc ) SECTION( std::string("And when: ") + desc, "" )
+#define THEN( desc )     SECTION( std::string("    Then: ") + desc, "" )
+#define AND_THEN( desc ) SECTION( std::string("     And: ") + desc, "" )
+
+using Catch::Detail::Approx;
+
+// #included from: internal/catch_reenable_warnings.h
+
+#define TWOBLUECUBES_CATCH_REENABLE_WARNINGS_H_INCLUDED
+
+#ifdef __clang__
+#    ifdef __ICC // icpc defines the __clang__ macro
+#        pragma warning(pop)
+#    else
+#        pragma clang diagnostic pop
+#    endif
+#elif defined __GNUC__
+#    pragma GCC diagnostic pop
+#endif
+
+#endif // TWOBLUECUBES_SINGLE_INCLUDE_CATCH_HPP_INCLUDED
+
diff --git a/third-party/ArduinoJson/keywords.txt b/third-party/ArduinoJson/keywords.txt
new file mode 100644
index 0000000..3dff06b
--- /dev/null
+++ b/third-party/ArduinoJson/keywords.txt
@@ -0,0 +1,40 @@
+# Macros
+JSON_ARRAY_SIZE	KEYWORD2
+JSON_OBJECT_SIZE	KEYWORD2
+JSON_STRING_SIZE	KEYWORD2
+
+# Free functions
+deserializeJson	KEYWORD2
+deserializeMsgPack	KEYWORD2
+serialized	KEYWORD2
+serializeJson	KEYWORD2
+serializeJsonPretty	KEYWORD2
+serializeMsgPack	KEYWORD2
+measureJson	KEYWORD2
+measureJsonPretty	KEYWORD2
+measureMsgPack	KEYWORD2
+
+# Methods
+add	KEYWORD2
+as	KEYWORD2
+createNestedArray	KEYWORD2
+createNestedObject	KEYWORD2
+get	KEYWORD2
+set	KEYWORD2
+to	KEYWORD2
+
+# Type names
+DeserializationError	KEYWORD1	DATA_TYPE
+DynamicJsonDocument	KEYWORD1	DATA_TYPE
+JsonArray	KEYWORD1	DATA_TYPE
+JsonArrayConst	KEYWORD1	DATA_TYPE
+JsonDocument	KEYWORD1	DATA_TYPE
+JsonFloat	KEYWORD1	DATA_TYPE
+JsonInteger	KEYWORD1	DATA_TYPE
+JsonObject	KEYWORD1	DATA_TYPE
+JsonObjectConst	KEYWORD1	DATA_TYPE
+JsonString	KEYWORD1	DATA_TYPE
+JsonUInt	KEYWORD1	DATA_TYPE
+JsonVariant	KEYWORD1	DATA_TYPE
+JsonVariantConst	KEYWORD1	DATA_TYPE
+StaticJsonDocument	KEYWORD1	DATA_TYPE
diff --git a/third-party/ArduinoJson/library.json b/third-party/ArduinoJson/library.json
new file mode 100644
index 0000000..0faad3a
--- /dev/null
+++ b/third-party/ArduinoJson/library.json
@@ -0,0 +1,24 @@
+{
+  "name": "ArduinoJson",
+  "keywords": "json, rest, http, web",
+  "description": "A simple and efficient JSON library for embedded C++. ArduinoJson supports ✔ serialization, ✔ deserialization, ✔ MessagePack, ✔ fixed allocation, ✔ zero-copy, ✔ streams, ✔ filtering, and more. It is the most popular Arduino library on GitHub ❤❤❤❤❤. Check out arduinojson.org for a comprehensive documentation.",
+  "homepage": "https://arduinojson.org/?utm_source=meta&utm_medium=library.json",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bblanchon/ArduinoJson.git"
+  },
+  "version": "6.18.2",
+  "authors": {
+    "name": "Benoit Blanchon",
+    "url": "https://blog.benoitblanchon.fr"
+  },
+  "exclude": [
+    ".github",
+    "extras"
+  ],
+  "frameworks": "*",
+  "platforms": "*",
+  "build": {
+    "libArchive": false
+  }
+}
diff --git a/third-party/ArduinoJson/library.properties b/third-party/ArduinoJson/library.properties
new file mode 100644
index 0000000..a0354b0
--- /dev/null
+++ b/third-party/ArduinoJson/library.properties
@@ -0,0 +1,11 @@
+name=ArduinoJson
+version=6.18.2
+author=Benoit Blanchon <blog.benoitblanchon.fr>
+maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
+sentence=A simple and efficient JSON library for embedded C++.
+paragraph=ArduinoJson supports ✔ serialization, ✔ deserialization, ✔ MessagePack, ✔ fixed allocation, ✔ zero-copy, ✔ streams, ✔ filtering, and more. It is the most popular Arduino library on GitHub ❤❤❤❤❤. Check out arduinojson.org for a comprehensive documentation.
+category=Data Processing
+url=https://arduinojson.org/?utm_source=meta&utm_medium=library.properties
+architectures=*
+repository=https://github.com/bblanchon/ArduinoJson.git
+license=MIT
diff --git a/third-party/ArduinoJson/src/ArduinoJson.h b/third-party/ArduinoJson/src/ArduinoJson.h
new file mode 100644
index 0000000..2984c23
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson.h
@@ -0,0 +1,17 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#ifdef __cplusplus
+
+#include "ArduinoJson.hpp"
+
+using namespace ArduinoJson;
+
+#else
+
+#error ArduinoJson requires a C++ compiler, please change file extension to .cc or .cpp
+
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson.hpp b/third-party/ArduinoJson/src/ArduinoJson.hpp
new file mode 100644
index 0000000..d16ca08
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson.hpp
@@ -0,0 +1,73 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "ArduinoJson/Configuration.hpp"
+
+#if !ARDUINOJSON_DEBUG
+#  ifdef __clang__
+#    pragma clang system_header
+#  elif defined __GNUC__
+#    pragma GCC system_header
+#  endif
+#endif
+
+#include "ArduinoJson/Array/ArrayRef.hpp"
+#include "ArduinoJson/Object/ObjectRef.hpp"
+#include "ArduinoJson/Variant/VariantRef.hpp"
+
+#include "ArduinoJson/Document/DynamicJsonDocument.hpp"
+#include "ArduinoJson/Document/StaticJsonDocument.hpp"
+
+#include "ArduinoJson/Array/ArrayImpl.hpp"
+#include "ArduinoJson/Array/ElementProxy.hpp"
+#include "ArduinoJson/Array/Utilities.hpp"
+#include "ArduinoJson/Collection/CollectionImpl.hpp"
+#include "ArduinoJson/Object/MemberProxy.hpp"
+#include "ArduinoJson/Object/ObjectImpl.hpp"
+#include "ArduinoJson/Variant/ConverterImpl.hpp"
+#include "ArduinoJson/Variant/VariantCompare.hpp"
+#include "ArduinoJson/Variant/VariantImpl.hpp"
+
+#include "ArduinoJson/Json/JsonDeserializer.hpp"
+#include "ArduinoJson/Json/JsonSerializer.hpp"
+#include "ArduinoJson/Json/PrettyJsonSerializer.hpp"
+#include "ArduinoJson/MsgPack/MsgPackDeserializer.hpp"
+#include "ArduinoJson/MsgPack/MsgPackSerializer.hpp"
+
+#include "ArduinoJson/compatibility.hpp"
+
+namespace ArduinoJson {
+typedef ARDUINOJSON_NAMESPACE::ArrayConstRef JsonArrayConst;
+typedef ARDUINOJSON_NAMESPACE::ArrayRef JsonArray;
+typedef ARDUINOJSON_NAMESPACE::Float JsonFloat;
+typedef ARDUINOJSON_NAMESPACE::Integer JsonInteger;
+typedef ARDUINOJSON_NAMESPACE::ObjectConstRef JsonObjectConst;
+typedef ARDUINOJSON_NAMESPACE::ObjectRef JsonObject;
+typedef ARDUINOJSON_NAMESPACE::Pair JsonPair;
+typedef ARDUINOJSON_NAMESPACE::PairConst JsonPairConst;
+typedef ARDUINOJSON_NAMESPACE::String JsonString;
+typedef ARDUINOJSON_NAMESPACE::UInt JsonUInt;
+typedef ARDUINOJSON_NAMESPACE::VariantConstRef JsonVariantConst;
+typedef ARDUINOJSON_NAMESPACE::VariantRef JsonVariant;
+using ARDUINOJSON_NAMESPACE::BasicJsonDocument;
+using ARDUINOJSON_NAMESPACE::copyArray;
+using ARDUINOJSON_NAMESPACE::DeserializationError;
+using ARDUINOJSON_NAMESPACE::deserializeJson;
+using ARDUINOJSON_NAMESPACE::deserializeMsgPack;
+using ARDUINOJSON_NAMESPACE::DynamicJsonDocument;
+using ARDUINOJSON_NAMESPACE::JsonDocument;
+using ARDUINOJSON_NAMESPACE::measureJson;
+using ARDUINOJSON_NAMESPACE::serialized;
+using ARDUINOJSON_NAMESPACE::serializeJson;
+using ARDUINOJSON_NAMESPACE::serializeJsonPretty;
+using ARDUINOJSON_NAMESPACE::serializeMsgPack;
+using ARDUINOJSON_NAMESPACE::StaticJsonDocument;
+
+namespace DeserializationOption {
+using ARDUINOJSON_NAMESPACE::Filter;
+using ARDUINOJSON_NAMESPACE::NestingLimit;
+}  // namespace DeserializationOption
+}  // namespace ArduinoJson
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayFunctions.hpp b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayFunctions.hpp
new file mode 100644
index 0000000..e7cdc4c
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayFunctions.hpp
@@ -0,0 +1,31 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Collection/CollectionData.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+inline VariantData *arrayAdd(CollectionData *arr, MemoryPool *pool) {
+  return arr ? arr->addElement(pool) : 0;
+}
+
+template <typename TVisitor>
+inline typename TVisitor::result_type arrayAccept(const CollectionData *arr,
+                                                  TVisitor &visitor) {
+  if (arr)
+    return visitor.visitArray(*arr);
+  else
+    return visitor.visitNull();
+}
+
+inline bool arrayEquals(const CollectionData *lhs, const CollectionData *rhs) {
+  if (lhs == rhs)
+    return true;
+  if (!lhs || !rhs)
+    return false;
+  return lhs->equalsArray(*rhs);
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp
new file mode 100644
index 0000000..ae06b20
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp
@@ -0,0 +1,28 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/ArrayRef.hpp>
+#include <ArduinoJson/Object/ObjectRef.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TArray>
+inline ArrayRef ArrayShortcuts<TArray>::createNestedArray() const {
+  return impl()->addElement().template to<ArrayRef>();
+}
+
+template <typename TArray>
+inline ObjectRef ArrayShortcuts<TArray>::createNestedObject() const {
+  return impl()->addElement().template to<ObjectRef>();
+}
+
+template <typename TArray>
+inline ElementProxy<TArray> ArrayShortcuts<TArray>::operator[](
+    size_t index) const {
+  return ElementProxy<TArray>(*impl(), index);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayIterator.hpp b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayIterator.hpp
new file mode 100644
index 0000000..fcacc6b
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayIterator.hpp
@@ -0,0 +1,121 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Variant/SlotFunctions.hpp>
+#include <ArduinoJson/Variant/VariantRef.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class VariantPtr {
+ public:
+  VariantPtr(MemoryPool *pool, VariantData *data) : _variant(pool, data) {}
+
+  VariantRef *operator->() {
+    return &_variant;
+  }
+
+  VariantRef &operator*() {
+    return _variant;
+  }
+
+ private:
+  VariantRef _variant;
+};
+
+class ArrayIterator {
+ public:
+  ArrayIterator() : _slot(0) {}
+  explicit ArrayIterator(MemoryPool *pool, VariantSlot *slot)
+      : _pool(pool), _slot(slot) {}
+
+  VariantRef operator*() const {
+    return VariantRef(_pool, _slot->data());
+  }
+  VariantPtr operator->() {
+    return VariantPtr(_pool, _slot->data());
+  }
+
+  bool operator==(const ArrayIterator &other) const {
+    return _slot == other._slot;
+  }
+
+  bool operator!=(const ArrayIterator &other) const {
+    return _slot != other._slot;
+  }
+
+  ArrayIterator &operator++() {
+    _slot = _slot->next();
+    return *this;
+  }
+
+  ArrayIterator &operator+=(size_t distance) {
+    _slot = _slot->next(distance);
+    return *this;
+  }
+
+  VariantSlot *internal() {
+    return _slot;
+  }
+
+ private:
+  MemoryPool *_pool;
+  VariantSlot *_slot;
+};
+
+class VariantConstPtr {
+ public:
+  VariantConstPtr(const VariantData *data) : _variant(data) {}
+
+  VariantConstRef *operator->() {
+    return &_variant;
+  }
+
+  VariantConstRef &operator*() {
+    return _variant;
+  }
+
+ private:
+  VariantConstRef _variant;
+};
+
+class ArrayConstRefIterator {
+ public:
+  ArrayConstRefIterator() : _slot(0) {}
+  explicit ArrayConstRefIterator(const VariantSlot *slot) : _slot(slot) {}
+
+  VariantConstRef operator*() const {
+    return VariantConstRef(_slot->data());
+  }
+  VariantConstPtr operator->() {
+    return VariantConstPtr(_slot->data());
+  }
+
+  bool operator==(const ArrayConstRefIterator &other) const {
+    return _slot == other._slot;
+  }
+
+  bool operator!=(const ArrayConstRefIterator &other) const {
+    return _slot != other._slot;
+  }
+
+  ArrayConstRefIterator &operator++() {
+    _slot = _slot->next();
+    return *this;
+  }
+
+  ArrayConstRefIterator &operator+=(size_t distance) {
+    _slot = _slot->next(distance);
+    return *this;
+  }
+
+  const VariantSlot *internal() {
+    return _slot;
+  }
+
+ private:
+  const VariantSlot *_slot;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayRef.hpp b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayRef.hpp
new file mode 100644
index 0000000..219a6b8
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayRef.hpp
@@ -0,0 +1,213 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/ArrayFunctions.hpp>
+#include <ArduinoJson/Array/ArrayIterator.hpp>
+#include <ArduinoJson/Variant/VariantData.hpp>
+
+// Returns the size (in bytes) of an array with n elements.
+// Can be very handy to determine the size of a StaticMemoryPool.
+#define JSON_ARRAY_SIZE(NUMBER_OF_ELEMENTS) \
+  ((NUMBER_OF_ELEMENTS) * sizeof(ARDUINOJSON_NAMESPACE::VariantSlot))
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class ObjectRef;
+template <typename>
+class ElementProxy;
+
+template <typename TData>
+class ArrayRefBase {
+ public:
+  operator VariantConstRef() const {
+    const void* data = _data;  // prevent warning cast-align
+    return VariantConstRef(reinterpret_cast<const VariantData*>(data));
+  }
+
+  template <typename TVisitor>
+  FORCE_INLINE typename TVisitor::result_type accept(TVisitor& visitor) const {
+    return arrayAccept(_data, visitor);
+  }
+
+  FORCE_INLINE bool isNull() const {
+    return _data == 0;
+  }
+
+  FORCE_INLINE operator bool() const {
+    return _data != 0;
+  }
+
+  FORCE_INLINE size_t memoryUsage() const {
+    return _data ? _data->memoryUsage() : 0;
+  }
+
+  FORCE_INLINE size_t nesting() const {
+    return _data ? _data->nesting() : 0;
+  }
+
+  FORCE_INLINE size_t size() const {
+    return _data ? _data->size() : 0;
+  }
+
+ protected:
+  ArrayRefBase(TData* data) : _data(data) {}
+  TData* _data;
+};
+
+class ArrayConstRef : public ArrayRefBase<const CollectionData>,
+                      public Visitable {
+  friend class ArrayRef;
+  typedef ArrayRefBase<const CollectionData> base_type;
+
+ public:
+  typedef ArrayConstRefIterator iterator;
+
+  FORCE_INLINE iterator begin() const {
+    if (!_data)
+      return iterator();
+    return iterator(_data->head());
+  }
+
+  FORCE_INLINE iterator end() const {
+    return iterator();
+  }
+
+  FORCE_INLINE ArrayConstRef() : base_type(0) {}
+  FORCE_INLINE ArrayConstRef(const CollectionData* data) : base_type(data) {}
+
+  FORCE_INLINE bool operator==(ArrayConstRef rhs) const {
+    return arrayEquals(_data, rhs._data);
+  }
+
+  FORCE_INLINE VariantConstRef operator[](size_t index) const {
+    return getElement(index);
+  }
+
+  FORCE_INLINE VariantConstRef getElement(size_t index) const {
+    return VariantConstRef(_data ? _data->getElement(index) : 0);
+  }
+};
+
+class ArrayRef : public ArrayRefBase<CollectionData>,
+                 public ArrayShortcuts<ArrayRef>,
+                 public Visitable {
+  typedef ArrayRefBase<CollectionData> base_type;
+
+ public:
+  typedef ArrayIterator iterator;
+
+  FORCE_INLINE ArrayRef() : base_type(0), _pool(0) {}
+  FORCE_INLINE ArrayRef(MemoryPool* pool, CollectionData* data)
+      : base_type(data), _pool(pool) {}
+
+  operator VariantRef() {
+    void* data = _data;  // prevent warning cast-align
+    return VariantRef(_pool, reinterpret_cast<VariantData*>(data));
+  }
+
+  operator ArrayConstRef() const {
+    return ArrayConstRef(_data);
+  }
+
+  VariantRef addElement() const {
+    return VariantRef(_pool, arrayAdd(_data, _pool));
+  }
+
+  FORCE_INLINE iterator begin() const {
+    if (!_data)
+      return iterator();
+    return iterator(_pool, _data->head());
+  }
+
+  FORCE_INLINE iterator end() const {
+    return iterator();
+  }
+
+  // Copy a ArrayRef
+  FORCE_INLINE bool set(ArrayConstRef src) const {
+    if (!_data || !src._data)
+      return false;
+    return _data->copyFrom(*src._data, _pool);
+  }
+
+  FORCE_INLINE bool operator==(ArrayRef rhs) const {
+    return arrayEquals(_data, rhs._data);
+  }
+
+  // Internal use
+  FORCE_INLINE VariantRef getOrAddElement(size_t index) const {
+    return VariantRef(_pool, _data ? _data->getOrAddElement(index, _pool) : 0);
+  }
+
+  // Gets the value at the specified index.
+  FORCE_INLINE VariantRef getElement(size_t index) const {
+    return VariantRef(_pool, _data ? _data->getElement(index) : 0);
+  }
+
+  // Removes element at specified position.
+  FORCE_INLINE void remove(iterator it) const {
+    if (!_data)
+      return;
+    _data->removeSlot(it.internal());
+  }
+
+  // Removes element at specified index.
+  FORCE_INLINE void remove(size_t index) const {
+    if (!_data)
+      return;
+    _data->removeElement(index);
+  }
+
+  void clear() const {
+    if (!_data)
+      return;
+    _data->clear();
+  }
+
+ private:
+  MemoryPool* _pool;
+};
+
+template <>
+struct Converter<ArrayConstRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+
+  static ArrayConstRef fromJson(VariantConstRef src) {
+    return ArrayConstRef(variantAsArray(getData(src)));
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isArray();
+  }
+};
+
+template <>
+struct Converter<ArrayRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+
+  static ArrayRef fromJson(VariantRef src) {
+    VariantData* data = getData(src);
+    MemoryPool* pool = getPool(src);
+    return ArrayRef(pool, data != 0 ? data->asArray() : 0);
+  }
+
+  static InvalidConversion<VariantConstRef, ArrayRef> fromJson(VariantConstRef);
+
+  static bool checkJson(VariantConstRef) {
+    return false;
+  }
+
+  static bool checkJson(VariantRef src) {
+    VariantData* data = getData(src);
+    return data && data->isArray();
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayShortcuts.hpp b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayShortcuts.hpp
new file mode 100644
index 0000000..fd26d04
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Array/ArrayShortcuts.hpp
@@ -0,0 +1,49 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/attributes.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+// Forward declarations.
+class ArrayRef;
+class ObjectRef;
+template <typename>
+class ElementProxy;
+
+template <typename TArray>
+class ArrayShortcuts {
+ public:
+  // Returns the element at specified index if the variant is an array.
+  FORCE_INLINE ElementProxy<TArray> operator[](size_t index) const;
+
+  FORCE_INLINE ObjectRef createNestedObject() const;
+
+  FORCE_INLINE ArrayRef createNestedArray() const;
+
+  // Adds the specified value at the end of the array.
+  //
+  // bool add(TValue);
+  // TValue = bool, long, int, short, float, double, serialized, VariantRef,
+  //          std::string, String, ObjectRef
+  template <typename T>
+  FORCE_INLINE bool add(const T &value) const {
+    return impl()->addElement().set(value);
+  }
+  //
+  // bool add(TValue);
+  // TValue = char*, const char*, const __FlashStringHelper*
+  template <typename T>
+  FORCE_INLINE bool add(T *value) const {
+    return impl()->addElement().set(value);
+  }
+
+ private:
+  const TArray *impl() const {
+    return static_cast<const TArray *>(this);
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp b/third-party/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp
new file mode 100644
index 0000000..7ee7f03
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp
@@ -0,0 +1,193 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Variant/VariantOperators.hpp>
+#include <ArduinoJson/Variant/VariantShortcuts.hpp>
+#include <ArduinoJson/Variant/VariantTo.hpp>
+
+#ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable : 4522)
+#endif
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TArray>
+class ElementProxy : public VariantOperators<ElementProxy<TArray> >,
+                     public VariantShortcuts<ElementProxy<TArray> >,
+                     public Visitable,
+                     public VariantTag {
+  typedef ElementProxy<TArray> this_type;
+
+ public:
+  typedef VariantRef variant_type;
+
+  FORCE_INLINE ElementProxy(TArray array, size_t index)
+      : _array(array), _index(index) {}
+
+  FORCE_INLINE ElementProxy(const ElementProxy& src)
+      : _array(src._array), _index(src._index) {}
+
+  FORCE_INLINE this_type& operator=(const this_type& src) {
+    getOrAddUpstreamElement().set(src.as<VariantConstRef>());
+    return *this;
+  }
+
+  // Replaces the value
+  //
+  // operator=(const TValue&)
+  // TValue = bool, long, int, short, float, double, serialized, VariantRef,
+  //          std::string, String, ArrayRef, ObjectRef
+  template <typename T>
+  FORCE_INLINE this_type& operator=(const T& src) {
+    getOrAddUpstreamElement().set(src);
+    return *this;
+  }
+  //
+  // operator=(TValue)
+  // TValue = char*, const char*, const __FlashStringHelper*
+  template <typename T>
+  FORCE_INLINE this_type& operator=(T* src) {
+    getOrAddUpstreamElement().set(src);
+    return *this;
+  }
+
+  FORCE_INLINE void clear() const {
+    getUpstreamElement().clear();
+  }
+
+  FORCE_INLINE bool isNull() const {
+    return getUpstreamElement().isNull();
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<!is_same<T, char*>::value, T>::type as()
+      const {
+    return getUpstreamElement().template as<T>();
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char*>::value, const char*>::type
+  ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
+      as() const {
+    return as<const char*>();
+  }
+
+  template <typename T>
+  FORCE_INLINE operator T() const {
+    return getUpstreamElement();
+  }
+
+  template <typename T>
+  FORCE_INLINE bool is() const {
+    return getUpstreamElement().template is<T>();
+  }
+
+  template <typename T>
+  FORCE_INLINE typename VariantTo<T>::type to() const {
+    return getOrAddUpstreamElement().template to<T>();
+  }
+
+  // Replaces the value
+  //
+  // bool set(const TValue&)
+  // TValue = bool, long, int, short, float, double, serialized, VariantRef,
+  //          std::string, String, ArrayRef, ObjectRef
+  template <typename TValue>
+  FORCE_INLINE bool set(const TValue& value) const {
+    return getOrAddUpstreamElement().set(value);
+  }
+  //
+  // bool set(TValue)
+  // TValue = char*, const char*, const __FlashStringHelper*
+  template <typename TValue>
+  FORCE_INLINE bool set(TValue* value) const {
+    return getOrAddUpstreamElement().set(value);
+  }
+
+  template <typename TVisitor>
+  typename TVisitor::result_type accept(TVisitor& visitor) const {
+    return getUpstreamElement().accept(visitor);
+  }
+
+  FORCE_INLINE size_t size() const {
+    return getUpstreamElement().size();
+  }
+
+  template <typename TNestedKey>
+  VariantRef getMember(TNestedKey* key) const {
+    return getUpstreamElement().getMember(key);
+  }
+
+  template <typename TNestedKey>
+  VariantRef getMember(const TNestedKey& key) const {
+    return getUpstreamElement().getMember(key);
+  }
+
+  template <typename TNestedKey>
+  VariantRef getOrAddMember(TNestedKey* key) const {
+    return getOrAddUpstreamElement().getOrAddMember(key);
+  }
+
+  template <typename TNestedKey>
+  VariantRef getOrAddMember(const TNestedKey& key) const {
+    return getOrAddUpstreamElement().getOrAddMember(key);
+  }
+
+  VariantRef addElement() const {
+    return getOrAddUpstreamElement().addElement();
+  }
+
+  VariantRef getElement(size_t index) const {
+    return getOrAddUpstreamElement().getElement(index);
+  }
+
+  VariantRef getOrAddElement(size_t index) const {
+    return getOrAddUpstreamElement().getOrAddElement(index);
+  }
+
+  FORCE_INLINE void remove(size_t index) const {
+    getUpstreamElement().remove(index);
+  }
+  // remove(char*) const
+  // remove(const char*) const
+  // remove(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE typename enable_if<IsString<TChar*>::value>::type remove(
+      TChar* key) const {
+    getUpstreamElement().remove(key);
+  }
+  // remove(const std::string&) const
+  // remove(const String&) const
+  template <typename TString>
+  FORCE_INLINE typename enable_if<IsString<TString>::value>::type remove(
+      const TString& key) const {
+    getUpstreamElement().remove(key);
+  }
+
+ private:
+  FORCE_INLINE VariantRef getUpstreamElement() const {
+    return _array.getElement(_index);
+  }
+
+  FORCE_INLINE VariantRef getOrAddUpstreamElement() const {
+    return _array.getOrAddElement(_index);
+  }
+
+  friend bool convertToJson(const this_type& src, VariantRef dst) {
+    return dst.set(src.getUpstreamElement());
+  }
+
+  TArray _array;
+  const size_t _index;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp b/third-party/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp
new file mode 100644
index 0000000..619b91d
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp
@@ -0,0 +1,133 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/ArrayRef.hpp>
+#include <ArduinoJson/Document/JsonDocument.hpp>
+#include <ArduinoJson/Variant/Visitor.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// Copy a 1D array to a JsonArray
+template <typename T, size_t N, typename TDestination>
+inline typename enable_if<!is_array<T>::value &&
+                              !is_base_of<JsonDocument, TDestination>::value,
+                          bool>::type
+copyArray(T (&src)[N], const TDestination& dst) {
+  return copyArray(src, N, dst);
+}
+
+// Copy a 1D array to a JsonDocument
+template <typename T, size_t N>
+inline bool copyArray(T (&src)[N], JsonDocument& dst) {
+  return copyArray(src, dst.to<ArrayRef>());
+}
+
+// Copy a 1D array to a JsonArray
+template <typename T, typename TDestination>
+inline typename enable_if<!is_array<T>::value &&
+                              !is_base_of<JsonDocument, TDestination>::value,
+                          bool>::type
+copyArray(T* src, size_t len, const TDestination& dst) {
+  bool ok = true;
+  for (size_t i = 0; i < len; i++) {
+    ok &= dst.add(src[i]);
+  }
+  return ok;
+}
+
+// Copy a 1D array to a JsonDocument
+template <typename T>
+inline bool copyArray(T* src, size_t len, JsonDocument& dst) {
+  return copyArray(src, len, dst.to<ArrayRef>());
+}
+
+// Copy a 2D array to a JsonArray
+template <typename T, size_t N1, size_t N2, typename TDestination>
+inline typename enable_if<!is_base_of<JsonDocument, TDestination>::value,
+                          bool>::type
+copyArray(T (&src)[N1][N2], const TDestination& dst) {
+  bool ok = true;
+  for (size_t i = 0; i < N1; i++) {
+    ArrayRef nestedArray = dst.createNestedArray();
+    for (size_t j = 0; j < N2; j++) {
+      ok &= nestedArray.add(src[i][j]);
+    }
+  }
+  return ok;
+}
+
+// Copy a 2D array to a JsonDocument
+template <typename T, size_t N1, size_t N2>
+inline bool copyArray(T (&src)[N1][N2], JsonDocument& dst) {
+  return copyArray(src, dst.to<ArrayRef>());
+}
+
+template <typename T>
+class ArrayCopier1D : public Visitor<size_t> {
+ public:
+  ArrayCopier1D(T* destination, size_t capacity)
+      : _destination(destination), _capacity(capacity) {}
+
+  size_t visitArray(const CollectionData& array) {
+    size_t size = 0;
+    VariantSlot* slot = array.head();
+
+    while (slot != 0 && size < _capacity) {
+      _destination[size++] =
+          Converter<T>::fromJson(VariantConstRef(slot->data()));
+      slot = slot->next();
+    }
+    return size;
+  }
+
+ private:
+  T* _destination;
+  size_t _capacity;
+};
+
+template <typename T, size_t N1, size_t N2>
+class ArrayCopier2D : public Visitor<void> {
+ public:
+  ArrayCopier2D(T (*destination)[N1][N2]) : _destination(destination) {}
+
+  void visitArray(const CollectionData& array) {
+    VariantSlot* slot = array.head();
+    size_t n = 0;
+    while (slot != 0 && n < N1) {
+      ArrayCopier1D<T> copier((*_destination)[n++], N2);
+      variantAccept(slot->data(), copier);
+      slot = slot->next();
+    }
+  }
+
+ private:
+  T (*_destination)[N1][N2];
+  size_t _capacity1, _capacity2;
+};
+
+// Copy a JsonArray to a 1D array
+template <typename TSource, typename T, size_t N>
+inline typename enable_if<!is_array<T>::value, size_t>::type copyArray(
+    const TSource& src, T (&dst)[N]) {
+  return copyArray(src, dst, N);
+}
+
+// Copy a JsonArray to a 1D array
+template <typename TSource, typename T>
+inline size_t copyArray(const TSource& src, T* dst, size_t len) {
+  ArrayCopier1D<T> copier(dst, len);
+
+  return src.accept(copier);
+}
+
+// Copy a JsonArray to a 2D array
+template <typename TSource, typename T, size_t N1, size_t N2>
+inline void copyArray(const TSource& src, T (&dst)[N1][N2]) {
+  ArrayCopier2D<T, N1, N2> copier(&dst);
+  src.accept(copier);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp b/third-party/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp
new file mode 100644
index 0000000..d2bca45
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp
@@ -0,0 +1,88 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+
+#include <stddef.h>  // size_t
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class MemoryPool;
+class VariantData;
+class VariantSlot;
+
+class CollectionData {
+  VariantSlot *_head;
+  VariantSlot *_tail;
+
+ public:
+  // Must be a POD!
+  // - no constructor
+  // - no destructor
+  // - no virtual
+  // - no inheritance
+
+  // Array only
+
+  VariantData *addElement(MemoryPool *pool);
+
+  VariantData *getElement(size_t index) const;
+
+  VariantData *getOrAddElement(size_t index, MemoryPool *pool);
+
+  void removeElement(size_t index);
+
+  bool equalsArray(const CollectionData &other) const;
+
+  // Object only
+
+  template <typename TAdaptedString>
+  VariantData *addMember(TAdaptedString key, MemoryPool *pool);
+
+  template <typename TAdaptedString>
+  VariantData *getMember(TAdaptedString key) const;
+
+  template <typename TAdaptedString>
+  VariantData *getOrAddMember(TAdaptedString key, MemoryPool *pool);
+
+  template <typename TAdaptedString>
+  void removeMember(TAdaptedString key) {
+    removeSlot(getSlot(key));
+  }
+
+  template <typename TAdaptedString>
+  bool containsKey(const TAdaptedString &key) const;
+
+  bool equalsObject(const CollectionData &other) const;
+
+  // Generic
+
+  void clear();
+  size_t memoryUsage() const;
+  size_t nesting() const;
+  size_t size() const;
+
+  VariantSlot *addSlot(MemoryPool *);
+  void removeSlot(VariantSlot *slot);
+
+  bool copyFrom(const CollectionData &src, MemoryPool *pool);
+
+  VariantSlot *head() const {
+    return _head;
+  }
+
+  void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance);
+
+ private:
+  VariantSlot *getSlot(size_t index) const;
+
+  template <typename TAdaptedString>
+  VariantSlot *getSlot(TAdaptedString key) const;
+
+  VariantSlot *getPreviousSlot(VariantSlot *) const;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp b/third-party/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp
new file mode 100644
index 0000000..49a24be
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp
@@ -0,0 +1,234 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Collection/CollectionData.hpp>
+#include <ArduinoJson/Variant/VariantData.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+inline bool variantEquals(const VariantData* a, const VariantData* b) {
+  return variantCompare(a, b) == COMPARE_RESULT_EQUAL;
+}
+
+inline VariantSlot* CollectionData::addSlot(MemoryPool* pool) {
+  VariantSlot* slot = pool->allocVariant();
+  if (!slot)
+    return 0;
+
+  if (_tail) {
+    _tail->setNextNotNull(slot);
+    _tail = slot;
+  } else {
+    _head = slot;
+    _tail = slot;
+  }
+
+  slot->clear();
+  return slot;
+}
+
+inline VariantData* CollectionData::addElement(MemoryPool* pool) {
+  return slotData(addSlot(pool));
+}
+
+template <typename TAdaptedString>
+inline VariantData* CollectionData::addMember(TAdaptedString key,
+                                              MemoryPool* pool) {
+  VariantSlot* slot = addSlot(pool);
+  if (!slotSetKey(slot, key, pool)) {
+    removeSlot(slot);
+    return 0;
+  }
+  return slot->data();
+}
+
+inline void CollectionData::clear() {
+  _head = 0;
+  _tail = 0;
+}
+
+template <typename TAdaptedString>
+inline bool CollectionData::containsKey(const TAdaptedString& key) const {
+  return getSlot(key) != 0;
+}
+
+inline bool CollectionData::copyFrom(const CollectionData& src,
+                                     MemoryPool* pool) {
+  clear();
+  for (VariantSlot* s = src._head; s; s = s->next()) {
+    VariantData* var;
+    if (s->key() != 0) {
+      if (s->ownsKey())
+        var = addMember(RamStringAdapter(s->key()), pool);
+      else
+        var = addMember(ConstRamStringAdapter(s->key()), pool);
+    } else {
+      var = addElement(pool);
+    }
+    if (!var)
+      return false;
+    if (!var->copyFrom(*s->data(), pool))
+      return false;
+  }
+  return true;
+}
+
+inline bool CollectionData::equalsObject(const CollectionData& other) const {
+  size_t count = 0;
+  for (VariantSlot* slot = _head; slot; slot = slot->next()) {
+    VariantData* v1 = slot->data();
+    VariantData* v2 = other.getMember(adaptString(slot->key()));
+    if (!variantEquals(v1, v2))
+      return false;
+    count++;
+  }
+  return count == other.size();
+}
+
+inline bool CollectionData::equalsArray(const CollectionData& other) const {
+  VariantSlot* s1 = _head;
+  VariantSlot* s2 = other._head;
+  for (;;) {
+    if (s1 == s2)
+      return true;
+    if (!s1 || !s2)
+      return false;
+    if (!variantEquals(s1->data(), s2->data()))
+      return false;
+    s1 = s1->next();
+    s2 = s2->next();
+  }
+}
+
+template <typename TAdaptedString>
+inline VariantSlot* CollectionData::getSlot(TAdaptedString key) const {
+  VariantSlot* slot = _head;
+  while (slot) {
+    if (key.equals(slot->key()))
+      break;
+    slot = slot->next();
+  }
+  return slot;
+}
+
+inline VariantSlot* CollectionData::getSlot(size_t index) const {
+  if (!_head)
+    return 0;
+  return _head->next(index);
+}
+
+inline VariantSlot* CollectionData::getPreviousSlot(VariantSlot* target) const {
+  VariantSlot* current = _head;
+  while (current) {
+    VariantSlot* next = current->next();
+    if (next == target)
+      return current;
+    current = next;
+  }
+  return 0;
+}
+
+template <typename TAdaptedString>
+inline VariantData* CollectionData::getMember(TAdaptedString key) const {
+  VariantSlot* slot = getSlot(key);
+  return slot ? slot->data() : 0;
+}
+
+template <typename TAdaptedString>
+inline VariantData* CollectionData::getOrAddMember(TAdaptedString key,
+                                                   MemoryPool* pool) {
+  // ignore null key
+  if (key.isNull())
+    return 0;
+
+  // search a matching key
+  VariantSlot* slot = getSlot(key);
+  if (slot)
+    return slot->data();
+
+  return addMember(key, pool);
+}
+
+inline VariantData* CollectionData::getElement(size_t index) const {
+  VariantSlot* slot = getSlot(index);
+  return slot ? slot->data() : 0;
+}
+
+inline VariantData* CollectionData::getOrAddElement(size_t index,
+                                                    MemoryPool* pool) {
+  VariantSlot* slot = _head;
+  while (slot && index > 0) {
+    slot = slot->next();
+    index--;
+  }
+  if (!slot)
+    index++;
+  while (index > 0) {
+    slot = addSlot(pool);
+    index--;
+  }
+  return slotData(slot);
+}
+
+inline void CollectionData::removeSlot(VariantSlot* slot) {
+  if (!slot)
+    return;
+  VariantSlot* prev = getPreviousSlot(slot);
+  VariantSlot* next = slot->next();
+  if (prev)
+    prev->setNext(next);
+  else
+    _head = next;
+  if (!next)
+    _tail = prev;
+}
+
+inline void CollectionData::removeElement(size_t index) {
+  removeSlot(getSlot(index));
+}
+
+inline size_t CollectionData::memoryUsage() const {
+  size_t total = 0;
+  for (VariantSlot* s = _head; s; s = s->next()) {
+    total += sizeof(VariantSlot) + s->data()->memoryUsage();
+    if (s->ownsKey())
+      total += strlen(s->key()) + 1;
+  }
+  return total;
+}
+
+inline size_t CollectionData::nesting() const {
+  size_t maxChildNesting = 0;
+  for (VariantSlot* s = _head; s; s = s->next()) {
+    size_t childNesting = s->data()->nesting();
+    if (childNesting > maxChildNesting)
+      maxChildNesting = childNesting;
+  }
+  return maxChildNesting + 1;
+}
+
+inline size_t CollectionData::size() const {
+  return slotSize(_head);
+}
+
+template <typename T>
+inline void movePointer(T*& p, ptrdiff_t offset) {
+  if (!p)
+    return;
+  p = reinterpret_cast<T*>(
+      reinterpret_cast<void*>(reinterpret_cast<char*>(p) + offset));
+  ARDUINOJSON_ASSERT(isAligned(p));
+}
+
+inline void CollectionData::movePointers(ptrdiff_t stringDistance,
+                                         ptrdiff_t variantDistance) {
+  movePointer(_head, variantDistance);
+  movePointer(_tail, variantDistance);
+  for (VariantSlot* slot = _head; slot; slot = slot->next())
+    slot->movePointers(stringDistance, variantDistance);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Configuration.hpp b/third-party/ArduinoJson/src/ArduinoJson/Configuration.hpp
new file mode 100644
index 0000000..332abb6
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Configuration.hpp
@@ -0,0 +1,273 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#if __cplusplus >= 201103L
+#  define ARDUINOJSON_HAS_LONG_LONG 1
+#  define ARDUINOJSON_HAS_RVALUE_REFERENCES 1
+#else
+#  define ARDUINOJSON_HAS_LONG_LONG 0
+#  define ARDUINOJSON_HAS_RVALUE_REFERENCES 0
+#endif
+
+#ifndef ARDUINOJSON_HAS_NULLPTR
+#  if __cplusplus >= 201103L
+#    define ARDUINOJSON_HAS_NULLPTR 1
+#  else
+#    define ARDUINOJSON_HAS_NULLPTR 0
+#  endif
+#endif
+
+#if defined(_MSC_VER) && !ARDUINOJSON_HAS_LONG_LONG
+#  define ARDUINOJSON_HAS_INT64 1
+#else
+#  define ARDUINOJSON_HAS_INT64 0
+#endif
+
+// Small or big machine?
+#ifndef ARDUINOJSON_EMBEDDED_MODE
+#  if defined(ARDUINO)                /* Arduino*/                 \
+      || defined(__IAR_SYSTEMS_ICC__) /* IAR Embedded Workbench */ \
+      || defined(__XC)                /* MPLAB XC compiler */      \
+      || defined(__ARMCC_VERSION)     /* Keil ARM Compiler */      \
+      || defined(__AVR)               /* Atmel AVR8/GNU C Compiler */
+#    define ARDUINOJSON_EMBEDDED_MODE 1
+#  else
+#    define ARDUINOJSON_EMBEDDED_MODE 0
+#  endif
+#endif
+
+// Auto enable std::stream if the right headers are here and no conflicting
+// macro is defined
+#if !defined(ARDUINOJSON_ENABLE_STD_STREAM) && defined(__has_include)
+#  if __has_include(<istream>) && \
+    __has_include(<ostream>) && \
+    !defined(min) && \
+    !defined(max)
+#    define ARDUINOJSON_ENABLE_STD_STREAM 1
+#  else
+#    define ARDUINOJSON_ENABLE_STD_STREAM 0
+#  endif
+#endif
+
+// Auto enable std::string if the right header is here and no conflicting
+// macro is defined
+#if !defined(ARDUINOJSON_ENABLE_STD_STRING) && defined(__has_include)
+#  if __has_include(<string>) && !defined(min) && !defined(max)
+#    define ARDUINOJSON_ENABLE_STD_STRING 1
+#  else
+#    define ARDUINOJSON_ENABLE_STD_STRING 0
+#  endif
+#endif
+
+#ifndef ARDUINOJSON_ENABLE_STRING_VIEW
+#  ifdef __has_include
+#    if __has_include(<string_view>) && __cplusplus >= 201703L
+#      define ARDUINOJSON_ENABLE_STRING_VIEW 1
+#    endif
+#  endif
+#endif
+#ifndef ARDUINOJSON_ENABLE_STRING_VIEW
+#  define ARDUINOJSON_ENABLE_STRING_VIEW 0
+#endif
+
+#if ARDUINOJSON_EMBEDDED_MODE
+
+// Store floats by default to reduce the memory usage (issue #134)
+#  ifndef ARDUINOJSON_USE_DOUBLE
+#    define ARDUINOJSON_USE_DOUBLE 0
+#  endif
+
+// Store longs by default, because they usually match the size of a float.
+#  ifndef ARDUINOJSON_USE_LONG_LONG
+#    define ARDUINOJSON_USE_LONG_LONG 0
+#  endif
+
+// Embedded systems usually don't have std::string
+#  ifndef ARDUINOJSON_ENABLE_STD_STRING
+#    define ARDUINOJSON_ENABLE_STD_STRING 0
+#  endif
+
+// Embedded systems usually don't have std::stream
+#  ifndef ARDUINOJSON_ENABLE_STD_STREAM
+#    define ARDUINOJSON_ENABLE_STD_STREAM 0
+#  endif
+
+// Limit nesting as the stack is likely to be small
+#  ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
+#    define ARDUINOJSON_DEFAULT_NESTING_LIMIT 10
+#  endif
+
+// Number of bits to store the pointer to next node
+// (saves RAM but limits the number of values in a document)
+#  ifndef ARDUINOJSON_SLOT_OFFSET_SIZE
+#    if defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ == 2
+// Address space == 16-bit => max 127 values
+#      define ARDUINOJSON_SLOT_OFFSET_SIZE 1
+#    else
+// Address space > 16-bit => max 32767 values
+#      define ARDUINOJSON_SLOT_OFFSET_SIZE 2
+#    endif
+#  endif
+
+#else  // ARDUINOJSON_EMBEDDED_MODE
+
+// On a computer we have plenty of memory so we can use doubles
+#  ifndef ARDUINOJSON_USE_DOUBLE
+#    define ARDUINOJSON_USE_DOUBLE 1
+#  endif
+
+// Use long long when available
+#  ifndef ARDUINOJSON_USE_LONG_LONG
+#    if ARDUINOJSON_HAS_LONG_LONG || ARDUINOJSON_HAS_INT64
+#      define ARDUINOJSON_USE_LONG_LONG 1
+#    else
+#      define ARDUINOJSON_USE_LONG_LONG 0
+#    endif
+#  endif
+
+// On a computer, we can use std::string
+#  ifndef ARDUINOJSON_ENABLE_STD_STRING
+#    define ARDUINOJSON_ENABLE_STD_STRING 1
+#  endif
+
+// On a computer, we can assume std::stream
+#  ifndef ARDUINOJSON_ENABLE_STD_STREAM
+#    define ARDUINOJSON_ENABLE_STD_STREAM 1
+#  endif
+
+// On a computer, the stack is large so we can increase nesting limit
+#  ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
+#    define ARDUINOJSON_DEFAULT_NESTING_LIMIT 50
+#  endif
+
+// Number of bits to store the pointer to next node
+#  ifndef ARDUINOJSON_SLOT_OFFSET_SIZE
+#    define ARDUINOJSON_SLOT_OFFSET_SIZE 4
+#  endif
+
+#endif  // ARDUINOJSON_EMBEDDED_MODE
+
+#ifdef ARDUINO
+
+#  include <Arduino.h>
+
+// Enable support for Arduino's String class
+#  ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
+#    define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
+#  endif
+
+// Enable support for Arduino's Stream class
+#  ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
+#    define ARDUINOJSON_ENABLE_ARDUINO_STREAM 1
+#  endif
+
+// Enable support for Arduino's Print class
+#  ifndef ARDUINOJSON_ENABLE_ARDUINO_PRINT
+#    define ARDUINOJSON_ENABLE_ARDUINO_PRINT 1
+#  endif
+
+#else  // ARDUINO
+
+// Disable support for Arduino's String class
+#  ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
+#    define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
+#  endif
+
+// Disable support for Arduino's Stream class
+#  ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
+#    define ARDUINOJSON_ENABLE_ARDUINO_STREAM 0
+#  endif
+
+// Disable support for Arduino's Print class
+#  ifndef ARDUINOJSON_ENABLE_ARDUINO_PRINT
+#    define ARDUINOJSON_ENABLE_ARDUINO_PRINT 0
+#  endif
+
+#endif  // ARDUINO
+
+#ifndef ARDUINOJSON_ENABLE_PROGMEM
+#  if defined(PROGMEM) && defined(pgm_read_byte) && defined(pgm_read_dword) && \
+      defined(pgm_read_ptr) && defined(pgm_read_float)
+#    define ARDUINOJSON_ENABLE_PROGMEM 1
+#  else
+#    define ARDUINOJSON_ENABLE_PROGMEM 0
+#  endif
+#endif
+
+// Convert unicode escape sequence (\u0123) to UTF-8
+#ifndef ARDUINOJSON_DECODE_UNICODE
+#  define ARDUINOJSON_DECODE_UNICODE 1
+#endif
+
+// Ignore comments in input
+#ifndef ARDUINOJSON_ENABLE_COMMENTS
+#  define ARDUINOJSON_ENABLE_COMMENTS 0
+#endif
+
+// Support NaN in JSON
+#ifndef ARDUINOJSON_ENABLE_NAN
+#  define ARDUINOJSON_ENABLE_NAN 0
+#endif
+
+// Support Infinity in JSON
+#ifndef ARDUINOJSON_ENABLE_INFINITY
+#  define ARDUINOJSON_ENABLE_INFINITY 0
+#endif
+
+// Control the exponentiation threshold for big numbers
+// CAUTION: cannot be more that 1e9 !!!!
+#ifndef ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD
+#  define ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD 1e7
+#endif
+
+// Control the exponentiation threshold for small numbers
+#ifndef ARDUINOJSON_NEGATIVE_EXPONENTIATION_THRESHOLD
+#  define ARDUINOJSON_NEGATIVE_EXPONENTIATION_THRESHOLD 1e-5
+#endif
+
+#ifndef ARDUINOJSON_LITTLE_ENDIAN
+#  if defined(_MSC_VER) ||                           \
+      (defined(__BYTE_ORDER__) &&                    \
+       __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \
+      defined(__LITTLE_ENDIAN__) || defined(__i386) || defined(__x86_64)
+#    define ARDUINOJSON_LITTLE_ENDIAN 1
+#  else
+#    define ARDUINOJSON_LITTLE_ENDIAN 0
+#  endif
+#endif
+
+#ifndef ARDUINOJSON_ENABLE_ALIGNMENT
+#  if defined(__AVR)
+#    define ARDUINOJSON_ENABLE_ALIGNMENT 0
+#  else
+#    define ARDUINOJSON_ENABLE_ALIGNMENT 1
+#  endif
+#endif
+
+#ifndef ARDUINOJSON_TAB
+#  define ARDUINOJSON_TAB "  "
+#endif
+
+#ifndef ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
+#  define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 1
+#endif
+
+#ifndef ARDUINOJSON_STRING_BUFFER_SIZE
+#  define ARDUINOJSON_STRING_BUFFER_SIZE 32
+#endif
+
+#ifndef ARDUINOJSON_DEBUG
+#  ifdef __PLATFORMIO_BUILD_DEBUG__
+#    define ARDUINOJSON_DEBUG 1
+#  else
+#    define ARDUINOJSON_DEBUG 0
+#  endif
+#endif
+
+#if ARDUINOJSON_HAS_NULLPTR && defined(nullptr)
+#  error nullptr is defined as a macro. Remove the faulty #define or #undef nullptr
+// See https://github.com/bblanchon/ArduinoJson/issues/1355
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp
new file mode 100644
index 0000000..11ec7df
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp
@@ -0,0 +1,122 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Polyfills/preprocessor.hpp>
+#include <ArduinoJson/Polyfills/static_array.hpp>
+
+#if ARDUINOJSON_ENABLE_STD_STREAM
+#  include <ostream>
+#endif
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class DeserializationError {
+  // safe bool idiom
+  typedef void (DeserializationError::*bool_type)() const;
+  void safeBoolHelper() const {}
+
+ public:
+  enum Code {
+    Ok,
+    EmptyInput,
+    IncompleteInput,
+    InvalidInput,
+    NoMemory,
+    TooDeep
+  };
+
+  DeserializationError() {}
+  DeserializationError(Code c) : _code(c) {}
+
+  // Compare with DeserializationError
+  friend bool operator==(const DeserializationError& lhs,
+                         const DeserializationError& rhs) {
+    return lhs._code == rhs._code;
+  }
+  friend bool operator!=(const DeserializationError& lhs,
+                         const DeserializationError& rhs) {
+    return lhs._code != rhs._code;
+  }
+
+  // Compare with Code
+  friend bool operator==(const DeserializationError& lhs, Code rhs) {
+    return lhs._code == rhs;
+  }
+  friend bool operator==(Code lhs, const DeserializationError& rhs) {
+    return lhs == rhs._code;
+  }
+  friend bool operator!=(const DeserializationError& lhs, Code rhs) {
+    return lhs._code != rhs;
+  }
+  friend bool operator!=(Code lhs, const DeserializationError& rhs) {
+    return lhs != rhs._code;
+  }
+
+  // Behaves like a bool
+  operator bool_type() const {
+    return _code != Ok ? &DeserializationError::safeBoolHelper : 0;
+  }
+  friend bool operator==(bool value, const DeserializationError& err) {
+    return static_cast<bool>(err) == value;
+  }
+  friend bool operator==(const DeserializationError& err, bool value) {
+    return static_cast<bool>(err) == value;
+  }
+  friend bool operator!=(bool value, const DeserializationError& err) {
+    return static_cast<bool>(err) != value;
+  }
+  friend bool operator!=(const DeserializationError& err, bool value) {
+    return static_cast<bool>(err) != value;
+  }
+
+  // Returns internal enum, useful for switch statement
+  Code code() const {
+    return _code;
+  }
+
+  const char* c_str() const {
+    static const char* messages[] = {
+        "Ok",           "EmptyInput", "IncompleteInput",
+        "InvalidInput", "NoMemory",   "TooDeep"};
+    ARDUINOJSON_ASSERT(static_cast<size_t>(_code) <
+                       sizeof(messages) / sizeof(messages[0]));
+    return messages[_code];
+  }
+
+#if ARDUINOJSON_ENABLE_PROGMEM
+  const __FlashStringHelper* f_str() const {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s0, "Ok");
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s1, "EmptyInput");
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s2, "IncompleteInput");
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s3, "InvalidInput");
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s4, "NoMemory");
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(char, s5, "TooDeep");
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(
+        const char*, messages, ARDUINOJSON_EXPAND6({s0, s1, s2, s3, s4, s5}));
+    return ARDUINOJSON_READ_STATIC_ARRAY(const __FlashStringHelper*, messages,
+                                         _code);
+  }
+#endif
+
+ private:
+  Code _code;
+};
+
+#if ARDUINOJSON_ENABLE_STD_STREAM
+inline std::ostream& operator<<(std::ostream& s,
+                                const DeserializationError& e) {
+  s << e.c_str();
+  return s;
+}
+
+inline std::ostream& operator<<(std::ostream& s, DeserializationError::Code c) {
+  s << DeserializationError(c).c_str();
+  return s;
+}
+#endif
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Filter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Filter.hpp
new file mode 100644
index 0000000..7ea3078
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Filter.hpp
@@ -0,0 +1,66 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class Filter {
+ public:
+  explicit Filter(VariantConstRef v) : _variant(v) {}
+
+  bool allow() const {
+    return _variant;
+  }
+
+  bool allowArray() const {
+    return _variant == true || _variant.is<ArrayConstRef>();
+  }
+
+  bool allowObject() const {
+    return _variant == true || _variant.is<ObjectConstRef>();
+  }
+
+  bool allowValue() const {
+    return _variant == true;
+  }
+
+  template <typename TKey>
+  Filter operator[](const TKey& key) const {
+    if (_variant == true)  // "true" means "allow recursively"
+      return *this;
+    else
+      return Filter(_variant[key] | _variant["*"]);
+  }
+
+ private:
+  VariantConstRef _variant;
+};
+
+struct AllowAllFilter {
+  bool allow() const {
+    return true;
+  }
+
+  bool allowArray() const {
+    return true;
+  }
+
+  bool allowObject() const {
+    return true;
+  }
+
+  bool allowValue() const {
+    return true;
+  }
+
+  template <typename TKey>
+  AllowAllFilter operator[](const TKey&) const {
+    return AllowAllFilter();
+  }
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp
new file mode 100644
index 0000000..06964b4
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp
@@ -0,0 +1,29 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class NestingLimit {
+ public:
+  NestingLimit() : _value(ARDUINOJSON_DEFAULT_NESTING_LIMIT) {}
+  explicit NestingLimit(uint8_t n) : _value(n) {}
+
+  NestingLimit decrement() const {
+    ARDUINOJSON_ASSERT(_value > 0);
+    return NestingLimit(static_cast<uint8_t>(_value - 1));
+  }
+
+  bool reached() const {
+    return _value == 0;
+  }
+
+ private:
+  uint8_t _value;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp
new file mode 100644
index 0000000..9ae2d59
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp
@@ -0,0 +1,56 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+#include <stdlib.h>  // for size_t
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// The default reader is a simple wrapper for Readers that are not copiable
+template <typename TSource, typename Enable = void>
+struct Reader {
+ public:
+  Reader(TSource& source) : _source(&source) {}
+
+  int read() {
+    return _source->read();
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    return _source->readBytes(buffer, length);
+  }
+
+ private:
+  TSource* _source;
+};
+
+template <typename TSource, typename Enable = void>
+struct BoundedReader {
+  // no default implementation because we need to pass the size to the
+  // constructor
+};
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#include <ArduinoJson/Deserialization/Readers/IteratorReader.hpp>
+#include <ArduinoJson/Deserialization/Readers/RamReader.hpp>
+#include <ArduinoJson/Deserialization/Readers/VariantReader.hpp>
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STREAM
+#  include <ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp>
+#endif
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
+#  include <ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp>
+#endif
+
+#if ARDUINOJSON_ENABLE_PROGMEM
+#  include <ArduinoJson/Deserialization/Readers/FlashReader.hpp>
+#endif
+
+#if ARDUINOJSON_ENABLE_STD_STREAM
+#  include <ArduinoJson/Deserialization/Readers/StdStreamReader.hpp>
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
new file mode 100644
index 0000000..724638f
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
@@ -0,0 +1,31 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <Arduino.h>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TSource>
+struct Reader<TSource,
+              typename enable_if<is_base_of<Stream, TSource>::value>::type> {
+ public:
+  explicit Reader(Stream& stream) : _stream(&stream) {}
+
+  int read() {
+    // don't use _stream.read() as it ignores the timeout
+    char c;
+    return _stream->readBytes(&c, 1) ? static_cast<unsigned char>(c) : -1;
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    return _stream->readBytes(buffer, length);
+  }
+
+ private:
+  Stream* _stream;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp
new file mode 100644
index 0000000..71571d4
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp
@@ -0,0 +1,17 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TSource>
+struct Reader<TSource,
+              typename enable_if<is_base_of< ::String, TSource>::value>::type>
+    : BoundedReader<const char*> {
+  explicit Reader(const ::String& s)
+      : BoundedReader<const char*>(s.c_str(), s.length()) {}
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp
new file mode 100644
index 0000000..7eca134
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp
@@ -0,0 +1,53 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <>
+struct Reader<const __FlashStringHelper*, void> {
+  const char* _ptr;
+
+ public:
+  explicit Reader(const __FlashStringHelper* ptr)
+      : _ptr(reinterpret_cast<const char*>(ptr)) {}
+
+  int read() {
+    return pgm_read_byte(_ptr++);
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    memcpy_P(buffer, _ptr, length);
+    _ptr += length;
+    return length;
+  }
+};
+
+template <>
+struct BoundedReader<const __FlashStringHelper*, void> {
+  const char* _ptr;
+  const char* _end;
+
+ public:
+  explicit BoundedReader(const __FlashStringHelper* ptr, size_t size)
+      : _ptr(reinterpret_cast<const char*>(ptr)), _end(_ptr + size) {}
+
+  int read() {
+    if (_ptr < _end)
+      return pgm_read_byte(_ptr++);
+    else
+      return -1;
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    size_t available = static_cast<size_t>(_end - _ptr);
+    if (available < length)
+      length = available;
+    memcpy_P(buffer, _ptr, length);
+    _ptr += length;
+    return length;
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp
new file mode 100644
index 0000000..37c3c31
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp
@@ -0,0 +1,43 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TIterator>
+class IteratorReader {
+  TIterator _ptr, _end;
+
+ public:
+  explicit IteratorReader(TIterator begin, TIterator end)
+      : _ptr(begin), _end(end) {}
+
+  int read() {
+    if (_ptr < _end)
+      return static_cast<unsigned char>(*_ptr++);
+    else
+      return -1;
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    size_t i = 0;
+    while (i < length && _ptr < _end) buffer[i++] = *_ptr++;
+    return i;
+  }
+};
+
+template <typename T>
+struct void_ {
+  typedef void type;
+};
+
+template <typename TSource>
+struct Reader<TSource, typename void_<typename TSource::const_iterator>::type>
+    : IteratorReader<typename TSource::const_iterator> {
+  explicit Reader(const TSource& source)
+      : IteratorReader<typename TSource::const_iterator>(source.begin(),
+                                                         source.end()) {}
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp
new file mode 100644
index 0000000..67cf682
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp
@@ -0,0 +1,50 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+struct IsCharOrVoid {
+  static const bool value =
+      is_same<T, void>::value || is_same<T, char>::value ||
+      is_same<T, unsigned char>::value || is_same<T, signed char>::value;
+};
+
+template <typename T>
+struct IsCharOrVoid<const T> : IsCharOrVoid<T> {};
+
+template <typename TSource>
+struct Reader<TSource*,
+              typename enable_if<IsCharOrVoid<TSource>::value>::type> {
+  const char* _ptr;
+
+ public:
+  explicit Reader(const void* ptr)
+      : _ptr(ptr ? reinterpret_cast<const char*>(ptr) : "") {}
+
+  int read() {
+    return static_cast<unsigned char>(*_ptr++);
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    for (size_t i = 0; i < length; i++) buffer[i] = *_ptr++;
+    return length;
+  }
+};
+
+template <typename TSource>
+struct BoundedReader<TSource*,
+                     typename enable_if<IsCharOrVoid<TSource>::value>::type>
+    : public IteratorReader<const char*> {
+ public:
+  explicit BoundedReader(const void* ptr, size_t len)
+      : IteratorReader<const char*>(reinterpret_cast<const char*>(ptr),
+                                    reinterpret_cast<const char*>(ptr) + len) {}
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp
new file mode 100644
index 0000000..eebaa2c
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp
@@ -0,0 +1,29 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <istream>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TSource>
+struct Reader<TSource, typename enable_if<
+                           is_base_of<std::istream, TSource>::value>::type> {
+ public:
+  explicit Reader(std::istream& stream) : _stream(&stream) {}
+
+  int read() {
+    return _stream->get();
+  }
+
+  size_t readBytes(char* buffer, size_t length) {
+    _stream->read(buffer, static_cast<std::streamsize>(length));
+    return static_cast<size_t>(_stream->gcount());
+  }
+
+ private:
+  std::istream* _stream;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp
new file mode 100644
index 0000000..e56e262
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp
@@ -0,0 +1,34 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Object/MemberProxy.hpp>
+#include <ArduinoJson/Variant/VariantRef.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TArray>
+struct Reader<ElementProxy<TArray>, void> : Reader<char*, void> {
+  explicit Reader(const ElementProxy<TArray>& x)
+      : Reader<char*, void>(x.template as<const char*>()) {}
+};
+
+template <typename TObject, typename TStringRef>
+struct Reader<MemberProxy<TObject, TStringRef>, void> : Reader<char*, void> {
+  explicit Reader(const MemberProxy<TObject, TStringRef>& x)
+      : Reader<char*, void>(x.template as<const char*>()) {}
+};
+
+template <>
+struct Reader<VariantRef, void> : Reader<char*, void> {
+  explicit Reader(VariantRef x) : Reader<char*, void>(x.as<const char*>()) {}
+};
+
+template <>
+struct Reader<VariantConstRef, void> : Reader<char*, void> {
+  explicit Reader(VariantConstRef x)
+      : Reader<char*, void>(x.as<const char*>()) {}
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp
new file mode 100644
index 0000000..2329542
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp
@@ -0,0 +1,71 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Deserialization/DeserializationError.hpp>
+#include <ArduinoJson/Deserialization/Filter.hpp>
+#include <ArduinoJson/Deserialization/NestingLimit.hpp>
+#include <ArduinoJson/Deserialization/Reader.hpp>
+#include <ArduinoJson/StringStorage/StringStorage.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <template <typename, typename> class TDeserializer, typename TReader,
+          typename TWriter>
+TDeserializer<TReader, TWriter> makeDeserializer(MemoryPool &pool,
+                                                 TReader reader,
+                                                 TWriter writer) {
+  return TDeserializer<TReader, TWriter>(pool, reader, writer);
+}
+
+// deserialize(JsonDocument&, const std::string&, NestingLimit, Filter);
+// deserialize(JsonDocument&, const String&, NestingLimit, Filter);
+// deserialize(JsonDocument&, char*, NestingLimit, Filter);
+// deserialize(JsonDocument&, const char*, NestingLimit, Filter);
+// deserialize(JsonDocument&, const __FlashStringHelper*, NestingLimit, Filter);
+template <template <typename, typename> class TDeserializer, typename TString,
+          typename TFilter>
+typename enable_if<!is_array<TString>::value, DeserializationError>::type
+deserialize(JsonDocument &doc, const TString &input, NestingLimit nestingLimit,
+            TFilter filter) {
+  Reader<TString> reader(input);
+  doc.clear();
+  return makeDeserializer<TDeserializer>(
+             doc.memoryPool(), reader,
+             makeStringStorage(input, doc.memoryPool()))
+      .parse(doc.data(), filter, nestingLimit);
+}
+//
+// deserialize(JsonDocument&, char*, size_t, NestingLimit, Filter);
+// deserialize(JsonDocument&, const char*, size_t, NestingLimit, Filter);
+// deserialize(JsonDocument&, const __FlashStringHelper*, size_t, NL, Filter);
+template <template <typename, typename> class TDeserializer, typename TChar,
+          typename TFilter>
+DeserializationError deserialize(JsonDocument &doc, TChar *input,
+                                 size_t inputSize, NestingLimit nestingLimit,
+                                 TFilter filter) {
+  BoundedReader<TChar *> reader(input, inputSize);
+  doc.clear();
+  return makeDeserializer<TDeserializer>(
+             doc.memoryPool(), reader,
+             makeStringStorage(input, doc.memoryPool()))
+      .parse(doc.data(), filter, nestingLimit);
+}
+//
+// deserialize(JsonDocument&, std::istream&, NestingLimit, Filter);
+// deserialize(JsonDocument&, Stream&, NestingLimit, Filter);
+template <template <typename, typename> class TDeserializer, typename TStream,
+          typename TFilter>
+DeserializationError deserialize(JsonDocument &doc, TStream &input,
+                                 NestingLimit nestingLimit, TFilter filter) {
+  Reader<TStream> reader(input);
+  doc.clear();
+  return makeDeserializer<TDeserializer>(
+             doc.memoryPool(), reader,
+             makeStringStorage(input, doc.memoryPool()))
+      .parse(doc.data(), filter, nestingLimit);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp b/third-party/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp
new file mode 100644
index 0000000..5c85d8a
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp
@@ -0,0 +1,164 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Document/JsonDocument.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// Helper to implement the "base-from-member" idiom
+// (we need to store the allocator before constructing JsonDocument)
+template <typename TAllocator>
+class AllocatorOwner {
+ public:
+  AllocatorOwner() {}
+  AllocatorOwner(const AllocatorOwner& src) : _allocator(src._allocator) {}
+  AllocatorOwner(TAllocator a) : _allocator(a) {}
+
+  void* allocate(size_t size) {
+    return _allocator.allocate(size);
+  }
+
+  void deallocate(void* ptr) {
+    if (ptr)
+      _allocator.deallocate(ptr);
+  }
+
+  void* reallocate(void* ptr, size_t new_size) {
+    return _allocator.reallocate(ptr, new_size);
+  }
+
+  TAllocator& allocator() {
+    return _allocator;
+  }
+
+ private:
+  TAllocator _allocator;
+};
+
+template <typename TAllocator>
+class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
+ public:
+  explicit BasicJsonDocument(size_t capa, TAllocator alloc = TAllocator())
+      : AllocatorOwner<TAllocator>(alloc), JsonDocument(allocPool(capa)) {}
+
+  // Copy-constructor
+  BasicJsonDocument(const BasicJsonDocument& src)
+      : AllocatorOwner<TAllocator>(src), JsonDocument() {
+    copyAssignFrom(src);
+  }
+
+  // Move-constructor
+#if ARDUINOJSON_HAS_RVALUE_REFERENCES
+  BasicJsonDocument(BasicJsonDocument&& src) : AllocatorOwner<TAllocator>(src) {
+    moveAssignFrom(src);
+  }
+#endif
+
+  BasicJsonDocument(const JsonDocument& src) {
+    copyAssignFrom(src);
+  }
+
+  // Construct from variant, array, or object
+  template <typename T>
+  BasicJsonDocument(
+      const T& src,
+      typename enable_if<
+          is_same<T, VariantRef>::value || is_same<T, VariantConstRef>::value ||
+          is_same<T, ArrayRef>::value || is_same<T, ArrayConstRef>::value ||
+          is_same<T, ObjectRef>::value ||
+          is_same<T, ObjectConstRef>::value>::type* = 0)
+      : JsonDocument(allocPool(src.memoryUsage())) {
+    set(src);
+  }
+
+  // disambiguate
+  BasicJsonDocument(VariantRef src)
+      : JsonDocument(allocPool(src.memoryUsage())) {
+    set(src);
+  }
+
+  ~BasicJsonDocument() {
+    freePool();
+  }
+
+  BasicJsonDocument& operator=(const BasicJsonDocument& src) {
+    copyAssignFrom(src);
+    return *this;
+  }
+
+#if ARDUINOJSON_HAS_RVALUE_REFERENCES
+  BasicJsonDocument& operator=(BasicJsonDocument&& src) {
+    moveAssignFrom(src);
+    return *this;
+  }
+#endif
+
+  template <typename T>
+  BasicJsonDocument& operator=(const T& src) {
+    reallocPoolIfTooSmall(src.memoryUsage());
+    set(src);
+    return *this;
+  }
+
+  void shrinkToFit() {
+    ptrdiff_t bytes_reclaimed = _pool.squash();
+    if (bytes_reclaimed == 0)
+      return;
+
+    void* old_ptr = _pool.buffer();
+    void* new_ptr = this->reallocate(old_ptr, _pool.capacity());
+
+    ptrdiff_t ptr_offset =
+        static_cast<char*>(new_ptr) - static_cast<char*>(old_ptr);
+
+    _pool.movePointers(ptr_offset);
+    _data.movePointers(ptr_offset, ptr_offset - bytes_reclaimed);
+  }
+
+  bool garbageCollect() {
+    // make a temporary clone and move assign
+    BasicJsonDocument tmp(*this);
+    if (!tmp.capacity())
+      return false;
+    tmp.set(*this);
+    moveAssignFrom(tmp);
+    return true;
+  }
+
+  using AllocatorOwner<TAllocator>::allocator;
+
+ private:
+  MemoryPool allocPool(size_t requiredSize) {
+    size_t capa = addPadding(requiredSize);
+    return MemoryPool(reinterpret_cast<char*>(this->allocate(capa)), capa);
+  }
+
+  void reallocPoolIfTooSmall(size_t requiredSize) {
+    if (requiredSize <= capacity())
+      return;
+    freePool();
+    replacePool(allocPool(addPadding(requiredSize)));
+  }
+
+  void freePool() {
+    this->deallocate(memoryPool().buffer());
+  }
+
+  void copyAssignFrom(const JsonDocument& src) {
+    reallocPoolIfTooSmall(src.capacity());
+    set(src);
+  }
+
+  void moveAssignFrom(BasicJsonDocument& src) {
+    freePool();
+    _data = src._data;
+    _pool = src._pool;
+    src._data.setNull();
+    src._pool = MemoryPool(0, 0);
+  }
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp b/third-party/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp
new file mode 100644
index 0000000..de6f411
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp
@@ -0,0 +1,29 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Document/BasicJsonDocument.hpp>
+
+#include <stdlib.h>  // malloc, free
+
+namespace ARDUINOJSON_NAMESPACE {
+
+struct DefaultAllocator {
+  void* allocate(size_t size) {
+    return malloc(size);
+  }
+
+  void deallocate(void* ptr) {
+    free(ptr);
+  }
+
+  void* reallocate(void* ptr, size_t new_size) {
+    return realloc(ptr, new_size);
+  }
+};
+
+typedef BasicJsonDocument<DefaultAllocator> DynamicJsonDocument;
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp b/third-party/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp
new file mode 100644
index 0000000..64c76b8
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp
@@ -0,0 +1,344 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/ElementProxy.hpp>
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Object/MemberProxy.hpp>
+#include <ArduinoJson/Object/ObjectRef.hpp>
+#include <ArduinoJson/Variant/VariantRef.hpp>
+#include <ArduinoJson/Variant/VariantTo.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class JsonDocument : public Visitable {
+ public:
+  template <typename TVisitor>
+  typename TVisitor::result_type accept(TVisitor& visitor) const {
+    return getVariant().accept(visitor);
+  }
+
+  template <typename T>
+  T as() {
+    return getVariant().template as<T>();
+  }
+
+  template <typename T>
+  T as() const {
+    return getVariant().template as<T>();
+  }
+
+  void clear() {
+    _pool.clear();
+    _data.init();
+  }
+
+  template <typename T>
+  bool is() {
+    return getVariant().template is<T>();
+  }
+
+  template <typename T>
+  bool is() const {
+    return getVariant().template is<T>();
+  }
+
+  bool isNull() const {
+    return getVariant().isNull();
+  }
+
+  size_t memoryUsage() const {
+    return _pool.size();
+  }
+
+  bool overflowed() const {
+    return _pool.overflowed();
+  }
+
+  size_t nesting() const {
+    return _data.nesting();
+  }
+
+  size_t capacity() const {
+    return _pool.capacity();
+  }
+
+  size_t size() const {
+    return _data.size();
+  }
+
+  bool set(const JsonDocument& src) {
+    return to<VariantRef>().set(src.as<VariantConstRef>());
+  }
+
+  template <typename T>
+  typename enable_if<!is_base_of<JsonDocument, T>::value, bool>::type set(
+      const T& src) {
+    return to<VariantRef>().set(src);
+  }
+
+  template <typename T>
+  typename VariantTo<T>::type to() {
+    clear();
+    return getVariant().template to<T>();
+  }
+
+  // for internal use only
+  MemoryPool& memoryPool() {
+    return _pool;
+  }
+
+  // for internal use only
+  VariantData& data() {
+    return _data;
+  }
+
+  ArrayRef createNestedArray() {
+    return addElement().to<ArrayRef>();
+  }
+
+  // createNestedArray(char*)
+  // createNestedArray(const char*)
+  // createNestedArray(const __FlashStringHelper*)
+  template <typename TChar>
+  ArrayRef createNestedArray(TChar* key) {
+    return getOrAddMember(key).template to<ArrayRef>();
+  }
+
+  // createNestedArray(const std::string&)
+  // createNestedArray(const String&)
+  template <typename TString>
+  ArrayRef createNestedArray(const TString& key) {
+    return getOrAddMember(key).template to<ArrayRef>();
+  }
+
+  ObjectRef createNestedObject() {
+    return addElement().to<ObjectRef>();
+  }
+
+  // createNestedObject(char*)
+  // createNestedObject(const char*)
+  // createNestedObject(const __FlashStringHelper*)
+  template <typename TChar>
+  ObjectRef createNestedObject(TChar* key) {
+    return getOrAddMember(key).template to<ObjectRef>();
+  }
+
+  // createNestedObject(const std::string&)
+  // createNestedObject(const String&)
+  template <typename TString>
+  ObjectRef createNestedObject(const TString& key) {
+    return getOrAddMember(key).template to<ObjectRef>();
+  }
+
+  // containsKey(char*) const
+  // containsKey(const char*) const
+  // containsKey(const __FlashStringHelper*) const
+  template <typename TChar>
+  bool containsKey(TChar* key) const {
+    return !getMember(key).isUndefined();
+  }
+
+  // containsKey(const std::string&) const
+  // containsKey(const String&) const
+  template <typename TString>
+  bool containsKey(const TString& key) const {
+    return !getMember(key).isUndefined();
+  }
+
+  // operator[](const std::string&)
+  // operator[](const String&)
+  template <typename TString>
+  FORCE_INLINE typename enable_if<IsString<TString>::value,
+                                  MemberProxy<JsonDocument&, TString> >::type
+  operator[](const TString& key) {
+    return MemberProxy<JsonDocument&, TString>(*this, key);
+  }
+
+  // operator[](char*)
+  // operator[](const char*)
+  // operator[](const __FlashStringHelper*)
+  template <typename TChar>
+  FORCE_INLINE typename enable_if<IsString<TChar*>::value,
+                                  MemberProxy<JsonDocument&, TChar*> >::type
+  operator[](TChar* key) {
+    return MemberProxy<JsonDocument&, TChar*>(*this, key);
+  }
+
+  // operator[](const std::string&) const
+  // operator[](const String&) const
+  template <typename TString>
+  FORCE_INLINE
+      typename enable_if<IsString<TString>::value, VariantConstRef>::type
+      operator[](const TString& key) const {
+    return getMember(key);
+  }
+
+  // operator[](char*) const
+  // operator[](const char*) const
+  // operator[](const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE
+      typename enable_if<IsString<TChar*>::value, VariantConstRef>::type
+      operator[](TChar* key) const {
+    return getMember(key);
+  }
+
+  FORCE_INLINE ElementProxy<JsonDocument&> operator[](size_t index) {
+    return ElementProxy<JsonDocument&>(*this, index);
+  }
+
+  FORCE_INLINE VariantConstRef operator[](size_t index) const {
+    return getElement(index);
+  }
+
+  FORCE_INLINE VariantRef getElement(size_t index) {
+    return VariantRef(&_pool, _data.getElement(index));
+  }
+
+  FORCE_INLINE VariantConstRef getElement(size_t index) const {
+    return VariantConstRef(_data.getElement(index));
+  }
+
+  FORCE_INLINE VariantRef getOrAddElement(size_t index) {
+    return VariantRef(&_pool, _data.getOrAddElement(index, &_pool));
+  }
+
+  // JsonVariantConst getMember(char*) const
+  // JsonVariantConst getMember(const char*) const
+  // JsonVariantConst getMember(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE VariantConstRef getMember(TChar* key) const {
+    return VariantConstRef(_data.getMember(adaptString(key)));
+  }
+
+  // JsonVariantConst getMember(const std::string&) const
+  // JsonVariantConst getMember(const String&) const
+  template <typename TString>
+  FORCE_INLINE
+      typename enable_if<IsString<TString>::value, VariantConstRef>::type
+      getMember(const TString& key) const {
+    return VariantConstRef(_data.getMember(adaptString(key)));
+  }
+
+  // JsonVariant getMember(char*)
+  // JsonVariant getMember(const char*)
+  // JsonVariant getMember(const __FlashStringHelper*)
+  template <typename TChar>
+  FORCE_INLINE VariantRef getMember(TChar* key) {
+    return VariantRef(&_pool, _data.getMember(adaptString(key)));
+  }
+
+  // JsonVariant getMember(const std::string&)
+  // JsonVariant getMember(const String&)
+  template <typename TString>
+  FORCE_INLINE typename enable_if<IsString<TString>::value, VariantRef>::type
+  getMember(const TString& key) {
+    return VariantRef(&_pool, _data.getMember(adaptString(key)));
+  }
+
+  // getOrAddMember(char*)
+  // getOrAddMember(const char*)
+  // getOrAddMember(const __FlashStringHelper*)
+  template <typename TChar>
+  FORCE_INLINE VariantRef getOrAddMember(TChar* key) {
+    return VariantRef(&_pool, _data.getOrAddMember(adaptString(key), &_pool));
+  }
+
+  // getOrAddMember(const std::string&)
+  // getOrAddMember(const String&)
+  template <typename TString>
+  FORCE_INLINE VariantRef getOrAddMember(const TString& key) {
+    return VariantRef(&_pool, _data.getOrAddMember(adaptString(key), &_pool));
+  }
+
+  FORCE_INLINE VariantRef addElement() {
+    return VariantRef(&_pool, _data.addElement(&_pool));
+  }
+
+  template <typename TValue>
+  FORCE_INLINE bool add(const TValue& value) {
+    return addElement().set(value);
+  }
+
+  // add(char*) const
+  // add(const char*) const
+  // add(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE bool add(TChar* value) {
+    return addElement().set(value);
+  }
+
+  FORCE_INLINE void remove(size_t index) {
+    _data.remove(index);
+  }
+  // remove(char*)
+  // remove(const char*)
+  // remove(const __FlashStringHelper*)
+  template <typename TChar>
+  FORCE_INLINE typename enable_if<IsString<TChar*>::value>::type remove(
+      TChar* key) {
+    _data.remove(adaptString(key));
+  }
+  // remove(const std::string&)
+  // remove(const String&)
+  template <typename TString>
+  FORCE_INLINE typename enable_if<IsString<TString>::value>::type remove(
+      const TString& key) {
+    _data.remove(adaptString(key));
+  }
+
+  FORCE_INLINE operator VariantConstRef() const {
+    return VariantConstRef(&_data);
+  }
+
+  bool operator==(VariantConstRef rhs) const {
+    return getVariant() == rhs;
+  }
+
+  bool operator!=(VariantConstRef rhs) const {
+    return getVariant() != rhs;
+  }
+
+ protected:
+  JsonDocument() : _pool(0, 0) {
+    _data.init();
+  }
+
+  JsonDocument(MemoryPool pool) : _pool(pool) {
+    _data.init();
+  }
+
+  JsonDocument(char* buf, size_t capa) : _pool(buf, capa) {
+    _data.init();
+  }
+
+  ~JsonDocument() {}
+
+  void replacePool(MemoryPool pool) {
+    _pool = pool;
+  }
+
+  VariantRef getVariant() {
+    return VariantRef(&_pool, &_data);
+  }
+
+  VariantConstRef getVariant() const {
+    return VariantConstRef(&_data);
+  }
+
+  MemoryPool _pool;
+  VariantData _data;
+
+ private:
+  JsonDocument(const JsonDocument&);
+  JsonDocument& operator=(const JsonDocument&);
+};
+
+inline bool convertToJson(const JsonDocument& src, VariantRef dst) {
+  return dst.set(src.as<VariantConstRef>());
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp b/third-party/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp
new file mode 100644
index 0000000..fbbadd4
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp
@@ -0,0 +1,56 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Document/JsonDocument.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <size_t desiredCapacity>
+class StaticJsonDocument : public JsonDocument {
+  static const size_t _capacity =
+      AddPadding<Max<1, desiredCapacity>::value>::value;
+
+ public:
+  StaticJsonDocument() : JsonDocument(_buffer, _capacity) {}
+
+  StaticJsonDocument(const StaticJsonDocument& src)
+      : JsonDocument(_buffer, _capacity) {
+    set(src);
+  }
+
+  template <typename T>
+  StaticJsonDocument(const T& src,
+                     typename enable_if<IsVisitable<T>::value>::type* = 0)
+      : JsonDocument(_buffer, _capacity) {
+    set(src);
+  }
+
+  // disambiguate
+  StaticJsonDocument(VariantRef src) : JsonDocument(_buffer, _capacity) {
+    set(src);
+  }
+
+  StaticJsonDocument operator=(const StaticJsonDocument& src) {
+    set(src);
+    return *this;
+  }
+
+  template <typename T>
+  StaticJsonDocument operator=(const T& src) {
+    set(src);
+    return *this;
+  }
+
+  void garbageCollect() {
+    StaticJsonDocument tmp(*this);
+    set(tmp);
+  }
+
+ private:
+  char _buffer[_capacity];
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp b/third-party/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp
new file mode 100644
index 0000000..811e825
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp
@@ -0,0 +1,39 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class EscapeSequence {
+ public:
+  // Optimized for code size on a 8-bit AVR
+  static char escapeChar(char c) {
+    const char *p = escapeTable(true);
+    while (p[0] && p[1] != c) {
+      p += 2;
+    }
+    return p[0];
+  }
+
+  // Optimized for code size on a 8-bit AVR
+  static char unescapeChar(char c) {
+    const char *p = escapeTable(false);
+    for (;;) {
+      if (p[0] == '\0')
+        return 0;
+      if (p[0] == c)
+        return p[1];
+      p += 2;
+    }
+  }
+
+ private:
+  static const char *escapeTable(bool excludeSolidus) {
+    return &"//\"\"\\\\b\bf\fn\nr\rt\t"[excludeSolidus ? 2 : 0];
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp b/third-party/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp
new file mode 100644
index 0000000..1a07be8
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp
@@ -0,0 +1,740 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Deserialization/deserialize.hpp>
+#include <ArduinoJson/Json/EscapeSequence.hpp>
+#include <ArduinoJson/Json/Latch.hpp>
+#include <ArduinoJson/Json/Utf16.hpp>
+#include <ArduinoJson/Json/Utf8.hpp>
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Numbers/parseNumber.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Variant/VariantData.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TReader, typename TStringStorage>
+class JsonDeserializer {
+ public:
+  JsonDeserializer(MemoryPool &pool, TReader reader,
+                   TStringStorage stringStorage)
+      : _stringStorage(stringStorage),
+        _foundSomething(false),
+        _latch(reader),
+        _pool(&pool),
+        _error(DeserializationError::Ok) {}
+
+  template <typename TFilter>
+  DeserializationError parse(VariantData &variant, TFilter filter,
+                             NestingLimit nestingLimit) {
+    parseVariant(variant, filter, nestingLimit);
+
+    if (!_error && _latch.last() != 0 && !variant.isEnclosed()) {
+      // We don't detect trailing characters earlier, so we need to check now
+      return DeserializationError::InvalidInput;
+    }
+
+    return _error;
+  }
+
+ private:
+  char current() {
+    return _latch.current();
+  }
+
+  void move() {
+    _latch.clear();
+  }
+
+  bool eat(char charToSkip) {
+    if (current() != charToSkip)
+      return false;
+    move();
+    return true;
+  }
+
+  template <typename TFilter>
+  bool parseVariant(VariantData &variant, TFilter filter,
+                    NestingLimit nestingLimit) {
+    if (!skipSpacesAndComments())
+      return false;
+
+    switch (current()) {
+      case '[':
+        if (filter.allowArray())
+          return parseArray(variant.toArray(), filter, nestingLimit);
+        else
+          return skipArray(nestingLimit);
+
+      case '{':
+        if (filter.allowObject())
+          return parseObject(variant.toObject(), filter, nestingLimit);
+        else
+          return skipObject(nestingLimit);
+
+      case '\"':
+      case '\'':
+        if (filter.allowValue())
+          return parseStringValue(variant);
+        else
+          return skipString();
+
+      default:
+        if (filter.allowValue())
+          return parseNumericValue(variant);
+        else
+          return skipNumericValue();
+    }
+  }
+
+  bool skipVariant(NestingLimit nestingLimit) {
+    if (!skipSpacesAndComments())
+      return false;
+
+    switch (current()) {
+      case '[':
+        return skipArray(nestingLimit);
+
+      case '{':
+        return skipObject(nestingLimit);
+
+      case '\"':
+      case '\'':
+        return skipString();
+
+      default:
+        return skipNumericValue();
+    }
+  }
+
+  template <typename TFilter>
+  bool parseArray(CollectionData &array, TFilter filter,
+                  NestingLimit nestingLimit) {
+    if (nestingLimit.reached()) {
+      _error = DeserializationError::TooDeep;
+      return false;
+    }
+
+    // Skip opening braket
+    ARDUINOJSON_ASSERT(current() == '[');
+    move();
+
+    // Skip spaces
+    if (!skipSpacesAndComments())
+      return false;
+
+    // Empty array?
+    if (eat(']'))
+      return true;
+
+    TFilter memberFilter = filter[0UL];
+
+    // Read each value
+    for (;;) {
+      if (memberFilter.allow()) {
+        // Allocate slot in array
+        VariantData *value = array.addElement(_pool);
+        if (!value) {
+          _error = DeserializationError::NoMemory;
+          return false;
+        }
+
+        // 1 - Parse value
+        if (!parseVariant(*value, memberFilter, nestingLimit.decrement()))
+          return false;
+      } else {
+        if (!skipVariant(nestingLimit.decrement()))
+          return false;
+      }
+
+      // 2 - Skip spaces
+      if (!skipSpacesAndComments())
+        return false;
+
+      // 3 - More values?
+      if (eat(']'))
+        return true;
+      if (!eat(',')) {
+        _error = DeserializationError::InvalidInput;
+        return false;
+      }
+    }
+  }
+
+  bool skipArray(NestingLimit nestingLimit) {
+    if (nestingLimit.reached()) {
+      _error = DeserializationError::TooDeep;
+      return false;
+    }
+
+    // Skip opening braket
+    ARDUINOJSON_ASSERT(current() == '[');
+    move();
+
+    // Read each value
+    for (;;) {
+      // 1 - Skip value
+      if (!skipVariant(nestingLimit.decrement()))
+        return false;
+
+      // 2 - Skip spaces
+      if (!skipSpacesAndComments())
+        return false;
+
+      // 3 - More values?
+      if (eat(']'))
+        return true;
+      if (!eat(',')) {
+        _error = DeserializationError::InvalidInput;
+        return false;
+      }
+    }
+  }
+
+  template <typename TFilter>
+  bool parseObject(CollectionData &object, TFilter filter,
+                   NestingLimit nestingLimit) {
+    if (nestingLimit.reached()) {
+      _error = DeserializationError::TooDeep;
+      return false;
+    }
+
+    // Skip opening brace
+    ARDUINOJSON_ASSERT(current() == '{');
+    move();
+
+    // Skip spaces
+    if (!skipSpacesAndComments())
+      return false;
+
+    // Empty object?
+    if (eat('}'))
+      return true;
+
+    // Read each key value pair
+    for (;;) {
+      // Parse key
+      if (!parseKey())
+        return false;
+
+      // Skip spaces
+      if (!skipSpacesAndComments())
+        return false;
+
+      // Colon
+      if (!eat(':')) {
+        _error = DeserializationError::InvalidInput;
+        return false;
+      }
+
+      const char *key = _stringStorage.c_str();
+
+      TFilter memberFilter = filter[key];
+
+      if (memberFilter.allow()) {
+        VariantData *variant = object.getMember(adaptString(key));
+        if (!variant) {
+          // Save key in memory pool.
+          // This MUST be done before adding the slot.
+          key = _stringStorage.save();
+
+          // Allocate slot in object
+          VariantSlot *slot = object.addSlot(_pool);
+          if (!slot) {
+            _error = DeserializationError::NoMemory;
+            return false;
+          }
+
+          slot->setKey(key, typename TStringStorage::storage_policy());
+
+          variant = slot->data();
+        }
+
+        // Parse value
+        if (!parseVariant(*variant, memberFilter, nestingLimit.decrement()))
+          return false;
+      } else {
+        if (!skipVariant(nestingLimit.decrement()))
+          return false;
+      }
+
+      // Skip spaces
+      if (!skipSpacesAndComments())
+        return false;
+
+      // More keys/values?
+      if (eat('}'))
+        return true;
+      if (!eat(',')) {
+        _error = DeserializationError::InvalidInput;
+        return false;
+      }
+
+      // Skip spaces
+      if (!skipSpacesAndComments())
+        return false;
+    }
+  }
+
+  bool skipObject(NestingLimit nestingLimit) {
+    if (nestingLimit.reached()) {
+      _error = DeserializationError::TooDeep;
+      return false;
+    }
+
+    // Skip opening brace
+    ARDUINOJSON_ASSERT(current() == '{');
+    move();
+
+    // Skip spaces
+    if (!skipSpacesAndComments())
+      return false;
+
+    // Empty object?
+    if (eat('}'))
+      return true;
+
+    // Read each key value pair
+    for (;;) {
+      // Skip key
+      if (!skipVariant(nestingLimit.decrement()))
+        return false;
+
+      // Skip spaces
+      if (!skipSpacesAndComments())
+        return false;
+
+      // Colon
+      if (!eat(':')) {
+        _error = DeserializationError::InvalidInput;
+        return false;
+      }
+
+      // Skip value
+      if (!skipVariant(nestingLimit.decrement()))
+        return false;
+
+      // Skip spaces
+      if (!skipSpacesAndComments())
+        return false;
+
+      // More keys/values?
+      if (eat('}'))
+        return true;
+      if (!eat(',')) {
+        _error = DeserializationError::InvalidInput;
+        return false;
+      }
+    }
+  }
+
+  bool parseKey() {
+    _stringStorage.startString();
+    if (isQuote(current())) {
+      return parseQuotedString();
+    } else {
+      return parseNonQuotedString();
+    }
+  }
+
+  bool parseStringValue(VariantData &variant) {
+    _stringStorage.startString();
+    if (!parseQuotedString())
+      return false;
+    const char *value = _stringStorage.save();
+    variant.setStringPointer(value, typename TStringStorage::storage_policy());
+    return true;
+  }
+
+  bool parseQuotedString() {
+#if ARDUINOJSON_DECODE_UNICODE
+    Utf16::Codepoint codepoint;
+#endif
+    const char stopChar = current();
+
+    move();
+    for (;;) {
+      char c = current();
+      move();
+      if (c == stopChar)
+        break;
+
+      if (c == '\0') {
+        _error = DeserializationError::IncompleteInput;
+        return false;
+      }
+
+      if (c == '\\') {
+        c = current();
+
+        if (c == '\0') {
+          _error = DeserializationError::IncompleteInput;
+          return false;
+        }
+
+        if (c == 'u') {
+#if ARDUINOJSON_DECODE_UNICODE
+          move();
+          uint16_t codeunit;
+          if (!parseHex4(codeunit))
+            return false;
+          if (codepoint.append(codeunit))
+            Utf8::encodeCodepoint(codepoint.value(), _stringStorage);
+#else
+          _stringStorage.append('\\');
+#endif
+          continue;
+        }
+
+        // replace char
+        c = EscapeSequence::unescapeChar(c);
+        if (c == '\0') {
+          _error = DeserializationError::InvalidInput;
+          return false;
+        }
+        move();
+      }
+
+      _stringStorage.append(c);
+    }
+
+    _stringStorage.append('\0');
+
+    if (!_stringStorage.isValid()) {
+      _error = DeserializationError::NoMemory;
+      return false;
+    }
+
+    return true;
+  }
+
+  bool parseNonQuotedString() {
+    char c = current();
+    ARDUINOJSON_ASSERT(c);
+
+    if (canBeInNonQuotedString(c)) {  // no quotes
+      do {
+        move();
+        _stringStorage.append(c);
+        c = current();
+      } while (canBeInNonQuotedString(c));
+    } else {
+      _error = DeserializationError::InvalidInput;
+      return false;
+    }
+
+    _stringStorage.append('\0');
+
+    if (!_stringStorage.isValid()) {
+      _error = DeserializationError::NoMemory;
+      return false;
+    }
+
+    return true;
+  }
+
+  bool skipString() {
+    const char stopChar = current();
+
+    move();
+    for (;;) {
+      char c = current();
+      move();
+      if (c == stopChar)
+        break;
+      if (c == '\0') {
+        _error = DeserializationError::IncompleteInput;
+        return false;
+      }
+      if (c == '\\') {
+        if (current() != '\0')
+          move();
+      }
+    }
+
+    return true;
+  }
+
+  bool parseNumericValue(VariantData &result) {
+    uint8_t n = 0;
+
+    char c = current();
+    while (canBeInNonQuotedString(c) && n < 63) {
+      move();
+      _buffer[n++] = c;
+      c = current();
+    }
+    _buffer[n] = 0;
+
+    c = _buffer[0];
+    if (c == 't') {  // true
+      result.setBoolean(true);
+      if (n != 4) {
+        _error = DeserializationError::IncompleteInput;
+        return false;
+      }
+      return true;
+    }
+    if (c == 'f') {  // false
+      result.setBoolean(false);
+      if (n != 5) {
+        _error = DeserializationError::IncompleteInput;
+        return false;
+      }
+      return true;
+    }
+    if (c == 'n') {  // null
+      // the variant is already null
+      if (n != 4) {
+        _error = DeserializationError::IncompleteInput;
+        return false;
+      }
+      return true;
+    }
+
+    if (!parseNumber(_buffer, result)) {
+      _error = DeserializationError::InvalidInput;
+      return false;
+    }
+
+    return true;
+  }
+
+  bool skipNumericValue() {
+    char c = current();
+    while (canBeInNonQuotedString(c)) {
+      move();
+      c = current();
+    }
+    return true;
+  }
+
+  bool parseHex4(uint16_t &result) {
+    result = 0;
+    for (uint8_t i = 0; i < 4; ++i) {
+      char digit = current();
+      if (!digit) {
+        _error = DeserializationError::IncompleteInput;
+        return false;
+      }
+      uint8_t value = decodeHex(digit);
+      if (value > 0x0F) {
+        _error = DeserializationError::InvalidInput;
+        return false;
+      }
+      result = uint16_t((result << 4) | value);
+      move();
+    }
+    return true;
+  }
+
+  static inline bool isBetween(char c, char min, char max) {
+    return min <= c && c <= max;
+  }
+
+  static inline bool canBeInNonQuotedString(char c) {
+    return isBetween(c, '0', '9') || isBetween(c, '_', 'z') ||
+           isBetween(c, 'A', 'Z') || c == '+' || c == '-' || c == '.';
+  }
+
+  static inline bool isQuote(char c) {
+    return c == '\'' || c == '\"';
+  }
+
+  static inline uint8_t decodeHex(char c) {
+    if (c < 'A')
+      return uint8_t(c - '0');
+    c = char(c & ~0x20);  // uppercase
+    return uint8_t(c - 'A' + 10);
+  }
+
+  bool skipSpacesAndComments() {
+    for (;;) {
+      switch (current()) {
+        // end of string
+        case '\0':
+          _error = _foundSomething ? DeserializationError::IncompleteInput
+                                   : DeserializationError::EmptyInput;
+          return false;
+
+        // spaces
+        case ' ':
+        case '\t':
+        case '\r':
+        case '\n':
+          move();
+          continue;
+
+#if ARDUINOJSON_ENABLE_COMMENTS
+        // comments
+        case '/':
+          move();  // skip '/'
+          switch (current()) {
+            // block comment
+            case '*': {
+              move();  // skip '*'
+              bool wasStar = false;
+              for (;;) {
+                char c = current();
+                if (c == '\0') {
+                  _error = DeserializationError::IncompleteInput;
+                  return false;
+                }
+                if (c == '/' && wasStar) {
+                  move();
+                  break;
+                }
+                wasStar = c == '*';
+                move();
+              }
+              break;
+            }
+
+            // trailing comment
+            case '/':
+              // no need to skip "//"
+              for (;;) {
+                move();
+                char c = current();
+                if (c == '\0') {
+                  _error = DeserializationError::IncompleteInput;
+                  return false;
+                }
+                if (c == '\n')
+                  break;
+              }
+              break;
+
+            // not a comment, just a '/'
+            default:
+              _error = DeserializationError::InvalidInput;
+              return false;
+          }
+          break;
+#endif
+
+        default:
+          _foundSomething = true;
+          return true;
+      }
+    }
+  }
+
+  TStringStorage _stringStorage;
+  bool _foundSomething;
+  Latch<TReader> _latch;
+  MemoryPool *_pool;
+  char _buffer[64];  // using a member instead of a local variable because it
+                     // ended in the recursive path after compiler inlined the
+                     // code
+  DeserializationError _error;
+};
+
+//
+// deserializeJson(JsonDocument&, const std::string&, ...)
+//
+// ... = NestingLimit
+template <typename TString>
+DeserializationError deserializeJson(
+    JsonDocument &doc, const TString &input,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<JsonDeserializer>(doc, input, nestingLimit,
+                                       AllowAllFilter());
+}
+// ... = Filter, NestingLimit
+template <typename TString>
+DeserializationError deserializeJson(
+    JsonDocument &doc, const TString &input, Filter filter,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<JsonDeserializer>(doc, input, nestingLimit, filter);
+}
+// ... = NestingLimit, Filter
+template <typename TString>
+DeserializationError deserializeJson(JsonDocument &doc, const TString &input,
+                                     NestingLimit nestingLimit, Filter filter) {
+  return deserialize<JsonDeserializer>(doc, input, nestingLimit, filter);
+}
+
+//
+// deserializeJson(JsonDocument&, std::istream&, ...)
+//
+// ... = NestingLimit
+template <typename TStream>
+DeserializationError deserializeJson(
+    JsonDocument &doc, TStream &input,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<JsonDeserializer>(doc, input, nestingLimit,
+                                       AllowAllFilter());
+}
+// ... = Filter, NestingLimit
+template <typename TStream>
+DeserializationError deserializeJson(
+    JsonDocument &doc, TStream &input, Filter filter,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<JsonDeserializer>(doc, input, nestingLimit, filter);
+}
+// ... = NestingLimit, Filter
+template <typename TStream>
+DeserializationError deserializeJson(JsonDocument &doc, TStream &input,
+                                     NestingLimit nestingLimit, Filter filter) {
+  return deserialize<JsonDeserializer>(doc, input, nestingLimit, filter);
+}
+
+//
+// deserializeJson(JsonDocument&, char*, ...)
+//
+// ... = NestingLimit
+template <typename TChar>
+DeserializationError deserializeJson(
+    JsonDocument &doc, TChar *input,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<JsonDeserializer>(doc, input, nestingLimit,
+                                       AllowAllFilter());
+}
+// ... = Filter, NestingLimit
+template <typename TChar>
+DeserializationError deserializeJson(
+    JsonDocument &doc, TChar *input, Filter filter,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<JsonDeserializer>(doc, input, nestingLimit, filter);
+}
+// ... = NestingLimit, Filter
+template <typename TChar>
+DeserializationError deserializeJson(JsonDocument &doc, TChar *input,
+                                     NestingLimit nestingLimit, Filter filter) {
+  return deserialize<JsonDeserializer>(doc, input, nestingLimit, filter);
+}
+
+//
+// deserializeJson(JsonDocument&, char*, size_t, ...)
+//
+// ... = NestingLimit
+template <typename TChar>
+DeserializationError deserializeJson(
+    JsonDocument &doc, TChar *input, size_t inputSize,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<JsonDeserializer>(doc, input, inputSize, nestingLimit,
+                                       AllowAllFilter());
+}
+// ... = Filter, NestingLimit
+template <typename TChar>
+DeserializationError deserializeJson(
+    JsonDocument &doc, TChar *input, size_t inputSize, Filter filter,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<JsonDeserializer>(doc, input, inputSize, nestingLimit,
+                                       filter);
+}
+// ... = NestingLimit, Filter
+template <typename TChar>
+DeserializationError deserializeJson(JsonDocument &doc, TChar *input,
+                                     size_t inputSize,
+                                     NestingLimit nestingLimit, Filter filter) {
+  return deserialize<JsonDeserializer>(doc, input, inputSize, nestingLimit,
+                                       filter);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp b/third-party/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp
new file mode 100644
index 0000000..5cb9aa2
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp
@@ -0,0 +1,137 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Json/TextFormatter.hpp>
+#include <ArduinoJson/Misc/Visitable.hpp>
+#include <ArduinoJson/Serialization/measure.hpp>
+#include <ArduinoJson/Serialization/serialize.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TWriter>
+class JsonSerializer : public Visitor<size_t> {
+ public:
+  static const bool producesText = true;
+
+  JsonSerializer(TWriter writer) : _formatter(writer) {}
+
+  FORCE_INLINE size_t visitArray(const CollectionData &array) {
+    write('[');
+
+    VariantSlot *slot = array.head();
+
+    while (slot != 0) {
+      slot->data()->accept(*this);
+
+      slot = slot->next();
+      if (slot == 0)
+        break;
+
+      write(',');
+    }
+
+    write(']');
+    return bytesWritten();
+  }
+
+  size_t visitObject(const CollectionData &object) {
+    write('{');
+
+    VariantSlot *slot = object.head();
+
+    while (slot != 0) {
+      _formatter.writeString(slot->key());
+      write(':');
+      slot->data()->accept(*this);
+
+      slot = slot->next();
+      if (slot == 0)
+        break;
+
+      write(',');
+    }
+
+    write('}');
+    return bytesWritten();
+  }
+
+  size_t visitFloat(Float value) {
+    _formatter.writeFloat(value);
+    return bytesWritten();
+  }
+
+  size_t visitString(const char *value) {
+    _formatter.writeString(value);
+    return bytesWritten();
+  }
+
+  size_t visitRawJson(const char *data, size_t n) {
+    _formatter.writeRaw(data, n);
+    return bytesWritten();
+  }
+
+  size_t visitSignedInteger(Integer value) {
+    _formatter.writeInteger(value);
+    return bytesWritten();
+  }
+
+  size_t visitUnsignedInteger(UInt value) {
+    _formatter.writeInteger(value);
+    return bytesWritten();
+  }
+
+  size_t visitBoolean(bool value) {
+    _formatter.writeBoolean(value);
+    return bytesWritten();
+  }
+
+  size_t visitNull() {
+    _formatter.writeRaw("null");
+    return bytesWritten();
+  }
+
+ protected:
+  size_t bytesWritten() const {
+    return _formatter.bytesWritten();
+  }
+
+  void write(char c) {
+    _formatter.writeRaw(c);
+  }
+
+  void write(const char *s) {
+    _formatter.writeRaw(s);
+  }
+
+ private:
+  TextFormatter<TWriter> _formatter;
+};
+
+template <typename TSource, typename TDestination>
+size_t serializeJson(const TSource &source, TDestination &destination) {
+  return serialize<JsonSerializer>(source, destination);
+}
+
+template <typename TSource>
+size_t serializeJson(const TSource &source, void *buffer, size_t bufferSize) {
+  return serialize<JsonSerializer>(source, buffer, bufferSize);
+}
+
+template <typename TSource>
+size_t measureJson(const TSource &source) {
+  return measure<JsonSerializer>(source);
+}
+
+#if ARDUINOJSON_ENABLE_STD_STREAM
+template <typename T>
+inline typename enable_if<IsVisitable<T>::value, std::ostream &>::type
+operator<<(std::ostream &os, const T &source) {
+  serializeJson(source, os);
+  return os;
+}
+#endif
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Json/Latch.hpp b/third-party/ArduinoJson/src/ArduinoJson/Json/Latch.hpp
new file mode 100644
index 0000000..70866d6
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Json/Latch.hpp
@@ -0,0 +1,56 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/assert.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TReader>
+class Latch {
+ public:
+  Latch(TReader reader) : _reader(reader), _loaded(false) {
+#if ARDUINOJSON_DEBUG
+    _ended = false;
+#endif
+  }
+
+  void clear() {
+    _loaded = false;
+  }
+
+  int last() const {
+    return _current;
+  }
+
+  FORCE_INLINE char current() {
+    if (!_loaded) {
+      load();
+    }
+    return _current;
+  }
+
+ private:
+  void load() {
+    ARDUINOJSON_ASSERT(!_ended);
+    int c = _reader.read();
+#if ARDUINOJSON_DEBUG
+    if (c <= 0)
+      _ended = true;
+#endif
+    _current = static_cast<char>(c > 0 ? c : 0);
+    _loaded = true;
+  }
+
+  TReader _reader;
+  char _current;  // NOLINT(clang-analyzer-optin.cplusplus.UninitializedObject)
+                  // Not initialized in constructor (+10 bytes on AVR)
+  bool _loaded;
+#if ARDUINOJSON_DEBUG
+  bool _ended;
+#endif
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp b/third-party/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp
new file mode 100644
index 0000000..dbb0c17
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp
@@ -0,0 +1,89 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Json/JsonSerializer.hpp>
+#include <ArduinoJson/Serialization/measure.hpp>
+#include <ArduinoJson/Serialization/serialize.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TWriter>
+class PrettyJsonSerializer : public JsonSerializer<TWriter> {
+  typedef JsonSerializer<TWriter> base;
+
+ public:
+  PrettyJsonSerializer(TWriter writer) : base(writer), _nesting(0) {}
+
+  size_t visitArray(const CollectionData &array) {
+    VariantSlot *slot = array.head();
+    if (slot) {
+      base::write("[\r\n");
+      _nesting++;
+      while (slot != 0) {
+        indent();
+        slot->data()->accept(*this);
+
+        slot = slot->next();
+        base::write(slot ? ",\r\n" : "\r\n");
+      }
+      _nesting--;
+      indent();
+      base::write("]");
+    } else {
+      base::write("[]");
+    }
+    return this->bytesWritten();
+  }
+
+  size_t visitObject(const CollectionData &object) {
+    VariantSlot *slot = object.head();
+    if (slot) {
+      base::write("{\r\n");
+      _nesting++;
+      while (slot != 0) {
+        indent();
+        base::visitString(slot->key());
+        base::write(": ");
+        slot->data()->accept(*this);
+
+        slot = slot->next();
+        base::write(slot ? ",\r\n" : "\r\n");
+      }
+      _nesting--;
+      indent();
+      base::write("}");
+    } else {
+      base::write("{}");
+    }
+    return this->bytesWritten();
+  }
+
+ private:
+  void indent() {
+    for (uint8_t i = 0; i < _nesting; i++) base::write(ARDUINOJSON_TAB);
+  }
+
+  uint8_t _nesting;
+};
+
+template <typename TSource, typename TDestination>
+size_t serializeJsonPretty(const TSource &source, TDestination &destination) {
+  return serialize<PrettyJsonSerializer>(source, destination);
+}
+
+template <typename TSource>
+size_t serializeJsonPretty(const TSource &source, void *buffer,
+                           size_t bufferSize) {
+  return serialize<PrettyJsonSerializer>(source, buffer, bufferSize);
+}
+
+template <typename TSource>
+size_t measureJsonPretty(const TSource &source) {
+  return measure<PrettyJsonSerializer>(source);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp
new file mode 100644
index 0000000..7795671
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp
@@ -0,0 +1,162 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <stdint.h>
+#include <string.h>  // for strlen
+
+#include <ArduinoJson/Json/EscapeSequence.hpp>
+#include <ArduinoJson/Numbers/FloatParts.hpp>
+#include <ArduinoJson/Numbers/Integer.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/attributes.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Serialization/CountingDecorator.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TWriter>
+class TextFormatter {
+ public:
+  explicit TextFormatter(TWriter writer) : _writer(writer) {}
+
+  // Returns the number of bytes sent to the TWriter implementation.
+  size_t bytesWritten() const {
+    return _writer.count();
+  }
+
+  void writeBoolean(bool value) {
+    if (value)
+      writeRaw("true");
+    else
+      writeRaw("false");
+  }
+
+  void writeString(const char *value) {
+    ARDUINOJSON_ASSERT(value != NULL);
+    writeRaw('\"');
+    while (*value) writeChar(*value++);
+    writeRaw('\"');
+  }
+
+  void writeChar(char c) {
+    char specialChar = EscapeSequence::escapeChar(c);
+    if (specialChar) {
+      writeRaw('\\');
+      writeRaw(specialChar);
+    } else {
+      writeRaw(c);
+    }
+  }
+
+  template <typename T>
+  void writeFloat(T value) {
+    if (isnan(value))
+      return writeRaw(ARDUINOJSON_ENABLE_NAN ? "NaN" : "null");
+
+#if ARDUINOJSON_ENABLE_INFINITY
+    if (value < 0.0) {
+      writeRaw('-');
+      value = -value;
+    }
+
+    if (isinf(value))
+      return writeRaw("Infinity");
+#else
+    if (isinf(value))
+      return writeRaw("null");
+
+    if (value < 0.0) {
+      writeRaw('-');
+      value = -value;
+    }
+#endif
+
+    FloatParts<T> parts(value);
+
+    writeInteger(parts.integral);
+    if (parts.decimalPlaces)
+      writeDecimals(parts.decimal, parts.decimalPlaces);
+
+    if (parts.exponent) {
+      writeRaw('e');
+      writeInteger(parts.exponent);
+    }
+  }
+
+  template <typename T>
+  typename enable_if<is_signed<T>::value>::type writeInteger(T value) {
+    typedef typename make_unsigned<T>::type unsigned_type;
+    unsigned_type unsigned_value;
+    if (value < 0) {
+      writeRaw('-');
+      unsigned_value = unsigned_type(unsigned_type(~value) + 1);
+    } else {
+      unsigned_value = unsigned_type(value);
+    }
+    writeInteger(unsigned_value);
+  }
+
+  template <typename T>
+  typename enable_if<is_unsigned<T>::value>::type writeInteger(T value) {
+    char buffer[22];
+    char *end = buffer + sizeof(buffer);
+    char *begin = end;
+
+    // write the string in reverse order
+    do {
+      *--begin = char(value % 10 + '0');
+      value = T(value / 10);
+    } while (value);
+
+    // and dump it in the right order
+    writeRaw(begin, end);
+  }
+
+  void writeDecimals(uint32_t value, int8_t width) {
+    // buffer should be big enough for all digits and the dot
+    char buffer[16];
+    char *end = buffer + sizeof(buffer);
+    char *begin = end;
+
+    // write the string in reverse order
+    while (width--) {
+      *--begin = char(value % 10 + '0');
+      value /= 10;
+    }
+    *--begin = '.';
+
+    // and dump it in the right order
+    writeRaw(begin, end);
+  }
+
+  void writeRaw(const char *s) {
+    _writer.write(reinterpret_cast<const uint8_t *>(s), strlen(s));
+  }
+
+  void writeRaw(const char *s, size_t n) {
+    _writer.write(reinterpret_cast<const uint8_t *>(s), n);
+  }
+
+  void writeRaw(const char *begin, const char *end) {
+    _writer.write(reinterpret_cast<const uint8_t *>(begin),
+                  static_cast<size_t>(end - begin));
+  }
+
+  template <size_t N>
+  void writeRaw(const char (&s)[N]) {
+    _writer.write(reinterpret_cast<const uint8_t *>(s), N - 1);
+  }
+  void writeRaw(char c) {
+    _writer.write(static_cast<uint8_t>(c));
+  }
+
+ protected:
+  CountingDecorator<TWriter> _writer;
+
+ private:
+  TextFormatter &operator=(const TextFormatter &);  // cannot be assigned
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp b/third-party/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp
new file mode 100644
index 0000000..e2b9010
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp
@@ -0,0 +1,67 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+#include <stdint.h>  // uint16_t, uint32_t
+
+// The high surrogate may be uninitialized if the pair is invalid,
+// we choose to ignore the problem to reduce the size of the code
+// Garbage in => Garbage out
+#if defined(__GNUC__)
+#  if __GNUC__ >= 7
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#  endif
+#endif
+
+namespace ARDUINOJSON_NAMESPACE {
+
+namespace Utf16 {
+inline bool isHighSurrogate(uint16_t codeunit) {
+  return codeunit >= 0xD800 && codeunit < 0xDC00;
+}
+
+inline bool isLowSurrogate(uint16_t codeunit) {
+  return codeunit >= 0xDC00 && codeunit < 0xE000;
+}
+
+class Codepoint {
+ public:
+  Codepoint() : _highSurrogate(0), _codepoint(0) {}
+
+  bool append(uint16_t codeunit) {
+    if (isHighSurrogate(codeunit)) {
+      _highSurrogate = codeunit & 0x3FF;
+      return false;
+    }
+
+    if (isLowSurrogate(codeunit)) {
+      _codepoint =
+          uint32_t(0x10000 + ((_highSurrogate << 10) | (codeunit & 0x3FF)));
+      return true;
+    }
+
+    _codepoint = codeunit;
+    return true;
+  }
+
+  uint32_t value() const {
+    return _codepoint;
+  }
+
+ private:
+  uint16_t _highSurrogate;
+  uint32_t _codepoint;
+};
+}  // namespace Utf16
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#if defined(__GNUC__)
+#  if __GNUC__ >= 8
+#    pragma GCC diagnostic pop
+#  endif
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp b/third-party/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp
new file mode 100644
index 0000000..a30f77a
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp
@@ -0,0 +1,46 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+namespace Utf8 {
+template <typename TStringBuilder>
+inline void encodeCodepoint(uint32_t codepoint32, TStringBuilder& str) {
+  // this function was optimize for code size on AVR
+
+  // a buffer to store the string in reverse
+  char buf[5];
+  char* p = buf;
+
+  *(p++) = 0;
+  if (codepoint32 < 0x80) {
+    *(p++) = char((codepoint32));
+  } else {
+    *(p++) = char((codepoint32 | 0x80) & 0xBF);
+    uint16_t codepoint16 = uint16_t(codepoint32 >> 6);
+    if (codepoint16 < 0x20) {  // 0x800
+      *(p++) = char(codepoint16 | 0xC0);
+    } else {
+      *(p++) = char((codepoint16 | 0x80) & 0xBF);
+      codepoint16 = uint16_t(codepoint16 >> 6);
+      if (codepoint16 < 0x10) {  // 0x10000
+        *(p++) = char(codepoint16 | 0xE0);
+      } else {
+        *(p++) = char((codepoint16 | 0x80) & 0xBF);
+        codepoint16 = uint16_t(codepoint16 >> 6);
+        *(p++) = char(codepoint16 | 0xF0);
+      }
+    }
+  }
+
+  while (*(--p)) {
+    str.append(*p);
+  }
+}
+}  // namespace Utf8
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp b/third-party/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp
new file mode 100644
index 0000000..bf16798
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp
@@ -0,0 +1,60 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+#include <stddef.h>  // size_t
+
+namespace ARDUINOJSON_NAMESPACE {
+
+#if ARDUINOJSON_ENABLE_ALIGNMENT
+
+inline bool isAligned(size_t value) {
+  const size_t mask = sizeof(void *) - 1;
+  size_t addr = value;
+  return (addr & mask) == 0;
+}
+
+inline size_t addPadding(size_t bytes) {
+  const size_t mask = sizeof(void *) - 1;
+  return (bytes + mask) & ~mask;
+}
+
+template <size_t bytes>
+struct AddPadding {
+  static const size_t mask = sizeof(void *) - 1;
+  static const size_t value = (bytes + mask) & ~mask;
+};
+
+#else
+
+inline bool isAligned(size_t) {
+  return true;
+}
+
+inline size_t addPadding(size_t bytes) {
+  return bytes;
+}
+
+template <size_t bytes>
+struct AddPadding {
+  static const size_t value = bytes;
+};
+
+#endif
+
+template <typename T>
+inline bool isAligned(T *ptr) {
+  return isAligned(reinterpret_cast<size_t>(ptr));
+}
+
+template <typename T>
+inline T *addPadding(T *p) {
+  size_t address = addPadding(reinterpret_cast<size_t>(p));
+  return reinterpret_cast<T *>(address);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp b/third-party/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp
new file mode 100644
index 0000000..7d3cd0c
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp
@@ -0,0 +1,209 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/Alignment.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/mpl/max.hpp>
+#include <ArduinoJson/Strings/StringAdapters.hpp>
+#include <ArduinoJson/Variant/VariantSlot.hpp>
+
+#include <string.h>  // memmove
+
+#define JSON_STRING_SIZE(SIZE) (SIZE + 1)
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// _begin                                   _end
+// v                                           v
+// +-------------+--------------+--------------+
+// | strings...  |   (free)     |  ...variants |
+// +-------------+--------------+--------------+
+//               ^              ^
+//             _left          _right
+
+class MemoryPool {
+ public:
+  MemoryPool(char* buf, size_t capa)
+      : _begin(buf),
+        _left(buf),
+        _right(buf ? buf + capa : 0),
+        _end(buf ? buf + capa : 0),
+        _overflowed(false) {
+    ARDUINOJSON_ASSERT(isAligned(_begin));
+    ARDUINOJSON_ASSERT(isAligned(_right));
+    ARDUINOJSON_ASSERT(isAligned(_end));
+  }
+
+  void* buffer() {
+    return _begin;  // NOLINT(clang-analyzer-unix.Malloc)
+                    // movePointers() alters this pointer
+  }
+
+  // Gets the capacity of the memoryPool in bytes
+  size_t capacity() const {
+    return size_t(_end - _begin);
+  }
+
+  size_t size() const {
+    return size_t(_left - _begin + _end - _right);
+  }
+
+  bool overflowed() const {
+    return _overflowed;
+  }
+
+  VariantSlot* allocVariant() {
+    return allocRight<VariantSlot>();
+  }
+
+  template <typename TAdaptedString>
+  const char* saveString(const TAdaptedString& str) {
+    if (str.isNull())
+      return 0;
+
+#if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
+    const char* existingCopy = findString(str);
+    if (existingCopy)
+      return existingCopy;
+#endif
+
+    size_t n = str.size();
+
+    char* newCopy = allocString(n + 1);
+    if (newCopy) {
+      str.copyTo(newCopy, n);
+      newCopy[n] = 0;  // force null-terminator
+    }
+    return newCopy;
+  }
+
+  void getFreeZone(char** zoneStart, size_t* zoneSize) const {
+    *zoneStart = _left;
+    *zoneSize = size_t(_right - _left);
+  }
+
+  const char* saveStringFromFreeZone(size_t len) {
+#if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
+    const char* dup = findString(adaptString(_left));
+    if (dup)
+      return dup;
+#endif
+
+    const char* str = _left;
+    _left += len;
+    checkInvariants();
+    return str;
+  }
+
+  void markAsOverflowed() {
+    _overflowed = true;
+  }
+
+  void clear() {
+    _left = _begin;
+    _right = _end;
+    _overflowed = false;
+  }
+
+  bool canAlloc(size_t bytes) const {
+    return _left + bytes <= _right;
+  }
+
+  bool owns(void* p) const {
+    return _begin <= p && p < _end;
+  }
+
+  // Workaround for missing placement new
+  void* operator new(size_t, void* p) {
+    return p;
+  }
+
+  // Squash the free space between strings and variants
+  //
+  // _begin                    _end
+  // v                            v
+  // +-------------+--------------+
+  // | strings...  |  ...variants |
+  // +-------------+--------------+
+  //               ^
+  //          _left _right
+  //
+  // This funcion is called before a realloc.
+  ptrdiff_t squash() {
+    char* new_right = addPadding(_left);
+    if (new_right >= _right)
+      return 0;
+
+    size_t right_size = static_cast<size_t>(_end - _right);
+    memmove(new_right, _right, right_size);
+
+    ptrdiff_t bytes_reclaimed = _right - new_right;
+    _right = new_right;
+    _end = new_right + right_size;
+    return bytes_reclaimed;
+  }
+
+  // Move all pointers together
+  // This funcion is called after a realloc.
+  void movePointers(ptrdiff_t offset) {
+    _begin += offset;
+    _left += offset;
+    _right += offset;
+    _end += offset;
+  }
+
+ private:
+  void checkInvariants() {
+    ARDUINOJSON_ASSERT(_begin <= _left);
+    ARDUINOJSON_ASSERT(_left <= _right);
+    ARDUINOJSON_ASSERT(_right <= _end);
+    ARDUINOJSON_ASSERT(isAligned(_right));
+  }
+
+#if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
+  template <typename TAdaptedString>
+  const char* findString(const TAdaptedString& str) {
+    for (char* next = _begin; next < _left; ++next) {
+      if (str.equals(next))
+        return next;
+
+      // jump to next terminator
+      while (*next) ++next;
+    }
+    return 0;
+  }
+#endif
+
+  char* allocString(size_t n) {
+    if (!canAlloc(n)) {
+      _overflowed = true;
+      return 0;
+    }
+    char* s = _left;
+    _left += n;
+    checkInvariants();
+    return s;
+  }
+
+  template <typename T>
+  T* allocRight() {
+    return reinterpret_cast<T*>(allocRight(sizeof(T)));
+  }
+
+  void* allocRight(size_t bytes) {
+    if (!canAlloc(bytes)) {
+      _overflowed = true;
+      return 0;
+    }
+    _right -= bytes;
+    return _right;
+  }
+
+  char *_begin, *_left, *_right, *_end;
+  bool _overflowed;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp b/third-party/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp
new file mode 100644
index 0000000..30173bf
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp
@@ -0,0 +1,68 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Strings/StringAdapters.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// A special type of data that can be used to insert pregenerated JSON portions.
+template <typename T>
+class SerializedValue {
+ public:
+  explicit SerializedValue(T str) : _str(str) {}
+  operator T() const {
+    return _str;
+  }
+
+  const char* data() const {
+    return _str.c_str();
+  }
+
+  size_t size() const {
+    // CAUTION: the old Arduino String doesn't have size()
+    return _str.length();
+  }
+
+ private:
+  T _str;
+};
+
+template <typename TChar>
+class SerializedValue<TChar*> {
+ public:
+  explicit SerializedValue(TChar* p, size_t n) : _data(p), _size(n) {}
+  operator TChar*() const {
+    return _data;
+  }
+
+  TChar* data() const {
+    return _data;
+  }
+
+  size_t size() const {
+    return _size;
+  }
+
+ private:
+  TChar* _data;
+  size_t _size;
+};
+
+template <typename T>
+inline SerializedValue<T> serialized(T str) {
+  return SerializedValue<T>(str);
+}
+
+template <typename TChar>
+inline SerializedValue<TChar*> serialized(TChar* p) {
+  return SerializedValue<TChar*>(p, adaptString(p).size());
+}
+
+template <typename TChar>
+inline SerializedValue<TChar*> serialized(TChar* p, size_t n) {
+  return SerializedValue<TChar*>(p, n);
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Misc/Visitable.hpp b/third-party/ArduinoJson/src/ArduinoJson/Misc/Visitable.hpp
new file mode 100644
index 0000000..f25d12f
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Misc/Visitable.hpp
@@ -0,0 +1,21 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+struct Visitable {
+  // template<Visitor>
+  // void accept(Visitor&) const;
+};
+
+template <typename T>
+struct IsVisitable : is_base_of<Visitable, T> {};
+
+template <typename T>
+struct IsVisitable<T &> : IsVisitable<T> {};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/third-party/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
new file mode 100644
index 0000000..fbeb05d
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
@@ -0,0 +1,596 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Deserialization/deserialize.hpp>
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/MsgPack/endianess.hpp>
+#include <ArduinoJson/MsgPack/ieee754.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Variant/VariantData.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TReader, typename TStringStorage>
+class MsgPackDeserializer {
+ public:
+  MsgPackDeserializer(MemoryPool &pool, TReader reader,
+                      TStringStorage stringStorage)
+      : _pool(&pool),
+        _reader(reader),
+        _stringStorage(stringStorage),
+        _error(DeserializationError::Ok),
+        _foundSomething(false) {}
+
+  template <typename TFilter>
+  DeserializationError parse(VariantData &variant, TFilter filter,
+                             NestingLimit nestingLimit) {
+    parseVariant(&variant, filter, nestingLimit);
+    return _foundSomething ? _error : DeserializationError::EmptyInput;
+  }
+
+ private:
+  bool invalidInput() {
+    _error = DeserializationError::InvalidInput;
+    return false;
+  }
+
+  template <typename TFilter>
+  bool parseVariant(VariantData *variant, TFilter filter,
+                    NestingLimit nestingLimit) {
+    uint8_t code = 0;  // TODO: why do we need to initialize this variable?
+    if (!readByte(code))
+      return false;
+
+    _foundSomething = true;
+
+    bool allowValue = filter.allowValue();
+
+    switch (code) {
+      case 0xc0:
+        // already null
+        return true;
+
+      case 0xc1:
+        return invalidInput();
+
+      case 0xc2:
+        if (allowValue)
+          variant->setBoolean(false);
+        return true;
+
+      case 0xc3:
+        if (allowValue)
+          variant->setBoolean(true);
+        return true;
+
+      case 0xc4:  // bin 8 (not supported)
+        return skipString<uint8_t>();
+
+      case 0xc5:  // bin 16 (not supported)
+        return skipString<uint16_t>();
+
+      case 0xc6:  // bin 32 (not supported)
+        return skipString<uint32_t>();
+
+      case 0xc7:  // ext 8 (not supported)
+        return skipExt<uint8_t>();
+
+      case 0xc8:  // ext 16 (not supported)
+        return skipExt<uint16_t>();
+
+      case 0xc9:  // ext 32 (not supported)
+        return skipExt<uint32_t>();
+
+      case 0xca:
+        if (allowValue)
+          return readFloat<float>(variant);
+        else
+          return skipBytes(4);
+
+      case 0xcb:
+        if (allowValue)
+          return readDouble<double>(variant);
+        else
+          return skipBytes(8);
+
+      case 0xcc:
+        if (allowValue)
+          return readInteger<uint8_t>(variant);
+        else
+          return skipBytes(1);
+
+      case 0xcd:
+        if (allowValue)
+          return readInteger<uint16_t>(variant);
+        else
+          return skipBytes(2);
+
+      case 0xce:
+        if (allowValue)
+          return readInteger<uint32_t>(variant);
+        else
+          return skipBytes(4);
+
+      case 0xcf:
+#if ARDUINOJSON_USE_LONG_LONG
+        if (allowValue)
+          return readInteger<uint64_t>(variant);
+        else
+          return skipBytes(8);
+#else
+        return skipBytes(8);  // not supported
+#endif
+
+      case 0xd0:
+        if (allowValue)
+          return readInteger<int8_t>(variant);
+        else
+          return skipBytes(1);
+
+      case 0xd1:
+        if (allowValue)
+          return readInteger<int16_t>(variant);
+        else
+          return skipBytes(2);
+
+      case 0xd2:
+        if (allowValue)
+          return readInteger<int32_t>(variant);
+        else
+          return skipBytes(4);
+
+      case 0xd3:
+#if ARDUINOJSON_USE_LONG_LONG
+        if (allowValue)
+          return readInteger<int64_t>(variant);
+        else
+          return skipBytes(8);  // not supported
+#else
+        return skipBytes(8);
+#endif
+
+      case 0xd4:  // fixext 1 (not supported)
+        return skipBytes(2);
+
+      case 0xd5:  // fixext 2 (not supported)
+        return skipBytes(3);
+
+      case 0xd6:  // fixext 4 (not supported)
+        return skipBytes(5);
+
+      case 0xd7:  // fixext 8 (not supported)
+        return skipBytes(9);
+
+      case 0xd8:  // fixext 16 (not supported)
+        return skipBytes(17);
+
+      case 0xd9:
+        if (allowValue)
+          return readString<uint8_t>(variant);
+        else
+          return skipString<uint8_t>();
+
+      case 0xda:
+        if (allowValue)
+          return readString<uint16_t>(variant);
+        else
+          return skipString<uint16_t>();
+
+      case 0xdb:
+        if (allowValue)
+          return readString<uint32_t>(variant);
+        else
+          return skipString<uint32_t>();
+
+      case 0xdc:
+        return readArray<uint16_t>(variant, filter, nestingLimit);
+
+      case 0xdd:
+        return readArray<uint32_t>(variant, filter, nestingLimit);
+
+      case 0xde:
+        return readObject<uint16_t>(variant, filter, nestingLimit);
+
+      case 0xdf:
+        return readObject<uint32_t>(variant, filter, nestingLimit);
+    }
+
+    switch (code & 0xf0) {
+      case 0x80:
+        return readObject(variant, code & 0x0F, filter, nestingLimit);
+
+      case 0x90:
+        return readArray(variant, code & 0x0F, filter, nestingLimit);
+    }
+
+    if ((code & 0xe0) == 0xa0) {
+      if (allowValue)
+        return readString(variant, code & 0x1f);
+      else
+        return skipBytes(code & 0x1f);
+    }
+
+    if (allowValue)
+      variant->setInteger(static_cast<int8_t>(code));
+
+    return true;
+  }
+
+  bool readByte(uint8_t &value) {
+    int c = _reader.read();
+    if (c < 0) {
+      _error = DeserializationError::IncompleteInput;
+      return false;
+    }
+    value = static_cast<uint8_t>(c);
+    return true;
+  }
+
+  bool readBytes(uint8_t *p, size_t n) {
+    if (_reader.readBytes(reinterpret_cast<char *>(p), n) == n)
+      return true;
+    _error = DeserializationError::IncompleteInput;
+    return false;
+  }
+
+  template <typename T>
+  bool readBytes(T &value) {
+    return readBytes(reinterpret_cast<uint8_t *>(&value), sizeof(value));
+  }
+
+  bool skipBytes(size_t n) {
+    for (; n; --n) {
+      if (_reader.read() < 0) {
+        _error = DeserializationError::IncompleteInput;
+        return false;
+      }
+    }
+    return true;
+  }
+
+  template <typename T>
+  bool readInteger(T &value) {
+    if (!readBytes(value))
+      return false;
+    fixEndianess(value);
+    return true;
+  }
+
+  template <typename T>
+  bool readInteger(VariantData *variant) {
+    T value;
+    if (!readInteger(value))
+      return false;
+    variant->setInteger(value);
+    return true;
+  }
+
+  template <typename T>
+  typename enable_if<sizeof(T) == 4, bool>::type readFloat(
+      VariantData *variant) {
+    T value;
+    if (!readBytes(value))
+      return false;
+    fixEndianess(value);
+    variant->setFloat(value);
+    return true;
+  }
+
+  template <typename T>
+  typename enable_if<sizeof(T) == 8, bool>::type readDouble(
+      VariantData *variant) {
+    T value;
+    if (!readBytes(value))
+      return false;
+    fixEndianess(value);
+    variant->setFloat(value);
+    return true;
+  }
+
+  template <typename T>
+  typename enable_if<sizeof(T) == 4, bool>::type readDouble(
+      VariantData *variant) {
+    uint8_t i[8];  // input is 8 bytes
+    T value;       // output is 4 bytes
+    uint8_t *o = reinterpret_cast<uint8_t *>(&value);
+    if (!readBytes(i, 8))
+      return false;
+    doubleToFloat(i, o);
+    fixEndianess(value);
+    variant->setFloat(value);
+    return true;
+  }
+
+  template <typename T>
+  bool readString(VariantData *variant) {
+    T size;
+    if (!readInteger(size))
+      return false;
+    return readString(variant, size);
+  }
+
+  template <typename T>
+  bool readString() {
+    T size;
+    if (!readInteger(size))
+      return false;
+    return readString(size);
+  }
+
+  template <typename T>
+  bool skipString() {
+    T size;
+    if (!readInteger(size))
+      return false;
+    return skipBytes(size);
+  }
+
+  bool readString(VariantData *variant, size_t n) {
+    if (!readString(n))
+      return false;
+    variant->setStringPointer(_stringStorage.save(),
+                              typename TStringStorage::storage_policy());
+    return true;
+  }
+
+  bool readString(size_t n) {
+    _stringStorage.startString();
+    for (; n; --n) {
+      uint8_t c;
+      if (!readBytes(c))
+        return false;
+      _stringStorage.append(static_cast<char>(c));
+    }
+    _stringStorage.append('\0');
+    if (!_stringStorage.isValid()) {
+      _error = DeserializationError::NoMemory;
+      return false;
+    }
+
+    return true;
+  }
+
+  template <typename TSize, typename TFilter>
+  bool readArray(VariantData *variant, TFilter filter,
+                 NestingLimit nestingLimit) {
+    TSize size;
+    if (!readInteger(size))
+      return false;
+    return readArray(variant, size, filter, nestingLimit);
+  }
+
+  template <typename TFilter>
+  bool readArray(VariantData *variant, size_t n, TFilter filter,
+                 NestingLimit nestingLimit) {
+    if (nestingLimit.reached()) {
+      _error = DeserializationError::TooDeep;
+      return false;
+    }
+
+    bool allowArray = filter.allowArray();
+
+    CollectionData *array = allowArray ? &variant->toArray() : 0;
+
+    TFilter memberFilter = filter[0U];
+
+    for (; n; --n) {
+      VariantData *value;
+
+      if (memberFilter.allow()) {
+        value = array->addElement(_pool);
+        if (!value) {
+          _error = DeserializationError::NoMemory;
+          return false;
+        }
+      } else {
+        value = 0;
+      }
+
+      if (!parseVariant(value, memberFilter, nestingLimit.decrement()))
+        return false;
+    }
+
+    return true;
+  }
+
+  template <typename TSize, typename TFilter>
+  bool readObject(VariantData *variant, TFilter filter,
+                  NestingLimit nestingLimit) {
+    TSize size;
+    if (!readInteger(size))
+      return false;
+    return readObject(variant, size, filter, nestingLimit);
+  }
+
+  template <typename TFilter>
+  bool readObject(VariantData *variant, size_t n, TFilter filter,
+                  NestingLimit nestingLimit) {
+    if (nestingLimit.reached()) {
+      _error = DeserializationError::TooDeep;
+      return false;
+    }
+
+    CollectionData *object = filter.allowObject() ? &variant->toObject() : 0;
+
+    for (; n; --n) {
+      if (!readKey())
+        return false;
+
+      const char *key = _stringStorage.c_str();
+      TFilter memberFilter = filter[key];
+      VariantData *member;
+
+      if (memberFilter.allow()) {
+        // Save key in memory pool.
+        // This MUST be done before adding the slot.
+        key = _stringStorage.save();
+
+        VariantSlot *slot = object->addSlot(_pool);
+        if (!slot) {
+          _error = DeserializationError::NoMemory;
+          return false;
+        }
+
+        slot->setKey(key, typename TStringStorage::storage_policy());
+
+        member = slot->data();
+      } else {
+        member = 0;
+      }
+
+      if (!parseVariant(member, memberFilter, nestingLimit.decrement()))
+        return false;
+    }
+
+    return true;
+  }
+
+  bool readKey() {
+    uint8_t code;
+    if (!readByte(code))
+      return false;
+
+    if ((code & 0xe0) == 0xa0)
+      return readString(code & 0x1f);
+
+    switch (code) {
+      case 0xd9:
+        return readString<uint8_t>();
+
+      case 0xda:
+        return readString<uint16_t>();
+
+      case 0xdb:
+        return readString<uint32_t>();
+
+      default:
+        return invalidInput();
+    }
+  }
+
+  template <typename T>
+  bool skipExt() {
+    T size;
+    if (!readInteger(size))
+      return false;
+    return skipBytes(size + 1);
+  }
+
+  MemoryPool *_pool;
+  TReader _reader;
+  TStringStorage _stringStorage;
+  DeserializationError _error;
+  bool _foundSomething;
+};
+
+//
+// deserializeMsgPack(JsonDocument&, const std::string&, ...)
+//
+// ... = NestingLimit
+template <typename TString>
+DeserializationError deserializeMsgPack(
+    JsonDocument &doc, const TString &input,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<MsgPackDeserializer>(doc, input, nestingLimit,
+                                          AllowAllFilter());
+}
+// ... = Filter, NestingLimit
+template <typename TString>
+DeserializationError deserializeMsgPack(
+    JsonDocument &doc, const TString &input, Filter filter,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
+}
+// ... = NestingLimit, Filter
+template <typename TString>
+DeserializationError deserializeMsgPack(JsonDocument &doc, const TString &input,
+                                        NestingLimit nestingLimit,
+                                        Filter filter) {
+  return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
+}
+
+//
+// deserializeMsgPack(JsonDocument&, std::istream&, ...)
+//
+// ... = NestingLimit
+template <typename TStream>
+DeserializationError deserializeMsgPack(
+    JsonDocument &doc, TStream &input,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<MsgPackDeserializer>(doc, input, nestingLimit,
+                                          AllowAllFilter());
+}
+// ... = Filter, NestingLimit
+template <typename TStream>
+DeserializationError deserializeMsgPack(
+    JsonDocument &doc, TStream &input, Filter filter,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
+}
+// ... = NestingLimit, Filter
+template <typename TStream>
+DeserializationError deserializeMsgPack(JsonDocument &doc, TStream &input,
+                                        NestingLimit nestingLimit,
+                                        Filter filter) {
+  return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
+}
+
+//
+// deserializeMsgPack(JsonDocument&, char*, ...)
+//
+// ... = NestingLimit
+template <typename TChar>
+DeserializationError deserializeMsgPack(
+    JsonDocument &doc, TChar *input,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<MsgPackDeserializer>(doc, input, nestingLimit,
+                                          AllowAllFilter());
+}
+// ... = Filter, NestingLimit
+template <typename TChar>
+DeserializationError deserializeMsgPack(
+    JsonDocument &doc, TChar *input, Filter filter,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
+}
+// ... = NestingLimit, Filter
+template <typename TChar>
+DeserializationError deserializeMsgPack(JsonDocument &doc, TChar *input,
+                                        NestingLimit nestingLimit,
+                                        Filter filter) {
+  return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
+}
+
+//
+// deserializeMsgPack(JsonDocument&, char*, size_t, ...)
+//
+// ... = NestingLimit
+template <typename TChar>
+DeserializationError deserializeMsgPack(
+    JsonDocument &doc, TChar *input, size_t inputSize,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit,
+                                          AllowAllFilter());
+}
+// ... = Filter, NestingLimit
+template <typename TChar>
+DeserializationError deserializeMsgPack(
+    JsonDocument &doc, TChar *input, size_t inputSize, Filter filter,
+    NestingLimit nestingLimit = NestingLimit()) {
+  return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit,
+                                          filter);
+}
+// ... = NestingLimit, Filter
+template <typename TChar>
+DeserializationError deserializeMsgPack(JsonDocument &doc, TChar *input,
+                                        size_t inputSize,
+                                        NestingLimit nestingLimit,
+                                        Filter filter) {
+  return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit,
+                                          filter);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp b/third-party/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
new file mode 100644
index 0000000..b1cd872
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
@@ -0,0 +1,212 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/MsgPack/endianess.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Serialization/CountingDecorator.hpp>
+#include <ArduinoJson/Serialization/measure.hpp>
+#include <ArduinoJson/Serialization/serialize.hpp>
+#include <ArduinoJson/Variant/VariantData.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TWriter>
+class MsgPackSerializer : public Visitor<size_t> {
+ public:
+  static const bool producesText = false;
+
+  MsgPackSerializer(TWriter writer) : _writer(writer) {}
+
+  template <typename T>
+  typename enable_if<sizeof(T) == 4, size_t>::type visitFloat(T value32) {
+    writeByte(0xCA);
+    writeInteger(value32);
+    return bytesWritten();
+  }
+
+  template <typename T>
+  ARDUINOJSON_NO_SANITIZE("float-cast-overflow")
+  typename enable_if<sizeof(T) == 8, size_t>::type visitFloat(T value64) {
+    float value32 = float(value64);
+    if (value32 == value64) {
+      writeByte(0xCA);
+      writeInteger(value32);
+    } else {
+      writeByte(0xCB);
+      writeInteger(value64);
+    }
+    return bytesWritten();
+  }
+
+  size_t visitArray(const CollectionData& array) {
+    size_t n = array.size();
+    if (n < 0x10) {
+      writeByte(uint8_t(0x90 + array.size()));
+    } else if (n < 0x10000) {
+      writeByte(0xDC);
+      writeInteger(uint16_t(n));
+    } else {
+      writeByte(0xDD);
+      writeInteger(uint32_t(n));
+    }
+    for (VariantSlot* slot = array.head(); slot; slot = slot->next()) {
+      slot->data()->accept(*this);
+    }
+    return bytesWritten();
+  }
+
+  size_t visitObject(const CollectionData& object) {
+    size_t n = object.size();
+    if (n < 0x10) {
+      writeByte(uint8_t(0x80 + n));
+    } else if (n < 0x10000) {
+      writeByte(0xDE);
+      writeInteger(uint16_t(n));
+    } else {
+      writeByte(0xDF);
+      writeInteger(uint32_t(n));
+    }
+    for (VariantSlot* slot = object.head(); slot; slot = slot->next()) {
+      visitString(slot->key());
+      slot->data()->accept(*this);
+    }
+    return bytesWritten();
+  }
+
+  size_t visitString(const char* value) {
+    ARDUINOJSON_ASSERT(value != NULL);
+
+    size_t n = strlen(value);
+
+    if (n < 0x20) {
+      writeByte(uint8_t(0xA0 + n));
+    } else if (n < 0x100) {
+      writeByte(0xD9);
+      writeInteger(uint8_t(n));
+    } else if (n < 0x10000) {
+      writeByte(0xDA);
+      writeInteger(uint16_t(n));
+    } else {
+      writeByte(0xDB);
+      writeInteger(uint32_t(n));
+    }
+    writeBytes(reinterpret_cast<const uint8_t*>(value), n);
+    return bytesWritten();
+  }
+
+  size_t visitRawJson(const char* data, size_t size) {
+    writeBytes(reinterpret_cast<const uint8_t*>(data), size);
+    return bytesWritten();
+  }
+
+  size_t visitSignedInteger(Integer value) {
+    if (value > 0) {
+      visitUnsignedInteger(static_cast<UInt>(value));
+    } else if (value >= -0x20) {
+      writeInteger(int8_t(value));
+    } else if (value >= -0x80) {
+      writeByte(0xD0);
+      writeInteger(int8_t(value));
+    } else if (value >= -0x8000) {
+      writeByte(0xD1);
+      writeInteger(int16_t(value));
+    }
+#if ARDUINOJSON_USE_LONG_LONG
+    else if (value >= -0x80000000LL)
+#else
+    else
+#endif
+    {
+      writeByte(0xD2);
+      writeInteger(int32_t(value));
+    }
+#if ARDUINOJSON_USE_LONG_LONG
+    else {
+      writeByte(0xD3);
+      writeInteger(int64_t(value));
+    }
+#endif
+    return bytesWritten();
+  }
+
+  size_t visitUnsignedInteger(UInt value) {
+    if (value <= 0x7F) {
+      writeInteger(uint8_t(value));
+    } else if (value <= 0xFF) {
+      writeByte(0xCC);
+      writeInteger(uint8_t(value));
+    } else if (value <= 0xFFFF) {
+      writeByte(0xCD);
+      writeInteger(uint16_t(value));
+    }
+#if ARDUINOJSON_USE_LONG_LONG
+    else if (value <= 0xFFFFFFFF)
+#else
+    else
+#endif
+    {
+      writeByte(0xCE);
+      writeInteger(uint32_t(value));
+    }
+#if ARDUINOJSON_USE_LONG_LONG
+    else {
+      writeByte(0xCF);
+      writeInteger(uint64_t(value));
+    }
+#endif
+    return bytesWritten();
+  }
+
+  size_t visitBoolean(bool value) {
+    writeByte(value ? 0xC3 : 0xC2);
+    return bytesWritten();
+  }
+
+  size_t visitNull() {
+    writeByte(0xC0);
+    return bytesWritten();
+  }
+
+ private:
+  size_t bytesWritten() const {
+    return _writer.count();
+  }
+
+  void writeByte(uint8_t c) {
+    _writer.write(c);
+  }
+
+  void writeBytes(const uint8_t* p, size_t n) {
+    _writer.write(p, n);
+  }
+
+  template <typename T>
+  void writeInteger(T value) {
+    fixEndianess(value);
+    writeBytes(reinterpret_cast<uint8_t*>(&value), sizeof(value));
+  }
+
+  CountingDecorator<TWriter> _writer;
+};
+
+template <typename TSource, typename TDestination>
+inline size_t serializeMsgPack(const TSource& source, TDestination& output) {
+  return serialize<MsgPackSerializer>(source, output);
+}
+
+template <typename TSource>
+inline size_t serializeMsgPack(const TSource& source, void* output,
+                               size_t size) {
+  return serialize<MsgPackSerializer>(source, output, size);
+}
+
+template <typename TSource>
+inline size_t measureMsgPack(const TSource& source) {
+  return measure<MsgPackSerializer>(source);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp b/third-party/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp
new file mode 100644
index 0000000..74f7e9d
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp
@@ -0,0 +1,41 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Polyfills/utility.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+#if ARDUINOJSON_LITTLE_ENDIAN
+inline void fixEndianess(uint8_t *p, integral_constant<size_t, 8>) {
+  swap(p[0], p[7]);
+  swap(p[1], p[6]);
+  swap(p[2], p[5]);
+  swap(p[3], p[4]);
+}
+
+inline void fixEndianess(uint8_t *p, integral_constant<size_t, 4>) {
+  swap(p[0], p[3]);
+  swap(p[1], p[2]);
+}
+
+inline void fixEndianess(uint8_t *p, integral_constant<size_t, 2>) {
+  swap(p[0], p[1]);
+}
+
+inline void fixEndianess(uint8_t *, integral_constant<size_t, 1>) {}
+
+template <typename T>
+inline void fixEndianess(T &value) {
+  fixEndianess(reinterpret_cast<uint8_t *>(&value),
+               integral_constant<size_t, sizeof(T)>());
+}
+#else
+template <typename T>
+inline void fixEndianess(T &) {}
+#endif
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp b/third-party/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp
new file mode 100644
index 0000000..016d533
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp
@@ -0,0 +1,18 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+inline void doubleToFloat(const uint8_t d[8], uint8_t f[4]) {
+  f[0] = uint8_t((d[0] & 0xC0) | (d[0] << 3 & 0x3f) | (d[1] >> 5));
+  f[1] = uint8_t((d[1] << 3) | (d[2] >> 5));
+  f[2] = uint8_t((d[2] << 3) | (d[3] >> 5));
+  f[3] = uint8_t((d[3] << 3) | (d[4] >> 5));
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Namespace.hpp b/third-party/ArduinoJson/src/ArduinoJson/Namespace.hpp
new file mode 100644
index 0000000..26def8a
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Namespace.hpp
@@ -0,0 +1,26 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Polyfills/preprocessor.hpp>
+#include <ArduinoJson/version.hpp>
+
+#ifndef ARDUINOJSON_NAMESPACE
+
+#  define ARDUINOJSON_NAMESPACE                                               \
+    ARDUINOJSON_CONCAT4(                                                      \
+        ARDUINOJSON_CONCAT4(ArduinoJson, ARDUINOJSON_VERSION_MAJOR,           \
+                            ARDUINOJSON_VERSION_MINOR,                        \
+                            ARDUINOJSON_VERSION_REVISION),                    \
+        _,                                                                    \
+        ARDUINOJSON_HEX_DIGIT(                                                \
+            ARDUINOJSON_ENABLE_PROGMEM, ARDUINOJSON_USE_LONG_LONG,            \
+            ARDUINOJSON_USE_DOUBLE, ARDUINOJSON_ENABLE_STRING_DEDUPLICATION), \
+        ARDUINOJSON_HEX_DIGIT(                                                \
+            ARDUINOJSON_ENABLE_NAN, ARDUINOJSON_ENABLE_INFINITY,              \
+            ARDUINOJSON_ENABLE_COMMENTS, ARDUINOJSON_DECODE_UNICODE))
+
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Numbers/Float.hpp b/third-party/ArduinoJson/src/ArduinoJson/Numbers/Float.hpp
new file mode 100644
index 0000000..bbaca04
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Numbers/Float.hpp
@@ -0,0 +1,17 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+#if ARDUINOJSON_USE_DOUBLE
+typedef double Float;
+#else
+typedef float Float;
+#endif
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp b/third-party/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp
new file mode 100644
index 0000000..4e53add
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp
@@ -0,0 +1,87 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Numbers/FloatTraits.hpp>
+#include <ArduinoJson/Polyfills/math.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TFloat>
+struct FloatParts {
+  uint32_t integral;
+  uint32_t decimal;
+  int16_t exponent;
+  int8_t decimalPlaces;
+
+  FloatParts(TFloat value) {
+    uint32_t maxDecimalPart = sizeof(TFloat) >= 8 ? 1000000000 : 1000000;
+    decimalPlaces = sizeof(TFloat) >= 8 ? 9 : 6;
+
+    exponent = normalize(value);
+
+    integral = uint32_t(value);
+    // reduce number of decimal places by the number of integral places
+    for (uint32_t tmp = integral; tmp >= 10; tmp /= 10) {
+      maxDecimalPart /= 10;
+      decimalPlaces--;
+    }
+
+    TFloat remainder = (value - TFloat(integral)) * TFloat(maxDecimalPart);
+
+    decimal = uint32_t(remainder);
+    remainder = remainder - TFloat(decimal);
+
+    // rounding:
+    // increment by 1 if remainder >= 0.5
+    decimal += uint32_t(remainder * 2);
+    if (decimal >= maxDecimalPart) {
+      decimal = 0;
+      integral++;
+      if (exponent && integral >= 10) {
+        exponent++;
+        integral = 1;
+      }
+    }
+
+    // remove trailing zeros
+    while (decimal % 10 == 0 && decimalPlaces > 0) {
+      decimal /= 10;
+      decimalPlaces--;
+    }
+  }
+
+  static int16_t normalize(TFloat& value) {
+    typedef FloatTraits<TFloat> traits;
+    int16_t powersOf10 = 0;
+
+    int8_t index = sizeof(TFloat) == 8 ? 8 : 5;
+    int bit = 1 << index;
+
+    if (value >= ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD) {
+      for (; index >= 0; index--) {
+        if (value >= traits::positiveBinaryPowerOfTen(index)) {
+          value *= traits::negativeBinaryPowerOfTen(index);
+          powersOf10 = int16_t(powersOf10 + bit);
+        }
+        bit >>= 1;
+      }
+    }
+
+    if (value > 0 && value <= ARDUINOJSON_NEGATIVE_EXPONENTIATION_THRESHOLD) {
+      for (; index >= 0; index--) {
+        if (value < traits::negativeBinaryPowerOfTenPlusOne(index)) {
+          value *= traits::positiveBinaryPowerOfTen(index);
+          powersOf10 = int16_t(powersOf10 - bit);
+        }
+        bit >>= 1;
+      }
+    }
+
+    return powersOf10;
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp b/third-party/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp
new file mode 100644
index 0000000..60b1dfd
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp
@@ -0,0 +1,201 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <stddef.h>  // for size_t
+#include <stdint.h>
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Polyfills/alias_cast.hpp>
+#include <ArduinoJson/Polyfills/math.hpp>
+#include <ArduinoJson/Polyfills/preprocessor.hpp>
+#include <ArduinoJson/Polyfills/static_array.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T, size_t = sizeof(T)>
+struct FloatTraits {};
+
+template <typename T>
+struct FloatTraits<T, 8 /*64bits*/> {
+  typedef uint64_t mantissa_type;
+  static const short mantissa_bits = 52;
+  static const mantissa_type mantissa_max =
+      (mantissa_type(1) << mantissa_bits) - 1;
+
+  typedef int16_t exponent_type;
+  static const exponent_type exponent_max = 308;
+
+  template <typename TExponent>
+  static T make_float(T m, TExponent e) {
+    if (e > 0) {
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1)
+          m *= positiveBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    } else {
+      e = TExponent(-e);
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1)
+          m *= negativeBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    }
+    return m;
+  }
+
+  static T positiveBinaryPowerOfTen(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(  //
+        uint32_t, factors,
+        ARDUINOJSON_EXPAND18({
+            0x40240000, 0x00000000,  // 1e1
+            0x40590000, 0x00000000,  // 1e2
+            0x40C38800, 0x00000000,  // 1e4
+            0x4197D784, 0x00000000,  // 1e8
+            0x4341C379, 0x37E08000,  // 1e16
+            0x4693B8B5, 0xB5056E17,  // 1e32
+            0x4D384F03, 0xE93FF9F5,  // 1e64
+            0x5A827748, 0xF9301D32,  // 1e128
+            0x75154FDD, 0x7F73BF3C   // 1e256
+        }));
+    return forge(
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index),
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index + 1));
+  }
+
+  static T negativeBinaryPowerOfTen(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(  //
+        uint32_t, factors,
+        ARDUINOJSON_EXPAND18({
+            0x3FB99999, 0x9999999A,  // 1e-1
+            0x3F847AE1, 0x47AE147B,  // 1e-2
+            0x3F1A36E2, 0xEB1C432D,  // 1e-4
+            0x3E45798E, 0xE2308C3A,  // 1e-8
+            0x3C9CD2B2, 0x97D889BC,  // 1e-16
+            0x3949F623, 0xD5A8A733,  // 1e-32
+            0x32A50FFD, 0x44F4A73D,  // 1e-64
+            0x255BBA08, 0xCF8C979D,  // 1e-128
+            0x0AC80628, 0x64AC6F43   // 1e-256
+        }));
+    return forge(
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index),
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index + 1));
+  }
+
+  static T negativeBinaryPowerOfTenPlusOne(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(  //
+        uint32_t, factors,
+        ARDUINOJSON_EXPAND18({
+            0x3FF00000, 0x00000000,  // 1e0
+            0x3FB99999, 0x9999999A,  // 1e-1
+            0x3F50624D, 0xD2F1A9FC,  // 1e-3
+            0x3E7AD7F2, 0x9ABCAF48,  // 1e-7
+            0x3CD203AF, 0x9EE75616,  // 1e-15
+            0x398039D6, 0x65896880,  // 1e-31
+            0x32DA53FC, 0x9631D10D,  // 1e-63
+            0x25915445, 0x81B7DEC2,  // 1e-127
+            0x0AFE07B2, 0x7DD78B14   // 1e-255
+        }));
+    return forge(
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index),
+        ARDUINOJSON_READ_STATIC_ARRAY(uint32_t, factors, 2 * index + 1));
+  }
+
+  static T nan() {
+    return forge(0x7ff80000, 0x00000000);
+  }
+
+  static T inf() {
+    return forge(0x7ff00000, 0x00000000);
+  }
+
+  static T highest() {
+    return forge(0x7FEFFFFF, 0xFFFFFFFF);
+  }
+
+  static T lowest() {
+    return forge(0xFFEFFFFF, 0xFFFFFFFF);
+  }
+
+  // constructs a double floating point values from its binary representation
+  // we use this function to workaround platforms with single precision literals
+  // (for example, when -fsingle-precision-constant is passed to GCC)
+  static T forge(uint32_t msb, uint32_t lsb) {
+    return alias_cast<T>((uint64_t(msb) << 32) | lsb);
+  }
+};
+
+template <typename T>
+struct FloatTraits<T, 4 /*32bits*/> {
+  typedef uint32_t mantissa_type;
+  static const short mantissa_bits = 23;
+  static const mantissa_type mantissa_max =
+      (mantissa_type(1) << mantissa_bits) - 1;
+
+  typedef int8_t exponent_type;
+  static const exponent_type exponent_max = 38;
+
+  template <typename TExponent>
+  static T make_float(T m, TExponent e) {
+    if (e > 0) {
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1)
+          m *= positiveBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    } else {
+      e = -e;
+      for (uint8_t index = 0; e != 0; index++) {
+        if (e & 1)
+          m *= negativeBinaryPowerOfTen(index);
+        e >>= 1;
+      }
+    }
+    return m;
+  }
+
+  static T positiveBinaryPowerOfTen(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(
+        T, factors,
+        ARDUINOJSON_EXPAND6({1e1f, 1e2f, 1e4f, 1e8f, 1e16f, 1e32f}));
+    return ARDUINOJSON_READ_STATIC_ARRAY(T, factors, index);
+  }
+
+  static T negativeBinaryPowerOfTen(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(
+        T, factors,
+        ARDUINOJSON_EXPAND6({1e-1f, 1e-2f, 1e-4f, 1e-8f, 1e-16f, 1e-32f}));
+    return ARDUINOJSON_READ_STATIC_ARRAY(T, factors, index);
+  }
+
+  static T negativeBinaryPowerOfTenPlusOne(int index) {
+    ARDUINOJSON_DEFINE_STATIC_ARRAY(
+        T, factors,
+        ARDUINOJSON_EXPAND6({1e0f, 1e-1f, 1e-3f, 1e-7f, 1e-15f, 1e-31f}));
+    return ARDUINOJSON_READ_STATIC_ARRAY(T, factors, index);
+  }
+
+  static T forge(uint32_t bits) {
+    return alias_cast<T>(bits);
+  }
+
+  static T nan() {
+    return forge(0x7fc00000);
+  }
+
+  static T inf() {
+    return forge(0x7f800000);
+  }
+
+  static T highest() {
+    return forge(0x7f7fffff);
+  }
+
+  static T lowest() {
+    return forge(0xFf7fffff);
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Numbers/Integer.hpp b/third-party/ArduinoJson/src/ArduinoJson/Numbers/Integer.hpp
new file mode 100644
index 0000000..e0ed519
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Numbers/Integer.hpp
@@ -0,0 +1,32 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Namespace.hpp>
+
+#include <stdint.h>  // int64_t
+
+namespace ARDUINOJSON_NAMESPACE {
+
+#if ARDUINOJSON_USE_LONG_LONG
+typedef int64_t Integer;
+typedef uint64_t UInt;
+#else
+typedef long Integer;
+typedef unsigned long UInt;
+#endif
+
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#if ARDUINOJSON_HAS_LONG_LONG && !ARDUINOJSON_USE_LONG_LONG
+#  define ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(T)                  \
+    static_assert(sizeof(T) <= sizeof(ARDUINOJSON_NAMESPACE::Integer),     \
+                  "To use 64-bit integers with ArduinoJson, you must set " \
+                  "ARDUINOJSON_USE_LONG_LONG to 1. See "                   \
+                  "https://arduinojson.org/v6/api/config/use_long_long/");
+#else
+#  define ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(T)
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Numbers/arithmeticCompare.hpp b/third-party/ArduinoJson/src/ArduinoJson/Numbers/arithmeticCompare.hpp
new file mode 100644
index 0000000..bfd41d5
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Numbers/arithmeticCompare.hpp
@@ -0,0 +1,121 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Numbers/Integer.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+enum CompareResult {
+  COMPARE_RESULT_DIFFER = 0,
+  COMPARE_RESULT_EQUAL = 1,
+  COMPARE_RESULT_GREATER = 2,
+  COMPARE_RESULT_LESS = 4,
+
+  COMPARE_RESULT_GREATER_OR_EQUAL = 3,
+  COMPARE_RESULT_LESS_OR_EQUAL = 5
+};
+
+template <typename T>
+CompareResult arithmeticCompare(const T &lhs, const T &rhs) {
+  if (lhs < rhs)
+    return COMPARE_RESULT_LESS;
+  else if (lhs > rhs)
+    return COMPARE_RESULT_GREATER;
+  else
+    return COMPARE_RESULT_EQUAL;
+}
+
+template <typename T1, typename T2>
+CompareResult arithmeticCompare(
+    const T1 &lhs, const T2 &rhs,
+    typename enable_if<is_integral<T1>::value && is_integral<T2>::value &&
+                           sizeof(T1) < sizeof(T2),
+                       int  // Using int instead of void to avoid C2572 on
+                            // Visual Studio 2012, 2013, and 2015
+                       >::type * = 0) {
+  return arithmeticCompare<T2>(static_cast<T2>(lhs), rhs);
+}
+
+template <typename T1, typename T2>
+CompareResult arithmeticCompare(
+    const T1 &lhs, const T2 &rhs,
+    typename enable_if<is_integral<T1>::value && is_integral<T2>::value &&
+                       sizeof(T2) < sizeof(T1)>::type * = 0) {
+  return arithmeticCompare<T1>(lhs, static_cast<T1>(rhs));
+}
+
+template <typename T1, typename T2>
+CompareResult arithmeticCompare(
+    const T1 &lhs, const T2 &rhs,
+    typename enable_if<is_integral<T1>::value && is_integral<T2>::value &&
+                       is_signed<T1>::value == is_signed<T2>::value &&
+                       sizeof(T2) == sizeof(T1)>::type * = 0) {
+  return arithmeticCompare<T1>(lhs, static_cast<T1>(rhs));
+}
+
+template <typename T1, typename T2>
+CompareResult arithmeticCompare(
+    const T1 &lhs, const T2 &rhs,
+    typename enable_if<is_integral<T1>::value && is_integral<T2>::value &&
+                       is_unsigned<T1>::value && is_signed<T2>::value &&
+                       sizeof(T2) == sizeof(T1)>::type * = 0) {
+  if (rhs < 0)
+    return COMPARE_RESULT_GREATER;
+  return arithmeticCompare<T1>(lhs, static_cast<T1>(rhs));
+}
+
+template <typename T1, typename T2>
+CompareResult arithmeticCompare(
+    const T1 &lhs, const T2 &rhs,
+    typename enable_if<is_integral<T1>::value && is_integral<T2>::value &&
+                       is_signed<T1>::value && is_unsigned<T2>::value &&
+                       sizeof(T2) == sizeof(T1)>::type * = 0) {
+  if (lhs < 0)
+    return COMPARE_RESULT_LESS;
+  return arithmeticCompare<T2>(static_cast<T2>(lhs), rhs);
+}
+
+template <typename T1, typename T2>
+CompareResult arithmeticCompare(
+    const T1 &lhs, const T2 &rhs,
+    typename enable_if<is_floating_point<T1>::value ||
+                       is_floating_point<T2>::value>::type * = 0) {
+  return arithmeticCompare<double>(static_cast<double>(lhs),
+                                   static_cast<double>(rhs));
+}
+
+template <typename T2>
+CompareResult arithmeticCompareNegateLeft(
+    UInt, const T2 &, typename enable_if<is_unsigned<T2>::value>::type * = 0) {
+  return COMPARE_RESULT_LESS;
+}
+
+template <typename T2>
+CompareResult arithmeticCompareNegateLeft(
+    UInt lhs, const T2 &rhs,
+    typename enable_if<is_signed<T2>::value>::type * = 0) {
+  if (rhs > 0)
+    return COMPARE_RESULT_LESS;
+  return arithmeticCompare(-rhs, static_cast<T2>(lhs));
+}
+
+template <typename T1>
+CompareResult arithmeticCompareNegateRight(
+    const T1 &, UInt, typename enable_if<is_unsigned<T1>::value>::type * = 0) {
+  return COMPARE_RESULT_GREATER;
+}
+
+template <typename T1>
+CompareResult arithmeticCompareNegateRight(
+    const T1 &lhs, UInt rhs,
+    typename enable_if<is_signed<T1>::value>::type * = 0) {
+  if (lhs > 0)
+    return COMPARE_RESULT_GREATER;
+  return arithmeticCompare(static_cast<T1>(rhs), -lhs);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp b/third-party/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp
new file mode 100644
index 0000000..3087459
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp
@@ -0,0 +1,121 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#if defined(__clang__)
+#  pragma clang diagnostic push
+#  pragma clang diagnostic ignored "-Wconversion"
+#elif defined(__GNUC__)
+#  if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#    pragma GCC diagnostic push
+#  endif
+#  pragma GCC diagnostic ignored "-Wconversion"
+#endif
+
+#include <ArduinoJson/Numbers/Float.hpp>
+#include <ArduinoJson/Polyfills/limits.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// uint32 -> int32
+// uint64 -> int32
+template <typename TOut, typename TIn>
+typename enable_if<is_integral<TIn>::value && is_unsigned<TIn>::value &&
+                       is_integral<TOut>::value && sizeof(TOut) <= sizeof(TIn),
+                   bool>::type
+canConvertNumber(TIn value) {
+  return value <= TIn(numeric_limits<TOut>::highest());
+}
+
+// uint32 -> int64
+template <typename TOut, typename TIn>
+typename enable_if<is_integral<TIn>::value && is_unsigned<TIn>::value &&
+                       is_integral<TOut>::value && sizeof(TIn) < sizeof(TOut),
+                   bool>::type
+canConvertNumber(TIn) {
+  return true;
+}
+
+// uint32 -> float
+// int32 -> float
+template <typename TOut, typename TIn>
+typename enable_if<is_integral<TIn>::value && is_floating_point<TOut>::value,
+                   bool>::type
+canConvertNumber(TIn) {
+  return true;
+}
+
+// int64 -> int32
+template <typename TOut, typename TIn>
+typename enable_if<is_integral<TIn>::value && is_signed<TIn>::value &&
+                       is_integral<TOut>::value && is_signed<TOut>::value &&
+                       sizeof(TOut) < sizeof(TIn),
+                   bool>::type
+canConvertNumber(TIn value) {
+  return value >= TIn(numeric_limits<TOut>::lowest()) &&
+         value <= TIn(numeric_limits<TOut>::highest());
+}
+
+// int32 -> int32
+// int32 -> int64
+template <typename TOut, typename TIn>
+typename enable_if<is_integral<TIn>::value && is_signed<TIn>::value &&
+                       is_integral<TOut>::value && is_signed<TOut>::value &&
+                       sizeof(TIn) <= sizeof(TOut),
+                   bool>::type
+canConvertNumber(TIn) {
+  return true;
+}
+
+// int32 -> uint32
+// int32 -> uint64
+template <typename TOut, typename TIn>
+typename enable_if<is_integral<TIn>::value && is_signed<TIn>::value &&
+                       is_integral<TOut>::value && is_unsigned<TOut>::value &&
+                       sizeof(TOut) >= sizeof(TIn),
+                   bool>::type
+canConvertNumber(TIn value) {
+  if (value < 0)
+    return false;
+  return TOut(value) <= numeric_limits<TOut>::highest();
+}
+
+// int32 -> uint16
+template <typename TOut, typename TIn>
+typename enable_if<is_integral<TIn>::value && is_signed<TIn>::value &&
+                       is_integral<TOut>::value && is_unsigned<TOut>::value &&
+                       sizeof(TOut) < sizeof(TIn),
+                   bool>::type
+canConvertNumber(TIn value) {
+  if (value < 0)
+    return false;
+  return value <= TIn(numeric_limits<TOut>::highest());
+}
+
+// float -> int32
+// float -> int64
+template <typename TOut, typename TIn>
+typename enable_if<is_floating_point<TIn>::value &&
+                       !is_floating_point<TOut>::value,
+                   bool>::type
+canConvertNumber(TIn value) {
+  return value >= numeric_limits<TOut>::lowest() &&
+         value <= numeric_limits<TOut>::highest();
+}
+
+template <typename TOut, typename TIn>
+TOut convertNumber(TIn value) {
+  return canConvertNumber<TOut>(value) ? TOut(value) : 0;
+}
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#if defined(__clang__)
+#  pragma clang diagnostic pop
+#elif defined(__GNUC__)
+#  if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#    pragma GCC diagnostic pop
+#  endif
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp b/third-party/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp
new file mode 100644
index 0000000..cf050c7
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp
@@ -0,0 +1,153 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Numbers/FloatTraits.hpp>
+#include <ArduinoJson/Numbers/convertNumber.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/ctype.hpp>
+#include <ArduinoJson/Polyfills/math.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Variant/Converter.hpp>
+#include <ArduinoJson/Variant/VariantData.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename A, typename B>
+struct choose_largest : conditional<(sizeof(A) > sizeof(B)), A, B> {};
+
+inline bool parseNumber(const char* s, VariantData& result) {
+  typedef FloatTraits<Float> traits;
+  typedef choose_largest<traits::mantissa_type, UInt>::type mantissa_t;
+  typedef traits::exponent_type exponent_t;
+
+  ARDUINOJSON_ASSERT(s != 0);
+
+  bool is_negative = false;
+  switch (*s) {
+    case '-':
+      is_negative = true;
+      s++;
+      break;
+    case '+':
+      s++;
+      break;
+  }
+
+#if ARDUINOJSON_ENABLE_NAN
+  if (*s == 'n' || *s == 'N') {
+    result.setFloat(traits::nan());
+    return true;
+  }
+#endif
+
+#if ARDUINOJSON_ENABLE_INFINITY
+  if (*s == 'i' || *s == 'I') {
+    result.setFloat(is_negative ? -traits::inf() : traits::inf());
+    return true;
+  }
+#endif
+
+  if (!isdigit(*s) && *s != '.')
+    return false;
+
+  mantissa_t mantissa = 0;
+  exponent_t exponent_offset = 0;
+  const mantissa_t maxUint = UInt(-1);
+
+  while (isdigit(*s)) {
+    uint8_t digit = uint8_t(*s - '0');
+    if (mantissa > maxUint / 10)
+      break;
+    mantissa *= 10;
+    if (mantissa > maxUint - digit)
+      break;
+    mantissa += digit;
+    s++;
+  }
+
+  if (*s == '\0') {
+    if (is_negative) {
+      const mantissa_t sintMantissaMax = mantissa_t(1)
+                                         << (sizeof(Integer) * 8 - 1);
+      if (mantissa <= sintMantissaMax) {
+        result.setInteger(Integer(~mantissa + 1));
+        return true;
+      }
+    } else {
+      result.setInteger(UInt(mantissa));
+      return true;
+    }
+  }
+
+  // avoid mantissa overflow
+  while (mantissa > traits::mantissa_max) {
+    mantissa /= 10;
+    exponent_offset++;
+  }
+
+  // remaing digits can't fit in the mantissa
+  while (isdigit(*s)) {
+    exponent_offset++;
+    s++;
+  }
+
+  if (*s == '.') {
+    s++;
+    while (isdigit(*s)) {
+      if (mantissa < traits::mantissa_max / 10) {
+        mantissa = mantissa * 10 + uint8_t(*s - '0');
+        exponent_offset--;
+      }
+      s++;
+    }
+  }
+
+  int exponent = 0;
+  if (*s == 'e' || *s == 'E') {
+    s++;
+    bool negative_exponent = false;
+    if (*s == '-') {
+      negative_exponent = true;
+      s++;
+    } else if (*s == '+') {
+      s++;
+    }
+
+    while (isdigit(*s)) {
+      exponent = exponent * 10 + (*s - '0');
+      if (exponent + exponent_offset > traits::exponent_max) {
+        if (negative_exponent)
+          result.setFloat(is_negative ? -0.0f : 0.0f);
+        else
+          result.setFloat(is_negative ? -traits::inf() : traits::inf());
+        return true;
+      }
+      s++;
+    }
+    if (negative_exponent)
+      exponent = -exponent;
+  }
+  exponent += exponent_offset;
+
+  // we should be at the end of the string, otherwise it's an error
+  if (*s != '\0')
+    return false;
+
+  Float final_result =
+      traits::make_float(static_cast<Float>(mantissa), exponent);
+
+  result.setFloat(is_negative ? -final_result : final_result);
+  return true;
+}
+
+template <typename T>
+inline T parseNumber(const char* s) {
+  VariantData value;
+  value.init();  // VariantData is a POD, so it has no constructor
+  parseNumber(s, value);
+  return Converter<T>::fromJson(VariantConstRef(&value));
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp b/third-party/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp
new file mode 100644
index 0000000..882b1fd
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp
@@ -0,0 +1,202 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Variant/VariantOperators.hpp>
+#include <ArduinoJson/Variant/VariantRef.hpp>
+#include <ArduinoJson/Variant/VariantShortcuts.hpp>
+#include <ArduinoJson/Variant/VariantTo.hpp>
+
+#ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable : 4522)
+#endif
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TObject, typename TStringRef>
+class MemberProxy : public VariantOperators<MemberProxy<TObject, TStringRef> >,
+                    public VariantShortcuts<MemberProxy<TObject, TStringRef> >,
+                    public Visitable,
+                    public VariantTag {
+  typedef MemberProxy<TObject, TStringRef> this_type;
+
+ public:
+  typedef VariantRef variant_type;
+
+  FORCE_INLINE MemberProxy(TObject variant, TStringRef key)
+      : _object(variant), _key(key) {}
+
+  FORCE_INLINE MemberProxy(const MemberProxy &src)
+      : _object(src._object), _key(src._key) {}
+
+  FORCE_INLINE operator VariantConstRef() const {
+    return getUpstreamMember();
+  }
+
+  FORCE_INLINE this_type &operator=(const this_type &src) {
+    getOrAddUpstreamMember().set(src);
+    return *this;
+  }
+
+  template <typename TValue>
+  FORCE_INLINE typename enable_if<!is_array<TValue>::value, this_type &>::type
+  operator=(const TValue &src) {
+    getOrAddUpstreamMember().set(src);
+    return *this;
+  }
+
+  // operator=(char*)
+  // operator=(const char*)
+  // operator=(const __FlashStringHelper*)
+  template <typename TChar>
+  FORCE_INLINE this_type &operator=(TChar *src) {
+    getOrAddUpstreamMember().set(src);
+    return *this;
+  }
+
+  FORCE_INLINE void clear() const {
+    getUpstreamMember().clear();
+  }
+
+  FORCE_INLINE bool isNull() const {
+    return getUpstreamMember().isNull();
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<!is_same<T, char *>::value, T>::type as()
+      const {
+    return getUpstreamMember().template as<T>();
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type
+  ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
+      as() const {
+    return as<const char *>();
+  }
+
+  template <typename T>
+  FORCE_INLINE operator T() const {
+    return getUpstreamMember();
+  }
+
+  template <typename TValue>
+  FORCE_INLINE bool is() const {
+    return getUpstreamMember().template is<TValue>();
+  }
+
+  FORCE_INLINE size_t size() const {
+    return getUpstreamMember().size();
+  }
+
+  FORCE_INLINE void remove(size_t index) const {
+    getUpstreamMember().remove(index);
+  }
+  // remove(char*) const
+  // remove(const char*) const
+  // remove(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE typename enable_if<IsString<TChar *>::value>::type remove(
+      TChar *key) const {
+    getUpstreamMember().remove(key);
+  }
+  // remove(const std::string&) const
+  // remove(const String&) const
+  template <typename TString>
+  FORCE_INLINE typename enable_if<IsString<TString>::value>::type remove(
+      const TString &key) const {
+    getUpstreamMember().remove(key);
+  }
+
+  template <typename TValue>
+  FORCE_INLINE typename VariantTo<TValue>::type to() {
+    return getOrAddUpstreamMember().template to<TValue>();
+  }
+
+  template <typename TValue>
+  FORCE_INLINE bool set(const TValue &value) {
+    return getOrAddUpstreamMember().set(value);
+  }
+
+  // set(char*) const
+  // set(const char*) const
+  // set(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE bool set(TChar *value) {
+    return getOrAddUpstreamMember().set(value);
+  }
+
+  template <typename TVisitor>
+  typename TVisitor::result_type accept(TVisitor &visitor) const {
+    return getUpstreamMember().accept(visitor);
+  }
+
+  FORCE_INLINE VariantRef addElement() const {
+    return getOrAddUpstreamMember().addElement();
+  }
+
+  FORCE_INLINE VariantRef getElement(size_t index) const {
+    return getUpstreamMember().getElement(index);
+  }
+
+  FORCE_INLINE VariantRef getOrAddElement(size_t index) const {
+    return getOrAddUpstreamMember().getOrAddElement(index);
+  }
+
+  // getMember(char*) const
+  // getMember(const char*) const
+  // getMember(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE VariantRef getMember(TChar *key) const {
+    return getUpstreamMember().getMember(key);
+  }
+
+  // getMember(const std::string&) const
+  // getMember(const String&) const
+  template <typename TString>
+  FORCE_INLINE VariantRef getMember(const TString &key) const {
+    return getUpstreamMember().getMember(key);
+  }
+
+  // getOrAddMember(char*) const
+  // getOrAddMember(const char*) const
+  // getOrAddMember(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE VariantRef getOrAddMember(TChar *key) const {
+    return getOrAddUpstreamMember().getOrAddMember(key);
+  }
+
+  // getOrAddMember(const std::string&) const
+  // getOrAddMember(const String&) const
+  template <typename TString>
+  FORCE_INLINE VariantRef getOrAddMember(const TString &key) const {
+    return getOrAddUpstreamMember().getOrAddMember(key);
+  }
+
+ private:
+  FORCE_INLINE VariantRef getUpstreamMember() const {
+    return _object.getMember(_key);
+  }
+
+  FORCE_INLINE VariantRef getOrAddUpstreamMember() const {
+    return _object.getOrAddMember(_key);
+  }
+
+  friend bool convertToJson(const this_type &src, VariantRef dst) {
+    return dst.set(src.getUpstreamMember());
+  }
+
+  TObject _object;
+  TStringRef _key;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectFunctions.hpp b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectFunctions.hpp
new file mode 100644
index 0000000..1b46e84
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectFunctions.hpp
@@ -0,0 +1,51 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Collection/CollectionData.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TVisitor>
+typename TVisitor::result_type objectAccept(const CollectionData *obj,
+                                            TVisitor &visitor) {
+  if (obj)
+    return visitor.visitObject(*obj);
+  else
+    return visitor.visitNull();
+}
+
+inline bool objectEquals(const CollectionData *lhs, const CollectionData *rhs) {
+  if (lhs == rhs)
+    return true;
+  if (!lhs || !rhs)
+    return false;
+  return lhs->equalsObject(*rhs);
+}
+
+template <typename TAdaptedString>
+inline VariantData *objectGetMember(const CollectionData *obj,
+                                    TAdaptedString key) {
+  if (!obj)
+    return 0;
+  return obj->getMember(key);
+}
+
+template <typename TAdaptedString>
+void objectRemove(CollectionData *obj, TAdaptedString key) {
+  if (!obj)
+    return;
+  obj->removeMember(key);
+}
+
+template <typename TAdaptedString>
+inline VariantData *objectGetOrAddMember(CollectionData *obj,
+                                         TAdaptedString key, MemoryPool *pool) {
+  if (!obj)
+    return 0;
+
+  return obj->getOrAddMember(key, pool);
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp
new file mode 100644
index 0000000..d66b61c
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp
@@ -0,0 +1,69 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/ArrayRef.hpp>
+#include <ArduinoJson/Object/ObjectRef.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TObject>
+template <typename TString>
+inline ArrayRef ObjectShortcuts<TObject>::createNestedArray(
+    const TString& key) const {
+  return impl()->getOrAddMember(key).template to<ArrayRef>();
+}
+
+template <typename TObject>
+template <typename TChar>
+inline ArrayRef ObjectShortcuts<TObject>::createNestedArray(TChar* key) const {
+  return impl()->getOrAddMember(key).template to<ArrayRef>();
+}
+
+template <typename TObject>
+template <typename TString>
+inline ObjectRef ObjectShortcuts<TObject>::createNestedObject(
+    const TString& key) const {
+  return impl()->getOrAddMember(key).template to<ObjectRef>();
+}
+
+template <typename TObject>
+template <typename TChar>
+inline ObjectRef ObjectShortcuts<TObject>::createNestedObject(
+    TChar* key) const {
+  return impl()->getOrAddMember(key).template to<ObjectRef>();
+}
+
+template <typename TObject>
+template <typename TString>
+inline typename enable_if<IsString<TString>::value, bool>::type
+ObjectShortcuts<TObject>::containsKey(const TString& key) const {
+  return !impl()->getMember(key).isUndefined();
+}
+
+template <typename TObject>
+template <typename TChar>
+inline typename enable_if<IsString<TChar*>::value, bool>::type
+ObjectShortcuts<TObject>::containsKey(TChar* key) const {
+  return !impl()->getMember(key).isUndefined();
+}
+
+template <typename TObject>
+template <typename TString>
+inline typename enable_if<IsString<TString*>::value,
+                          MemberProxy<TObject, TString*> >::type
+ObjectShortcuts<TObject>::operator[](TString* key) const {
+  return MemberProxy<TObject, TString*>(*impl(), key);
+}
+
+template <typename TObject>
+template <typename TString>
+inline typename enable_if<IsString<TString>::value,
+                          MemberProxy<TObject, TString> >::type
+ObjectShortcuts<TObject>::operator[](const TString& key) const {
+  return MemberProxy<TObject, TString>(*impl(), key);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectIterator.hpp b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectIterator.hpp
new file mode 100644
index 0000000..d729459
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectIterator.hpp
@@ -0,0 +1,123 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Object/Pair.hpp>
+#include <ArduinoJson/Variant/SlotFunctions.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class PairPtr {
+ public:
+  PairPtr(MemoryPool *pool, VariantSlot *slot) : _pair(pool, slot) {}
+
+  const Pair *operator->() const {
+    return &_pair;
+  }
+
+  const Pair &operator*() const {
+    return _pair;
+  }
+
+ private:
+  Pair _pair;
+};
+
+class ObjectIterator {
+ public:
+  ObjectIterator() : _slot(0) {}
+
+  explicit ObjectIterator(MemoryPool *pool, VariantSlot *slot)
+      : _pool(pool), _slot(slot) {}
+
+  Pair operator*() const {
+    return Pair(_pool, _slot);
+  }
+  PairPtr operator->() {
+    return PairPtr(_pool, _slot);
+  }
+
+  bool operator==(const ObjectIterator &other) const {
+    return _slot == other._slot;
+  }
+
+  bool operator!=(const ObjectIterator &other) const {
+    return _slot != other._slot;
+  }
+
+  ObjectIterator &operator++() {
+    _slot = _slot->next();
+    return *this;
+  }
+
+  ObjectIterator &operator+=(size_t distance) {
+    _slot = _slot->next(distance);
+    return *this;
+  }
+
+  VariantSlot *internal() {
+    return _slot;
+  }
+
+ private:
+  MemoryPool *_pool;
+  VariantSlot *_slot;
+};
+
+class PairConstPtr {
+ public:
+  PairConstPtr(const VariantSlot *slot) : _pair(slot) {}
+
+  const PairConst *operator->() const {
+    return &_pair;
+  }
+
+  const PairConst &operator*() const {
+    return _pair;
+  }
+
+ private:
+  PairConst _pair;
+};
+
+class ObjectConstIterator {
+ public:
+  ObjectConstIterator() : _slot(0) {}
+
+  explicit ObjectConstIterator(const VariantSlot *slot) : _slot(slot) {}
+
+  PairConst operator*() const {
+    return PairConst(_slot);
+  }
+  PairConstPtr operator->() {
+    return PairConstPtr(_slot);
+  }
+
+  bool operator==(const ObjectConstIterator &other) const {
+    return _slot == other._slot;
+  }
+
+  bool operator!=(const ObjectConstIterator &other) const {
+    return _slot != other._slot;
+  }
+
+  ObjectConstIterator &operator++() {
+    _slot = _slot->next();
+    return *this;
+  }
+
+  ObjectConstIterator &operator+=(size_t distance) {
+    _slot = _slot->next(distance);
+    return *this;
+  }
+
+  const VariantSlot *internal() {
+    return _slot;
+  }
+
+ private:
+  const VariantSlot *_slot;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectRef.hpp b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectRef.hpp
new file mode 100644
index 0000000..cb541bd
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectRef.hpp
@@ -0,0 +1,280 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Object/ObjectFunctions.hpp>
+#include <ArduinoJson/Object/ObjectIterator.hpp>
+
+// Returns the size (in bytes) of an object with n elements.
+// Can be very handy to determine the size of a StaticMemoryPool.
+#define JSON_OBJECT_SIZE(NUMBER_OF_ELEMENTS) \
+  ((NUMBER_OF_ELEMENTS) * sizeof(ARDUINOJSON_NAMESPACE::VariantSlot))
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TData>
+class ObjectRefBase {
+ public:
+  operator VariantConstRef() const {
+    const void* data = _data;  // prevent warning cast-align
+    return VariantConstRef(reinterpret_cast<const VariantData*>(data));
+  }
+
+  template <typename TVisitor>
+  typename TVisitor::result_type accept(TVisitor& visitor) const {
+    return objectAccept(_data, visitor);
+  }
+
+  FORCE_INLINE bool isNull() const {
+    return _data == 0;
+  }
+
+  FORCE_INLINE operator bool() const {
+    return _data != 0;
+  }
+
+  FORCE_INLINE size_t memoryUsage() const {
+    return _data ? _data->memoryUsage() : 0;
+  }
+
+  FORCE_INLINE size_t nesting() const {
+    return _data ? _data->nesting() : 0;
+  }
+
+  FORCE_INLINE size_t size() const {
+    return _data ? _data->size() : 0;
+  }
+
+ protected:
+  ObjectRefBase(TData* data) : _data(data) {}
+  TData* _data;
+};
+
+class ObjectConstRef : public ObjectRefBase<const CollectionData>,
+                       public Visitable {
+  friend class ObjectRef;
+  typedef ObjectRefBase<const CollectionData> base_type;
+
+ public:
+  typedef ObjectConstIterator iterator;
+
+  ObjectConstRef() : base_type(0) {}
+  ObjectConstRef(const CollectionData* data) : base_type(data) {}
+
+  FORCE_INLINE iterator begin() const {
+    if (!_data)
+      return iterator();
+    return iterator(_data->head());
+  }
+
+  FORCE_INLINE iterator end() const {
+    return iterator();
+  }
+
+  // containsKey(const std::string&) const
+  // containsKey(const String&) const
+  template <typename TString>
+  FORCE_INLINE bool containsKey(const TString& key) const {
+    return !getMember(key).isUndefined();
+  }
+
+  // containsKey(char*) const
+  // containsKey(const char*) const
+  // containsKey(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE bool containsKey(TChar* key) const {
+    return !getMember(key).isUndefined();
+  }
+
+  // getMember(const std::string&) const
+  // getMember(const String&) const
+  template <typename TString>
+  FORCE_INLINE VariantConstRef getMember(const TString& key) const {
+    return get_impl(adaptString(key));
+  }
+
+  // getMember(char*) const
+  // getMember(const char*) const
+  // getMember(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE VariantConstRef getMember(TChar* key) const {
+    return get_impl(adaptString(key));
+  }
+
+  // operator[](const std::string&) const
+  // operator[](const String&) const
+  template <typename TString>
+  FORCE_INLINE
+      typename enable_if<IsString<TString>::value, VariantConstRef>::type
+      operator[](const TString& key) const {
+    return get_impl(adaptString(key));
+  }
+
+  // operator[](char*) const
+  // operator[](const char*) const
+  // operator[](const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE
+      typename enable_if<IsString<TChar*>::value, VariantConstRef>::type
+      operator[](TChar* key) const {
+    return get_impl(adaptString(key));
+  }
+
+  FORCE_INLINE bool operator==(ObjectConstRef rhs) const {
+    return objectEquals(_data, rhs._data);
+  }
+
+ private:
+  template <typename TAdaptedString>
+  FORCE_INLINE VariantConstRef get_impl(TAdaptedString key) const {
+    return VariantConstRef(objectGetMember(_data, key));
+  }
+};
+
+class ObjectRef : public ObjectRefBase<CollectionData>,
+                  public ObjectShortcuts<ObjectRef>,
+                  public Visitable {
+  typedef ObjectRefBase<CollectionData> base_type;
+
+ public:
+  typedef ObjectIterator iterator;
+
+  FORCE_INLINE ObjectRef() : base_type(0), _pool(0) {}
+  FORCE_INLINE ObjectRef(MemoryPool* buf, CollectionData* data)
+      : base_type(data), _pool(buf) {}
+
+  operator VariantRef() const {
+    void* data = _data;  // prevent warning cast-align
+    return VariantRef(_pool, reinterpret_cast<VariantData*>(data));
+  }
+
+  operator ObjectConstRef() const {
+    return ObjectConstRef(_data);
+  }
+
+  FORCE_INLINE iterator begin() const {
+    if (!_data)
+      return iterator();
+    return iterator(_pool, _data->head());
+  }
+
+  FORCE_INLINE iterator end() const {
+    return iterator();
+  }
+
+  void clear() const {
+    if (!_data)
+      return;
+    _data->clear();
+  }
+
+  FORCE_INLINE bool set(ObjectConstRef src) {
+    if (!_data || !src._data)
+      return false;
+    return _data->copyFrom(*src._data, _pool);
+  }
+
+  // getMember(const std::string&) const
+  // getMember(const String&) const
+  template <typename TString>
+  FORCE_INLINE VariantRef getMember(const TString& key) const {
+    return VariantRef(_pool, objectGetMember(_data, adaptString(key)));
+  }
+
+  // getMember(char*) const
+  // getMember(const char*) const
+  // getMember(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE VariantRef getMember(TChar* key) const {
+    return VariantRef(_pool, objectGetMember(_data, adaptString(key)));
+  }
+
+  // getOrAddMember(const std::string&) const
+  // getOrAddMember(const String&) const
+  template <typename TString>
+  FORCE_INLINE VariantRef getOrAddMember(const TString& key) const {
+    return VariantRef(_pool,
+                      objectGetOrAddMember(_data, adaptString(key), _pool));
+  }
+
+  // getOrAddMember(char*) const
+  // getOrAddMember(const char*) const
+  // getOrAddMember(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE VariantRef getOrAddMember(TChar* key) const {
+    return VariantRef(_pool,
+                      objectGetOrAddMember(_data, adaptString(key), _pool));
+  }
+
+  FORCE_INLINE bool operator==(ObjectRef rhs) const {
+    return objectEquals(_data, rhs._data);
+  }
+
+  FORCE_INLINE void remove(iterator it) const {
+    if (!_data)
+      return;
+    _data->removeSlot(it.internal());
+  }
+
+  // remove(const std::string&) const
+  // remove(const String&) const
+  template <typename TString>
+  FORCE_INLINE void remove(const TString& key) const {
+    objectRemove(_data, adaptString(key));
+  }
+
+  // remove(char*) const
+  // remove(const char*) const
+  // remove(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE void remove(TChar* key) const {
+    objectRemove(_data, adaptString(key));
+  }
+
+ private:
+  MemoryPool* _pool;
+};
+
+template <>
+struct Converter<ObjectConstRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+
+  static ObjectConstRef fromJson(VariantConstRef src) {
+    return ObjectConstRef(variantAsObject(getData(src)));
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isObject();
+  }
+};
+
+template <>
+struct Converter<ObjectRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+
+  static ObjectRef fromJson(VariantRef src) {
+    VariantData* data = getData(src);
+    MemoryPool* pool = getPool(src);
+    return ObjectRef(pool, data != 0 ? data->asObject() : 0);
+  }
+
+  static InvalidConversion<VariantConstRef, ObjectRef> fromJson(
+      VariantConstRef);
+
+  static bool checkJson(VariantConstRef) {
+    return false;
+  }
+
+  static bool checkJson(VariantRef src) {
+    VariantData* data = getData(src);
+    return data && data->isObject();
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectShortcuts.hpp b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectShortcuts.hpp
new file mode 100644
index 0000000..0f3409f
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Object/ObjectShortcuts.hpp
@@ -0,0 +1,73 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/attributes.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Strings/StringAdapters.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+template <typename TParent, typename TStringRef>
+class MemberProxy;
+
+template <typename TObject>
+class ObjectShortcuts {
+ public:
+  // containsKey(const std::string&) const
+  // containsKey(const String&) const
+  template <typename TString>
+  FORCE_INLINE typename enable_if<IsString<TString>::value, bool>::type
+  containsKey(const TString &key) const;
+
+  // containsKey(char*) const
+  // containsKey(const char*) const
+  // containsKey(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE typename enable_if<IsString<TChar *>::value, bool>::type
+  containsKey(TChar *key) const;
+
+  // operator[](const std::string&) const
+  // operator[](const String&) const
+  template <typename TString>
+  FORCE_INLINE typename enable_if<IsString<TString>::value,
+                                  MemberProxy<TObject, TString> >::type
+  operator[](const TString &key) const;
+
+  // operator[](char*) const
+  // operator[](const char*) const
+  // operator[](const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE typename enable_if<IsString<TChar *>::value,
+                                  MemberProxy<TObject, TChar *> >::type
+  operator[](TChar *key) const;
+
+  // createNestedArray(const std::string&) const
+  // createNestedArray(const String&) const
+  template <typename TString>
+  FORCE_INLINE ArrayRef createNestedArray(const TString &key) const;
+
+  // createNestedArray(char*) const
+  // createNestedArray(const char*) const
+  // createNestedArray(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE ArrayRef createNestedArray(TChar *key) const;
+
+  // createNestedObject(const std::string&) const
+  // createNestedObject(const String&) const
+  template <typename TString>
+  ObjectRef createNestedObject(const TString &key) const;
+
+  // createNestedObject(char*) const
+  // createNestedObject(const char*) const
+  // createNestedObject(const __FlashStringHelper*) const
+  template <typename TChar>
+  ObjectRef createNestedObject(TChar *key) const;
+
+ private:
+  const TObject *impl() const {
+    return static_cast<const TObject *>(this);
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Object/Pair.hpp b/third-party/ArduinoJson/src/ArduinoJson/Object/Pair.hpp
new file mode 100644
index 0000000..44fce75
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Object/Pair.hpp
@@ -0,0 +1,55 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Strings/String.hpp>
+#include <ArduinoJson/Variant/VariantRef.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+// A key value pair for CollectionData.
+class Pair {
+ public:
+  Pair(MemoryPool* pool, VariantSlot* slot) {
+    if (slot) {
+      _key = String(slot->key(), !slot->ownsKey());
+      _value = VariantRef(pool, slot->data());
+    }
+  }
+
+  String key() const {
+    return _key;
+  }
+
+  VariantRef value() const {
+    return _value;
+  }
+
+ private:
+  String _key;
+  VariantRef _value;
+};
+
+class PairConst {
+ public:
+  PairConst(const VariantSlot* slot) {
+    if (slot) {
+      _key = String(slot->key(), !slot->ownsKey());
+      _value = VariantConstRef(slot->data());
+    }
+  }
+
+  String key() const {
+    return _key;
+  }
+
+  VariantConstRef value() const {
+    return _value;
+  }
+
+ private:
+  String _key;
+  VariantConstRef _value;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp
new file mode 100644
index 0000000..8f8e277
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp
@@ -0,0 +1,29 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <stdint.h>
+#include <stdlib.h>  // for size_t
+
+#include <ArduinoJson/Configuration.hpp>
+#include "math.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T, typename F>
+struct alias_cast_t {
+  union {
+    F raw;
+    T data;
+  };
+};
+
+template <typename T, typename F>
+T alias_cast(F raw_data) {
+  alias_cast_t<T, F> ac;
+  ac.raw = raw_data;
+  return ac.data;
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp
new file mode 100644
index 0000000..f5fa946
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp
@@ -0,0 +1,14 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+
+#if ARDUINOJSON_DEBUG
+#  include <assert.h>
+#  define ARDUINOJSON_ASSERT(X) assert(X)
+#else
+#  define ARDUINOJSON_ASSERT(X) ((void)0)
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp
new file mode 100644
index 0000000..8ef33af
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp
@@ -0,0 +1,54 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#ifdef _MSC_VER  // Visual Studio
+
+#  define FORCE_INLINE  // __forceinline causes C4714 when returning std::string
+#  define NO_INLINE __declspec(noinline)
+
+#  ifndef ARDUINOJSON_DEPRECATED
+#    define ARDUINOJSON_DEPRECATED(msg) __declspec(deprecated(msg))
+#  endif
+
+#elif defined(__GNUC__)  // GCC or Clang
+
+#  define FORCE_INLINE __attribute__((always_inline))
+#  define NO_INLINE __attribute__((noinline))
+
+#  ifndef ARDUINOJSON_DEPRECATED
+#    if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#      define ARDUINOJSON_DEPRECATED(msg) __attribute__((deprecated(msg)))
+#    else
+#      define ARDUINOJSON_DEPRECATED(msg) __attribute__((deprecated))
+#    endif
+#  endif
+
+#else  // Other compilers
+
+#  define FORCE_INLINE
+#  define NO_INLINE
+
+#  ifndef ARDUINOJSON_DEPRECATED
+#    define ARDUINOJSON_DEPRECATED(msg)
+#  endif
+
+#endif
+
+#if __cplusplus >= 201103L
+#  define NOEXCEPT noexcept
+#else
+#  define NOEXCEPT throw()
+#endif
+
+#if defined(__has_attribute)
+#  if __has_attribute(no_sanitize)
+#    define ARDUINOJSON_NO_SANITIZE(check) __attribute__((no_sanitize(check)))
+#  else
+#    define ARDUINOJSON_NO_SANITIZE(check)
+#  endif
+#else
+#  define ARDUINOJSON_NO_SANITIZE(check)
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp
new file mode 100644
index 0000000..bd7a8cc
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp
@@ -0,0 +1,20 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+#ifndef isdigit
+inline bool isdigit(char c) {
+  return '0' <= c && c <= '9';
+}
+#endif
+
+inline bool issign(char c) {
+  return '-' == c || c == '+';
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/integer.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/integer.hpp
new file mode 100644
index 0000000..066c7b8
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/integer.hpp
@@ -0,0 +1,30 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <stdint.h>  // int8_t, int16_t
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <int Bits>
+struct int_t;
+
+template <>
+struct int_t<8> {
+  typedef int8_t type;
+};
+
+template <>
+struct int_t<16> {
+  typedef int16_t type;
+};
+
+template <>
+struct int_t<32> {
+  typedef int32_t type;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp
new file mode 100644
index 0000000..68a2bf8
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp
@@ -0,0 +1,45 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "type_traits.hpp"
+
+#ifdef _MSC_VER
+#  pragma warning(push)
+#  pragma warning(disable : 4310)
+#endif
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// Differs from standard because we can't use the symbols "min" and "max"
+template <typename T, typename Enable = void>
+struct numeric_limits;
+
+template <typename T>
+struct numeric_limits<T, typename enable_if<is_unsigned<T>::value>::type> {
+  static T lowest() {
+    return 0;
+  }
+  static T highest() {
+    return T(-1);
+  }
+};
+
+template <typename T>
+struct numeric_limits<
+    T, typename enable_if<is_integral<T>::value && is_signed<T>::value>::type> {
+  static T lowest() {
+    return T(T(1) << (sizeof(T) * 8 - 1));
+  }
+  static T highest() {
+    return T(~lowest());
+  }
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp
new file mode 100644
index 0000000..eff272a
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp
@@ -0,0 +1,27 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// Some libraries #define isnan() and isinf() so we need to check before
+// using this name
+
+#ifndef isnan
+template <typename T>
+bool isnan(T x) {
+  return x != x;
+}
+#endif
+
+#ifndef isinf
+template <typename T>
+bool isinf(T x) {
+  return x != 0.0 && x * 2 == x;
+}
+#endif
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp
new file mode 100644
index 0000000..9ac47a5
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp
@@ -0,0 +1,26 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+#include <stddef.h>  // for size_t
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// A meta-function that returns the highest value
+template <size_t X, size_t Y, bool MaxIsX = (X > Y)>
+struct Max {};
+
+template <size_t X, size_t Y>
+struct Max<X, Y, true> {
+  static const size_t value = X;
+};
+
+template <size_t X, size_t Y>
+struct Max<X, Y, false> {
+  static const size_t value = Y;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp
new file mode 100644
index 0000000..f253818
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp
@@ -0,0 +1,79 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+// Wraps a const char* so that the our functions are picked only if the
+// originals are missing
+struct pgm_p {
+  pgm_p(const char* p) : address(p) {}
+  const char* address;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#ifndef strlen_P
+inline size_t strlen_P(ARDUINOJSON_NAMESPACE::pgm_p s) {
+  const char* p = s.address;
+  ARDUINOJSON_ASSERT(p != NULL);
+  while (pgm_read_byte(p)) p++;
+  return size_t(p - s.address);
+}
+#endif
+
+#ifndef strncmp_P
+inline int strncmp_P(const char* a, ARDUINOJSON_NAMESPACE::pgm_p b, size_t n) {
+  const char* s1 = a;
+  const char* s2 = b.address;
+  ARDUINOJSON_ASSERT(s1 != NULL);
+  ARDUINOJSON_ASSERT(s2 != NULL);
+  while (n-- > 0) {
+    char c1 = *s1++;
+    char c2 = static_cast<char>(pgm_read_byte(s2++));
+    if (c1 < c2)
+      return -1;
+    if (c1 > c2)
+      return 1;
+    if (c1 == 0 /* and c2 as well */)
+      return 0;
+  }
+  return 0;
+}
+#endif
+
+#ifndef strcmp_P
+inline int strcmp_P(const char* a, ARDUINOJSON_NAMESPACE::pgm_p b) {
+  const char* s1 = a;
+  const char* s2 = b.address;
+  ARDUINOJSON_ASSERT(s1 != NULL);
+  ARDUINOJSON_ASSERT(s2 != NULL);
+  for (;;) {
+    char c1 = *s1++;
+    char c2 = static_cast<char>(pgm_read_byte(s2++));
+    if (c1 < c2)
+      return -1;
+    if (c1 > c2)
+      return 1;
+    if (c1 == 0 /* and c2 as well */)
+      return 0;
+  }
+}
+#endif
+
+#ifndef memcpy_P
+inline void* memcpy_P(void* dst, ARDUINOJSON_NAMESPACE::pgm_p src, size_t n) {
+  uint8_t* d = reinterpret_cast<uint8_t*>(dst);
+  const char* s = src.address;
+  ARDUINOJSON_ASSERT(d != NULL);
+  ARDUINOJSON_ASSERT(s != NULL);
+  while (n-- > 0) {
+    *d++ = pgm_read_byte(s++);
+  }
+  return dst;
+}
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace_generic.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace_generic.hpp
new file mode 100644
index 0000000..f5bbd85
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace_generic.hpp
@@ -0,0 +1,32 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+typename enable_if<is_pointer<T>::value, T>::type pgm_read(const void* p) {
+  return reinterpret_cast<T>(pgm_read_ptr(p));
+}
+
+template <typename T>
+typename enable_if<is_floating_point<T>::value &&
+                       sizeof(T) == sizeof(float),  // on AVR sizeof(double) ==
+                                                    // sizeof(float)
+                   T>::type
+pgm_read(const void* p) {
+  return pgm_read_float(p);
+}
+
+template <typename T>
+typename enable_if<is_same<T, uint32_t>::value, T>::type pgm_read(
+    const void* p) {
+  return pgm_read_dword(p);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/preprocessor.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/preprocessor.hpp
new file mode 100644
index 0000000..488654b
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/preprocessor.hpp
@@ -0,0 +1,35 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#define ARDUINOJSON_EXPAND6(a, b, c, d, e, f) a, b, c, d, e, f
+#define ARDUINOJSON_EXPAND9(a, b, c, d, e, f, g, h, i) a, b, c, d, e, f, g, h, i
+#define ARDUINOJSON_EXPAND18(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, \
+                             q, r)                                           \
+  a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r
+
+#define ARDUINOJSON_CONCAT_(A, B) A##B
+#define ARDUINOJSON_CONCAT2(A, B) ARDUINOJSON_CONCAT_(A, B)
+#define ARDUINOJSON_CONCAT4(A, B, C, D) \
+  ARDUINOJSON_CONCAT2(ARDUINOJSON_CONCAT2(A, B), ARDUINOJSON_CONCAT2(C, D))
+
+#define ARDUINOJSON_HEX_DIGIT_0000() 0
+#define ARDUINOJSON_HEX_DIGIT_0001() 1
+#define ARDUINOJSON_HEX_DIGIT_0010() 2
+#define ARDUINOJSON_HEX_DIGIT_0011() 3
+#define ARDUINOJSON_HEX_DIGIT_0100() 4
+#define ARDUINOJSON_HEX_DIGIT_0101() 5
+#define ARDUINOJSON_HEX_DIGIT_0110() 6
+#define ARDUINOJSON_HEX_DIGIT_0111() 7
+#define ARDUINOJSON_HEX_DIGIT_1000() 8
+#define ARDUINOJSON_HEX_DIGIT_1001() 9
+#define ARDUINOJSON_HEX_DIGIT_1010() A
+#define ARDUINOJSON_HEX_DIGIT_1011() B
+#define ARDUINOJSON_HEX_DIGIT_1100() C
+#define ARDUINOJSON_HEX_DIGIT_1101() D
+#define ARDUINOJSON_HEX_DIGIT_1110() E
+#define ARDUINOJSON_HEX_DIGIT_1111() F
+#define ARDUINOJSON_HEX_DIGIT_(A, B, C, D) ARDUINOJSON_HEX_DIGIT_##A##B##C##D()
+#define ARDUINOJSON_HEX_DIGIT(A, B, C, D) ARDUINOJSON_HEX_DIGIT_(A, B, C, D)
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/safe_strcmp.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/safe_strcmp.hpp
new file mode 100644
index 0000000..e017b5d
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/safe_strcmp.hpp
@@ -0,0 +1,32 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+#include <stdint.h>  // int8_t
+
+namespace ARDUINOJSON_NAMESPACE {
+
+inline int safe_strcmp(const char* a, const char* b) {
+  if (a == b)
+    return 0;
+  if (!a)
+    return -1;
+  if (!b)
+    return 1;
+  return strcmp(a, b);
+}
+
+inline int safe_strncmp(const char* a, const char* b, size_t n) {
+  if (a == b)
+    return 0;
+  if (!a)
+    return -1;
+  if (!b)
+    return 1;
+  return strncmp(a, b, n);
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/static_array.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/static_array.hpp
new file mode 100644
index 0000000..b070628
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/static_array.hpp
@@ -0,0 +1,34 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+
+#if ARDUINOJSON_ENABLE_PROGMEM
+
+#  include <ArduinoJson/Polyfills/pgmspace_generic.hpp>
+
+#  ifndef ARDUINOJSON_DEFINE_STATIC_ARRAY
+#    define ARDUINOJSON_DEFINE_STATIC_ARRAY(type, name, value) \
+      static type const name[] PROGMEM = value;
+#  endif
+
+#  ifndef ARDUINOJSON_READ_STATIC_ARRAY
+#    define ARDUINOJSON_READ_STATIC_ARRAY(type, name, index) \
+      pgm_read<type>(name + index)
+#  endif
+
+#else  // i.e. ARDUINOJSON_ENABLE_PROGMEM == 0
+
+#  ifndef ARDUINOJSON_DEFINE_STATIC_ARRAY
+#    define ARDUINOJSON_DEFINE_STATIC_ARRAY(type, name, value) \
+      static type const name[] = value;
+#  endif
+
+#  ifndef ARDUINOJSON_READ_STATIC_ARRAY
+#    define ARDUINOJSON_READ_STATIC_ARRAY(type, name, index) name[index]
+#  endif
+
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp
new file mode 100644
index 0000000..4a8ff4b
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp
@@ -0,0 +1,24 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "type_traits/conditional.hpp"
+#include "type_traits/enable_if.hpp"
+#include "type_traits/integral_constant.hpp"
+#include "type_traits/is_array.hpp"
+#include "type_traits/is_base_of.hpp"
+#include "type_traits/is_class.hpp"
+#include "type_traits/is_const.hpp"
+#include "type_traits/is_convertible.hpp"
+#include "type_traits/is_enum.hpp"
+#include "type_traits/is_floating_point.hpp"
+#include "type_traits/is_integral.hpp"
+#include "type_traits/is_pointer.hpp"
+#include "type_traits/is_same.hpp"
+#include "type_traits/is_signed.hpp"
+#include "type_traits/is_unsigned.hpp"
+#include "type_traits/make_unsigned.hpp"
+#include "type_traits/remove_const.hpp"
+#include "type_traits/remove_reference.hpp"
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp
new file mode 100644
index 0000000..e42d1bb
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp
@@ -0,0 +1,20 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <bool Condition, class TrueType, class FalseType>
+struct conditional {
+  typedef TrueType type;
+};
+
+template <class TrueType, class FalseType>
+struct conditional<false, TrueType, FalseType> {
+  typedef FalseType type;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/declval.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/declval.hpp
new file mode 100644
index 0000000..8708112
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/declval.hpp
@@ -0,0 +1,14 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+T declval();
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp
new file mode 100644
index 0000000..cc29b33
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp
@@ -0,0 +1,19 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// A meta-function that return the type T if Condition is true.
+template <bool Condition, typename T = void>
+struct enable_if {};
+
+template <typename T>
+struct enable_if<true, T> {
+  typedef T type;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp
new file mode 100644
index 0000000..b53d711
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp
@@ -0,0 +1,19 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T, T v>
+struct integral_constant {
+  static const T value = v;
+};
+
+typedef integral_constant<bool, true> true_type;
+typedef integral_constant<bool, false> false_type;
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp
new file mode 100644
index 0000000..ee739a7
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp
@@ -0,0 +1,21 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+#include <stddef.h>  // size_t
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+struct is_array : false_type {};
+
+template <typename T>
+struct is_array<T[]> : true_type {};
+
+template <typename T, size_t N>
+struct is_array<T[N]> : true_type {};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp
new file mode 100644
index 0000000..32b41cd
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp
@@ -0,0 +1,26 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// A meta-function that returns true if Derived inherits from TBase is an
+// integral type.
+template <typename TBase, typename TDerived>
+class is_base_of {
+ protected:  // <- to avoid GCC's "all member functions in class are private"
+  typedef char Yes[1];
+  typedef char No[2];
+
+  static Yes &probe(const TBase *);
+  static No &probe(...);
+
+ public:
+  static const bool value =
+      sizeof(probe(reinterpret_cast<TDerived *>(0))) == sizeof(Yes);
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_class.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_class.hpp
new file mode 100644
index 0000000..a3808f3
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_class.hpp
@@ -0,0 +1,26 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "declval.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+struct is_class {
+ protected:  // <- to avoid GCC's "all member functions in class are private"
+  typedef char Yes[1];
+  typedef char No[2];
+
+  template <typename U>
+  static Yes &probe(void (U::*)(void));
+  template <typename>
+  static No &probe(...);
+
+ public:
+  static const bool value = sizeof(probe<T>(0)) == sizeof(Yes);
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp
new file mode 100644
index 0000000..32e758c
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp
@@ -0,0 +1,17 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "integral_constant.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// A meta-function that return the type T without the const modifier
+template <typename T>
+struct is_const : false_type {};
+
+template <typename T>
+struct is_const<const T> : true_type {};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp
new file mode 100644
index 0000000..b3a073b
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp
@@ -0,0 +1,47 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "declval.hpp"
+
+#ifdef _MSC_VER
+#  pragma warning(push)
+// conversion from 'T' to 'To', possible loss of data
+#  pragma warning(disable : 4244)
+#endif
+
+// clang-format off
+#ifdef __ICCARM__
+// Suppress IAR Compiler Warning[Pa093]: implicit conversion from floating point to integer
+#pragma diag_suppress=Pa093
+#endif
+// clang-format on
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename From, typename To>
+struct is_convertible {
+ protected:  // <- to avoid GCC's "all member functions in class are private"
+  typedef char Yes[1];
+  typedef char No[2];
+
+  static Yes &probe(To);
+  static No &probe(...);
+
+ public:
+  static const bool value = sizeof(probe(declval<From>())) == sizeof(Yes);
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#ifdef _MSC_VER
+#  pragma warning(pop)
+#endif
+
+// clang-format off
+#ifdef __ICCARM__
+#pragma diag_default=Pa093
+#endif
+// clang-format on
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_enum.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_enum.hpp
new file mode 100644
index 0000000..26aec1d
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_enum.hpp
@@ -0,0 +1,22 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "is_class.hpp"
+#include "is_convertible.hpp"
+#include "is_floating_point.hpp"
+#include "is_integral.hpp"
+#include "is_same.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+struct is_enum {
+  static const bool value = is_convertible<T, int>::value &&
+                            !is_class<T>::value && !is_integral<T>::value &&
+                            !is_floating_point<T>::value;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp
new file mode 100644
index 0000000..fb42f05
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp
@@ -0,0 +1,20 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "integral_constant.hpp"
+#include "is_same.hpp"
+#include "remove_cv.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <class T>
+struct is_floating_point
+    : integral_constant<
+          bool,  //
+          is_same<float, typename remove_cv<T>::type>::value ||
+              is_same<double, typename remove_cv<T>::type>::value> {};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
new file mode 100644
index 0000000..65918cf
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
@@ -0,0 +1,37 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+
+#include "integral_constant.hpp"
+#include "is_same.hpp"
+#include "remove_cv.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// clang-format off
+template <typename T>
+struct is_integral : integral_constant<bool,
+    is_same<typename remove_cv<T>::type, signed char>::value ||
+    is_same<typename remove_cv<T>::type, unsigned char>::value ||
+    is_same<typename remove_cv<T>::type, signed short>::value ||
+    is_same<typename remove_cv<T>::type, unsigned short>::value ||
+    is_same<typename remove_cv<T>::type, signed int>::value ||
+    is_same<typename remove_cv<T>::type, unsigned int>::value ||
+    is_same<typename remove_cv<T>::type, signed long>::value ||
+    is_same<typename remove_cv<T>::type, unsigned long>::value ||
+#if ARDUINOJSON_HAS_LONG_LONG
+    is_same<typename remove_cv<T>::type, signed long long>::value ||
+    is_same<typename remove_cv<T>::type, unsigned long long>::value ||
+#endif
+#if ARDUINOJSON_HAS_INT64
+    is_same<typename remove_cv<T>::type, signed __int64>::value ||
+    is_same<typename remove_cv<T>::type, unsigned __int64>::value ||
+#endif
+    is_same<typename remove_cv<T>::type, char>::value ||
+    is_same<typename remove_cv<T>::type, bool>::value> {};
+// clang-format on
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_pointer.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_pointer.hpp
new file mode 100644
index 0000000..a249539
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_pointer.hpp
@@ -0,0 +1,16 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "integral_constant.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+struct is_pointer : false_type {};
+
+template <typename T>
+struct is_pointer<T*> : true_type {};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp
new file mode 100644
index 0000000..db5da9b
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp
@@ -0,0 +1,17 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "integral_constant.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// A meta-function that returns true if types T and U are the same.
+template <typename T, typename U>
+struct is_same : false_type {};
+
+template <typename T>
+struct is_same<T, T> : true_type {};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
new file mode 100644
index 0000000..3e064e3
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
@@ -0,0 +1,30 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "integral_constant.hpp"
+#include "is_same.hpp"
+#include "remove_cv.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// clang-format off
+template <typename T>
+struct is_signed : integral_constant<bool, 
+    is_same<typename remove_cv<T>::type, char>::value ||
+    is_same<typename remove_cv<T>::type, signed char>::value ||
+    is_same<typename remove_cv<T>::type, signed short>::value ||
+    is_same<typename remove_cv<T>::type, signed int>::value ||
+    is_same<typename remove_cv<T>::type, signed long>::value ||
+#if ARDUINOJSON_HAS_LONG_LONG
+    is_same<typename remove_cv<T>::type, signed long long>::value ||
+#endif
+#if ARDUINOJSON_HAS_INT64
+    is_same<typename remove_cv<T>::type, signed __int64>::value ||
+#endif
+    is_same<typename remove_cv<T>::type, float>::value ||
+    is_same<typename remove_cv<T>::type, double>::value> {};
+// clang-format on
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
new file mode 100644
index 0000000..57acff2
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
@@ -0,0 +1,28 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "integral_constant.hpp"
+#include "is_same.hpp"
+#include "remove_cv.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// clang-format off
+template <typename T>
+struct is_unsigned : integral_constant<bool,
+    is_same<typename remove_cv<T>::type, unsigned char>::value ||
+    is_same<typename remove_cv<T>::type, unsigned short>::value ||
+    is_same<typename remove_cv<T>::type, unsigned int>::value ||
+    is_same<typename remove_cv<T>::type, unsigned long>::value ||
+#if ARDUINOJSON_HAS_INT64
+    is_same<typename remove_cv<T>::type, unsigned __int64>::value ||
+#endif
+#if ARDUINOJSON_HAS_LONG_LONG
+    is_same<typename remove_cv<T>::type, unsigned long long>::value ||
+#endif
+    is_same<typename remove_cv<T>::type, bool>::value> {};
+// clang-format on
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
new file mode 100644
index 0000000..4cf2d08
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
@@ -0,0 +1,49 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "type_identity.hpp"
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+struct make_unsigned;
+
+template <>
+struct make_unsigned<char> : type_identity<unsigned char> {};
+
+template <>
+struct make_unsigned<signed char> : type_identity<unsigned char> {};
+template <>
+struct make_unsigned<unsigned char> : type_identity<unsigned char> {};
+
+template <>
+struct make_unsigned<signed short> : type_identity<unsigned short> {};
+template <>
+struct make_unsigned<unsigned short> : type_identity<unsigned short> {};
+
+template <>
+struct make_unsigned<signed int> : type_identity<unsigned int> {};
+template <>
+struct make_unsigned<unsigned int> : type_identity<unsigned int> {};
+
+template <>
+struct make_unsigned<signed long> : type_identity<unsigned long> {};
+template <>
+struct make_unsigned<unsigned long> : type_identity<unsigned long> {};
+
+#if ARDUINOJSON_HAS_LONG_LONG
+template <>
+struct make_unsigned<signed long long> : type_identity<unsigned long long> {};
+template <>
+struct make_unsigned<unsigned long long> : type_identity<unsigned long long> {};
+#endif
+
+#if ARDUINOJSON_HAS_INT64
+template <>
+struct make_unsigned<signed __int64> : type_identity<unsigned __int64> {};
+template <>
+struct make_unsigned<unsigned __int64> : type_identity<unsigned __int64> {};
+#endif
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp
new file mode 100644
index 0000000..5a19eb1
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp
@@ -0,0 +1,20 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// A meta-function that return the type T without the const modifier
+template <typename T>
+struct remove_const {
+  typedef T type;
+};
+template <typename T>
+struct remove_const<const T> {
+  typedef T type;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_cv.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_cv.hpp
new file mode 100644
index 0000000..021e0ec
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_cv.hpp
@@ -0,0 +1,27 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+struct remove_cv {
+  typedef T type;
+};
+template <typename T>
+struct remove_cv<const T> {
+  typedef T type;
+};
+template <typename T>
+struct remove_cv<volatile T> {
+  typedef T type;
+};
+template <typename T>
+struct remove_cv<const volatile T> {
+  typedef T type;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp
new file mode 100644
index 0000000..1812850
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp
@@ -0,0 +1,20 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// A meta-function that return the type T without the reference modifier.
+template <typename T>
+struct remove_reference {
+  typedef T type;
+};
+template <typename T>
+struct remove_reference<T&> {
+  typedef T type;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp
new file mode 100644
index 0000000..c464a47
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp
@@ -0,0 +1,15 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "integral_constant.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+struct type_identity {
+  typedef T type;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp
new file mode 100644
index 0000000..c99bc99
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp
@@ -0,0 +1,28 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include "type_traits.hpp"
+
+namespace ARDUINOJSON_NAMESPACE {
+template <typename T>
+inline void swap(T& a, T& b) {
+  T t(a);
+  a = b;
+  b = t;
+}
+
+#if ARDUINOJSON_HAS_RVALUE_REFERENCES
+template <typename T>
+typename remove_reference<T>::type&& move(T&& t) {
+  return static_cast<typename remove_reference<T>::type&&>(t);
+}
+#else
+template <typename T>
+T& move(T& t) {
+  return t;
+}
+#endif
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/CountingDecorator.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/CountingDecorator.hpp
new file mode 100644
index 0000000..3d89fb1
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/CountingDecorator.hpp
@@ -0,0 +1,33 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TWriter>
+class CountingDecorator {
+ public:
+  explicit CountingDecorator(TWriter& writer) : _writer(writer), _count(0) {}
+
+  void write(uint8_t c) {
+    _count += _writer.write(c);
+  }
+
+  void write(const uint8_t* s, size_t n) {
+    _count += _writer.write(s, n);
+  }
+
+  size_t count() const {
+    return _count;
+  }
+
+ private:
+  TWriter _writer;
+  size_t _count;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp
new file mode 100644
index 0000000..f9a9798
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp
@@ -0,0 +1,47 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// The default writer is a simple wrapper for Writers that are not copiable
+template <typename TDestination, typename Enable = void>
+class Writer {
+ public:
+  explicit Writer(TDestination& dest) : _dest(&dest) {}
+
+  size_t write(uint8_t c) {
+    return _dest->write(c);
+  }
+
+  size_t write(const uint8_t* s, size_t n) {
+    return _dest->write(s, n);
+  }
+
+ private:
+  TDestination* _dest;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#include <ArduinoJson/Serialization/Writers/StaticStringWriter.hpp>
+
+#if ARDUINOJSON_ENABLE_STD_STRING
+#  include <ArduinoJson/Serialization/Writers/StdStringWriter.hpp>
+#endif
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
+#  include <ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp>
+#endif
+
+#if ARDUINOJSON_ENABLE_STD_STREAM
+#  include <ArduinoJson/Serialization/Writers/StdStreamWriter.hpp>
+#endif
+
+#if ARDUINOJSON_ENABLE_ARDUINO_PRINT
+#  include <ArduinoJson/Serialization/Writers/PrintWriter.hpp>
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
new file mode 100644
index 0000000..5bb1ebd
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
@@ -0,0 +1,53 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <Arduino.h>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <>
+class Writer< ::String, void> {
+  static const size_t bufferCapacity = ARDUINOJSON_STRING_BUFFER_SIZE;
+
+ public:
+  explicit Writer(::String &str) : _destination(&str) {
+    _size = 0;
+  }
+
+  ~Writer() {
+    flush();
+  }
+
+  size_t write(uint8_t c) {
+    if (_size + 1 >= bufferCapacity)
+      if (flush() != 0)
+        return 0;
+    _buffer[_size++] = static_cast<char>(c);
+    return 1;
+  }
+
+  size_t write(const uint8_t *s, size_t n) {
+    for (size_t i = 0; i < n; i++) {
+      write(s[i]);
+    }
+    return n;
+  }
+
+  size_t flush() {
+    ARDUINOJSON_ASSERT(_size < bufferCapacity);
+    _buffer[_size] = 0;
+    if (_destination->concat(_buffer))
+      _size = 0;
+    return _size;
+  }
+
+ private:
+  ::String *_destination;
+  char _buffer[bufferCapacity];
+  size_t _size;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp
new file mode 100644
index 0000000..a26a1f1
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp
@@ -0,0 +1,21 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class DummyWriter {
+ public:
+  size_t write(uint8_t) {
+    return 1;
+  }
+
+  size_t write(const uint8_t*, size_t n) {
+    return n;
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp
new file mode 100644
index 0000000..13a6491
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp
@@ -0,0 +1,28 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TDestination>
+class Writer<
+    TDestination,
+    typename enable_if<is_base_of< ::Print, TDestination>::value>::type> {
+ public:
+  explicit Writer(::Print& print) : _print(&print) {}
+
+  size_t write(uint8_t c) {
+    return _print->write(c);
+  }
+
+  size_t write(const uint8_t* s, size_t n) {
+    return _print->write(s, n);
+  }
+
+ private:
+  ::Print* _print;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp
new file mode 100644
index 0000000..1a4213b
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp
@@ -0,0 +1,35 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class StaticStringWriter {
+ public:
+  StaticStringWriter(char *buf, size_t size) : end(buf + size), p(buf) {}
+
+  size_t write(uint8_t c) {
+    if (p >= end)
+      return 0;
+    *p++ = static_cast<char>(c);
+    return 1;
+  }
+
+  size_t write(const uint8_t *s, size_t n) {
+    char *begin = p;
+    while (p < end && n > 0) {
+      *p++ = static_cast<char>(*s++);
+      n--;
+    }
+    return size_t(p - begin);
+  }
+
+ private:
+  char *end;
+  char *p;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp
new file mode 100644
index 0000000..e08ba4d
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp
@@ -0,0 +1,32 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ostream>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TDestination>
+class Writer<
+    TDestination,
+    typename enable_if<is_base_of<std::ostream, TDestination>::value>::type> {
+ public:
+  explicit Writer(std::ostream& os) : _os(&os) {}
+
+  size_t write(uint8_t c) {
+    _os->put(static_cast<char>(c));
+    return 1;
+  }
+
+  size_t write(const uint8_t* s, size_t n) {
+    _os->write(reinterpret_cast<const char*>(s),
+               static_cast<std::streamsize>(n));
+    return n;
+  }
+
+ private:
+  std::ostream* _os;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp
new file mode 100644
index 0000000..c1f7cc0
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp
@@ -0,0 +1,40 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+
+#include <string>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <class T>
+struct is_std_string : false_type {};
+
+template <class TCharTraits, class TAllocator>
+struct is_std_string<std::basic_string<char, TCharTraits, TAllocator> >
+    : true_type {};
+
+template <typename TDestination>
+class Writer<TDestination,
+             typename enable_if<is_std_string<TDestination>::value>::type> {
+ public:
+  Writer(TDestination &str) : _str(&str) {}
+
+  size_t write(uint8_t c) {
+    _str->operator+=(static_cast<char>(c));
+    return 1;
+  }
+
+  size_t write(const uint8_t *s, size_t n) {
+    _str->append(reinterpret_cast<const char *>(s), n);
+    return n;
+  }
+
+ private:
+  TDestination *_str;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp
new file mode 100644
index 0000000..6d19994
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp
@@ -0,0 +1,18 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Serialization/Writers/DummyWriter.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <template <typename> class TSerializer, typename TSource>
+size_t measure(const TSource &source) {
+  DummyWriter dp;
+  TSerializer<DummyWriter> serializer(dp);
+  return source.accept(serializer);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp b/third-party/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp
new file mode 100644
index 0000000..16d2e4e
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp
@@ -0,0 +1,54 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Serialization/Writer.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <template <typename> class TSerializer, typename TSource,
+          typename TWriter>
+size_t doSerialize(const TSource &source, TWriter writer) {
+  TSerializer<TWriter> serializer(writer);
+  return source.accept(serializer);
+}
+
+template <template <typename> class TSerializer, typename TSource,
+          typename TDestination>
+size_t serialize(const TSource &source, TDestination &destination) {
+  Writer<TDestination> writer(destination);
+  return doSerialize<TSerializer>(source, writer);
+}
+
+template <template <typename> class TSerializer, typename TSource>
+typename enable_if<!TSerializer<StaticStringWriter>::producesText, size_t>::type
+serialize(const TSource &source, void *buffer, size_t bufferSize) {
+  StaticStringWriter writer(reinterpret_cast<char *>(buffer), bufferSize);
+  return doSerialize<TSerializer>(source, writer);
+}
+
+template <template <typename> class TSerializer, typename TSource>
+typename enable_if<TSerializer<StaticStringWriter>::producesText, size_t>::type
+serialize(const TSource &source, void *buffer, size_t bufferSize) {
+  StaticStringWriter writer(reinterpret_cast<char *>(buffer), bufferSize);
+  size_t n = doSerialize<TSerializer>(source, writer);
+  // add null-terminator for text output (not counted in the size)
+  if (n < bufferSize)
+    reinterpret_cast<char *>(buffer)[n] = 0;
+  return n;
+}
+
+template <template <typename> class TSerializer, typename TSource,
+          typename TChar, size_t N>
+#if defined _MSC_VER && _MSC_VER < 1900
+typename enable_if<sizeof(remove_reference<TChar>::type) == 1, size_t>::type
+#else
+typename enable_if<sizeof(TChar) == 1, size_t>::type
+#endif
+serialize(const TSource &source, TChar (&buffer)[N]) {
+  return serialize<TSerializer>(source, buffer, N);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp b/third-party/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp
new file mode 100644
index 0000000..80670aa
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp
@@ -0,0 +1,66 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class StringCopier {
+ public:
+  StringCopier(MemoryPool& pool) : _pool(&pool) {}
+
+  void startString() {
+    _pool->getFreeZone(&_ptr, &_capacity);
+    _size = 0;
+  }
+
+  const char* save() {
+    ARDUINOJSON_ASSERT(_ptr);
+    return _pool->saveStringFromFreeZone(_size);
+  }
+
+  void append(const char* s) {
+    while (*s) append(*s++);
+  }
+
+  void append(const char* s, size_t n) {
+    while (n-- > 0) append(*s++);
+  }
+
+  void append(char c) {
+    if (!_ptr)
+      return;
+
+    if (_size >= _capacity) {
+      _ptr = 0;
+      _pool->markAsOverflowed();
+      return;
+    }
+
+    _ptr[_size++] = c;
+  }
+
+  bool isValid() {
+    return _ptr != 0;
+  }
+
+  const char* c_str() {
+    return _ptr;
+  }
+
+  typedef storage_policies::store_by_copy storage_policy;
+
+ private:
+  MemoryPool* _pool;
+
+  // These fields aren't initialized by the constructor but startString()
+  //
+  // NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.UninitializedObject)
+  char* _ptr;
+  // NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.UninitializedObject)
+  size_t _size, _capacity;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp b/third-party/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp
new file mode 100644
index 0000000..f727a7d
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp
@@ -0,0 +1,42 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class StringMover {
+ public:
+  StringMover(char* ptr) : _writePtr(ptr) {}
+
+  void startString() {
+    _startPtr = _writePtr;
+  }
+
+  const char* save() const {
+    return _startPtr;
+  }
+
+  void append(char c) {
+    *_writePtr++ = c;
+  }
+
+  bool isValid() const {
+    return true;
+  }
+
+  const char* c_str() const {
+    return _startPtr;
+  }
+
+  typedef storage_policies::store_by_address storage_policy;
+
+ private:
+  char* _writePtr;
+  char* _startPtr;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp b/third-party/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp
new file mode 100644
index 0000000..36e6326
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp
@@ -0,0 +1,23 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/StringStorage/StringCopier.hpp>
+#include <ArduinoJson/StringStorage/StringMover.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TInput>
+StringCopier makeStringStorage(TInput&, MemoryPool& pool) {
+  return StringCopier(pool);
+}
+
+template <typename TChar>
+StringMover makeStringStorage(
+    TChar* input, MemoryPool&,
+    typename enable_if<!is_const<TChar>::value>::type* = 0) {
+  return StringMover(reinterpret_cast<char*>(input));
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp
new file mode 100644
index 0000000..3797d68
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/ArduinoStringAdapter.hpp
@@ -0,0 +1,58 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <Arduino.h>
+
+#include <ArduinoJson/Polyfills/safe_strcmp.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class ArduinoStringAdapter {
+ public:
+  ArduinoStringAdapter(const ::String& str) : _str(&str) {}
+
+  void copyTo(char* p, size_t n) const {
+    memcpy(p, _str->c_str(), n);
+  }
+
+  bool isNull() const {
+    // Arduino's String::c_str() can return NULL
+    return !_str->c_str();
+  }
+
+  int compare(const char* other) const {
+    // Arduino's String::c_str() can return NULL
+    const char* me = _str->c_str();
+    return safe_strcmp(me, other);
+  }
+
+  bool equals(const char* expected) const {
+    return compare(expected) == 0;
+  }
+
+  size_t size() const {
+    return _str->length();
+  }
+
+  typedef storage_policies::store_by_copy storage_policy;
+
+ private:
+  const ::String* _str;
+};
+
+template <>
+struct IsString< ::String> : true_type {};
+
+template <>
+struct IsString< ::StringSumHelper> : true_type {};
+
+inline ArduinoStringAdapter adaptString(const ::String& str) {
+  return ArduinoStringAdapter(str);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/ConstRamStringAdapter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/ConstRamStringAdapter.hpp
new file mode 100644
index 0000000..92298ac
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/ConstRamStringAdapter.hpp
@@ -0,0 +1,58 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <stddef.h>  // size_t
+#include <string.h>  // strcmp
+
+#include <ArduinoJson/Polyfills/safe_strcmp.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class ConstRamStringAdapter {
+ public:
+  ConstRamStringAdapter(const char* str = 0) : _str(str) {}
+
+  int compare(const char* other) const {
+    return safe_strcmp(_str, other);
+  }
+
+  bool equals(const char* expected) const {
+    return compare(expected) == 0;
+  }
+
+  bool isNull() const {
+    return !_str;
+  }
+
+  size_t size() const {
+    if (!_str)
+      return 0;
+    return strlen(_str);
+  }
+
+  const char* data() const {
+    return _str;
+  }
+
+  typedef storage_policies::store_by_address storage_policy;
+
+ protected:
+  const char* _str;
+};
+
+template <>
+struct IsString<const char*> : true_type {};
+
+template <int N>
+struct IsString<const char[N]> : true_type {};
+
+inline ConstRamStringAdapter adaptString(const char* str) {
+  return ConstRamStringAdapter(str);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/FlashStringAdapter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/FlashStringAdapter.hpp
new file mode 100644
index 0000000..918a535
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/FlashStringAdapter.hpp
@@ -0,0 +1,57 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/pgmspace.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class FlashStringAdapter {
+ public:
+  FlashStringAdapter(const __FlashStringHelper* str) : _str(str) {}
+
+  int compare(const char* other) const {
+    if (!other && !_str)
+      return 0;
+    if (!_str)
+      return -1;
+    if (!other)
+      return 1;
+    return -strcmp_P(other, reinterpret_cast<const char*>(_str));
+  }
+
+  bool equals(const char* expected) const {
+    return compare(expected) == 0;
+  }
+
+  bool isNull() const {
+    return !_str;
+  }
+
+  void copyTo(char* p, size_t n) const {
+    memcpy_P(p, reinterpret_cast<const char*>(_str), n);
+  }
+
+  size_t size() const {
+    if (!_str)
+      return 0;
+    return strlen_P(reinterpret_cast<const char*>(_str));
+  }
+
+  typedef storage_policies::store_by_copy storage_policy;
+
+ private:
+  const __FlashStringHelper* _str;
+};
+
+inline FlashStringAdapter adaptString(const __FlashStringHelper* str) {
+  return FlashStringAdapter(str);
+}
+
+template <>
+struct IsString<const __FlashStringHelper*> : true_type {};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/IsString.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/IsString.hpp
new file mode 100644
index 0000000..af5a91a
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/IsString.hpp
@@ -0,0 +1,18 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+template <typename>
+struct IsString : false_type {};
+
+template <typename T>
+struct IsString<const T> : IsString<T> {};
+
+template <typename T>
+struct IsString<T&> : IsString<T> {};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/IsWriteableString.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/IsWriteableString.hpp
new file mode 100644
index 0000000..556c476
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/IsWriteableString.hpp
@@ -0,0 +1,37 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
+#  include <Arduino.h>
+#endif
+
+#if ARDUINOJSON_ENABLE_STD_STRING
+#  include <string>
+#endif
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename>
+struct IsWriteableString : false_type {};
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
+
+template <>
+struct IsWriteableString< ::String> : true_type {};
+
+#endif
+
+#if ARDUINOJSON_ENABLE_STD_STRING
+
+template <typename TCharTraits, typename TAllocator>
+struct IsWriteableString<std::basic_string<char, TCharTraits, TAllocator> >
+    : true_type {};
+
+#endif
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/RamStringAdapter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/RamStringAdapter.hpp
new file mode 100644
index 0000000..eded6c9
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/RamStringAdapter.hpp
@@ -0,0 +1,43 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class RamStringAdapter : public ConstRamStringAdapter {
+ public:
+  RamStringAdapter(const char* str) : ConstRamStringAdapter(str) {}
+
+  void copyTo(char* p, size_t n) const {
+    memcpy(p, _str, n);
+  }
+
+  typedef ARDUINOJSON_NAMESPACE::storage_policies::store_by_copy storage_policy;
+};
+
+template <typename TChar>
+inline RamStringAdapter adaptString(const TChar* str) {
+  return RamStringAdapter(reinterpret_cast<const char*>(str));
+}
+
+inline RamStringAdapter adaptString(char* str) {
+  return RamStringAdapter(str);
+}
+
+template <typename TChar>
+struct IsString<TChar*> {
+  static const bool value = sizeof(TChar) == 1;
+};
+
+template <>
+struct IsString<void*> {
+  static const bool value = false;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp
new file mode 100644
index 0000000..1055f66
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp
@@ -0,0 +1,55 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class SizedFlashStringAdapter {
+ public:
+  SizedFlashStringAdapter(const __FlashStringHelper* str, size_t sz)
+      : _str(str), _size(sz) {}
+
+  int compare(const char* other) const {
+    if (!other && !_str)
+      return 0;
+    if (!_str)
+      return -1;
+    if (!other)
+      return 1;
+    return -strncmp_P(other, reinterpret_cast<const char*>(_str), _size);
+  }
+
+  bool equals(const char* expected) const {
+    return compare(expected) == 0;
+  }
+
+  bool isNull() const {
+    return !_str;
+  }
+
+  void copyTo(char* p, size_t n) const {
+    memcpy_P(p, reinterpret_cast<const char*>(_str), n);
+  }
+
+  size_t size() const {
+    return _size;
+  }
+
+  typedef storage_policies::store_by_copy storage_policy;
+
+ private:
+  const __FlashStringHelper* _str;
+  size_t _size;
+};
+
+inline SizedFlashStringAdapter adaptString(const __FlashStringHelper* str,
+                                           size_t sz) {
+  return SizedFlashStringAdapter(str, sz);
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/SizedRamStringAdapter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/SizedRamStringAdapter.hpp
new file mode 100644
index 0000000..62460a1
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/SizedRamStringAdapter.hpp
@@ -0,0 +1,51 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+#include <string.h>  // strcmp
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class SizedRamStringAdapter {
+ public:
+  SizedRamStringAdapter(const char* str, size_t n) : _str(str), _size(n) {}
+
+  int compare(const char* other) const {
+    return safe_strncmp(_str, other, _size);
+  }
+
+  bool equals(const char* expected) const {
+    return compare(expected) == 0;
+  }
+
+  bool isNull() const {
+    return !_str;
+  }
+
+  void copyTo(char* p, size_t n) const {
+    memcpy(p, _str, n);
+  }
+
+  size_t size() const {
+    return _size;
+  }
+
+  typedef storage_policies::store_by_copy storage_policy;
+
+ private:
+  const char* _str;
+  size_t _size;
+};
+
+template <typename TChar>
+inline SizedRamStringAdapter adaptString(const TChar* str, size_t size) {
+  return SizedRamStringAdapter(reinterpret_cast<const char*>(str), size);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/StdStringAdapter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/StdStringAdapter.hpp
new file mode 100644
index 0000000..3979070
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/StdStringAdapter.hpp
@@ -0,0 +1,61 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+#include <string>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TString>
+class StdStringAdapter {
+ public:
+  StdStringAdapter(const TString& str) : _str(&str) {}
+
+  void copyTo(char* p, size_t n) const {
+    memcpy(p, _str->c_str(), n);
+  }
+
+  bool isNull() const {
+    return false;
+  }
+
+  int compare(const char* other) const {
+    if (!other)
+      return 1;
+    return _str->compare(other);
+  }
+
+  bool equals(const char* expected) const {
+    if (!expected)
+      return false;
+    return *_str == expected;
+  }
+
+  size_t size() const {
+    return _str->size();
+  }
+
+  typedef storage_policies::store_by_copy storage_policy;
+
+ private:
+  const TString* _str;
+};
+
+template <typename TCharTraits, typename TAllocator>
+struct IsString<std::basic_string<char, TCharTraits, TAllocator> > : true_type {
+};
+
+template <typename TCharTraits, typename TAllocator>
+inline StdStringAdapter<std::basic_string<char, TCharTraits, TAllocator> >
+adaptString(const std::basic_string<char, TCharTraits, TAllocator>& str) {
+  return StdStringAdapter<std::basic_string<char, TCharTraits, TAllocator> >(
+      str);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/StoragePolicy.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/StoragePolicy.hpp
new file mode 100644
index 0000000..df0d62b
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/StoragePolicy.hpp
@@ -0,0 +1,15 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+namespace ARDUINOJSON_NAMESPACE {
+
+namespace storage_policies {
+struct store_by_address {};
+struct store_by_copy {};
+struct decide_at_runtime {};
+}  // namespace storage_policies
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/String.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/String.hpp
new file mode 100644
index 0000000..4f2abde
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/String.hpp
@@ -0,0 +1,77 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class String {
+ public:
+  String() : _data(0), _isStatic(true) {}
+  String(const char* data, bool isStaticData = true)
+      : _data(data), _isStatic(isStaticData) {}
+
+  const char* c_str() const {
+    return _data;
+  }
+
+  bool isNull() const {
+    return !_data;
+  }
+
+  bool isStatic() const {
+    return _isStatic;
+  }
+
+  friend bool operator==(String lhs, String rhs) {
+    if (lhs._data == rhs._data)
+      return true;
+    if (!lhs._data)
+      return false;
+    if (!rhs._data)
+      return false;
+    return strcmp(lhs._data, rhs._data) == 0;
+  }
+
+  friend bool operator!=(String lhs, String rhs) {
+    if (lhs._data == rhs._data)
+      return false;
+    if (!lhs._data)
+      return true;
+    if (!rhs._data)
+      return true;
+    return strcmp(lhs._data, rhs._data) != 0;
+  }
+
+ private:
+  const char* _data;
+  bool _isStatic;
+};
+
+class StringAdapter : public RamStringAdapter {
+ public:
+  StringAdapter(const String& str)
+      : RamStringAdapter(str.c_str()), _isStatic(str.isStatic()) {}
+
+  bool isStatic() const {
+    return _isStatic;
+  }
+
+  typedef storage_policies::decide_at_runtime storage_policy;
+
+ private:
+  bool _isStatic;
+};
+
+template <>
+struct IsString<String> : true_type {};
+
+inline StringAdapter adaptString(const String& str) {
+  return StringAdapter(str);
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp
new file mode 100644
index 0000000..1de86bc
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp
@@ -0,0 +1,26 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Strings/ConstRamStringAdapter.hpp>
+#include <ArduinoJson/Strings/RamStringAdapter.hpp>
+#include <ArduinoJson/Strings/SizedRamStringAdapter.hpp>
+
+#if ARDUINOJSON_ENABLE_STD_STRING
+#  include <ArduinoJson/Strings/StdStringAdapter.hpp>
+#endif
+
+#if ARDUINOJSON_ENABLE_STRING_VIEW
+#  include <ArduinoJson/Strings/StringViewAdapter.hpp>
+#endif
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STRING
+#  include <ArduinoJson/Strings/ArduinoStringAdapter.hpp>
+#endif
+
+#if ARDUINOJSON_ENABLE_PROGMEM
+#  include <ArduinoJson/Strings/FlashStringAdapter.hpp>
+#  include <ArduinoJson/Strings/SizedFlashStringAdapter.hpp>
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Strings/StringViewAdapter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Strings/StringViewAdapter.hpp
new file mode 100644
index 0000000..4720660
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Strings/StringViewAdapter.hpp
@@ -0,0 +1,56 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+
+#include <string_view>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class StringViewAdapter {
+ public:
+  StringViewAdapter(std::string_view str) : _str(str) {}
+
+  void copyTo(char* p, size_t n) const {
+    memcpy(p, _str.data(), n);
+  }
+
+  bool isNull() const {
+    return false;
+  }
+
+  int compare(const char* other) const {
+    if (!other)
+      return 1;
+    return _str.compare(other);
+  }
+
+  bool equals(const char* expected) const {
+    if (!expected)
+      return false;
+    return _str == expected;
+  }
+
+  size_t size() const {
+    return _str.size();
+  }
+
+  typedef storage_policies::store_by_copy storage_policy;
+
+ private:
+  std::string_view _str;
+};
+
+template <>
+struct IsString<std::string_view> : true_type {};
+
+inline StringViewAdapter adaptString(const std::string_view& str) {
+  return StringViewAdapter(str);
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/Converter.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/Converter.hpp
new file mode 100644
index 0000000..88afa52
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/Converter.hpp
@@ -0,0 +1,17 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T, typename Enable = void>
+struct Converter;
+
+// clang-format off
+template <typename T1, typename T2>
+class InvalidConversion;  // Error here? See https://arduinojson.org/v6/invalid-conversion/
+// clang-format on
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/ConverterImpl.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/ConverterImpl.hpp
new file mode 100644
index 0000000..34e12bb
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/ConverterImpl.hpp
@@ -0,0 +1,268 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Strings/IsWriteableString.hpp>
+#include <ArduinoJson/Variant/VariantFunctions.hpp>
+#include <ArduinoJson/Variant/VariantRef.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T, typename Enable>
+struct Converter {
+  static bool toJson(const T& src, VariantRef dst) {
+    // clang-format off
+    return convertToJson(src, dst); // Error here? See https://arduinojson.org/v6/unsupported-set/
+    // clang-format on
+  }
+
+  static T fromJson(VariantConstRef src) {
+    // clang-format off
+    T result; // Error here? See https://arduinojson.org/v6/non-default-constructible/
+    convertFromJson(src, result);  // Error here? See https://arduinojson.org/v6/unsupported-as/
+    // clang-format on
+    return result;
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    T dummy;
+    // clang-format off
+    return canConvertFromJson(src, dummy);  // Error here? See https://arduinojson.org/v6/unsupported-is/
+    // clang-format on
+  }
+};
+
+template <typename T>
+struct Converter<
+    T, typename enable_if<is_integral<T>::value && !is_same<bool, T>::value &&
+                          !is_same<char, T>::value>::type> {
+  static bool toJson(T src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(T);
+    if (!data)
+      return false;
+    data->setInteger(src);
+    return true;
+  }
+
+  static T fromJson(VariantConstRef src) {
+    ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(T);
+    const VariantData* data = getData(src);
+    return data ? data->asIntegral<T>() : T();
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isInteger<T>();
+  }
+};
+
+template <typename T>
+struct Converter<T, typename enable_if<is_enum<T>::value>::type> {
+  static bool toJson(T src, VariantRef dst) {
+    return dst.set(static_cast<Integer>(src));
+  }
+
+  static T fromJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data ? static_cast<T>(data->asIntegral<int>()) : T();
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isInteger<int>();
+  }
+};
+
+template <>
+struct Converter<bool> {
+  static bool toJson(bool src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    if (!data)
+      return false;
+    data->setBoolean(src);
+    return true;
+  }
+
+  static bool fromJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data ? data->asBoolean() : false;
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isBoolean();
+  }
+};
+
+template <typename T>
+struct Converter<T, typename enable_if<is_floating_point<T>::value>::type> {
+  static bool toJson(T src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    if (!data)
+      return false;
+    data->setFloat(static_cast<Float>(src));
+    return true;
+  }
+
+  static T fromJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data ? data->asFloat<T>() : false;
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isFloat();
+  }
+};
+
+template <>
+struct Converter<const char*> {
+  static bool toJson(const char* src, VariantRef dst) {
+    return variantSetString(getData(dst), adaptString(src), getPool(dst));
+  }
+
+  static const char* fromJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data ? data->asString() : 0;
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data && data->isString();
+  }
+};
+
+template <typename T>
+inline typename enable_if<IsString<T>::value, bool>::type convertToJson(
+    const T& src, VariantRef dst) {
+  VariantData* data = getData(dst);
+  MemoryPool* pool = getPool(dst);
+  return variantSetString(data, adaptString(src), pool);
+}
+
+template <typename T>
+inline typename enable_if<IsWriteableString<T>::value>::type convertFromJson(
+    VariantConstRef src, T& dst) {
+  const VariantData* data = getData(src);
+  const char* cstr = data != 0 ? data->asString() : 0;
+  if (cstr)
+    dst = cstr;
+  else
+    serializeJson(src, dst);
+}
+
+template <typename T>
+inline typename enable_if<IsWriteableString<T>::value, bool>::type
+canConvertFromJson(VariantConstRef src, const T&) {
+  const VariantData* data = getData(src);
+  return data && data->isString();
+}
+
+template <>
+struct Converter<SerializedValue<const char*> > {
+  static bool toJson(SerializedValue<const char*> src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    if (!data)
+      return false;
+    data->setLinkedRaw(src);
+    return true;
+  }
+};
+
+// SerializedValue<std::string>
+// SerializedValue<String>
+// SerializedValue<const __FlashStringHelper*>
+template <typename T>
+struct Converter<SerializedValue<T>,
+                 typename enable_if<!is_same<const char*, T>::value>::type> {
+  static bool toJson(SerializedValue<T> src, VariantRef dst) {
+    VariantData* data = getData(dst);
+    MemoryPool* pool = getPool(dst);
+    return data != 0 && data->setOwnedRaw(src, pool);
+  }
+};
+
+#if ARDUINOJSON_HAS_NULLPTR
+
+template <>
+struct Converter<decltype(nullptr)> {
+  static bool toJson(decltype(nullptr), VariantRef dst) {
+    variantSetNull(getData(dst));
+    return true;
+  }
+  static decltype(nullptr) fromJson(VariantConstRef) {
+    return nullptr;
+  }
+  static bool checkJson(VariantConstRef src) {
+    const VariantData* data = getData(src);
+    return data == 0 || data->isNull();
+  }
+};
+
+#endif
+
+#if ARDUINOJSON_ENABLE_ARDUINO_STREAM
+
+class MemoryPoolPrint : public Print {
+ public:
+  MemoryPoolPrint(MemoryPool* pool) : _pool(pool), _size(0) {
+    pool->getFreeZone(&_string, &_capacity);
+  }
+
+  const char* c_str() {
+    _string[_size++] = 0;
+    ARDUINOJSON_ASSERT(_size <= _capacity);
+    return _pool->saveStringFromFreeZone(_size);
+  }
+
+  size_t write(uint8_t c) {
+    if (_size >= _capacity)
+      return 0;
+
+    _string[_size++] = char(c);
+    return 1;
+  }
+
+  size_t write(const uint8_t* buffer, size_t size) {
+    if (_size + size >= _capacity) {
+      _size = _capacity;  // mark as overflowed
+      return 0;
+    }
+    memcpy(&_string[_size], buffer, size);
+    _size += size;
+    return size;
+  }
+
+  bool overflowed() const {
+    return _size >= _capacity;
+  }
+
+ private:
+  MemoryPool* _pool;
+  size_t _size;
+  char* _string;
+  size_t _capacity;
+};
+
+inline bool convertToJson(const ::Printable& src, VariantRef dst) {
+  MemoryPool* pool = getPool(dst);
+  VariantData* data = getData(dst);
+  if (!pool || !data)
+    return false;
+  MemoryPoolPrint print(pool);
+  src.printTo(print);
+  if (print.overflowed()) {
+    pool->markAsOverflowed();
+    data->setNull();
+    return false;
+  }
+  data->setStringPointer(print.c_str(), storage_policies::store_by_copy());
+  return true;
+}
+
+#endif
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp
new file mode 100644
index 0000000..74ac5a7
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp
@@ -0,0 +1,60 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Variant/VariantData.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TAdaptedString>
+inline bool slotSetKey(VariantSlot* var, TAdaptedString key, MemoryPool* pool) {
+  if (!var)
+    return false;
+  return slotSetKey(var, key, pool, typename TAdaptedString::storage_policy());
+}
+
+template <typename TAdaptedString>
+inline bool slotSetKey(VariantSlot* var, TAdaptedString key, MemoryPool* pool,
+                       storage_policies::decide_at_runtime) {
+  if (key.isStatic()) {
+    return slotSetKey(var, key, pool, storage_policies::store_by_address());
+  } else {
+    return slotSetKey(var, key, pool, storage_policies::store_by_copy());
+  }
+}
+
+template <typename TAdaptedString>
+inline bool slotSetKey(VariantSlot* var, TAdaptedString key, MemoryPool*,
+                       storage_policies::store_by_address) {
+  ARDUINOJSON_ASSERT(var);
+  var->setKey(key.data(), storage_policies::store_by_address());
+  return true;
+}
+
+template <typename TAdaptedString>
+inline bool slotSetKey(VariantSlot* var, TAdaptedString key, MemoryPool* pool,
+                       storage_policies::store_by_copy) {
+  const char* dup = pool->saveString(key);
+  if (!dup)
+    return false;
+  ARDUINOJSON_ASSERT(var);
+  var->setKey(dup, storage_policies::store_by_copy());
+  return true;
+}
+
+inline size_t slotSize(const VariantSlot* var) {
+  size_t n = 0;
+  while (var) {
+    n++;
+    var = var->next();
+  }
+  return n;
+}
+
+inline VariantData* slotData(VariantSlot* slot) {
+  return reinterpret_cast<VariantData*>(slot);
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantCompare.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantCompare.hpp
new file mode 100644
index 0000000..025ef90
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantCompare.hpp
@@ -0,0 +1,208 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Misc/Visitable.hpp>
+#include <ArduinoJson/Numbers/arithmeticCompare.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Strings/IsString.hpp>
+#include <ArduinoJson/Variant/Visitor.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class CollectionData;
+
+struct ComparerBase : Visitor<CompareResult> {};
+
+template <typename T, typename Enable = void>
+struct Comparer;
+
+template <typename T>
+struct Comparer<T, typename enable_if<IsString<T>::value>::type>
+    : ComparerBase {
+  T rhs;
+
+  explicit Comparer(T value) : rhs(value) {}
+
+  CompareResult visitString(const char *lhs) {
+    int i = adaptString(rhs).compare(lhs);
+    if (i < 0)
+      return COMPARE_RESULT_GREATER;
+    else if (i > 0)
+      return COMPARE_RESULT_LESS;
+    else
+      return COMPARE_RESULT_EQUAL;
+  }
+
+  CompareResult visitNull() {
+    if (adaptString(rhs).isNull())
+      return COMPARE_RESULT_EQUAL;
+    else
+      return COMPARE_RESULT_DIFFER;
+  }
+};
+
+template <typename T>
+struct Comparer<T, typename enable_if<is_integral<T>::value ||
+                                      is_floating_point<T>::value>::type>
+    : ComparerBase {
+  T rhs;
+
+  explicit Comparer(T value) : rhs(value) {}
+
+  CompareResult visitFloat(Float lhs) {
+    return arithmeticCompare(lhs, rhs);
+  }
+
+  CompareResult visitSignedInteger(Integer lhs) {
+    return arithmeticCompare(lhs, rhs);
+  }
+
+  CompareResult visitUnsignedInteger(UInt lhs) {
+    return arithmeticCompare(lhs, rhs);
+  }
+
+  CompareResult visitBoolean(bool lhs) {
+    return visitUnsignedInteger(static_cast<UInt>(lhs));
+  }
+};
+
+struct NullComparer : ComparerBase {
+  CompareResult visitNull() {
+    return COMPARE_RESULT_EQUAL;
+  }
+};
+
+#if ARDUINOJSON_HAS_NULLPTR
+template <>
+struct Comparer<decltype(nullptr), void> : NullComparer {
+  explicit Comparer(decltype(nullptr)) : NullComparer() {}
+};
+#endif
+
+struct ArrayComparer : ComparerBase {
+  const CollectionData *_rhs;
+
+  explicit ArrayComparer(const CollectionData &rhs) : _rhs(&rhs) {}
+
+  CompareResult visitArray(const CollectionData &lhs) {
+    if (lhs.equalsArray(*_rhs))
+      return COMPARE_RESULT_EQUAL;
+    else
+      return COMPARE_RESULT_DIFFER;
+  }
+};
+
+struct ObjectComparer : ComparerBase {
+  const CollectionData *_rhs;
+
+  explicit ObjectComparer(const CollectionData &rhs) : _rhs(&rhs) {}
+
+  CompareResult visitObject(const CollectionData &lhs) {
+    if (lhs.equalsObject(*_rhs))
+      return COMPARE_RESULT_EQUAL;
+    else
+      return COMPARE_RESULT_DIFFER;
+  }
+};
+
+struct RawComparer : ComparerBase {
+  const char *_rhsData;
+  size_t _rhsSize;
+
+  explicit RawComparer(const char *rhsData, size_t rhsSize)
+      : _rhsData(rhsData), _rhsSize(rhsSize) {}
+
+  CompareResult visitRawJson(const char *lhsData, size_t lhsSize) {
+    size_t size = _rhsSize < lhsSize ? _rhsSize : lhsSize;
+    int n = memcmp(lhsData, _rhsData, size);
+    if (n < 0)
+      return COMPARE_RESULT_LESS;
+    else if (n > 0)
+      return COMPARE_RESULT_GREATER;
+    else
+      return COMPARE_RESULT_EQUAL;
+  }
+};
+
+template <typename T>
+struct Comparer<T, typename enable_if<IsVisitable<T>::value>::type>
+    : ComparerBase {
+  T rhs;
+
+  explicit Comparer(T value) : rhs(value) {}
+
+  CompareResult visitArray(const CollectionData &lhs) {
+    ArrayComparer comparer(lhs);
+    return accept(comparer);
+  }
+
+  CompareResult visitObject(const CollectionData &lhs) {
+    ObjectComparer comparer(lhs);
+    return accept(comparer);
+  }
+
+  CompareResult visitFloat(Float lhs) {
+    Comparer<Float> comparer(lhs);
+    return accept(comparer);
+  }
+
+  CompareResult visitString(const char *lhs) {
+    Comparer<const char *> comparer(lhs);
+    return accept(comparer);
+  }
+
+  CompareResult visitRawJson(const char *lhsData, size_t lhsSize) {
+    RawComparer comparer(lhsData, lhsSize);
+    return accept(comparer);
+  }
+
+  CompareResult visitSignedInteger(Integer lhs) {
+    Comparer<Integer> comparer(lhs);
+    return accept(comparer);
+  }
+
+  CompareResult visitUnsignedInteger(UInt lhs) {
+    Comparer<UInt> comparer(lhs);
+    return accept(comparer);
+  }
+
+  CompareResult visitBoolean(bool lhs) {
+    Comparer<bool> comparer(lhs);
+    return accept(comparer);
+  }
+
+  CompareResult visitNull() {
+    NullComparer comparer;
+    return accept(comparer);
+  }
+
+ private:
+  template <typename TComparer>
+  CompareResult accept(TComparer &comparer) {
+    CompareResult reversedResult = rhs.accept(comparer);
+    switch (reversedResult) {
+      case COMPARE_RESULT_GREATER:
+        return COMPARE_RESULT_LESS;
+      case COMPARE_RESULT_LESS:
+        return COMPARE_RESULT_GREATER;
+      default:
+        return reversedResult;
+    }
+  }
+};
+
+template <typename T1, typename T2>
+CompareResult compare(const T1 &lhs, const T2 &rhs) {
+  Comparer<T2> comparer(rhs);
+  return lhs.accept(comparer);
+}
+
+inline int variantCompare(const VariantData *a, const VariantData *b) {
+  return compare(VariantConstRef(a), VariantConstRef(b));
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp
new file mode 100644
index 0000000..47bf09c
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp
@@ -0,0 +1,59 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <stddef.h>  // size_t
+
+#include <ArduinoJson/Collection/CollectionData.hpp>
+#include <ArduinoJson/Numbers/Float.hpp>
+#include <ArduinoJson/Numbers/Integer.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+//
+enum {
+  VALUE_MASK = 0x7F,
+
+  OWNED_VALUE_BIT = 0x01,
+  VALUE_IS_NULL = 0,
+  VALUE_IS_LINKED_RAW = 0x02,
+  VALUE_IS_OWNED_RAW = 0x03,
+  VALUE_IS_LINKED_STRING = 0x04,
+  VALUE_IS_OWNED_STRING = 0x05,
+
+  // CAUTION: no OWNED_VALUE_BIT below
+
+  VALUE_IS_BOOLEAN = 0x06,
+
+  NUMBER_BIT = 0x08,
+  VALUE_IS_UNSIGNED_INTEGER = 0x08,
+  VALUE_IS_SIGNED_INTEGER = 0x0A,
+  VALUE_IS_FLOAT = 0x0C,
+
+  COLLECTION_MASK = 0x60,
+  VALUE_IS_OBJECT = 0x20,
+  VALUE_IS_ARRAY = 0x40,
+
+  OWNED_KEY_BIT = 0x80
+};
+
+struct RawData {
+  const char *data;
+  size_t size;
+};
+
+union VariantContent {
+  Float asFloat;
+  bool asBoolean;
+  UInt asUnsignedInteger;
+  Integer asSignedInteger;
+  CollectionData asCollection;
+  const char *asString;
+  struct {
+    const char *data;
+    size_t size;
+  } asRaw;
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp
new file mode 100644
index 0000000..fd54a94
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp
@@ -0,0 +1,368 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Misc/SerializedValue.hpp>
+#include <ArduinoJson/Numbers/convertNumber.hpp>
+#include <ArduinoJson/Strings/RamStringAdapter.hpp>
+#include <ArduinoJson/Variant/VariantContent.hpp>
+
+// VariantData can't have a constructor (to be a POD), so we have no way to fix
+// this warning
+#if defined(__GNUC__)
+#  if __GNUC__ >= 7
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#    pragma GCC diagnostic ignored "-Wuninitialized"
+#  endif
+#endif
+
+namespace ARDUINOJSON_NAMESPACE {
+
+class VariantData {
+  VariantContent _content;  // must be first to allow cast from array to variant
+  uint8_t _flags;
+
+ public:
+  // Must be a POD!
+  // - no constructor
+  // - no destructor
+  // - no virtual
+  // - no inheritance
+  void init() {
+    _flags = VALUE_IS_NULL;
+  }
+
+  template <typename TVisitor>
+  typename TVisitor::result_type accept(TVisitor &visitor) const {
+    switch (type()) {
+      case VALUE_IS_FLOAT:
+        return visitor.visitFloat(_content.asFloat);
+
+      case VALUE_IS_ARRAY:
+        return visitor.visitArray(_content.asCollection);
+
+      case VALUE_IS_OBJECT:
+        return visitor.visitObject(_content.asCollection);
+
+      case VALUE_IS_LINKED_STRING:
+      case VALUE_IS_OWNED_STRING:
+        return visitor.visitString(_content.asString);
+
+      case VALUE_IS_OWNED_RAW:
+      case VALUE_IS_LINKED_RAW:
+        return visitor.visitRawJson(_content.asRaw.data, _content.asRaw.size);
+
+      case VALUE_IS_SIGNED_INTEGER:
+        return visitor.visitSignedInteger(_content.asSignedInteger);
+
+      case VALUE_IS_UNSIGNED_INTEGER:
+        return visitor.visitUnsignedInteger(_content.asUnsignedInteger);
+
+      case VALUE_IS_BOOLEAN:
+        return visitor.visitBoolean(_content.asBoolean != 0);
+
+      default:
+        return visitor.visitNull();
+    }
+  }
+
+  template <typename T>
+  T asIntegral() const;
+
+  template <typename T>
+  T asFloat() const;
+
+  const char *asString() const;
+
+  bool asBoolean() const;
+
+  CollectionData *asArray() {
+    return isArray() ? &_content.asCollection : 0;
+  }
+
+  const CollectionData *asArray() const {
+    return const_cast<VariantData *>(this)->asArray();
+  }
+
+  CollectionData *asObject() {
+    return isObject() ? &_content.asCollection : 0;
+  }
+
+  const CollectionData *asObject() const {
+    return const_cast<VariantData *>(this)->asObject();
+  }
+
+  bool copyFrom(const VariantData &src, MemoryPool *pool) {
+    switch (src.type()) {
+      case VALUE_IS_ARRAY:
+        return toArray().copyFrom(src._content.asCollection, pool);
+      case VALUE_IS_OBJECT:
+        return toObject().copyFrom(src._content.asCollection, pool);
+      case VALUE_IS_OWNED_STRING:
+        return setString(RamStringAdapter(src._content.asString), pool);
+      case VALUE_IS_OWNED_RAW:
+        return setOwnedRaw(
+            serialized(src._content.asRaw.data, src._content.asRaw.size), pool);
+      default:
+        setType(src.type());
+        _content = src._content;
+        return true;
+    }
+  }
+
+  bool isArray() const {
+    return (_flags & VALUE_IS_ARRAY) != 0;
+  }
+
+  bool isBoolean() const {
+    return type() == VALUE_IS_BOOLEAN;
+  }
+
+  bool isCollection() const {
+    return (_flags & COLLECTION_MASK) != 0;
+  }
+
+  template <typename T>
+  bool isInteger() const {
+    switch (type()) {
+      case VALUE_IS_UNSIGNED_INTEGER:
+        return canConvertNumber<T>(_content.asUnsignedInteger);
+
+      case VALUE_IS_SIGNED_INTEGER:
+        return canConvertNumber<T>(_content.asSignedInteger);
+
+      default:
+        return false;
+    }
+  }
+
+  bool isFloat() const {
+    return (_flags & NUMBER_BIT) != 0;
+  }
+
+  bool isString() const {
+    return type() == VALUE_IS_LINKED_STRING || type() == VALUE_IS_OWNED_STRING;
+  }
+
+  bool isObject() const {
+    return (_flags & VALUE_IS_OBJECT) != 0;
+  }
+
+  bool isNull() const {
+    return type() == VALUE_IS_NULL;
+  }
+
+  bool isEnclosed() const {
+    return !isFloat();
+  }
+
+  void remove(size_t index) {
+    if (isArray())
+      _content.asCollection.removeElement(index);
+  }
+
+  template <typename TAdaptedString>
+  void remove(TAdaptedString key) {
+    if (isObject())
+      _content.asCollection.removeMember(key);
+  }
+
+  void setBoolean(bool value) {
+    setType(VALUE_IS_BOOLEAN);
+    _content.asBoolean = value;
+  }
+
+  void setFloat(Float value) {
+    setType(VALUE_IS_FLOAT);
+    _content.asFloat = value;
+  }
+
+  void setLinkedRaw(SerializedValue<const char *> value) {
+    if (value.data()) {
+      setType(VALUE_IS_LINKED_RAW);
+      _content.asRaw.data = value.data();
+      _content.asRaw.size = value.size();
+    } else {
+      setType(VALUE_IS_NULL);
+    }
+  }
+
+  template <typename T>
+  bool setOwnedRaw(SerializedValue<T> value, MemoryPool *pool) {
+    const char *dup = pool->saveString(adaptString(value.data(), value.size()));
+    if (dup) {
+      setType(VALUE_IS_OWNED_RAW);
+      _content.asRaw.data = dup;
+      _content.asRaw.size = value.size();
+      return true;
+    } else {
+      setType(VALUE_IS_NULL);
+      return false;
+    }
+  }
+
+  template <typename T>
+  typename enable_if<is_unsigned<T>::value>::type setInteger(T value) {
+    setType(VALUE_IS_UNSIGNED_INTEGER);
+    _content.asUnsignedInteger = static_cast<UInt>(value);
+  }
+
+  template <typename T>
+  typename enable_if<is_signed<T>::value>::type setInteger(T value) {
+    setType(VALUE_IS_SIGNED_INTEGER);
+    _content.asSignedInteger = value;
+  }
+
+  void setNull() {
+    setType(VALUE_IS_NULL);
+  }
+
+  void setStringPointer(const char *s, storage_policies::store_by_copy) {
+    ARDUINOJSON_ASSERT(s != 0);
+    setType(VALUE_IS_OWNED_STRING);
+    _content.asString = s;
+  }
+
+  void setStringPointer(const char *s, storage_policies::store_by_address) {
+    ARDUINOJSON_ASSERT(s != 0);
+    setType(VALUE_IS_LINKED_STRING);
+    _content.asString = s;
+  }
+
+  template <typename TAdaptedString>
+  bool setString(TAdaptedString value, MemoryPool *pool) {
+    return storeString(value, pool, typename TAdaptedString::storage_policy());
+  }
+
+  CollectionData &toArray() {
+    setType(VALUE_IS_ARRAY);
+    _content.asCollection.clear();
+    return _content.asCollection;
+  }
+
+  CollectionData &toObject() {
+    setType(VALUE_IS_OBJECT);
+    _content.asCollection.clear();
+    return _content.asCollection;
+  }
+
+  size_t memoryUsage() const {
+    switch (type()) {
+      case VALUE_IS_OWNED_STRING:
+        return strlen(_content.asString) + 1;
+      case VALUE_IS_OWNED_RAW:
+        return _content.asRaw.size;
+      case VALUE_IS_OBJECT:
+      case VALUE_IS_ARRAY:
+        return _content.asCollection.memoryUsage();
+      default:
+        return 0;
+    }
+  }
+
+  size_t nesting() const {
+    return isCollection() ? _content.asCollection.nesting() : 0;
+  }
+
+  size_t size() const {
+    return isCollection() ? _content.asCollection.size() : 0;
+  }
+
+  VariantData *addElement(MemoryPool *pool) {
+    if (isNull())
+      toArray();
+    if (!isArray())
+      return 0;
+    return _content.asCollection.addElement(pool);
+  }
+
+  VariantData *getElement(size_t index) const {
+    return isArray() ? _content.asCollection.getElement(index) : 0;
+  }
+
+  VariantData *getOrAddElement(size_t index, MemoryPool *pool) {
+    if (isNull())
+      toArray();
+    if (!isArray())
+      return 0;
+    return _content.asCollection.getOrAddElement(index, pool);
+  }
+
+  template <typename TAdaptedString>
+  VariantData *getMember(TAdaptedString key) const {
+    return isObject() ? _content.asCollection.getMember(key) : 0;
+  }
+
+  template <typename TAdaptedString>
+  VariantData *getOrAddMember(TAdaptedString key, MemoryPool *pool) {
+    if (isNull())
+      toObject();
+    if (!isObject())
+      return 0;
+    return _content.asCollection.getOrAddMember(key, pool);
+  }
+
+  void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) {
+    if (_flags & OWNED_VALUE_BIT)
+      _content.asString += stringDistance;
+    if (_flags & COLLECTION_MASK)
+      _content.asCollection.movePointers(stringDistance, variantDistance);
+  }
+
+  uint8_t type() const {
+    return _flags & VALUE_MASK;
+  }
+
+ private:
+  void setType(uint8_t t) {
+    _flags &= OWNED_KEY_BIT;
+    _flags |= t;
+  }
+
+  template <typename TAdaptedString>
+  inline bool storeString(TAdaptedString value, MemoryPool *pool,
+                          storage_policies::decide_at_runtime) {
+    if (value.isStatic())
+      return storeString(value, pool, storage_policies::store_by_address());
+    else
+      return storeString(value, pool, storage_policies::store_by_copy());
+  }
+
+  template <typename TAdaptedString>
+  inline bool storeString(TAdaptedString value, MemoryPool *,
+                          storage_policies::store_by_address) {
+    if (value.isNull())
+      setNull();
+    else
+      setStringPointer(value.data(), storage_policies::store_by_address());
+    return true;
+  }
+
+  template <typename TAdaptedString>
+  inline bool storeString(TAdaptedString value, MemoryPool *pool,
+                          storage_policies::store_by_copy) {
+    if (value.isNull()) {
+      setNull();
+      return true;
+    }
+    const char *copy = pool->saveString(value);
+    if (!copy) {
+      setNull();
+      return false;
+    }
+    setStringPointer(copy, storage_policies::store_by_copy());
+    return true;
+  }
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
+
+#if defined(__GNUC__)
+#  if __GNUC__ >= 8
+#    pragma GCC diagnostic pop
+#  endif
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp
new file mode 100644
index 0000000..3fc9cbb
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp
@@ -0,0 +1,104 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/attributes.hpp>
+#include <ArduinoJson/Variant/VariantData.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TVisitor>
+inline typename TVisitor::result_type variantAccept(const VariantData *var,
+                                                    TVisitor &visitor) {
+  if (var != 0)
+    return var->accept(visitor);
+  else
+    return visitor.visitNull();
+}
+
+inline const CollectionData *variantAsArray(const VariantData *var) {
+  return var != 0 ? var->asArray() : 0;
+}
+
+inline const CollectionData *variantAsObject(const VariantData *var) {
+  return var != 0 ? var->asObject() : 0;
+}
+
+inline CollectionData *variantAsObject(VariantData *var) {
+  return var != 0 ? var->asObject() : 0;
+}
+
+inline bool variantCopyFrom(VariantData *dst, const VariantData *src,
+                            MemoryPool *pool) {
+  if (!dst)
+    return false;
+  if (!src) {
+    dst->setNull();
+    return true;
+  }
+  return dst->copyFrom(*src, pool);
+}
+
+inline int variantCompare(const VariantData *a, const VariantData *b);
+
+inline void variantSetNull(VariantData *var) {
+  if (!var)
+    return;
+  var->setNull();
+}
+
+template <typename TAdaptedString>
+inline bool variantSetString(VariantData *var, TAdaptedString value,
+                             MemoryPool *pool) {
+  if (!var)
+    return false;
+  return var->setString(value, pool);
+}
+
+inline size_t variantSize(const VariantData *var) {
+  return var != 0 ? var->size() : 0;
+}
+
+inline CollectionData *variantToArray(VariantData *var) {
+  if (!var)
+    return 0;
+  return &var->toArray();
+}
+
+inline CollectionData *variantToObject(VariantData *var) {
+  if (!var)
+    return 0;
+  return &var->toObject();
+}
+
+inline NO_INLINE VariantData *variantAddElement(VariantData *var,
+                                                MemoryPool *pool) {
+  return var != 0 ? var->addElement(pool) : 0;
+}
+
+inline NO_INLINE VariantData *variantGetOrAddElement(VariantData *var,
+                                                     size_t index,
+                                                     MemoryPool *pool) {
+  return var != 0 ? var->getOrAddElement(index, pool) : 0;
+}
+
+template <typename TChar>
+NO_INLINE VariantData *variantGetOrAddMember(VariantData *var, TChar *key,
+                                             MemoryPool *pool) {
+  return var != 0 ? var->getOrAddMember(adaptString(key), pool) : 0;
+}
+
+template <typename TString>
+NO_INLINE VariantData *variantGetOrAddMember(VariantData *var,
+                                             const TString &key,
+                                             MemoryPool *pool) {
+  return var != 0 ? var->getOrAddMember(adaptString(key), pool) : 0;
+}
+
+inline bool variantIsNull(const VariantData *var) {
+  return var == 0 || var->isNull();
+}
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp
new file mode 100644
index 0000000..ea49a92
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp
@@ -0,0 +1,148 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/ArrayRef.hpp>
+#include <ArduinoJson/Configuration.hpp>
+#include <ArduinoJson/Numbers/convertNumber.hpp>
+#include <ArduinoJson/Numbers/parseNumber.hpp>
+#include <ArduinoJson/Object/ObjectRef.hpp>
+#include <ArduinoJson/Variant/VariantRef.hpp>
+
+#include <string.h>  // for strcmp
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T>
+inline T VariantData::asIntegral() const {
+  switch (type()) {
+    case VALUE_IS_BOOLEAN:
+      return _content.asBoolean;
+    case VALUE_IS_UNSIGNED_INTEGER:
+      return convertNumber<T>(_content.asUnsignedInteger);
+    case VALUE_IS_SIGNED_INTEGER:
+      return convertNumber<T>(_content.asSignedInteger);
+    case VALUE_IS_LINKED_STRING:
+    case VALUE_IS_OWNED_STRING:
+      return parseNumber<T>(_content.asString);
+    case VALUE_IS_FLOAT:
+      return convertNumber<T>(_content.asFloat);
+    default:
+      return 0;
+  }
+}
+
+inline bool VariantData::asBoolean() const {
+  switch (type()) {
+    case VALUE_IS_BOOLEAN:
+      return _content.asBoolean;
+    case VALUE_IS_SIGNED_INTEGER:
+    case VALUE_IS_UNSIGNED_INTEGER:
+      return _content.asUnsignedInteger != 0;
+    case VALUE_IS_FLOAT:
+      return _content.asFloat != 0;
+    case VALUE_IS_NULL:
+      return false;
+    default:
+      return true;
+  }
+}
+
+// T = float/double
+template <typename T>
+inline T VariantData::asFloat() const {
+  switch (type()) {
+    case VALUE_IS_BOOLEAN:
+      return static_cast<T>(_content.asBoolean);
+    case VALUE_IS_UNSIGNED_INTEGER:
+      return static_cast<T>(_content.asUnsignedInteger);
+    case VALUE_IS_SIGNED_INTEGER:
+      return static_cast<T>(_content.asSignedInteger);
+    case VALUE_IS_LINKED_STRING:
+    case VALUE_IS_OWNED_STRING:
+      return parseNumber<T>(_content.asString);
+    case VALUE_IS_FLOAT:
+      return static_cast<T>(_content.asFloat);
+    default:
+      return 0;
+  }
+}
+
+inline const char *VariantData::asString() const {
+  switch (type()) {
+    case VALUE_IS_LINKED_STRING:
+    case VALUE_IS_OWNED_STRING:
+      return _content.asString;
+    default:
+      return 0;
+  }
+}
+
+template <typename T>
+inline typename enable_if<is_same<T, ArrayRef>::value, ArrayRef>::type
+VariantRef::to() const {
+  return ArrayRef(_pool, variantToArray(_data));
+}
+
+template <typename T>
+typename enable_if<is_same<T, ObjectRef>::value, ObjectRef>::type
+VariantRef::to() const {
+  return ObjectRef(_pool, variantToObject(_data));
+}
+
+template <typename T>
+typename enable_if<is_same<T, VariantRef>::value, VariantRef>::type
+VariantRef::to() const {
+  variantSetNull(_data);
+  return *this;
+}
+
+inline VariantConstRef VariantConstRef::getElement(size_t index) const {
+  return ArrayConstRef(_data != 0 ? _data->asArray() : 0)[index];
+}
+
+inline VariantRef VariantRef::addElement() const {
+  return VariantRef(_pool, variantAddElement(_data, _pool));
+}
+
+inline VariantRef VariantRef::getElement(size_t index) const {
+  return VariantRef(_pool, _data != 0 ? _data->getElement(index) : 0);
+}
+
+inline VariantRef VariantRef::getOrAddElement(size_t index) const {
+  return VariantRef(_pool, variantGetOrAddElement(_data, index, _pool));
+}
+
+template <typename TChar>
+inline VariantRef VariantRef::getMember(TChar *key) const {
+  return VariantRef(_pool, _data != 0 ? _data->getMember(adaptString(key)) : 0);
+}
+
+template <typename TString>
+inline typename enable_if<IsString<TString>::value, VariantRef>::type
+VariantRef::getMember(const TString &key) const {
+  return VariantRef(_pool, _data != 0 ? _data->getMember(adaptString(key)) : 0);
+}
+
+template <typename TChar>
+inline VariantRef VariantRef::getOrAddMember(TChar *key) const {
+  return VariantRef(_pool, variantGetOrAddMember(_data, key, _pool));
+}
+
+template <typename TString>
+inline VariantRef VariantRef::getOrAddMember(const TString &key) const {
+  return VariantRef(_pool, variantGetOrAddMember(_data, key, _pool));
+}
+
+inline VariantConstRef operator|(VariantConstRef preferedValue,
+                                 VariantConstRef defaultValue) {
+  return preferedValue ? preferedValue : defaultValue;
+}
+
+// Out of class definition to avoid #1560
+inline bool VariantRef::set(char value) const {
+  return set<signed char>(value);
+}
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantOperators.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantOperators.hpp
new file mode 100644
index 0000000..54174a4
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantOperators.hpp
@@ -0,0 +1,180 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Misc/Visitable.hpp>
+#include <ArduinoJson/Numbers/arithmeticCompare.hpp>
+#include <ArduinoJson/Polyfills/attributes.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Variant/VariantTag.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename T1, typename T2>
+CompareResult compare(const T1 &lhs, const T2 &rhs);  // VariantCompare.cpp
+
+template <typename TVariant>
+struct VariantOperators {
+  // Returns the default value if the VariantRef is undefined or incompatible
+  //
+  // int operator|(JsonVariant, int)
+  // float operator|(JsonVariant, float)
+  // bool operator|(JsonVariant, bool)
+  template <typename T>
+  friend
+      typename enable_if<!IsVariant<T>::value && !is_array<T>::value, T>::type
+      operator|(const TVariant &variant, const T &defaultValue) {
+    if (variant.template is<T>())
+      return variant.template as<T>();
+    else
+      return defaultValue;
+  }
+  //
+  // const char* operator|(JsonVariant, const char*)
+  friend const char *operator|(const TVariant &variant,
+                               const char *defaultValue) {
+    if (variant.template is<const char *>())
+      return variant.template as<const char *>();
+    else
+      return defaultValue;
+  }
+  //
+  // JsonVariant operator|(JsonVariant, JsonVariant)
+  template <typename T>
+  friend typename enable_if<IsVariant<T>::value, typename T::variant_type>::type
+  operator|(const TVariant &variant, T defaultValue) {
+    if (variant)
+      return variant;
+    else
+      return defaultValue;
+  }
+
+  // value == TVariant
+  template <typename T>
+  friend bool operator==(T *lhs, TVariant rhs) {
+    return compare(rhs, lhs) == COMPARE_RESULT_EQUAL;
+  }
+  template <typename T>
+  friend bool operator==(const T &lhs, TVariant rhs) {
+    return compare(rhs, lhs) == COMPARE_RESULT_EQUAL;
+  }
+
+  // TVariant == value
+  template <typename T>
+  friend bool operator==(TVariant lhs, T *rhs) {
+    return compare(lhs, rhs) == COMPARE_RESULT_EQUAL;
+  }
+  template <typename T>
+  friend typename enable_if<!IsVisitable<T>::value, bool>::type operator==(
+      TVariant lhs, const T &rhs) {
+    return compare(lhs, rhs) == COMPARE_RESULT_EQUAL;
+  }
+
+  // value != TVariant
+  template <typename T>
+  friend bool operator!=(T *lhs, TVariant rhs) {
+    return compare(rhs, lhs) != COMPARE_RESULT_EQUAL;
+  }
+  template <typename T>
+  friend bool operator!=(const T &lhs, TVariant rhs) {
+    return compare(rhs, lhs) != COMPARE_RESULT_EQUAL;
+  }
+
+  // TVariant != value
+  template <typename T>
+  friend bool operator!=(TVariant lhs, T *rhs) {
+    return compare(lhs, rhs) != COMPARE_RESULT_EQUAL;
+  }
+  template <typename T>
+  friend typename enable_if<!IsVisitable<T>::value, bool>::type operator!=(
+      TVariant lhs, const T &rhs) {
+    return compare(lhs, rhs) != COMPARE_RESULT_EQUAL;
+  }
+
+  // value < TVariant
+  template <typename T>
+  friend bool operator<(T *lhs, TVariant rhs) {
+    return compare(rhs, lhs) == COMPARE_RESULT_GREATER;
+  }
+  template <typename T>
+  friend bool operator<(const T &lhs, TVariant rhs) {
+    return compare(rhs, lhs) == COMPARE_RESULT_GREATER;
+  }
+
+  // TVariant < value
+  template <typename T>
+  friend bool operator<(TVariant lhs, T *rhs) {
+    return compare(lhs, rhs) == COMPARE_RESULT_LESS;
+  }
+  template <typename T>
+  friend typename enable_if<!IsVisitable<T>::value, bool>::type operator<(
+      TVariant lhs, const T &rhs) {
+    return compare(lhs, rhs) == COMPARE_RESULT_LESS;
+  }
+
+  // value <= TVariant
+  template <typename T>
+  friend bool operator<=(T *lhs, TVariant rhs) {
+    return (compare(rhs, lhs) & COMPARE_RESULT_GREATER_OR_EQUAL) != 0;
+  }
+  template <typename T>
+  friend bool operator<=(const T &lhs, TVariant rhs) {
+    return (compare(rhs, lhs) & COMPARE_RESULT_GREATER_OR_EQUAL) != 0;
+  }
+
+  // TVariant <= value
+  template <typename T>
+  friend bool operator<=(TVariant lhs, T *rhs) {
+    return (compare(lhs, rhs) & COMPARE_RESULT_LESS_OR_EQUAL) != 0;
+  }
+  template <typename T>
+  friend typename enable_if<!IsVisitable<T>::value, bool>::type operator<=(
+      TVariant lhs, const T &rhs) {
+    return (compare(lhs, rhs) & COMPARE_RESULT_LESS_OR_EQUAL) != 0;
+  }
+
+  // value > TVariant
+  template <typename T>
+  friend bool operator>(T *lhs, TVariant rhs) {
+    return compare(rhs, lhs) == COMPARE_RESULT_LESS;
+  }
+  template <typename T>
+  friend bool operator>(const T &lhs, TVariant rhs) {
+    return compare(rhs, lhs) == COMPARE_RESULT_LESS;
+  }
+
+  // TVariant > value
+  template <typename T>
+  friend bool operator>(TVariant lhs, T *rhs) {
+    return compare(lhs, rhs) == COMPARE_RESULT_GREATER;
+  }
+  template <typename T>
+  friend typename enable_if<!IsVisitable<T>::value, bool>::type operator>(
+      TVariant lhs, const T &rhs) {
+    return compare(lhs, rhs) == COMPARE_RESULT_GREATER;
+  }
+
+  // value >= TVariant
+  template <typename T>
+  friend bool operator>=(T *lhs, TVariant rhs) {
+    return (compare(rhs, lhs) & COMPARE_RESULT_LESS_OR_EQUAL) != 0;
+  }
+  template <typename T>
+  friend bool operator>=(const T &lhs, TVariant rhs) {
+    return (compare(rhs, lhs) & COMPARE_RESULT_LESS_OR_EQUAL) != 0;
+  }
+
+  // TVariant >= value
+  template <typename T>
+  friend bool operator>=(TVariant lhs, T *rhs) {
+    return (compare(lhs, rhs) & COMPARE_RESULT_GREATER_OR_EQUAL) != 0;
+  }
+  template <typename T>
+  friend typename enable_if<!IsVisitable<T>::value, bool>::type operator>=(
+      TVariant lhs, const T &rhs) {
+    return (compare(lhs, rhs) & COMPARE_RESULT_GREATER_OR_EQUAL) != 0;
+  }
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantRef.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantRef.hpp
new file mode 100644
index 0000000..0661592
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantRef.hpp
@@ -0,0 +1,379 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <stddef.h>
+#include <stdint.h>  // for uint8_t
+
+#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Misc/Visitable.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Strings/StringAdapters.hpp>
+#include <ArduinoJson/Variant/Converter.hpp>
+#include <ArduinoJson/Variant/VariantFunctions.hpp>
+#include <ArduinoJson/Variant/VariantOperators.hpp>
+#include <ArduinoJson/Variant/VariantRef.hpp>
+#include <ArduinoJson/Variant/VariantShortcuts.hpp>
+#include <ArduinoJson/Variant/VariantTag.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+// Forward declarations.
+class ArrayRef;
+class ObjectRef;
+
+// Contains the methods shared by VariantRef and VariantConstRef
+template <typename TData>
+class VariantRefBase : public VariantTag {
+ public:
+  FORCE_INLINE bool isNull() const {
+    return variantIsNull(_data);
+  }
+
+  FORCE_INLINE bool isUndefined() const {
+    return !_data;
+  }
+
+  FORCE_INLINE size_t memoryUsage() const {
+    return _data ? _data->memoryUsage() : 0;
+  }
+
+  FORCE_INLINE size_t nesting() const {
+    return _data ? _data->nesting() : 0;
+  }
+
+  size_t size() const {
+    return variantSize(_data);
+  }
+
+ protected:
+  VariantRefBase(TData *data) : _data(data) {}
+  TData *_data;
+
+  friend TData *getData(const VariantRefBase &variant) {
+    return variant._data;
+  }
+};
+
+// A variant that can be a any value serializable to a JSON value.
+//
+// It can be set to:
+// - a boolean
+// - a char, short, int or a long (signed or unsigned)
+// - a string (const char*)
+// - a reference to a ArrayRef or ObjectRef
+class VariantRef : public VariantRefBase<VariantData>,
+                   public VariantOperators<VariantRef>,
+                   public VariantShortcuts<VariantRef>,
+                   public Visitable {
+  typedef VariantRefBase<VariantData> base_type;
+  friend class VariantConstRef;
+
+ public:
+  // Intenal use only
+  FORCE_INLINE VariantRef(MemoryPool *pool, VariantData *data)
+      : base_type(data), _pool(pool) {}
+
+  // Creates an uninitialized VariantRef
+  FORCE_INLINE VariantRef() : base_type(0), _pool(0) {}
+
+  FORCE_INLINE void clear() const {
+    return variantSetNull(_data);
+  }
+
+  template <typename T>
+  FORCE_INLINE bool set(const T &value) const {
+    return Converter<T>::toJson(value, *this);
+  }
+
+  bool ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      set(char value) const;
+
+  template <typename T>
+  FORCE_INLINE bool set(T *value) const {
+    return Converter<T *>::toJson(value, *this);
+  }
+
+  template <typename T>
+  FORCE_INLINE
+      typename enable_if<!is_same<T, char *>::value && !is_same<T, char>::value,
+                         T>::type
+      as() const {
+    return Converter<T>::fromJson(*this);
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type
+  ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
+      as() const {
+    return as<const char *>();
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char>::value, char>::type
+  ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      as() const {
+    return as<signed char>();
+  }
+
+  template <typename T>
+  FORCE_INLINE
+      typename enable_if<!is_same<T, char *>::value && !is_same<T, char>::value,
+                         bool>::type
+      is() const {
+    return Converter<T>::checkJson(*this);
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, bool>::type
+  ARDUINOJSON_DEPRECATED("Replace is<char*>() with is<const char*>()")
+      is() const {
+    return is<const char *>();
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char>::value, bool>::type
+  ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      is() const {
+    return is<signed char>();
+  }
+
+  template <typename T>
+  FORCE_INLINE operator T() const {
+    return as<T>();
+  }
+
+  template <typename TVisitor>
+  typename TVisitor::result_type accept(TVisitor &visitor) const {
+    return variantAccept(_data, visitor);
+  }
+
+  // Change the type of the variant
+  //
+  // ArrayRef to<ArrayRef>()
+  template <typename T>
+  typename enable_if<is_same<T, ArrayRef>::value, ArrayRef>::type to() const;
+  //
+  // ObjectRef to<ObjectRef>()
+  template <typename T>
+  typename enable_if<is_same<T, ObjectRef>::value, ObjectRef>::type to() const;
+  //
+  // ObjectRef to<VariantRef>()
+  template <typename T>
+  typename enable_if<is_same<T, VariantRef>::value, VariantRef>::type to()
+      const;
+
+  VariantRef addElement() const;
+
+  FORCE_INLINE VariantRef getElement(size_t) const;
+
+  FORCE_INLINE VariantRef getOrAddElement(size_t) const;
+
+  // getMember(const char*) const
+  // getMember(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE VariantRef getMember(TChar *) const;
+
+  // getMember(const std::string&) const
+  // getMember(const String&) const
+  template <typename TString>
+  FORCE_INLINE typename enable_if<IsString<TString>::value, VariantRef>::type
+  getMember(const TString &) const;
+
+  // getOrAddMember(char*) const
+  // getOrAddMember(const char*) const
+  // getOrAddMember(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE VariantRef getOrAddMember(TChar *) const;
+
+  // getOrAddMember(const std::string&) const
+  // getOrAddMember(const String&) const
+  template <typename TString>
+  FORCE_INLINE VariantRef getOrAddMember(const TString &) const;
+
+  FORCE_INLINE void remove(size_t index) const {
+    if (_data)
+      _data->remove(index);
+  }
+  // remove(char*) const
+  // remove(const char*) const
+  // remove(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE typename enable_if<IsString<TChar *>::value>::type remove(
+      TChar *key) const {
+    if (_data)
+      _data->remove(adaptString(key));
+  }
+  // remove(const std::string&) const
+  // remove(const String&) const
+  template <typename TString>
+  FORCE_INLINE typename enable_if<IsString<TString>::value>::type remove(
+      const TString &key) const {
+    if (_data)
+      _data->remove(adaptString(key));
+  }
+
+ private:
+  MemoryPool *_pool;
+
+  friend MemoryPool *getPool(const VariantRef &variant) {
+    return variant._pool;
+  }
+};
+
+class VariantConstRef : public VariantRefBase<const VariantData>,
+                        public VariantOperators<VariantConstRef>,
+                        public VariantShortcuts<VariantConstRef>,
+                        public Visitable {
+  typedef VariantRefBase<const VariantData> base_type;
+  friend class VariantRef;
+
+ public:
+  VariantConstRef() : base_type(0) {}
+  VariantConstRef(const VariantData *data) : base_type(data) {}
+  VariantConstRef(VariantRef var) : base_type(var._data) {}
+
+  template <typename TVisitor>
+  typename TVisitor::result_type accept(TVisitor &visitor) const {
+    return variantAccept(_data, visitor);
+  }
+
+  template <typename T>
+  FORCE_INLINE
+      typename enable_if<!is_same<T, char *>::value && !is_same<T, char>::value,
+                         T>::type
+      as() const {
+    return Converter<T>::fromJson(*this);
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, const char *>::type
+  ARDUINOJSON_DEPRECATED("Replace as<char*>() with as<const char*>()")
+      as() const {
+    return as<const char *>();
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char>::value, char>::type
+  ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      as() const {
+    return as<signed char>();
+  }
+
+  template <typename T>
+  FORCE_INLINE
+      typename enable_if<!is_same<T, char *>::value && !is_same<T, char>::value,
+                         bool>::type
+      is() const {
+    return Converter<T>::checkJson(*this);
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char *>::value, bool>::type
+  ARDUINOJSON_DEPRECATED("Replace is<char*>() with is<const char*>()")
+      is() const {
+    return is<const char *>();
+  }
+
+  template <typename T>
+  FORCE_INLINE typename enable_if<is_same<T, char>::value, bool>::type
+  ARDUINOJSON_DEPRECATED(
+      "Support for char is deprecated, use int8_t or uint8_t instead")
+      is() const {
+    return is<signed char>();
+  }
+
+  template <typename T>
+  FORCE_INLINE operator T() const {
+    return as<T>();
+  }
+
+  FORCE_INLINE VariantConstRef getElement(size_t) const;
+
+  FORCE_INLINE VariantConstRef operator[](size_t index) const {
+    return getElement(index);
+  }
+
+  // getMember(const std::string&) const
+  // getMember(const String&) const
+  template <typename TString>
+  FORCE_INLINE VariantConstRef getMember(const TString &key) const {
+    return VariantConstRef(
+        objectGetMember(variantAsObject(_data), adaptString(key)));
+  }
+
+  // getMember(char*) const
+  // getMember(const char*) const
+  // getMember(const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE VariantConstRef getMember(TChar *key) const {
+    const CollectionData *obj = variantAsObject(_data);
+    return VariantConstRef(obj ? obj->getMember(adaptString(key)) : 0);
+  }
+
+  // operator[](const std::string&) const
+  // operator[](const String&) const
+  template <typename TString>
+  FORCE_INLINE
+      typename enable_if<IsString<TString>::value, VariantConstRef>::type
+      operator[](const TString &key) const {
+    return getMember(key);
+  }
+
+  // operator[](char*) const
+  // operator[](const char*) const
+  // operator[](const __FlashStringHelper*) const
+  template <typename TChar>
+  FORCE_INLINE
+      typename enable_if<IsString<TChar *>::value, VariantConstRef>::type
+      operator[](TChar *key) const {
+    return getMember(key);
+  }
+};
+
+template <>
+struct Converter<VariantRef> {
+  static bool toJson(VariantRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+
+  static VariantRef fromJson(VariantRef src) {
+    return src;
+  }
+
+  static InvalidConversion<VariantConstRef, VariantRef> fromJson(
+      VariantConstRef);
+
+  static bool checkJson(VariantRef src) {
+    VariantData *data = getData(src);
+    return !!data;
+  }
+
+  static bool checkJson(VariantConstRef) {
+    return false;
+  }
+};
+
+template <>
+struct Converter<VariantConstRef> {
+  static bool toJson(VariantConstRef src, VariantRef dst) {
+    return variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  }
+
+  static VariantConstRef fromJson(VariantConstRef src) {
+    return VariantConstRef(getData(src));
+  }
+
+  static bool checkJson(VariantConstRef src) {
+    const VariantData *data = getData(src);
+    return !!data;
+  }
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantShortcuts.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantShortcuts.hpp
new file mode 100644
index 0000000..e62847f
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantShortcuts.hpp
@@ -0,0 +1,23 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/ArrayShortcuts.hpp>
+#include <ArduinoJson/Object/ObjectShortcuts.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TVariant>
+class VariantShortcuts : public ObjectShortcuts<TVariant>,
+                         public ArrayShortcuts<TVariant> {
+ public:
+  using ArrayShortcuts<TVariant>::createNestedArray;
+  using ArrayShortcuts<TVariant>::createNestedObject;
+  using ArrayShortcuts<TVariant>::operator[];
+  using ObjectShortcuts<TVariant>::createNestedArray;
+  using ObjectShortcuts<TVariant>::createNestedObject;
+  using ObjectShortcuts<TVariant>::operator[];
+};
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp
new file mode 100644
index 0000000..a271c1e
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp
@@ -0,0 +1,116 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Polyfills/integer.hpp>
+#include <ArduinoJson/Polyfills/limits.hpp>
+#include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Strings/StoragePolicy.hpp>
+#include <ArduinoJson/Variant/VariantContent.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+typedef int_t<ARDUINOJSON_SLOT_OFFSET_SIZE * 8>::type VariantSlotDiff;
+
+class VariantSlot {
+  // CAUTION: same layout as VariantData
+  // we cannot use composition because it adds padding
+  // (+20% on ESP8266 for example)
+  VariantContent _content;
+  uint8_t _flags;
+  VariantSlotDiff _next;
+  const char* _key;
+
+ public:
+  // Must be a POD!
+  // - no constructor
+  // - no destructor
+  // - no virtual
+  // - no inheritance
+
+  VariantData* data() {
+    return reinterpret_cast<VariantData*>(&_content);
+  }
+
+  const VariantData* data() const {
+    return reinterpret_cast<const VariantData*>(&_content);
+  }
+
+  VariantSlot* next() {
+    return _next ? this + _next : 0;
+  }
+
+  const VariantSlot* next() const {
+    return const_cast<VariantSlot*>(this)->next();
+  }
+
+  VariantSlot* next(size_t distance) {
+    VariantSlot* slot = this;
+    while (distance--) {
+      if (!slot->_next)
+        return 0;
+      slot += slot->_next;
+    }
+    return slot;
+  }
+
+  const VariantSlot* next(size_t distance) const {
+    return const_cast<VariantSlot*>(this)->next(distance);
+  }
+
+  void setNext(VariantSlot* slot) {
+    ARDUINOJSON_ASSERT(!slot || slot - this >=
+                                    numeric_limits<VariantSlotDiff>::lowest());
+    ARDUINOJSON_ASSERT(!slot || slot - this <=
+                                    numeric_limits<VariantSlotDiff>::highest());
+    _next = VariantSlotDiff(slot ? slot - this : 0);
+  }
+
+  void setNextNotNull(VariantSlot* slot) {
+    ARDUINOJSON_ASSERT(slot != 0);
+    ARDUINOJSON_ASSERT(slot - this >=
+                       numeric_limits<VariantSlotDiff>::lowest());
+    ARDUINOJSON_ASSERT(slot - this <=
+                       numeric_limits<VariantSlotDiff>::highest());
+    _next = VariantSlotDiff(slot - this);
+  }
+
+  void setKey(const char* k, storage_policies::store_by_copy) {
+    ARDUINOJSON_ASSERT(k != NULL);
+    _flags |= OWNED_KEY_BIT;
+    _key = k;
+  }
+
+  void setKey(const char* k, storage_policies::store_by_address) {
+    ARDUINOJSON_ASSERT(k != NULL);
+    _flags &= VALUE_MASK;
+    _key = k;
+  }
+
+  const char* key() const {
+    return _key;
+  }
+
+  bool ownsKey() const {
+    return (_flags & OWNED_KEY_BIT) != 0;
+  }
+
+  void clear() {
+    _next = 0;
+    _flags = 0;
+    _key = 0;
+  }
+
+  void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) {
+    if (_flags & OWNED_KEY_BIT)
+      _key += stringDistance;
+    if (_flags & OWNED_VALUE_BIT)
+      _content.asString += stringDistance;
+    if (_flags & COLLECTION_MASK)
+      _content.asCollection.movePointers(stringDistance, variantDistance);
+  }
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantTag.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantTag.hpp
new file mode 100644
index 0000000..7164164
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantTag.hpp
@@ -0,0 +1,16 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+struct VariantTag {};
+
+template <typename T>
+struct IsVariant : is_base_of<VariantTag, T> {};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp
new file mode 100644
index 0000000..352ecba
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp
@@ -0,0 +1,32 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+class ArrayRef;
+class ObjectRef;
+class VariantRef;
+
+// A metafunction that returns the type of the value returned by
+// VariantRef::to<T>()
+template <typename T>
+struct VariantTo {};
+
+template <>
+struct VariantTo<ArrayRef> {
+  typedef ArrayRef type;
+};
+template <>
+struct VariantTo<ObjectRef> {
+  typedef ObjectRef type;
+};
+template <>
+struct VariantTo<VariantRef> {
+  typedef VariantRef type;
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/Variant/Visitor.hpp b/third-party/ArduinoJson/src/ArduinoJson/Variant/Visitor.hpp
new file mode 100644
index 0000000..33237dd
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/Variant/Visitor.hpp
@@ -0,0 +1,54 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Collection/CollectionData.hpp>
+#include <ArduinoJson/Numbers/Float.hpp>
+#include <ArduinoJson/Numbers/Integer.hpp>
+
+namespace ARDUINOJSON_NAMESPACE {
+
+template <typename TResult>
+struct Visitor {
+  typedef TResult result_type;
+
+  TResult visitArray(const CollectionData &) {
+    return TResult();
+  }
+
+  TResult visitBoolean(bool) {
+    return TResult();
+  }
+
+  TResult visitFloat(Float) {
+    return TResult();
+  }
+
+  TResult visitSignedInteger(Integer) {
+    return TResult();
+  }
+
+  TResult visitNull() {
+    return TResult();
+  }
+
+  TResult visitObject(const CollectionData &) {
+    return TResult();
+  }
+
+  TResult visitUnsignedInteger(UInt) {
+    return TResult();
+  }
+
+  TResult visitRawJson(const char *, size_t) {
+    return TResult();
+  }
+
+  TResult visitString(const char *) {
+    return TResult();
+  }
+};
+
+}  // namespace ARDUINOJSON_NAMESPACE
diff --git a/third-party/ArduinoJson/src/ArduinoJson/compatibility.hpp b/third-party/ArduinoJson/src/ArduinoJson/compatibility.hpp
new file mode 100644
index 0000000..cca477e
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/compatibility.hpp
@@ -0,0 +1,23 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+//
+// clang-format off
+
+#ifdef __GNUC__
+
+#define ARDUINOJSON_PRAGMA(x) _Pragma(#x)
+
+#define ARDUINOJSON_COMPILE_ERROR(msg) ARDUINOJSON_PRAGMA(GCC error msg)
+
+#define ARDUINOJSON_STRINGIFY(S) #S
+
+#define ARDUINOJSON_DEPRECATION_ERROR(X, Y) \
+  ARDUINOJSON_COMPILE_ERROR(ARDUINOJSON_STRINGIFY(X is a Y from ArduinoJson 5. Please see https:/\/arduinojson.org/upgrade to learn how to upgrade your program to ArduinoJson version 6))
+
+#define StaticJsonBuffer ARDUINOJSON_DEPRECATION_ERROR(StaticJsonBuffer, class)
+#define DynamicJsonBuffer ARDUINOJSON_DEPRECATION_ERROR(DynamicJsonBuffer, class)
+#define JsonBuffer ARDUINOJSON_DEPRECATION_ERROR(JsonBuffer, class)
+#define RawJson ARDUINOJSON_DEPRECATION_ERROR(RawJson, function)
+
+#endif
diff --git a/third-party/ArduinoJson/src/ArduinoJson/version.hpp b/third-party/ArduinoJson/src/ArduinoJson/version.hpp
new file mode 100644
index 0000000..cf20b1c
--- /dev/null
+++ b/third-party/ArduinoJson/src/ArduinoJson/version.hpp
@@ -0,0 +1,10 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright Benoit Blanchon 2014-2021
+// MIT License
+
+#pragma once
+
+#define ARDUINOJSON_VERSION "6.18.2"
+#define ARDUINOJSON_VERSION_MAJOR 6
+#define ARDUINOJSON_VERSION_MINOR 18
+#define ARDUINOJSON_VERSION_REVISION 2
diff --git a/third-party/ArduinoJson/src/CMakeLists.txt b/third-party/ArduinoJson/src/CMakeLists.txt
new file mode 100644
index 0000000..b76e580
--- /dev/null
+++ b/third-party/ArduinoJson/src/CMakeLists.txt
@@ -0,0 +1,90 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright Benoit Blanchon 2014-2021
+# MIT License
+
+# I have no idea what this is about, I simply followed the instructions from:
+# https://dominikberner.ch/cmake-interface-lib/
+
+add_library(ArduinoJson INTERFACE)
+
+include(GNUInstallDirs)
+
+# Adding the install interface generator expression makes sure that the include
+# files are installed to the proper location (provided by GNUInstallDirs)
+target_include_directories(ArduinoJson
+    INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+
+target_compile_definitions(ArduinoJson
+    INTERFACE
+        ARDUINOJSON_DEBUG=$<CONFIG:Debug>
+)
+
+# locations are provided by GNUInstallDirs
+install(
+    TARGETS
+        ArduinoJson
+    EXPORT
+        ArduinoJson_Targets
+    ARCHIVE DESTINATION
+        ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION
+        ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION
+        ${CMAKE_INSTALL_BINDIR}
+)
+
+include(CMakePackageConfigHelpers)
+
+if(${CMAKE_VERSION} VERSION_GREATER "3.14.0") 
+    set(ARCH_INDEPENDENT "ARCH_INDEPENDENT")
+endif()
+
+write_basic_package_version_file(
+        "${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake"
+    VERSION
+        ${PROJECT_VERSION}
+    COMPATIBILITY
+        SameMajorVersion
+    ${ARCH_INDEPENDENT}
+)
+
+configure_package_config_file(
+        "${PROJECT_SOURCE_DIR}/extras/ArduinoJsonConfig.cmake.in"
+        "${PROJECT_BINARY_DIR}/ArduinoJsonConfig.cmake"
+    INSTALL_DESTINATION
+        ${CMAKE_INSTALL_DATAROOTDIR}/ArduinoJson/cmake)
+
+install(
+    EXPORT
+        ArduinoJson_Targets
+    FILE
+        ArduinoJsonTargets.cmake
+    DESTINATION
+        ${CMAKE_INSTALL_DATAROOTDIR}/ArduinoJson/cmake
+)
+
+install(
+    FILES
+        "${PROJECT_BINARY_DIR}/ArduinoJsonConfig.cmake"
+        "${PROJECT_BINARY_DIR}/ArduinoJsonConfigVersion.cmake"
+    DESTINATION
+        "${CMAKE_INSTALL_DATAROOTDIR}/ArduinoJson/cmake"
+)
+
+install(
+    FILES
+        ArduinoJson.h
+        ArduinoJson.hpp
+    DESTINATION
+        include
+)
+
+install(
+    DIRECTORY
+        "${CMAKE_CURRENT_SOURCE_DIR}/ArduinoJson"
+    DESTINATION
+        include
+)
diff --git a/third-party/LCDMenuLib2.old/LICENSE b/third-party/LCDMenuLib2.old/LICENSE
deleted file mode 100644
index 930c688..0000000
--- a/third-party/LCDMenuLib2.old/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) [2020] [Nils Feldkämper]
-
-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:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/README.md b/third-party/LCDMenuLib2.old/README.md
deleted file mode 100644
index 93dfcac..0000000
--- a/third-party/LCDMenuLib2.old/README.md
+++ /dev/null
@@ -1,76 +0,0 @@
-Arduino LCDMenuLib2 (LCDML) with layers for any LCD Type (Row Displays, Graphic Displays, Console output)
-=================================================================
-
-https://github.com/Jomelo/LCDMenuLib2/wiki
-
-Features:
-*  max 254 menu elements
-*  max 254 menu elements per layer
-*  based on a tree model (parent, child, sibling)
-*  min 3 buttons needed up, down, enter
-*  support for 6 defined buttons up, down, left, right, back/quit, enter
-*  support for 64 custom events it could be a button click or something else. This events could be combined with a special handling to open a defined menu function when the status is changed. 
-*  separation of structural and functional level
-*  support for screensaver which is shown after x seconds
-*  display a scrollbar when more menu elements in a layer then display rows
-*  the menu function are only updated when a button is hit / a custom event is called  or a trigger is set
-*  it is possible to set special conditions to display an element
-*  it is possible to change parameter direct from the menu
-*  possibility to jump from one menu element directly to another
-*  examples for many different LCD libraries
-*  examples for different functionality (change param, set params, ...)
-
-
-Attention:
-*  when you change from LCDMenuLib v2.3.4 to LCDMenuLib2 v1.0.0 or higher
-** the backend system is removed from this lib use this when you need a task system: https://github.com/arkhipenko/TaskScheduler
-
-
-Description (German):
-http://forum.arduino.cc/index.php?topic=73816.0
-
-Images:
-
-* 20x4
-
-![20x4 display](extras/img/20x4_1.jpg?raw=true "20x4 display")
-![20x4 display](extras/img/20x4_2.jpg?raw=true "20x4 display")
-![20x4 display](extras/img/20x4_3.jpg?raw=true "20x4 display")
-![20x4 display](extras/img/20x4_4.jpg?raw=true "20x4 display")
-
-* glcd with u8glib
-
-![Graphic display](extras/img/glcd_1.jpg?raw=true "Graphic display")
-![Graphic display](extras/img/glcd_2.jpg?raw=true "Graphic display")
-![Graphic display](extras/img/glcd_3.jpg?raw=true "Graphic display")
-![Graphic display](extras/img/glcd_4.jpg?raw=true "Graphic display")
-
-* serial monitor for testing or programming without a connected display
-
-![Serial Monitor](extras/img/console_1.png?raw=true "Serial Monitor")
-![Serial Monitor](extras/img/console_2.png?raw=true "Serial Monitor")
-![Serial Monitor](extras/img/console_3.png?raw=true "Serial Monitor")
-
-
-MIT License
-
-Copyright (c) [2020] [Nils Feldkämper]
-
-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:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_000_serialMonitor.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_000_serialMonitor.ino
deleted file mode 100644
index 3d01025..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_000_serialMonitor.ino
+++ /dev/null
@@ -1,163 +0,0 @@
-// ============================================================
-// Example:     LCDML_serialmonitor
-// ============================================================
-// Description:
-// This example includes the complete functionality over some
-// tabs. All Tabs which are started with "LCDML_display_.."
-// generates an output on the display / console / ....
-// This example is for the author to test the complete functionality
-// ============================================================
-// *********************************************************************
-// special settings for non arduino basic controllers
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <LCDMenuLib2.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  20
-  #define _LCDML_DISP_rows  4
-  
-  // enable this line (set to 1) to show a header above the first menu element
-  // this function can be changed in LCDML_display_menu tab
-  #define _LCDML_DSIP_use_header 0
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows-_LCDML_DSIP_use_header, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // Example function for event handling (only serial output in this example)  
-  LCDML_add         (23 , LCDML_0         , 8  , "Event Handling"                 , mFunc_exampleEventHandling);  // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    23
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    //LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-
-    // In the following line the new event handling system ins configured
-    // you can use 0 - 3 special events when calling the LCDML.CE_set(id) function
-    // when you need more events you can change in LCDMenuLib.h the number until 0-63
-    LCDML.CE_setOnChangeCbFunction(0, mFunc_exampleEventHandling);
-    //LCDML.CE_setOnChangeCbFunction(1, your_special_menu_function);
-    //...
-
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    LCDML.loop();
-  }
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_condition.ino
deleted file mode 100644
index 2e55c07..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_condition.ino
+++ /dev/null
@@ -1,13 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_display_dynFunction.ino
deleted file mode 100644
index 9f95433..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-      }
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-      }
-    }
-  }
-
-  Serial.print("dynValue:");
-  Serial.print(g_dynParam);
-}
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_display_menu.ino
deleted file mode 100644
index 53c0338..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_display_menu.ino
+++ /dev/null
@@ -1,106 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  for(uint8_t i=0;i<15;i++) {
-    Serial.println();
-  }
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // init vars
-  //uint8_t n_max = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate() || LCDML.DISP_checkMenuCursorUpdate() ) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  Menu ===================="));
-    Serial.println(F("==========================================="));
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = (_LCDML_DISP_rows - _LCDML_DSIP_use_header) + i;
-    uint8_t n = 0;
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // Display a header with the parent element name
-      if(_LCDML_DSIP_use_header > 0)
-      {
-        // only one line
-        if(LCDML.MENU_getLayer() == 0)
-        {
-          // this text is displayed when no header is available
-          Serial.println(F("Root Menu"));
-        }
-        else
-        {
-          // Display parent name
-          LCDML_getContent(content_text, LCDML.MENU_getParentID());
-          Serial.print(content_text);
-          Serial.println();
-        }        
-      }
-
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // display cursor
-          if (n == LCDML.MENU_getCursorPos())
-          {
-            Serial.print(F("(x) "));
-          }
-          else
-          {
-            Serial.print(F("( ) "));
-          }
-
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            Serial.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-
-          Serial.println();
-
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_display_menuFunction.ino
deleted file mode 100644
index 3cb75af..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_000_serialMonitor/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,414 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-
-    Serial.println(F("To close this"));
-    Serial.println(F("function press"));
-    Serial.println(F("any button or use"));
-    Serial.println(F("back button"));
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.println(F("wait 20 seconds or press back button"));
-    g_func_timer_info = 20;       // reset and set timer
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000)) {
-      g_func_timer_info--;                // increment the value every second
-      Serial.println(g_func_timer_info);  // print the time counter value
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.println(F("press a or w"));
-    Serial.println(F("count: 0 of 3"));
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        Serial.print(F("count: "));
-        Serial.print(g_button_value); //print change content
-        Serial.println(F(" of 3"));
-      }
-    }
-
-    // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function
-  }
-}
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    Serial.println(F("start screensaver"));
-    Serial.println(F("press any key to quit"));
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())
-  {
-     LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.print(F("parameter: "));
-    Serial.println(param);
-
-    Serial.println(F("press any key"));
-    Serial.println(F("to leave it"));
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())          // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())        // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_exampleEventHandling(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    LCDML_UNUSED(param);
-    
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    //LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    LCDML.FUNC_setGBA(); 
-
-    // display content
-    Serial.println("Event handling function is active");
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    // this function is only working when a loop timer is set
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }   
-
-    // check if any event is active  
-    if(LCDML.CE_checkAny())
-    { 
-      // check if the defined command char is pressed 
-      if(LCDML.CE_check(0))
-      {
-        Serial.println(F("The defined command char is enabled"));         
-      }
-      
-      // check if a special char was pressed
-      // there are 10 defined special chars in control tab
-      for(uint8_t i=1; i<=10; i++)
-      {
-        if(LCDML.CE_check(i))
-        {
-          Serial.print(F("The command number: "));
-          Serial.print(i-1);
-          Serial.println(F(" is pressed"));
-        }
-      }        
-    }
-    else
-    {
-      Serial.println(F("This function is called by menu, not over the callback function")); 
-      Serial.println(F("Press 'c' or a number to display the content"));
-    }
-    LCDML.CE_resetAll();
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-
-    // reset all events 
-    LCDML.CE_resetAll();
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_001_liquidCrystal.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_001_liquidCrystal.ino
deleted file mode 100644
index 744893c..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_001_liquidCrystal.ino
+++ /dev/null
@@ -1,173 +0,0 @@
-// ============================================================
-// Example:     LCDML_serialmonitor
-// ============================================================
-// Description:
-// This example includes the complete functionality over some
-// tabs. All Tabs which are started with "LCDML_display_.."
-// generates an output on the display / console / ....
-// This example is for the author to test the complete functionality
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <LiquidCrystal.h>
-  #include <LCDMenuLib2.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  20
-  #define _LCDML_DISP_rows  4
-
-  // enable this line (set to 1) to show a header above the first menu element
-  // this function can be changed in LCDML_display_menu tab
-  #define _LCDML_DSIP_use_header 0
-
-  #define _LCDML_DISP_cfg_cursor                     0x7E   // cursor Symbol
-  #define _LCDML_DISP_cfg_scrollbar                  1      // enable a scrollbar
-
-  // LCD object
-  // liquid crystal needs (rs, e, dat4, dat5, dat6, dat7)
-  LiquidCrystal lcd(22, 24, 9, 10, 11, 12);
-
-  const uint8_t scroll_bar[5][8] = {
-    {B10001, B10001, B10001, B10001, B10001, B10001, B10001, B10001}, // scrollbar top
-    {B11111, B11111, B10001, B10001, B10001, B10001, B10001, B10001}, // scroll state 1
-    {B10001, B10001, B11111, B11111, B10001, B10001, B10001, B10001}, // scroll state 2
-    {B10001, B10001, B10001, B10001, B11111, B11111, B10001, B10001}, // scroll state 3
-    {B10001, B10001, B10001, B10001, B10001, B10001, B11111, B11111}  // scrollbar bottom
-  };
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Global variables
-// *********************************************************************
-
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows-_LCDML_DSIP_use_header, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCD Begin
-    lcd.begin(_LCDML_DISP_cols,_LCDML_DISP_rows);
-    // set special chars for scrollbar
-    lcd.createChar(0, (uint8_t*)scroll_bar[0]);
-    lcd.createChar(1, (uint8_t*)scroll_bar[1]);
-    lcd.createChar(2, (uint8_t*)scroll_bar[2]);
-    lcd.createChar(3, (uint8_t*)scroll_bar[3]);
-    lcd.createChar(4, (uint8_t*)scroll_bar[4]);
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    LCDML.loop();
-  }
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_condition.ino
deleted file mode 100644
index 4ddf48e..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_condition.ino
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_display_dynFunction.ino
deleted file mode 100644
index 22642ba..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-      }
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-      }
-    }
-  }
-
-  char buf[20];
-  sprintf (buf, "dynValue: %d", g_dynParam);
-
-  // use the line from function parameters
-  lcd.setCursor(1, (line + _LCDML_DSIP_use_header));
-  lcd.print(buf);
-
-}
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_display_menu.ino
deleted file mode 100644
index af75290..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_display_menu.ino
+++ /dev/null
@@ -1,144 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  lcd.clear();
-  lcd.setCursor(0, 0);
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate()) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = (_LCDML_DISP_rows - _LCDML_DSIP_use_header) + i;
-    uint8_t n = 0;
-
-    // Display a header with the parent element name
-    if(_LCDML_DSIP_use_header > 0)
-    {
-      // only one line
-      if(LCDML.MENU_getLayer() == 0)
-      {
-        // this text is displayed when no header is available
-        lcd.setCursor(0,0);
-        lcd.print(F("Root Menu"));       
-      }
-      else
-      {
-        // Display parent name
-        LCDML_getContent(content_text, LCDML.MENU_getParentID());
-        lcd.setCursor(0,0);
-        lcd.print(content_text);       
-      }        
-    }      
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            lcd.setCursor(1, (n+_LCDML_DSIP_use_header));
-            lcd.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-
-  if(LCDML.DISP_checkMenuCursorUpdate())
-  {
-    // init vars
-    uint8_t n_max             = (LCDML.MENU_getChilds() >= (_LCDML_DISP_rows - _LCDML_DSIP_use_header)) ? (_LCDML_DISP_rows - _LCDML_DSIP_use_header) : (LCDML.MENU_getChilds());
-    uint8_t scrollbar_min     = 0;
-    uint8_t scrollbar_max     = LCDML.MENU_getChilds();
-    uint8_t scrollbar_cur_pos = LCDML.MENU_getCursorPosAbs();
-    uint8_t scroll_pos        = ((1.*n_max * (_LCDML_DISP_rows - _LCDML_DSIP_use_header)) / (scrollbar_max - 1) * scrollbar_cur_pos);
-
-
-    // display rows
-    for (uint8_t n = 0; n < n_max; n++)
-    {
-      //set cursor
-      lcd.setCursor(0, (n+_LCDML_DSIP_use_header));
-
-      //set cursor char
-      if (n == LCDML.MENU_getCursorPos()) {
-        lcd.write(_LCDML_DISP_cfg_cursor);
-      } else {
-        lcd.write(' ');
-      }
-
-      // delete or reset scrollbar
-      if (_LCDML_DISP_cfg_scrollbar == 1) {
-        if (scrollbar_max > n_max) {
-          lcd.setCursor((_LCDML_DISP_cols - 1), (n+_LCDML_DSIP_use_header));
-          lcd.write((uint8_t)0);
-        }
-        else {
-          lcd.setCursor((_LCDML_DISP_cols - 1), (n+_LCDML_DSIP_use_header));
-          lcd.print(' ');
-        }
-      }
-    }
-
-    // display scrollbar
-    if (_LCDML_DISP_cfg_scrollbar == 1) {
-      if (scrollbar_max > n_max) {
-        //set scroll position
-        if (scrollbar_cur_pos == scrollbar_min) {
-          // min pos
-          lcd.setCursor((_LCDML_DISP_cols - 1), (0+_LCDML_DSIP_use_header));
-          lcd.write((uint8_t)1);
-        } else if (scrollbar_cur_pos == (scrollbar_max - 1)) {
-          // max pos
-          lcd.setCursor((_LCDML_DISP_cols - 1), (n_max - 1 + _LCDML_DSIP_use_header));
-          lcd.write((uint8_t)4);
-        } else {
-          // between
-          lcd.setCursor((_LCDML_DISP_cols - 1), (scroll_pos / n_max + _LCDML_DSIP_use_header));
-          lcd.write((uint8_t)(scroll_pos % n_max) + 1);
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_display_menuFunction.ino
deleted file mode 100644
index bfdb485..0000000
--- a/third-party/LCDMenuLib2.old/examples/00_beginners/LCDML_001_liquidCrystal/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,347 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    lcd.setCursor(0, 0);
-    lcd.print(F("To close this"));
-    lcd.setCursor(0, 1);
-    lcd.print(F("function press"));
-    lcd.setCursor(0, 2);
-    lcd.print(F("any button or use"));
-    lcd.setCursor(0, 3);
-    lcd.print(F("back button"));
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    lcd.print(F("20 sec wait")); // print some content on first row
-    g_func_timer_info = 20;       // reset and set timer
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000)) {
-      g_func_timer_info--;                // increment the value every second
-      lcd.setCursor(0, 0);                // set cursor pos
-      lcd.print(F("  "));
-      lcd.setCursor(0, 0);                // set cursor pos
-      lcd.print(g_func_timer_info);       // print the time counter value
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    // print LCD content
-    lcd.setCursor(0, 0);
-    lcd.print(F("press left or up"));
-    lcd.setCursor(0, 1);
-    lcd.print(F("count: 0 of 3"));
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        // update LCD content
-        lcd.setCursor(7, 1); // set cursor
-        lcd.print(g_button_value); // print change content
-      }
-    }
-
-    // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // update LCD content
-    lcd.setCursor(0, 0); // set cursor
-    lcd.print(F("screensaver")); // print change content
-    lcd.setCursor(0, 1); // set cursor
-    lcd.print(F("press any key"));
-    lcd.setCursor(0, 2); // set cursor
-    lcd.print(F("to leave it"));
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      // remmove compiler warnings when the param variable is not used:
-      LCDML_UNUSED(param);
-
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())
-  {
-    // The screensaver go to the root menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function and go a layer back
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-
-    char buf[20];
-    sprintf (buf, "parameter: %d", param);
-
-    lcd.setCursor(0, 0);
-    lcd.print(buf);
-    lcd.setCursor(0, 1);
-    lcd.print(F("press any key"));
-    lcd.setCursor(0, 2);
-    lcd.print(F("to leave it"));
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())          // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())        // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_010_simpleThread.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_010_simpleThread.ino
deleted file mode 100644
index 8060947..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_010_simpleThread.ino
+++ /dev/null
@@ -1,238 +0,0 @@
-// ============================================================
-// Example:     LCDML_simpleThread example
-// ============================================================
-// Description:
-// This example includes the complete functionality over some
-// tabs. All Tabs which are started with "LCDML_display_.."
-// generates an output on the display / console / ....
-// This example is for the author to test the complete functionality
-//
-// The simpleThread Library provides a method to to run more then 
-// one loop function. The loop functions are called with a priority 
-// and a time interval. The lib is not using interrupts.
-// When a function is called it runs until the function end is reached. 
-//
-// Download simple thread:
-// https://github.com/Jomelo/simpleThread
-// 
-// documentation (german):
-// https://forum.arduino.cc/index.php?topic=165552.0
-// 
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <LCDMenuLib2.h>
-  #include <simpleThread.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  20
-  #define _LCDML_DISP_rows  4
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Blink Thread"     , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "Start Thread"     , mFunc_thread_start);      // Thread control (start)
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "Stop Thread"      , mFunc_thread_stop);       // Thread control (stop)
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-
-// *********************************************************************
-// Simple Thread configuration
-// *********************************************************************
-  // define the thread number _sT_cnt_1 => 1,  _sT_cnt_2 => 2, ....  
-  #define _sT_cnt         _sT_cnt_3
-
-  // initialisation
-  simpleThread_init(_sT_cnt);
-    
-  /* create a new thread
-   * - params for "timebased_static" and "timebased_dynamic" (dynamic: the runtime can be changed)
-   *    param 1: priority (unique id) (the first is "_sT_P1", next one "_sT_P2", ...) 
-   *    param 2: time mode: "_sT_millis" or "_sT_micros"
-   *    param 3: waittime as unsigned long ( 50UL or something else with UL at the end)
-   *    param 4: the current state of a thread "_sT_start" or "_sT_stop" or "_sT_stable" 
-   *             ("_sT_stable" => a stable state function is called) 
-   *    param 5: callback function name
-   *             
-   * - params for "eventbased"            
-   *    param 1: param 1: priority (unique id) (the first is "_sT_P1", next one "_sT_P2", ...) 
-   *    param 2: callback function name
-   */
-  simpleThread_new_timebased_static   (_sT_P1  , _sT_micros, 0       , _sT_start , Thread_input_check);  
-  simpleThread_new_timebased_static   (_sT_P2  , _sT_millis, 1000UL  , _sT_stop  , Thread_Serial_Blink_Example);
-  simpleThread_new_timebased_static   (_sT_P3  , _sT_millis, 100UL   , _sT_start , Thread_LCDMenuLib);
-
-  /* simple thread control makros reference
-   *  initialisation:
-   *  ===============
-   *  void      simpleThread_init( number of threads )
-   *  void      simpleThread_new_timebased_static(unique_id, time_mode, wait_time, current_state, callback_function)
-   *  void      simpleThread_new_timebased_dynamic(unique_id, time_mode, wait_time, current_state, callback_function)
-   *  void      simpleThread_new_eventbased(unique_id, callback_function)
-   *  
-   *  setup initialisation:
-   *  ===============
-   *  void      simpleThread_initSetup(_sT_cnt); // do no change something here
-   *  
-   *  loop initialisation:
-   *  ===============
-   *  void      simpleThread_run(_sT_priority);  
-   *  or
-   *  void      simpleThread_run(_sT_no_priority); // the return value of simpleThread_loop is set to true
-   *  
-   *  create a thread function: 
-   *  ===============
-   *  void      simpleThread_setup(callback_function)
-   *  boolean   simpleThread_loop(callback_function)    // return true  =>  go to the next function (use this when the
-   *                                                                        wait_time is 0 to call the other threads
-   *                                                    // return false =>  go to the begin of the thread list
-   *  void      simpleThread_stable(callback_function)
-   *  
-   *  thread handling:
-   *  ===============
-   *  void      simpleThread_start(callback_function) 
-   *  void      simpleThread_stop(callback_function)
-   *  void      simpleThread_reset(callback_function)           // setup function is called on the next start
-   *  void      simpleThread_restart(callback_function)         // reset and start
-   *  
-   *  void      simpleThread_event_start(callback_function)
-   *  void      simpleThread_event_reset(callback_function)     // setup function is called on the next start 
-   *  void      simpleThread_event_restart(callback_function)   // reset and start
-   *  
-   *  call a thread directly:
-   *  ===============
-   *  void      simpleThread_call(callback_function)
-   *  
-   *  call a part of a thread directly
-   *  ===============
-   *  void      simpleThread_call_setup(callback_function)
-   *  boolean   simpleThread_call_loop(callback_function)
-   *  void      simpleThread_call_stable(callback_function)
-   *  
-   */
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    simpleThread_initSetup(_sT_cnt); 
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    //LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    simpleThread_run(_sT_priority);
-  }
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_condition.ino
deleted file mode 100644
index 2e55c07..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_condition.ino
+++ /dev/null
@@ -1,13 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_display_dynFunction.ino
deleted file mode 100644
index 9f95433..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-      }
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-      }
-    }
-  }
-
-  Serial.print("dynValue:");
-  Serial.print(g_dynParam);
-}
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_display_menu.ino
deleted file mode 100644
index de74de9..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_display_menu.ino
+++ /dev/null
@@ -1,88 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  for(uint8_t i=0;i<15;i++) {
-    Serial.println();
-  }
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // init vars
-  //uint8_t n_max = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate() || LCDML.DISP_checkMenuCursorUpdate() ) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  Menu ===================="));
-    Serial.println(F("==========================================="));
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = _LCDML_DISP_rows + i;
-    uint8_t n = 0;
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // display cursor
-          if (n == LCDML.MENU_getCursorPos())
-          {
-            Serial.print(F("(x) "));
-          }
-          else
-          {
-            Serial.print(F("( ) "));
-          }
-
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            Serial.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-
-          Serial.println();
-
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_display_menuFunction.ino
deleted file mode 100644
index d8c95fe..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,374 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-// *********************************************************************
-void mFunc_thread_start(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup
-    // is called only if it is started  
-    simpleThread_start(Thread_Serial_Blink_Example);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function
-  } 
-}
-
-
-// *********************************************************************
-void mFunc_thread_stop(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup
-    // is called only if it is started  
-    simpleThread_stop(Thread_Serial_Blink_Example);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function
-  } 
-}
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-
-    Serial.println(F("To close this"));
-    Serial.println(F("function press"));
-    Serial.println(F("any button or use"));
-    Serial.println(F("back button"));
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.println(F("wait 20 seconds or press back button"));
-    g_func_timer_info = 20;       // reset and set timer
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000)) {
-      g_func_timer_info--;                // increment the value every second
-      Serial.println(g_func_timer_info);  // print the time counter value
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.println(F("press a or w"));
-    Serial.println(F("count: 0 of 3"));
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        Serial.print(F("count: "));
-        Serial.print(g_button_value); //print change content
-        Serial.println(F(" of 3"));
-      }
-    }
-
-    // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function
-  }
-}
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    Serial.println(F("start screensaver"));
-    Serial.println(F("press any key to quit"));
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())
-  {
-     LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.print(F("parameter: "));
-    Serial.println(param);
-
-    Serial.println(F("press any key"));
-    Serial.println(F("to leave it"));
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())          // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())        // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/simple_threads.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/simple_threads.ino
deleted file mode 100644
index abf0094..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_010_simpleThread/simple_threads.ino
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-// =====================================================================
-void simpleThread_setup(Thread_Serial_Blink_Example)
-// ===================================================================== 
-{
-  // for example set pinmode for some inputs
-  Serial.println();
-}
-
-boolean simpleThread_loop(Thread_Serial_Blink_Example)
-{
-  // generate a serial-output in the console every secound
-  Serial.print(".");
-
-
-  return false;
-}
-
-
-void simpleThread_stable(Thread_Serial_Blink_Example)
-{ 
-  // stable state   
-}
-
-
-
-
-// =====================================================================
-void simpleThread_setup(Thread_input_check)
-// ===================================================================== 
-{
-  // for example set pinmode for some inputs
-}
-
-boolean simpleThread_loop(Thread_input_check)
-{
-  // check inputs
-
-  // check LCDML inputs
-  LCDML.loop_control();
-
-  // go to the next function because the wait time is set to 0
-  // when this return value is "false" all threads with a higher priority will not be called
-  return true;
-}
-
-
-void simpleThread_stable(Thread_input_check)
-{ 
-  // stable state   
-}
-
-
-
-// =====================================================================
-void simpleThread_setup(Thread_LCDMenuLib)
-// =====================================================================
-{     
-}
-boolean simpleThread_loop(Thread_LCDMenuLib)
-{  
-
-  LCDML.loop_menu();
-
-  return false;
-}
-
-void simpleThread_stable(Thread_LCDMenuLib)
-{ 
-   
-}
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_011_TaskScheduler.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_011_TaskScheduler.ino
deleted file mode 100644
index 9a270f0..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_011_TaskScheduler.ino
+++ /dev/null
@@ -1,181 +0,0 @@
-// ============================================================
-// Example:     LCDML_simpleThread example
-// ============================================================
-// Description:
-// This example includes the complete functionality over some
-// tabs. All Tabs which are started with "LCDML_display_.."
-// generates an output on the display / console / ....
-// This example is for the author to test the complete functionality
-//
-// Add the TaskScheduler Libarary
-//
-// Download simple thread:
-// https://github.com/arkhipenko/TaskScheduler
-// 
-// 
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <LCDMenuLib2.h>
-  #include <TaskScheduler.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  20
-  #define _LCDML_DISP_rows  4
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Blink Thread"     , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "Start Thread"     , mFunc_thread_start);      // Thread control (start)
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "Stop Thread"      , mFunc_thread_stop);       // Thread control (stop)
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-
-// *********************************************************************
-// Task Scheduler
-// *********************************************************************
-
-  // objects
-  Scheduler r, hpr;
-
-  // Callback methods prototypes
-  void Task_input_check(); 
-  void Task_Serial_Blink_Example(); 
-  void Task_LCDMenuLib();
-
-  // Tasks
-  Task t1(10,   TASK_FOREVER, &Task_input_check, &r);  //adding task to the chain on creation
-  Task t2(1000, TASK_FOREVER, &Task_Serial_Blink_Example, &r);
-  Task t3(100,  TASK_FOREVER, &Task_LCDMenuLib, &r);
-
-
-
-
- 
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // Enable  input and LCDML Task
-    t1.enable();
-    t3.enable();   
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    //LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    r.execute();
-  }
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_condition.ino
deleted file mode 100644
index 2e55c07..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_condition.ino
+++ /dev/null
@@ -1,13 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_display_dynFunction.ino
deleted file mode 100644
index 9f95433..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-      }
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-      }
-    }
-  }
-
-  Serial.print("dynValue:");
-  Serial.print(g_dynParam);
-}
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_display_menu.ino
deleted file mode 100644
index de74de9..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_display_menu.ino
+++ /dev/null
@@ -1,88 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  for(uint8_t i=0;i<15;i++) {
-    Serial.println();
-  }
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // init vars
-  //uint8_t n_max = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate() || LCDML.DISP_checkMenuCursorUpdate() ) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  Menu ===================="));
-    Serial.println(F("==========================================="));
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = _LCDML_DISP_rows + i;
-    uint8_t n = 0;
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // display cursor
-          if (n == LCDML.MENU_getCursorPos())
-          {
-            Serial.print(F("(x) "));
-          }
-          else
-          {
-            Serial.print(F("( ) "));
-          }
-
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            Serial.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-
-          Serial.println();
-
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_display_menuFunction.ino
deleted file mode 100644
index 92b0d28..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,386 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-// *********************************************************************
-void mFunc_thread_start(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup
-    // start thread 
-    if(t2.isEnabled() == false)
-    {
-      t2.enable();
-    }
-    else
-    {
-      Serial.println(F("is enabled"));
-    }
-    
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function
-  } 
-}
-
-
-// *********************************************************************
-void mFunc_thread_stop(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup
-    // stop thread
-    if(t2.isEnabled() == true)
-    {
-      t2.disable();
-    }
-    else
-    {
-      Serial.println(F("is disabled"));
-    }
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function
-  } 
-}
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-
-    Serial.println(F("To close this"));
-    Serial.println(F("function press"));
-    Serial.println(F("any button or use"));
-    Serial.println(F("back button"));
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.println(F("wait 20 seconds or press back button"));
-    g_func_timer_info = 20;       // reset and set timer
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000)) {
-      g_func_timer_info--;                // increment the value every second
-      Serial.println(g_func_timer_info);  // print the time counter value
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.println(F("press a or w"));
-    Serial.println(F("count: 0 of 3"));
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        Serial.print(F("count: "));
-        Serial.print(g_button_value); //print change content
-        Serial.println(F(" of 3"));
-      }
-    }
-
-    // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function
-  }
-}
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    Serial.println(F("start screensaver"));
-    Serial.println(F("press any key to quit"));
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())
-  {
-     LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.print(F("parameter: "));
-    Serial.println(param);
-
-    Serial.println(F("press any key"));
-    Serial.println(F("to leave it"));
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())          // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())        // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/TaskScheduler.ino b/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/TaskScheduler.ino
deleted file mode 100644
index 4e138b4..0000000
--- a/third-party/LCDMenuLib2.old/examples/01_backend/LCDML_011_TaskScheduler/TaskScheduler.ino
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-// ********************************************************** 
-void Task_Serial_Blink_Example() {
-// ********************************************************** 
-
-  
-  Serial.println(".");
-}
-
-// ********************************************************** 
-void Task_input_check() {
-// ********************************************************** 
-  
-  // check LCDML inputs
-  LCDML.loop_control();
-}
-
-// ********************************************************** 
-void Task_LCDMenuLib() {
-// ********************************************************** 
- 
-  
-  LCDML.loop_menu();
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_020_filelist.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_020_filelist.ino
deleted file mode 100644
index c213028..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_020_filelist.ino
+++ /dev/null
@@ -1,150 +0,0 @@
-// ============================================================
-// Example:     LCDML_dynamic_file_list
-// ============================================================
-// Description:
-// This example includes the complete functionality over some
-// tabs. All Tabs which are started with "LCDML_display_.."
-// generates an output on the display / console / ....
-// This example is for the author to test the complete functionality
-// 
-// This example shows how a dynamic file list can be added
-// Program->Program 1-> Filelist
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <LCDMenuLib2.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  20
-  #define _LCDML_DISP_rows  4
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "Filelist"         , mFunc_filelist);          // Add an filelist which can be scrolled
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    //LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    LCDML.loop();
-  }
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_condition.ino
deleted file mode 100644
index 2e55c07..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_condition.ino
+++ /dev/null
@@ -1,13 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_display_dynFunction.ino
deleted file mode 100644
index 9f95433..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-      }
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-      }
-    }
-  }
-
-  Serial.print("dynValue:");
-  Serial.print(g_dynParam);
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_display_menu.ino
deleted file mode 100644
index de74de9..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_display_menu.ino
+++ /dev/null
@@ -1,88 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  for(uint8_t i=0;i<15;i++) {
-    Serial.println();
-  }
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // init vars
-  //uint8_t n_max = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate() || LCDML.DISP_checkMenuCursorUpdate() ) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  Menu ===================="));
-    Serial.println(F("==========================================="));
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = _LCDML_DISP_rows + i;
-    uint8_t n = 0;
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // display cursor
-          if (n == LCDML.MENU_getCursorPos())
-          {
-            Serial.print(F("(x) "));
-          }
-          else
-          {
-            Serial.print(F("( ) "));
-          }
-
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            Serial.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-
-          Serial.println();
-
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_display_menuFunction.ino
deleted file mode 100644
index aabdd8e..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_020_filelist/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,536 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-
-
-
-// this needs some bytes in ram
-#define MAX_FILES_IN_LIST 20
-
-// scroll row position
-uint8_t scroll_row;
-// cursor real position on lcd lines (0 - _LCDML_DISP_rows - 1)
-uint8_t cursor_real_pos;
-// max filelist count
-uint8_t current_max_list_count;
-// cursor position to file list entry
-uint8_t cursor_position_cur;
-// filelist
-static char filelist[MAX_FILES_IN_LIST][20];
-
-// comment this line out when you are using a display like 20x4 or 16x4
-#define _LCDML_USE_SERIAL_MONITOR
-
-// *********************************************************************
-void mFunc_filelist(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup
-    // is called only if it is started
-
-    // use this to init some vars 
-  
-    // set max file counter
-    current_max_list_count = 0;
-    // set current cursor position
-    cursor_position_cur = 0;
-    // 
-    scroll_row = 0;
-    cursor_real_pos = 0;
-  
-  
-    // for example read sd card files here 
-   
-    // for example here only with a dummy list
-    // with 12 dummyfiles
-    // subfolders are not supported
-  
-    // generate file names
-    for(uint8_t i = 0; i<13; i++) {
-      if(i < MAX_FILES_IN_LIST) { 
-        // copy dummy string to new position
-        memcpy(filelist[i], "File   .txt", 11);
-        
-        if(i<10) {                    // filenames < 10
-          filelist[i][5] = 0+48;      // number + '0'     '0' = 48
-          filelist[i][6] = i+48;      // number
-        } else {                      // filenames >= 10
-          filelist[i][5] = i/10+48;  
-          filelist[i][6] = i%10+48;
-        }      
-        current_max_list_count++;     
-      }
-    } 
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button status change
-   
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-  
-    // init some vars for scrollbar
-    uint8_t n_max             = (current_max_list_count >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (current_max_list_count);;
-    uint8_t scrollbar_min     = 0;
-    uint8_t scrollbar_max     = current_max_list_count;
-    //uint8_t scrollbar_cur_pos = cursor_position_cur;
-    uint8_t scroll_pos        = ((1.*n_max * _LCDML_DISP_rows) / (scrollbar_max - 1) * cursor_position_cur);
-      
-    if(LCDML.BT_checkUp())
-    {
-      // scroll up   
-      if(cursor_position_cur > 0) { // check minimum cursor
-        cursor_position_cur--;      // scroll up
-        if(cursor_real_pos == 0) {  
-          scroll_row--;             // scroll display rows
-        }      
-      }
-    }
-
-    if(LCDML.BT_checkDown())
-    {
-      // scroll down
-      if(cursor_position_cur < (current_max_list_count-1)) {    // check list end   
-        cursor_position_cur++;                                  // go to next element
-        if(cursor_real_pos == (_LCDML_DISP_rows-1)) {           // check if current cursor is in last display line
-          scroll_row++;                                         // scroll content
-        } 
-      }
-    }
-
-  
-    // clear display
-    // ================
-    lcdml_menu_clear();
-    
-    // display content
-    // ==================
-    for (uint8_t n = scroll_row; n < (scroll_row+_LCDML_DISP_rows); n++)
-    { 
-      #ifndef _LCDML_USE_SERIAL_MONITOR      
-        // set cursor
-        lcd.setCursor(1, n-scroll_row);
-        // set content
-        lcd.print(filelist[n]);
-      #else
-        if (n == cursor_position_cur) 
-        {
-          Serial.print(F("->"));
-          cursor_real_pos = n-scroll_row;
-        }
-        else
-        {
-          Serial.print(F("  "));
-        }
-        Serial.println(filelist[n]);
-      #endif      
-    }
-  
-    // set cursor and scrollbar
-    // =============================
-    #ifndef _LCDML_USE_SERIAL_MONITOR
-      for (uint8_t n = scroll_row; n <(scroll_row+_LCDML_DISP_rows); n++)
-      {
-        lcd.setCursor(0, n-scroll_row);
-          
-        // set cursor
-        // =====================
-        if (n == cursor_position_cur) {
-          lcd.write(_LCDML_DISP_cfg_cursor);
-          cursor_real_pos = n-scroll_row;
-        } else {
-          lcd.write(' ');
-        }    
-    
-        // display scrollbar
-        // ==============================
-        // delete or reset scrollbar
-        if (scrollbar_max > n_max) {
-          lcd.setCursor((_LCDML_DISP_cols - 1), n-scroll_row);
-          lcd.write((uint8_t)0);
-        }
-        else {
-          lcd.setCursor((_LCDML_DISP_cols - 1), n-scroll_row);
-          lcd.print(' ');
-        }
-    
-        // set scrollbar
-        if (scrollbar_max > n_max) {
-          //set scroll position
-          if (cursor_position_cur == scrollbar_min) {
-            // min pos
-            lcd.setCursor((_LCDML_DISP_cols - 1), 0);
-            lcd.write((uint8_t)1);
-          } else if (cursor_position_cur == (scrollbar_max - 1)) {
-            // max pos
-            lcd.setCursor((_LCDML_DISP_cols - 1), (n_max - 1));
-            lcd.write((uint8_t)4);
-          } else {
-            // between
-            lcd.setCursor((_LCDML_DISP_cols - 1), scroll_pos / n_max);
-            lcd.write((uint8_t)(scroll_pos % n_max) + 1);
-          }
-        }    
-      }
-    #endif
-
-   
-
-    if(LCDML.BT_checkEnter())
-    {
-      Serial.println(filelist[cursor_position_cur]);
-      LCDML.FUNC_goBackToMenu();      
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-  }
-}
-
-
-
-
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-
-    Serial.println(F("To close this"));
-    Serial.println(F("function press"));
-    Serial.println(F("any button or use"));
-    Serial.println(F("back button"));
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.println(F("wait 20 seconds or press back button"));
-    g_func_timer_info = 20;       // reset and set timer
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000)) {
-      g_func_timer_info--;                // increment the value every second
-      Serial.println(g_func_timer_info);  // print the time counter value
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.println(F("press a or w"));
-    Serial.println(F("count: 0 of 3"));
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        Serial.print(F("count: "));
-        Serial.print(g_button_value); //print change content
-        Serial.println(F(" of 3"));
-      }
-    }
-
-    // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function
-  }
-}
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    Serial.println(F("start screensaver"));
-    Serial.println(F("press any key to quit"));
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())
-  {
-     LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.print(F("parameter: "));
-    Serial.println(param);
-
-    Serial.println(F("press any key"));
-    Serial.println(F("to leave it"));
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())          // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())        // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_021_dynUpdatedContent.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_021_dynUpdatedContent.ino
deleted file mode 100644
index 97d917c..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_021_dynUpdatedContent.ino
+++ /dev/null
@@ -1,204 +0,0 @@
-// ============================================================
-// Example:     LCDML_021_dynUpdatedContent 
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <LiquidCrystal.h>
-  #include <LCDMenuLib2.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  20
-  #define _LCDML_DISP_rows  4
-
-  #define _LCDML_DISP_cfg_cursor                     0x7E   // cursor Symbol
-  #define _LCDML_DISP_cfg_scrollbar                  1      // enable a scrollbar
-
-  // LCD object
-  // liquid crystal needs (rs, e, dat4, dat5, dat6, dat7)
-  LiquidCrystal lcd(2, 3, 8, 9, 10, 11);
-
-  const uint8_t scroll_bar[5][8] = {
-    {B10001, B10001, B10001, B10001, B10001, B10001, B10001, B10001}, // scrollbar top
-    {B11111, B11111, B10001, B10001, B10001, B10001, B10001, B10001}, // scroll state 1
-    {B10001, B10001, B11111, B11111, B10001, B10001, B10001, B10001}, // scroll state 2
-    {B10001, B10001, B10001, B10001, B11111, B11111, B10001, B10001}, // scroll state 3
-    {B10001, B10001, B10001, B10001, B10001, B10001, B11111, B11111}  // scrollbar bottom
-  };
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Global variables
-// *********************************************************************
-
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // 2. Example for dyn content
-  // add a function which have a upwards timer with seconds / minutes / hours
-  // the timer value is continuously updated
-  // the initscreentimer is disabled for this function 
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , NULL,          ""                  , mDyn_time,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (23 , LCDML_0         , 8  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    23
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCD Begin
-    lcd.begin(_LCDML_DISP_cols,_LCDML_DISP_rows);
-    // set special chars for scrollbar
-    lcd.createChar(0, (uint8_t*)scroll_bar[0]);
-    lcd.createChar(1, (uint8_t*)scroll_bar[1]);
-    lcd.createChar(2, (uint8_t*)scroll_bar[2]);
-    lcd.createChar(3, (uint8_t*)scroll_bar[3]);
-    lcd.createChar(4, (uint8_t*)scroll_bar[4]);
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-
-// special gobal variables for this example
-unsigned long g_timer_1000ms = 0;
-uint8_t dyn_hour = 0;
-uint8_t dyn_min  = 0;
-uint8_t dyn_sec  = 0;
-boolean dyn_menu_is_displayed = false;
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    // split loop() into loop_control() and loop_menu()
-    LCDML.loop_control();
-
-    // add a counter (1000ms) 
-    if(LCDML.TIMER_ms(g_timer_1000ms, 1000))
-    {
-      // only update the menu when a dynamic content function is called
-      // This variable is set in the LCDML_display_menu Tab on line 59/60
-      if(LCDML.MENU_checkDynContent() == true)
-      {
-        LCDML.DISP_update();
-      }    
-
-      // callculate a new value for the next update
-      dyn_sec++;
-      if(dyn_sec==60) {
-        dyn_sec = 0;
-        dyn_min++;
-        if(dyn_min==60) {
-          dyn_min = 0;
-          dyn_hour++;
-        }
-      }     
-    }
-
-    // call the "normaly" menu content
-    LCDML.loop_menu();
-  }
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_condition.ino
deleted file mode 100644
index 4ddf48e..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_condition.ino
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_display_dynFunction.ino
deleted file mode 100644
index f558314..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-      }
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-      }
-    }
-  }
-
-  char buf[20];
-  sprintf (buf, "dynValue: %d", g_dynParam);
-
-  // use the line from function parameters
-  lcd.setCursor(1, line);
-  lcd.print(buf);
-
-}
-
-
-
-
-// *********************************************************************
-void mDyn_time(uint8_t line)
-// *********************************************************************
-{
-  char buf[20];
-  // http://www.c-howto.de/tutorial/benutzerinteraktion/bildschirmausgaben/
-  sprintf (buf, "%02d:%02d:%02d", dyn_hour, dyn_min, dyn_sec);
-
-  // use the line from function parameters
-  lcd.setCursor(1, line);
-  lcd.print(buf);
-
-  // reset initscreen timer when this function is displayed
-  LCDML.SCREEN_resetTimer();
-  
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // ...
-
-
-  
-  }
-}
-
-
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_display_menu.ino
deleted file mode 100644
index 29867b0..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_display_menu.ino
+++ /dev/null
@@ -1,131 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  lcd.clear();
-  lcd.setCursor(0, 0);
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate()) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = _LCDML_DISP_rows + i;
-    uint8_t n = 0;
-    
-    // reset a state 
-    dyn_menu_is_displayed = false;
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {      
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            lcd.setCursor(1, n);
-            lcd.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) 
-            {
-              // call a dyn content element
-              LCDML.MENU_setDynContent();             
-              tmp->callback(n);
-            }
-          }
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-
-  if(LCDML.DISP_checkMenuCursorUpdate())
-  {
-    // init vars
-    uint8_t n_max             = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-    uint8_t scrollbar_min     = 0;
-    uint8_t scrollbar_max     = LCDML.MENU_getChilds();
-    uint8_t scrollbar_cur_pos = LCDML.MENU_getCursorPosAbs();
-    uint8_t scroll_pos        = ((1.*n_max * _LCDML_DISP_rows) / (scrollbar_max - 1) * scrollbar_cur_pos);
-
-
-    // display rows
-    for (uint8_t n = 0; n < n_max; n++)
-    {
-      //set cursor
-      lcd.setCursor(0, n);
-
-      //set cursor char
-      if (n == LCDML.MENU_getCursorPos()) {
-        lcd.write(_LCDML_DISP_cfg_cursor);
-      } else {
-        lcd.write(' ');
-      }
-
-      // delete or reset scrollbar
-      if (_LCDML_DISP_cfg_scrollbar == 1) {
-        if (scrollbar_max > n_max) {
-          lcd.setCursor((_LCDML_DISP_cols - 1), n);
-          lcd.write((uint8_t)0);
-        }
-        else {
-          lcd.setCursor((_LCDML_DISP_cols - 1), n);
-          lcd.print(' ');
-        }
-      }
-    }
-
-    // display scrollbar
-    if (_LCDML_DISP_cfg_scrollbar == 1) {
-      if (scrollbar_max > n_max) {
-        //set scroll position
-        if (scrollbar_cur_pos == scrollbar_min) {
-          // min pos
-          lcd.setCursor((_LCDML_DISP_cols - 1), 0);
-          lcd.write((uint8_t)1);
-        } else if (scrollbar_cur_pos == (scrollbar_max - 1)) {
-          // max pos
-          lcd.setCursor((_LCDML_DISP_cols - 1), (n_max - 1));
-          lcd.write((uint8_t)4);
-        } else {
-          // between
-          lcd.setCursor((_LCDML_DISP_cols - 1), scroll_pos / n_max);
-          lcd.write((uint8_t)(scroll_pos % n_max) + 1);
-        }
-      }
-    }
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_display_menuFunction.ino
deleted file mode 100644
index 94a8603..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_021_dynUpdatedContent/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,345 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    lcd.setCursor(0, 0);
-    lcd.print(F("To close this"));
-    lcd.setCursor(0, 1);
-    lcd.print(F("function press"));
-    lcd.setCursor(0, 2);
-    lcd.print(F("any button or use"));
-    lcd.setCursor(0, 3);
-    lcd.print(F("back button"));
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    lcd.print(F("20 sec wait")); // print some content on first row
-    g_func_timer_info = 20;       // reset and set timer
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000)) {
-      g_func_timer_info--;                // increment the value every second
-      lcd.setCursor(0, 0);                // set cursor pos
-      lcd.print(F("  "));
-      lcd.setCursor(0, 0);                // set cursor pos
-      lcd.print(g_func_timer_info);       // print the time counter value
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    // print LCD content
-    lcd.setCursor(0, 0);
-    lcd.print(F("press left or up"));
-    lcd.setCursor(0, 1);
-    lcd.print(F("count: 0 of 3"));
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        // update LCD content
-        lcd.setCursor(7, 1); // set cursor
-        lcd.print(g_button_value); // print change content
-      }
-    }
-
-    // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // update LCD content
-    lcd.setCursor(0, 0); // set cursor
-    lcd.print(F("screensaver")); // print change content
-    lcd.setCursor(0, 1); // set cursor
-    lcd.print(F("press any key"));
-    lcd.setCursor(0, 2); // set cursor
-    lcd.print(F("to leave it"));
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())
-  {
-    // The screensaver go to the root menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function and go a layer back
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-
-    char buf[20];
-    sprintf (buf, "parameter: %d", param);
-
-    lcd.setCursor(0, 0);
-    lcd.print(buf);
-    lcd.setCursor(0, 1);
-    lcd.print(F("press any key"));
-    lcd.setCursor(0, 2);
-    lcd.print(F("to leave it"));
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())          // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())        // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_022_multiLanguage.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_022_multiLanguage.ino
deleted file mode 100644
index 2dac7e8..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_022_multiLanguage.ino
+++ /dev/null
@@ -1,230 +0,0 @@
-// ============================================================
-// Example:     LCDML_multilanguage
-// ============================================================
-// Description:
-// This example includes the complete functionality over some
-// tabs. All Tabs which are started with "LCDML_display_.."
-// generates an output on the display / console / ....
-// This example is for the author to test the complete functionality
-//
-// !!!!
-// Here are some diffcult parts, when something is not working in your code 
-// look in this example and please read the comments
-// !!!!
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <LCDMenuLib2.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  30
-  #define _LCDML_DISP_rows  4
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  // create a new language with a short name
-  // parameter (id from the element above, short language name, string)
-  LCDML_langDef     (0, DE, "Information");
-  
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (1, DE, "Zeit Info");
-  
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_langDef     (2, DE, "Programm");
-  
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_langDef     (3, DE, "Programm 1");
-  
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_langDef     (4, DE, "P1 Platzhalter");
-  
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_langDef     (5, DE, "P1 Einstellungen");
-  
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_langDef     (6, DE, "Warm");
-  
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_langDef     (7, DE, "Kalt");
-  
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (8, DE, "Zur\365ck");
-  
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (9, DE, "Zur\365ck");
-  
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (10, DE, "Programm 2");
-  
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (11, DE, "Zur\365ck");
-  
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_langDef     (12, DE, "Spezial");
-  
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (13, DE, "Geh zum Anfang");
-  
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (14, DE, "Springe zu Zeit Info");
-  
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (15, DE, "Zur\365ck");
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_langDef     (16, DE, "Parameter");
-  
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 10"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_langDef     (17, DE, "Parameter 10");
-  
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 20"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_langDef     (18, DE, "Parameter 20");
-  
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 30"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_langDef     (19, DE, "Parameter 30");
-  
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (20, DE, "Zur\365ck");
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-  LCDML_langDef     (21, DE, "");
-
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  ""        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (22, DE, "");
-
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-  // CREATE language types
-  // the language definition here should not be the same like in the definition above 
-  // please write here "LANG_" before the short name 
-  // EN -> LANG_EN
-  // DE -> LANG_DE
-  // ...
-  enum lang_types
-  {
-    LANG_DEFAULT  = 0,  // this value is every 0
-    LANG_DE       = 1   // the last element have no "," at the end
-    // custom elements can be added
-  };
-
-  // set the default language with the long name
-  //lang_types g_lcdml_lang_select = DEFAULT_LANG;
-  lang_types g_lcdml_lang_select = LANG_DE;
-
-  // in the source code you can change the language with this line:
-  // g_lcdml_lang_select = DEFAULT_LANG;
-  // g_lcdml_lang_select = LANG_DE;
-  // ...  
-
-  // create custom language with short name, not with the long name   
-  LCDML_createCustomLang(_LCDML_DISP_cnt, DE);
-
-  // next step when you add a new language:
-  // go into the LCDML_display_menu tab and change or add a switch case condition
-
-  // next step:
-  // change the menu function 
-
-  
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    //LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    LCDML.loop();
-  }
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_condition.ino
deleted file mode 100644
index 2e55c07..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_condition.ino
+++ /dev/null
@@ -1,13 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_display_dynFunction.ino
deleted file mode 100644
index 2d755cb..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-      }
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-      }
-    }
-  }
-  
-  Serial.print("dynValue:");
-  Serial.print(g_dynParam);
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_display_menu.ino
deleted file mode 100644
index 7cb6f7d..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_display_menu.ino
+++ /dev/null
@@ -1,108 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  for(uint8_t i=0;i<15;i++) {
-    Serial.println();
-  }
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // init vars
-  //uint8_t n_max = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate() || LCDML.DISP_checkMenuCursorUpdate() ) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  Menu ===================="));
-    Serial.println(F("==========================================="));
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = _LCDML_DISP_rows + i;
-    uint8_t n = 0;
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // display cursor
-          if (n == LCDML.MENU_getCursorPos())
-          {
-            Serial.print(F("(x) "));
-          }
-          else
-          {
-            Serial.print(F("( ) "));
-          }
-
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            switch(g_lcdml_lang_select)
-            {
-              case LANG_DE: // custom language long name
-                // get the custom language content with the short name of the language
-                LCDML_getCustomContent(DE, content_text, tmp->getID());
-              break;
-
-              /*
-              // this is only an example for other languages
-              case LANG_EN: // custom language long name
-              // get the custom language content with the short name of the language
-                LCDML_getCustomContent(EN, content_text, tmp->getID());
-              break;
-              */
-                
-
-              default: // default language
-                 LCDML_getContent(content_text, tmp->getID());
-                 break;
-            }
-            
-            Serial.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-
-          Serial.println();
-
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_display_menuFunction.ino
deleted file mode 100644
index e9c090e..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_022_multiLanguage/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,411 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-
-    switch(g_lcdml_lang_select)
-    {
-      case LANG_DE: // custom language long name
-        Serial.println(F("Zum schlie\342en der"));
-        Serial.println(F("Funktion, bitte druck"));
-        Serial.println(F("irgendeine Taste oder"));
-        Serial.println(F("den Zur\365ck Knopf"));
-      break;
-
-      default:
-        Serial.println(F("To close this"));
-        Serial.println(F("function press"));
-        Serial.println(F("any button or use"));
-        Serial.println(F("back button"));        
-      break;
-    }
-
-    
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-
-    switch(g_lcdml_lang_select)
-    {
-      case LANG_DE: // custom language long name
-        Serial.println(F("20 Sekunden warten oder Zur\365ck Knopf dr\365cken"));
-      break;
-
-      default:
-        Serial.println(F("wait 20 seconds or press back button"));
-      break;
-    }
-    
-    
-    g_func_timer_info = 20;       // reset and set timer
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000)) {
-      g_func_timer_info--;                // increment the value every second
-      Serial.println(g_func_timer_info);  // print the time counter value
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-
-    switch(g_lcdml_lang_select)
-    {
-      case LANG_DE: // custom language long name
-        Serial.println(F("Dr\365cke a oder w"));
-        Serial.println(F("Z\341hler: 0 of 3"));
-      break;
-
-      default:
-        Serial.println(F("press a or w"));
-        Serial.println(F("count: 0 of 3"));
-      break;
-    }
-    
-    
-   
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        switch(g_lcdml_lang_select)
-          {
-            case LANG_DE: // custom language long name
-              Serial.print(F("Z\341hler: "));
-              Serial.print(g_button_value); //print change content
-              Serial.println(F(" von 3"));      
-            break;
-      
-            default:
-              Serial.print(F("count: "));
-              Serial.print(g_button_value); //print change content
-              Serial.println(F(" of 3"));
-            break;
-          }
-      }
-    }
-
-    // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function
-  }
-}
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    switch(g_lcdml_lang_select)
-    {
-      case LANG_DE: // custom language long name
-        Serial.println(F("Bildschirmschoner gestartet"));
-        Serial.println(F("Zum verlassen einen Knopf drucken"));
-      break;
-
-      default:
-        Serial.println(F("start screensaver"));
-        Serial.println(F("press any key to quit"));
-      break;
-    }
-
-    
-   
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())
-  {
-     LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-    Serial.print(F("parameter: "));
-    Serial.println(param);
-
-    switch(g_lcdml_lang_select)
-    {
-      case LANG_DE: // custom language long name
-        Serial.println(F("Irgendeine Taste dr\365cken"));
-        Serial.println(F("zum verlassen"));
-
-      break;
-
-      default:
-        Serial.println(F("press any key"));
-        Serial.println(F("to leave it"));
-      break;
-    }
-
-   
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())          // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())        // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_023_multiLanguage_small.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_023_multiLanguage_small.ino
deleted file mode 100644
index 34e6a2f..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_023_multiLanguage_small.ino
+++ /dev/null
@@ -1,151 +0,0 @@
-// ============================================================
-// Example:     LCDML_multilanguage
-// ============================================================
-// Description:
-// This example includes the complete functionality over some
-// tabs. All Tabs which are started with "LCDML_display_.."
-// generates an output on the display / console / ....
-// This example is for the author to test the complete functionality
-//
-// !!!!
-// Here are some diffcult parts, when something is not working in your code 
-// look in this example and please read the comments
-// !!!!
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <LCDMenuLib2.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  30
-  #define _LCDML_DISP_rows  4
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  // create a new language with a short name
-  // parameter (id from the element above, short language name, string)
-  LCDML_langDef     (0, DE, "Information");
-  
-  LCDML_add         (1  , LCDML_0         , 2  , "Change Language"        , mFunc_switch_language);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_langDef     (1, DE, "Sprache umstellen");
-  
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_langDef     (2, DE, "Programm");
-  
-  
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    2
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-  // CREATE language types
-  // the language definition here should not be the same like in the definition above 
-  // please write here "LANG_" before the short name 
-  // EN -> LANG_EN
-  // DE -> LANG_DE
-  // ...
-  enum lang_types
-  {
-    LANG_DEFAULT  = 0,  // this value is every 0
-    LANG_DE       = 1   // the last element have no "," at the end
-    // custom elements can be added
-  };
-
-  // set the default language with the long name
-  lang_types g_lcdml_lang_select = LANG_DEFAULT;
-  //lang_types g_lcdml_lang_select = LANG_DE;
-
-  // in the source code you can change the language with this line:
-  // g_lcdml_lang_select = DEFAULT_LANG;
-  // g_lcdml_lang_select = LANG_DE;
-  // ...  
-
-  // create custom language with short name, not with the long name   
-  LCDML_createCustomLang(_LCDML_DISP_cnt, DE);
-
-  // next step when you add a new language:
-  // go into the LCDML_display_menu tab and change or add a switch case condition
-
-  // next step:
-  // change the menu function 
-
-  
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    //LCDML.MENU_enRollover();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    LCDML.loop();
-  }
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_condition.ino
deleted file mode 100644
index 2e55c07..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_condition.ino
+++ /dev/null
@@ -1,13 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_display_dynFunction.ino
deleted file mode 100644
index a803055..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,9 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-// not needed in this example
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_display_menu.ino
deleted file mode 100644
index 7cb6f7d..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_display_menu.ino
+++ /dev/null
@@ -1,108 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  for(uint8_t i=0;i<15;i++) {
-    Serial.println();
-  }
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // init vars
-  //uint8_t n_max = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate() || LCDML.DISP_checkMenuCursorUpdate() ) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  Menu ===================="));
-    Serial.println(F("==========================================="));
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = _LCDML_DISP_rows + i;
-    uint8_t n = 0;
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // display cursor
-          if (n == LCDML.MENU_getCursorPos())
-          {
-            Serial.print(F("(x) "));
-          }
-          else
-          {
-            Serial.print(F("( ) "));
-          }
-
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            switch(g_lcdml_lang_select)
-            {
-              case LANG_DE: // custom language long name
-                // get the custom language content with the short name of the language
-                LCDML_getCustomContent(DE, content_text, tmp->getID());
-              break;
-
-              /*
-              // this is only an example for other languages
-              case LANG_EN: // custom language long name
-              // get the custom language content with the short name of the language
-                LCDML_getCustomContent(EN, content_text, tmp->getID());
-              break;
-              */
-                
-
-              default: // default language
-                 LCDML_getContent(content_text, tmp->getID());
-                 break;
-            }
-            
-            Serial.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-
-          Serial.println();
-
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_display_menuFunction.ino
deleted file mode 100644
index f14e92b..0000000
--- a/third-party/LCDMenuLib2.old/examples/02_functionality/LCDML_023_multiLanguage_small/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,160 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    Serial.println(F("==========================================="));
-    Serial.println(F("================  FUNC ===================="));
-    Serial.println(F("==========================================="));
-
-    switch(g_lcdml_lang_select)
-    {
-      case LANG_DE: // custom language long name
-        Serial.println(F("Zum schlie\342en der"));
-        Serial.println(F("Funktion, bitte druck"));
-        Serial.println(F("irgendeine Taste oder"));
-        Serial.println(F("den Zur\365ck Knopf"));
-      break;
-
-      default:
-        Serial.println(F("To close this"));
-        Serial.println(F("function press"));
-        Serial.println(F("any button or use"));
-        Serial.println(F("back button"));        
-      break;
-    }
-
-    
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_switch_language(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    if(g_lcdml_lang_select == LANG_DE)
-    {
-      g_lcdml_lang_select = LANG_DEFAULT;
-    }
-    else
-    {
-      g_lcdml_lang_select = LANG_DE;
-    } 
-    
-    switch(g_lcdml_lang_select)
-    {
-      case LANG_DE: // custom language long name
-        Serial.println(F("Sprache geändert"));
-      break;
-
-      default:
-        Serial.println(F("wait 20 seconds or press back button"));
-      break;
-    }
-
-    // go back
-    LCDML.FUNC_goBackToMenu();
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // not needed here
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_adafruit_gfx_ssd1306.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_adafruit_gfx_ssd1306.ino
deleted file mode 100644
index d3ca2e5..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_adafruit_gfx_ssd1306.ino
+++ /dev/null
@@ -1,212 +0,0 @@
-// ============================================================
-// Example:     LCDML: use ADAFRUIT i2c display ssd1306 
-// ============================================================
-// Author:      Nils Feldkämper
-// Last update: 12.11.2018
-// License:     MIT
-// ============================================================
-// Description:
-// This example shows how to use the adafruit gfx library
-// with the LCDMenuLib.
-// The menu can placed in a box that can be placed anywhere on
-// the screen.
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-  // include libs
-  #include <LCDMenuLib2.h>  
-
-  #include <SPI.h>
-  #include <Wire.h>
-  #include <Adafruit_GFX.h>
-  #include <Adafruit_SSD1306.h>
-
-// *********************************************************************
-// Adufruit SSD1306
-// *********************************************************************
-  // http://blog.simtronyx.de/ein-096-zoll-oled-display-i%C2%B2c-mit-128x64-pixel-und-ein-arduino/
-
-  #define _ADAFRUIT_I2C_ADR    0x3C
-
-  #define _ADAFRUIT_I2C_ADR    0x3C
-  #define _LCDML_ADAFRUIT_TEXT_COLOR WHITE 
-  
-  #define _LCDML_ADAFRUIT_FONT_SIZE   1   
-  #define _LCDML_ADAFRUIT_FONT_W      (6*_LCDML_ADAFRUIT_FONT_SIZE)             // font width 
-  #define _LCDML_ADAFRUIT_FONT_H      (8*_LCDML_ADAFRUIT_FONT_SIZE)             // font heigt 
-  
-  // settings for u8g lib and lcd
-  #define _LCDML_ADAFRUIT_lcd_w       128            // lcd width
-  #define _LCDML_ADAFRUIT_lcd_h       64             // lcd height
- 
-  
-  
-  #define OLED_RESET 4 // not used / nicht genutzt bei diesem Display
-  Adafruit_SSD1306 display(OLED_RESET);
-
-  // nothing change here
-  #define _LCDML_ADAFRUIT_cols_max    (_LCDML_ADAFRUIT_lcd_w/_LCDML_ADAFRUIT_FONT_W)  
-  #define _LCDML_ADAFRUIT_rows_max    (_LCDML_ADAFRUIT_lcd_h/_LCDML_ADAFRUIT_FONT_H) 
-
-  // rows and cols 
-  // when you use more rows or cols as allowed change in LCDMenuLib.h the define "_LCDML_DISP_cfg_max_rows" and "_LCDML_DISP_cfg_max_string_length"
-  // the program needs more ram with this changes
-  #define _LCDML_ADAFRUIT_cols        20                   // max cols
-  #define _LCDML_ADAFRUIT_rows        _LCDML_ADAFRUIT_rows_max  // max rows 
-
-
-  // scrollbar width
-  #define _LCDML_ADAFRUIT_scrollbar_w 6  // scrollbar width 
-
-  // old defines with new content
-  #define _LCDML_DISP_cols      _LCDML_ADAFRUIT_cols
-  #define _LCDML_DISP_rows      _LCDML_ADAFRUIT_rows 
-
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-
-
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    /* INIT DISPLAY */
-    // initialize with the I2C addr / mit I2C-Adresse initialisieren
-    display.begin(SSD1306_SWITCHCAPVCC, _ADAFRUIT_I2C_ADR);
-    
-    // clear lcd
-    display.clearDisplay();
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * (3));
-    display.println("LCDMenuLib v2.1.4 alpha");
-    display.display();
-
-    /* INIT LCDML */
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Enable Menu Rollover
-    LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    // this function must called here, do not delete it
-    LCDML.loop();
-  }
-
-
-// *********************************************************************
-// check some errors - do not change here anything
-// *********************************************************************
-# if(_LCDML_glcd_tft_box_x1 > _LCDML_glcd_tft_w)
-# error _LCDML_glcd_tft_box_x1 is to big
-# endif
-
-# if(_LCDML_glcd_tft_box_y1 > _LCDML_glcd_tft_h)
-# error _LCDML_glcd_tft_box_y1 is to big
-# endif
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_condition.ino
deleted file mode 100644
index 791e813..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_condition.ino
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// ********************************************************************* 
-{ 
-  return false;  // hidden
-} 
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_dynFunction.ino
deleted file mode 100644
index 94d03b4..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-        
-        LCDML.BT_resetEnter();
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-        LCDML.BT_resetUp();
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-        LCDML.BT_resetDown();
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-        LCDML.BT_resetLeft();
-      }
-      
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-        LCDML.BT_resetRight();
-      }
-    }
-  }
-
-  char buf[20];
-  sprintf (buf, "dynValue: %d", g_dynParam);
-
-  display.setCursor(1, _LCDML_ADAFRUIT_FONT_H * (line));
-  display.println(buf);
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menu.ino
deleted file mode 100644
index 129138e..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menu.ino
+++ /dev/null
@@ -1,123 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // clear lcd
-  display.clearDisplay();
-  // set text color / Textfarbe setzen
-  display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-  // set text size / Textgroesse setzen
-  display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-
-  
-  // declaration of some variables
-  // ***************
-  // content variable
-  char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-  // menu element object
-  LCDMenuLib2_menu *tmp;
-  // some limit values
-  uint8_t i = LCDML.MENU_getScroll();
-  uint8_t maxi = _LCDML_DISP_rows + i;
-  uint8_t n = 0;
-
-   // init vars
-  uint8_t n_max             = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  uint8_t scrollbar_min     = 0;
-  uint8_t scrollbar_max     = LCDML.MENU_getChilds();
-  uint8_t scrollbar_cur_pos = LCDML.MENU_getCursorPosAbs();
-  uint8_t scroll_pos        = ((1.*n_max * _LCDML_DISP_rows) / (scrollbar_max - 1) * scrollbar_cur_pos);
-
-
-  n = 0;
-  i = LCDML.MENU_getScroll();
-  // update content
-  // ***************
-
-    // clear menu
-    // ***************
-
-  // check if this element has children
-  if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-  {
-    // loop to display lines
-    do
-    {
-      // check if a menu element has a condition and if the condition be true
-      if (tmp->checkCondition())
-      {
-        // check the type off a menu element
-        if(tmp->checkType_menu() == true)
-        {
-          // display normal content
-          LCDML_getContent(content_text, tmp->getID());
-          display.setCursor(1, _LCDML_ADAFRUIT_FONT_H * (n));
-          display.println(content_text);
-        }
-        else
-        {
-          if(tmp->checkType_dynParam()) {
-            tmp->callback(n);
-          }
-        }
-        // increment some values
-        i++;
-        n++;
-      }
-    // try to go to the next sibling and check the number of displayed rows
-    } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-  }
-
-  // set cursor
-  display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * (LCDML.MENU_getCursorPos()));
-  display.println("X");
-
-  // ***** todo *****
-  #ifdef _SCROLLBAR_TODO_
-  if(_LCDML_DISP_draw_frame == 1) {
-     u8g2.drawFrame(_LCDML_DISP_box_x0, _LCDML_DISP_box_y0, (_LCDML_DISP_box_x1-_LCDML_DISP_box_x0), (_LCDML_DISP_box_y1-_LCDML_DISP_box_y0));
-  }
-
-  
-  // display scrollbar when more content as rows available and with > 2
-  
-  if (scrollbar_max > n_max && _LCDML_DISP_scrollbar_w > 2)
-  {
-    // set frame for scrollbar
-    //u8g2.drawFrame(_LCDML_DISP_box_x1 - _LCDML_DISP_scrollbar_w, _LCDML_DISP_box_y0, _LCDML_DISP_scrollbar_w, _LCDML_DISP_box_y1-_LCDML_DISP_box_y0);
-    display.drawRect(_LCDML_ADAFRUIT_lcd_w - _LCDML_ADAFRUIT_scrollbar_w, 0,_LCDML_ADAFRUIT_scrollbar_w,_LCDML_ADAFRUIT_lcd_h, _LCDML_ADAFRUIT_TEXT_COLOR); 
-
-    // calculate scrollbar length
-    uint8_t scrollbar_block_length = scrollbar_max - n_max;
-    scrollbar_block_length = (_LCDML_DISP_box_y1-_LCDML_DISP_box_y0) / (scrollbar_block_length + _LCDML_DISP_rows);
-
-    //set scrollbar
-    if (scrollbar_cur_pos == 0) {                                   // top position     (min)
-      u8g2.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y0 + 1                                                     , (_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-    }
-    else if (scrollbar_cur_pos == (scrollbar_max-1)) {            // bottom position  (max)
-      u8g2.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y1 - scrollbar_block_length                                , (_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-    }
-    else {                                                                // between top and bottom
-      u8g2.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y0 + (scrollbar_block_length * scrollbar_cur_pos + 1),(_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-    }
-  }
-  #endif
-
-  display.display();
-  
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menuFunction.ino
deleted file mode 100644
index 9a42fe1..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_ssd1306/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,424 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // clear lcd
-    display.clearDisplay();  
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(F("To close this")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(F("function press")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 2); // line 2
-    display.println(F("any button or use")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 3); // line 3
-    display.println(F("back button")); 
-    display.display(); 
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    g_func_timer_info = 20;       // reset and set timer
-
-    char buf[20];
-    sprintf (buf, "wait %d seconds", g_func_timer_info);
-
-    // clear lcd
-    display.clearDisplay(); 
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(buf); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(F("or press back button")); 
-    display.display();
-    
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-     // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000))
-    {
-      g_timer_1 = millis();
-      g_func_timer_info--;                // increment the value every second
-      char buf[20];
-      sprintf (buf, "wait %d seconds", g_func_timer_info);
-
-      // clear lcd
-      display.clearDisplay(); 
-      // set text color / Textfarbe setzen
-      display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-      // set text size / Textgroesse setzen
-      display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-    
-      display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-      display.println(buf); 
-      display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-      display.println(F("or press back button")); 
-      display.display();
-
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    char buf[17];
-    sprintf (buf, "count: %d of 3", 0);
-
-    // clear lcd
-    display.clearDisplay(); 
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(F("press a or w button")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(buf); 
-    display.display();
-
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        char buf[20];
-        sprintf (buf, "count: %d of 3", g_button_value);
-
-        // clear lcd
-        display.clearDisplay(); 
-        // set text color / Textfarbe setzen
-        display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-        // set text size / Textgroesse setzen
-        display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-      
-        display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-        display.println(F("press a or w button")); 
-        display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-        display.println(buf); 
-        display.display(); 
-      }
-    }
-
-   // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-
-    // clear lcd
-    display.clearDisplay();  
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(F("screensaver")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(F("press any key")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 2); // line 2
-    display.println(F("to leave it")); 
-    display.display();
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())          // ****** STABLE END *********
-  {
-    // The screensaver go to the root menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function and go a layer back
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-
-    char buf[20];
-    sprintf (buf, "parameter: %d", param);
-    
-    // setup function
-    // clear lcd
-    display.clearDisplay();  
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(buf); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(F("press any key")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 2); // line 2
-    display.println(F("to leave it")); 
-    display.display();
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())               // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_adafruit_gfx_st7735.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_adafruit_gfx_st7735.ino
deleted file mode 100644
index 16d2203..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_adafruit_gfx_st7735.ino
+++ /dev/null
@@ -1,235 +0,0 @@
-// ============================================================
-// Example:     LCDML: use ADAFRUIT i2c display ssd1306 
-// ============================================================
-// Author:      Nils Feldkämper, Markus Rudel
-// Last update: 12.11.2018
-// License:     MIT
-// ============================================================
-// Description:
-// This example shows how to use the adafruit gfx library
-// with the LCDMenuLib.
-// The menu can placed in a box that can be placed anywhere on
-// the screen.
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-  // include libs
-  #include <LCDMenuLib2.h>  
-
-  #include <SPI.h>
-  #include <Wire.h>
-  #include <Adafruit_GFX.h>
-  #include <Adafruit_ST7735.h> // Hardware-specific library
-
-// *********************************************************************
-// Adafruit TFT_ST7735
-// *********************************************************************
-// https://learn.adafruit.com/1-8-tft-display/graphics-library
-
- #define _LCDML_ADAFRUIT_TEXT_COLOR       ST7735_WHITE
-  #define _LCDML_ADAFRUIT_BACKGROUND_COLOR ST7735_BLACK 
-  
-  #define _LCDML_ADAFRUIT_FONT_SIZE   3   
-  #define _LCDML_ADAFRUIT_FONT_W      (6*_LCDML_ADAFRUIT_FONT_SIZE)             // font width 
-  #define _LCDML_ADAFRUIT_FONT_H      (8*_LCDML_ADAFRUIT_FONT_SIZE)             // font heigt 
-  
-  // settings for u8g lib and lcd
-  #define _LCDML_ADAFRUIT_lcd_w       128            // lcd width
-  #define _LCDML_ADAFRUIT_lcd_h       160             // lcd height
- 
-  
-  
-  // TFT display and SD card will share the hardware SPI interface.
-  // Hardware SPI pins are specific to the Arduino board type and
-  // cannot be remapped to alternate pins.  For Arduino Uno,
-  // Duemilanove, etc., pin 11 = MOSI, pin 12 = MISO, pin 13 = SCK.
-  #define TFT_CS  10  // Chip select line for TFT display
-  #define TFT_RST  9  // Reset line for TFT (or see below...)
-  #define TFT_DC   8  // Data/command line for TFT
-
-  #define SD_CS    4  // Chip select line for SD card
-  Adafruit_ST7735 display = Adafruit_ST7735(TFT_CS, TFT_DC, TFT_RST);
-  
-
-
-  // nothing change here
-  #define _LCDML_ADAFRUIT_cols_max    (_LCDML_ADAFRUIT_lcd_w/_LCDML_ADAFRUIT_FONT_W)  
-  #define _LCDML_ADAFRUIT_rows_max    (_LCDML_ADAFRUIT_lcd_h/_LCDML_ADAFRUIT_FONT_H) 
-
-  // rows and cols 
-  // when you use more rows or cols as allowed change in LCDMenuLib.h the define "_LCDML_DISP_cfg_max_rows" and "_LCDML_DISP_cfg_max_string_length"
-  // the program needs more ram with this changes
-  #define _LCDML_ADAFRUIT_cols        20                   // max cols
-  #define _LCDML_ADAFRUIT_rows        _LCDML_ADAFRUIT_rows_max  // max rows 
-
-
-  // scrollbar width
-  #define _LCDML_ADAFRUIT_scrollbar_w 6  // scrollbar width  
-
-
-  // old defines with new content
-  #define _LCDML_DISP_cols      _LCDML_ADAFRUIT_cols
-  #define _LCDML_DISP_rows      _LCDML_ADAFRUIT_rows 
-
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-
-
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    /* INIT DISPLAY */
-    SPI.begin();
-
-    // Our supplier changed the 1.8" display slightly after Jan 10, 2012
-    // so that the alignment of the TFT had to be shifted by a few pixels
-    // this just means the init code is slightly different. Check the
-    // color of the tab to see which init code to try. If the display is
-    // cut off or has extra 'random' pixels on the top & left, try the
-    // other option!
-    // If you are seeing red and green color inversion, use Black Tab
-  
-    // If your TFT's plastic wrap has a Black Tab, use the following:
-    display.initR(INITR_BLACKTAB);   // initialize a ST7735S chip, black tab
-    // If your TFT's plastic wrap has a Red Tab, use the following:
-    //tft.initR(INITR_REDTAB);   // initialize a ST7735R chip, red tab
-    // If your TFT's plastic wrap has a Green Tab, use the following:
-    //tft.initR(INITR_GREENTAB); // initialize a ST7735R chip, green tab
-
-    // clear lcd
-    display.fillScreen(_LCDML_ADAFRUIT_BACKGROUND_COLOR);
-    
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * (3));
-    display.println(_LCDML_VERSION);
-
-    /* INIT LCDML */
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Enable Menu Rollover
-    LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    // this function must called here, do not delete it
-    LCDML.loop();
-  }
-
-
-// *********************************************************************
-// check some errors - do not change here anything
-// *********************************************************************
-# if(_LCDML_glcd_tft_box_x1 > _LCDML_glcd_tft_w)
-# error _LCDML_glcd_tft_box_x1 is to big
-# endif
-
-# if(_LCDML_glcd_tft_box_y1 > _LCDML_glcd_tft_h)
-# error _LCDML_glcd_tft_box_y1 is to big
-# endif
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_condition.ino
deleted file mode 100644
index 791e813..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_condition.ino
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// ********************************************************************* 
-{ 
-  return false;  // hidden
-} 
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_dynFunction.ino
deleted file mode 100644
index 94d03b4..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-        
-        LCDML.BT_resetEnter();
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-        LCDML.BT_resetUp();
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-        LCDML.BT_resetDown();
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-        LCDML.BT_resetLeft();
-      }
-      
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-        LCDML.BT_resetRight();
-      }
-    }
-  }
-
-  char buf[20];
-  sprintf (buf, "dynValue: %d", g_dynParam);
-
-  display.setCursor(1, _LCDML_ADAFRUIT_FONT_H * (line));
-  display.println(buf);
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menu.ino
deleted file mode 100644
index a968970..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menu.ino
+++ /dev/null
@@ -1,121 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // clear lcd
-  display.fillScreen(_LCDML_ADAFRUIT_BACKGROUND_COLOR);
-  // set text color / Textfarbe setzen
-  display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-  // set text size / Textgroesse setzen
-  display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-
-  
-  // declaration of some variables
-  // ***************
-  // content variable
-  char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-  // menu element object
-  LCDMenuLib2_menu *tmp;
-  // some limit values
-  uint8_t i = LCDML.MENU_getScroll();
-  uint8_t maxi = _LCDML_DISP_rows + i;
-  uint8_t n = 0;
-
-   // init vars
-  uint8_t n_max             = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  uint8_t scrollbar_min     = 0;
-  uint8_t scrollbar_max     = LCDML.MENU_getChilds();
-  uint8_t scrollbar_cur_pos = LCDML.MENU_getCursorPosAbs();
-  uint8_t scroll_pos        = ((1.*n_max * _LCDML_DISP_rows) / (scrollbar_max - 1) * scrollbar_cur_pos);
-
-
-  n = 0;
-  i = LCDML.MENU_getScroll();
-  // update content
-  // ***************
-
-    // clear menu
-    // ***************
-
-  // check if this element has children
-  if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-  {
-    // loop to display lines
-    do
-    {
-      // check if a menu element has a condition and if the condition be true
-      if (tmp->checkCondition())
-      {
-        // check the type off a menu element
-        if(tmp->checkType_menu() == true)
-        {
-          // display normal content
-          LCDML_getContent(content_text, tmp->getID());
-          display.setCursor(1, _LCDML_ADAFRUIT_FONT_H * (n));
-          display.println(content_text);
-        }
-        else
-        {
-          if(tmp->checkType_dynParam()) {
-            tmp->callback(n);
-          }
-        }
-        // increment some values
-        i++;
-        n++;
-      }
-    // try to go to the next sibling and check the number of displayed rows
-    } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-  }
-
-  // set cursor
-  display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * (LCDML.MENU_getCursorPos()));
-  display.println("X");
-
-  // ***** todo *****
-  #ifdef _SCROLLBAR_TODO_
-  if(_LCDML_DISP_draw_frame == 1) {
-     u8g2.drawFrame(_LCDML_DISP_box_x0, _LCDML_DISP_box_y0, (_LCDML_DISP_box_x1-_LCDML_DISP_box_x0), (_LCDML_DISP_box_y1-_LCDML_DISP_box_y0));
-  }
-
-  
-  // display scrollbar when more content as rows available and with > 2
-  
-  if (scrollbar_max > n_max && _LCDML_DISP_scrollbar_w > 2)
-  {
-    // set frame for scrollbar
-    //u8g2.drawFrame(_LCDML_DISP_box_x1 - _LCDML_DISP_scrollbar_w, _LCDML_DISP_box_y0, _LCDML_DISP_scrollbar_w, _LCDML_DISP_box_y1-_LCDML_DISP_box_y0);
-    display.drawRect(_LCDML_ADAFRUIT_lcd_w - _LCDML_ADAFRUIT_scrollbar_w, 0,_LCDML_ADAFRUIT_scrollbar_w,_LCDML_ADAFRUIT_lcd_h, _LCDML_ADAFRUIT_TEXT_COLOR); 
-
-    // calculate scrollbar length
-    uint8_t scrollbar_block_length = scrollbar_max - n_max;
-    scrollbar_block_length = (_LCDML_DISP_box_y1-_LCDML_DISP_box_y0) / (scrollbar_block_length + _LCDML_DISP_rows);
-
-    //set scrollbar
-    if (scrollbar_cur_pos == 0) {                                   // top position     (min)
-      u8g2.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y0 + 1                                                     , (_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-    }
-    else if (scrollbar_cur_pos == (scrollbar_max-1)) {            // bottom position  (max)
-      u8g2.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y1 - scrollbar_block_length                                , (_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-    }
-    else {                                                                // between top and bottom
-      u8g2.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y0 + (scrollbar_block_length * scrollbar_cur_pos + 1),(_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-    }
-  }
-  #endif
-  
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menuFunction.ino
deleted file mode 100644
index 68638d4..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/gfx/LCDML_adafruit_gfx_st7735/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,417 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // clear lcd
-    display.fillScreen(_LCDML_ADAFRUIT_BACKGROUND_COLOR);
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(F("To close this")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(F("function press")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 2); // line 2
-    display.println(F("any button or use")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 3); // line 3
-    display.println(F("back button")); 
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    g_func_timer_info = 20;       // reset and set timer
-
-    char buf[20];
-    sprintf (buf, "wait %d seconds", g_func_timer_info);
-
-    // clear lcd
-    display.fillScreen(_LCDML_ADAFRUIT_BACKGROUND_COLOR);
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(buf); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(F("or press back button")); 
-    
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-     // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000))
-    {
-      g_timer_1 = millis();
-      g_func_timer_info--;                // increment the value every second
-      char buf[20];
-      sprintf (buf, "wait %d seconds", g_func_timer_info);
-
-      // clear lcd
-      display.fillScreen(_LCDML_ADAFRUIT_BACKGROUND_COLOR);
-      // set text color / Textfarbe setzen
-      display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-      // set text size / Textgroesse setzen
-      display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-    
-      display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-      display.println(buf); 
-      display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-      display.println(F("or press back button")); 
-
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    char buf[17];
-    sprintf (buf, "count: %d of 3", 0);
-
-    // clear lcd
-    display.fillScreen(_LCDML_ADAFRUIT_BACKGROUND_COLOR);
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(F("press a or w button")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(buf); 
-
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        char buf[20];
-        sprintf (buf, "count: %d of 3", g_button_value);
-
-         // clear lcd
-        display.fillScreen(_LCDML_ADAFRUIT_BACKGROUND_COLOR);
-        // set text color / Textfarbe setzen
-        display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-        // set text size / Textgroesse setzen
-        display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-      
-        display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-        display.println(F("press a or w button")); 
-        display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-        display.println(buf); 
-      }
-    }
-
-   // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-
-    // clear lcd
-    display.fillScreen(_LCDML_ADAFRUIT_BACKGROUND_COLOR);
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(F("screensaver")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(F("press any key")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 2); // line 2
-    display.println(F("to leave it")); 
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())          // ****** STABLE END *********
-  {
-    // The screensaver go to the root menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function and go a layer back
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-
-    char buf[20];
-    sprintf (buf, "parameter: %d", param);
-    
-    // setup function
-     // clear lcd
-    display.fillScreen(_LCDML_ADAFRUIT_BACKGROUND_COLOR);
-    // set text color / Textfarbe setzen
-    display.setTextColor(_LCDML_ADAFRUIT_TEXT_COLOR);  
-    // set text size / Textgroesse setzen
-    display.setTextSize(_LCDML_ADAFRUIT_FONT_SIZE);
-  
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 0); // line 0
-    display.println(buf); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 1); // line 1
-    display.println(F("press any key")); 
-    display.setCursor(0, _LCDML_ADAFRUIT_FONT_H * 2); // line 2
-    display.println(F("to leave it")); 
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())               // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_condition.ino
deleted file mode 100644
index 791e813..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_condition.ino
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// ********************************************************************* 
-{ 
-  return false;  // hidden
-} 
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_dynFunction.ino
deleted file mode 100644
index 8e50a04..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-        
-        LCDML.BT_resetEnter();
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-        LCDML.BT_resetUp();
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-        LCDML.BT_resetDown();
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-        LCDML.BT_resetLeft();
-      }
-      
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-        LCDML.BT_resetRight();
-      }
-    }
-  }
-
-  char buf[20];
-  sprintf (buf, "dynValue: %d", g_dynParam);
-
-  // setup function
-  u8g2.drawStr( _LCDML_DISP_box_x0+_LCDML_DISP_font_w + _LCDML_DISP_cur_space_behind,  (_LCDML_DISP_font_h * (1+line)), buf);     // the value can be changed with left or right
-
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menu.ino
deleted file mode 100644
index b71ec55..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menu.ino
+++ /dev/null
@@ -1,112 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // for first test set font here
-  u8g2.setFont(_LCDML_DISP_font);
-
-  // declaration of some variables
-  // ***************
-  // content variable
-  char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-  // menu element object
-  LCDMenuLib2_menu *tmp;
-  // some limit values
-  uint8_t i = LCDML.MENU_getScroll();
-  uint8_t maxi = _LCDML_DISP_rows + i;
-  uint8_t n = 0;
-
-   // init vars
-  uint8_t n_max             = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  uint8_t scrollbar_min     = 0;
-  uint8_t scrollbar_max     = LCDML.MENU_getChilds();
-  uint8_t scrollbar_cur_pos = LCDML.MENU_getCursorPosAbs();
-  uint8_t scroll_pos        = ((1.*n_max * _LCDML_DISP_rows) / (scrollbar_max - 1) * scrollbar_cur_pos);
-
-  // generate content
-  u8g2.firstPage();
-  do {
-
-
-    n = 0;
-    i = LCDML.MENU_getScroll();
-    // update content
-    // ***************
-
-      // clear menu
-      // ***************
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            u8g2.drawStr( _LCDML_DISP_box_x0+_LCDML_DISP_font_w + _LCDML_DISP_cur_space_behind, _LCDML_DISP_box_y0 + _LCDML_DISP_font_h * (n + 1), content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-
-    // set cursor
-    u8g2.drawStr( _LCDML_DISP_box_x0+_LCDML_DISP_cur_space_before, _LCDML_DISP_box_y0 + _LCDML_DISP_font_h * (LCDML.MENU_getCursorPos() + 1),  _LCDML_DISP_cursor_char);
-
-    if(_LCDML_DISP_draw_frame == 1) {
-       u8g2.drawFrame(_LCDML_DISP_box_x0, _LCDML_DISP_box_y0, (_LCDML_DISP_box_x1-_LCDML_DISP_box_x0), (_LCDML_DISP_box_y1-_LCDML_DISP_box_y0));
-    }
-
-    // display scrollbar when more content as rows available and with > 2
-    if (scrollbar_max > n_max && _LCDML_DISP_scrollbar_w > 2)
-    {
-      // set frame for scrollbar
-      u8g2.drawFrame(_LCDML_DISP_box_x1 - _LCDML_DISP_scrollbar_w, _LCDML_DISP_box_y0, _LCDML_DISP_scrollbar_w, _LCDML_DISP_box_y1-_LCDML_DISP_box_y0);
-
-      // calculate scrollbar length
-      uint8_t scrollbar_block_length = scrollbar_max - n_max;
-      scrollbar_block_length = (_LCDML_DISP_box_y1-_LCDML_DISP_box_y0) / (scrollbar_block_length + _LCDML_DISP_rows);
-
-      //set scrollbar
-      if (scrollbar_cur_pos == 0) {                                   // top position     (min)
-        u8g2.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y0 + 1                                                     , (_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-      }
-      else if (scrollbar_cur_pos == (scrollbar_max-1)) {            // bottom position  (max)
-        u8g2.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y1 - scrollbar_block_length                                , (_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-      }
-      else {                                                                // between top and bottom
-        u8g2.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y0 + (scrollbar_block_length * scrollbar_cur_pos + 1),(_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-      }
-    }
-  } while ( u8g2.nextPage() );
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menuFunction.ino
deleted file mode 100644
index f7f4457..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,379 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    u8g2.setFont(_LCDML_DISP_font);
-    u8g2.firstPage();
-    do {
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 1), "To close this");
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 2), "function press");
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 3), "any button or use");
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 4), "back button");
-    } while( u8g2.nextPage() );
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    g_func_timer_info = 20;       // reset and set timer
-
-    char buf[20];
-    sprintf (buf, "wait %d seconds", g_func_timer_info);
-
-    u8g2.setFont(_LCDML_DISP_font);
-    u8g2.firstPage();
-    do {
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 1), buf);
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 2), "or press back button");
-    } while( u8g2.nextPage() );
-
-
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-     // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000))
-    {
-      g_timer_1 = millis();
-      g_func_timer_info--;                // increment the value every second
-      char buf[20];
-      sprintf (buf, "wait %d seconds", g_func_timer_info);
-
-      u8g2.setFont(_LCDML_DISP_font);
-      u8g2.firstPage();
-      do {
-        u8g2.drawStr( 0, (_LCDML_DISP_font_h * 1), buf);
-        u8g2.drawStr( 0, (_LCDML_DISP_font_h * 2), "or press back button");
-      } while( u8g2.nextPage() );
-
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    char buf[17];
-    sprintf (buf, "count: %d of 3", 0);
-
-    u8g2.setFont(_LCDML_DISP_font);
-    u8g2.firstPage();
-    do {
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 1), "press a or w button");
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 2), buf);
-    } while( u8g2.nextPage() );
-
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        char buf[20];
-        sprintf (buf, "count: %d of 3", g_button_value);
-
-        u8g2.setFont(_LCDML_DISP_font);
-        u8g2.firstPage();
-        do {
-          u8g2.drawStr( 0, (_LCDML_DISP_font_h * 1), "press a or w button");
-          u8g2.drawStr( 0, (_LCDML_DISP_font_h * 2), buf);
-        } while( u8g2.nextPage() );
-      }
-    }
-
-   // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    u8g2.setFont(_LCDML_DISP_font);
-    u8g2.firstPage();
-    do {
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 1), "screensaver");
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 2), "press any key");
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 3), "to leave it");
-    } while( u8g2.nextPage() );
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())          // ****** STABLE END *********
-  {
-    // The screensaver go to the root menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function and go a layer back
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-
-    char buf[20];
-    sprintf (buf, "parameter: %d", param);
-
-    // setup function
-    u8g2.setFont(_LCDML_DISP_font);
-    u8g2.firstPage();
-    do {
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 1), buf);
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 2), "press any key");
-      u8g2.drawStr( 0, (_LCDML_DISP_font_h * 3), "to leave it");
-    } while( u8g2.nextPage() );
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())               // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_u8g2lib.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_u8g2lib.ino
deleted file mode 100644
index 72fbce3..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8g2lib/LCDML_u8g2lib.ino
+++ /dev/null
@@ -1,201 +0,0 @@
-// ============================================================
-// Example:     LCDML: graphic display with u8g
-// ============================================================
-// Author:      Nils Feldkämper
-// Last update: 21.01.2018
-// License:     MIT
-// ============================================================
-// Description:
-// This example shows how to use the u8glib with the LCDMenuLib
-// The menu can placed in a box that can be placed anywhere on
-// the screen.
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-//#define _LCDML_cfg_use_ram 
-
-  // include libs
-  #include <LCDMenuLib2.h>
-
-  // U8g2lib
-  #include <Arduino.h>
-  #include <U8g2lib.h>
-
-  #ifdef U8X8_HAVE_HW_SPI
-  #include <SPI.h>
-  #endif
-  #ifdef U8X8_HAVE_HW_I2C
-  #include <Wire.h>
-  #endif
-
-// *********************************************************************
-// U8GLIB
-// *********************************************************************
-  // U8g2 Constructor List (Frame Buffer)
-  // The complete list is available here: https://github.com/olikraus/u8g2/wiki/u8g2setupcpp
-  // Please update the pin numbers according to your setup. Use U8X8_PIN_NONE if the reset pin is not connected
-  U8G2_ST7920_128X64_F_HW_SPI u8g2(U8G2_R0, /* CS=*/ 53, /* reset=*/ U8X8_PIN_NONE);     // (MEGA, ...
-  //U8G2_ST7920_128X64_F_HW_SPI u8g2(U8G2_R0, /* CS=*/ 12, /* reset=*/ U8X8_PIN_NONE);   // (Uno and co
-
-  // settings for u8g lib and LCD
-  #define _LCDML_DISP_w                 128            // LCD width
-  #define _LCDML_DISP_h                 64             // LCD height
-  // font settings
-  #define _LCDML_DISP_font              u8g_font_6x13  // u8glib font (more fonts under u8g.h line 1520 ...)
-  #define _LCDML_DISP_font_w            6              // font width
-  #define _LCDML_DISP_font_h            13             // font height
-  // cursor settings
-  #define _LCDML_DISP_cursor_char       "X"            // cursor char
-  #define _LCDML_DISP_cur_space_before  2              // cursor space between
-  #define _LCDML_DISP_cur_space_behind  4              // cursor space between
-  // menu position and size
-  #define _LCDML_DISP_box_x0            0              // start point (x0, y0)
-  #define _LCDML_DISP_box_y0            0              // start point (x0, y0)
-  #define _LCDML_DISP_box_x1            128            // width x  (x0 + width)
-  #define _LCDML_DISP_box_y1            64             // hight y  (y0 + height)
-  #define _LCDML_DISP_draw_frame        1              // draw a box around the menu
-   // scrollbar width
-  #define _LCDML_DISP_scrollbar_w       6  // scrollbar width (if this value is < 3, the scrollbar is disabled)
-
-  // nothing change here
-  #define _LCDML_DISP_cols_max          ((_LCDML_DISP_box_x1-_LCDML_DISP_box_x0)/_LCDML_DISP_font_w)
-  #define _LCDML_DISP_rows_max          ((_LCDML_DISP_box_y1-_LCDML_DISP_box_y0-((_LCDML_DISP_box_y1-_LCDML_DISP_box_y0)/_LCDML_DISP_font_h))/_LCDML_DISP_font_h)
-
-  // rows and cols
-  // when you use more rows or cols as allowed change in LCDMenuLib.h the define "_LCDML_DISP_cfg_max_rows" and "_LCDML_DISP_cfg_max_string_length"
-  // the program needs more ram with this changes
-  #define _LCDML_DISP_rows              _LCDML_DISP_rows_max  // max rows
-  #define _LCDML_DISP_cols              20                   // max cols
-
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-
-
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    u8g2.begin();
-
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Enable Menu Rollover
-    LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    // this function must called here, do not delete it
-    LCDML.loop();
-  }
-
-
-// *********************************************************************
-// check some errors - do not change here anything
-// *********************************************************************
-# if(_LCDML_glcd_tft_box_x1 > _LCDML_glcd_tft_w)
-# error _LCDML_glcd_tft_box_x1 is to big
-# endif
-
-# if(_LCDML_glcd_tft_box_y1 > _LCDML_glcd_tft_h)
-# error _LCDML_glcd_tft_box_y1 is to big
-# endif
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_condition.ino
deleted file mode 100644
index 4ddf48e..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_condition.ino
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_dynFunction.ino
deleted file mode 100644
index 99d99a8..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-        
-        LCDML.BT_resetEnter();
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-        LCDML.BT_resetUp();
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-        LCDML.BT_resetDown();
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-        LCDML.BT_resetLeft();
-      }
-      
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-        LCDML.BT_resetRight();
-      }
-    }
-  }
-
-  char buf[20];
-  sprintf (buf, "dynValue: %d", g_dynParam);
-
-  // setup function
-  u8g.drawStr( _LCDML_DISP_box_x0+_LCDML_DISP_font_w + _LCDML_DISP_cur_space_behind,  (_LCDML_DISP_font_h * (1+line)), buf);     // the value can be changed with left or right
-
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menu.ino
deleted file mode 100644
index 4189969..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menu.ino
+++ /dev/null
@@ -1,119 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // for first test set font here
-  u8g.setFont(_LCDML_DISP_font);
-  //u8g.setColorIndex(1); // Instructs the display to draw with a pixel on.
-
-  // declaration of some variables
-  // ***************
-  // content variable
-  char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-  // menu element object
-  LCDMenuLib2_menu *tmp;
-  // some limit values
-  uint8_t i = LCDML.MENU_getScroll();
-  uint8_t maxi = _LCDML_DISP_rows + i;
-  uint8_t n = 0;
-
-   // init vars
-  uint8_t n_max             = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-
-  uint8_t scrollbar_min     = 0;
-  uint8_t scrollbar_max     = LCDML.MENU_getChilds();
-  uint8_t scrollbar_cur_pos = LCDML.MENU_getCursorPosAbs();
-  uint8_t scroll_pos        = ((1.*n_max * _LCDML_DISP_rows) / (scrollbar_max - 1) * scrollbar_cur_pos);
-
-
- // for first test set font here
-  u8g.setFont(_LCDML_DISP_font);
-  u8g.setColorIndex(1); // Instructs the display to draw with a pixel on.
-
-
-  // generate content
-  u8g.firstPage();
-  do {
-
-
-    n = 0;
-    i = LCDML.MENU_getScroll();
-    // update content
-    // ***************
-
-      // clear menu
-      // ***************
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            u8g.drawStr( _LCDML_DISP_box_x0+_LCDML_DISP_font_w + _LCDML_DISP_cur_space_behind, _LCDML_DISP_box_y0 + _LCDML_DISP_font_h * (n + 1), content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-
-    // set cursor
-    u8g.drawStr( _LCDML_DISP_box_x0+_LCDML_DISP_cur_space_before, _LCDML_DISP_box_y0 + _LCDML_DISP_font_h * (LCDML.MENU_getCursorPos() + 1),  _LCDML_DISP_cursor_char);
-
-    if(_LCDML_DISP_draw_frame == 1) {
-       u8g.drawFrame(_LCDML_DISP_box_x0, _LCDML_DISP_box_y0, (_LCDML_DISP_box_x1-_LCDML_DISP_box_x0), (_LCDML_DISP_box_y1-_LCDML_DISP_box_y0));
-    }
-
-    // display scrollbar when more content as rows available and with > 2
-    if (scrollbar_max > n_max && _LCDML_DISP_scrollbar_w > 2)
-    {
-      // set frame for scrollbar
-      u8g.drawFrame(_LCDML_DISP_box_x1 - _LCDML_DISP_scrollbar_w, _LCDML_DISP_box_y0, _LCDML_DISP_scrollbar_w, _LCDML_DISP_box_y1-_LCDML_DISP_box_y0);
-
-      // calculate scrollbar length
-      uint8_t scrollbar_block_length = scrollbar_max - n_max;
-      scrollbar_block_length = (_LCDML_DISP_box_y1-_LCDML_DISP_box_y0) / (scrollbar_block_length + _LCDML_DISP_rows);
-
-      //set scrollbar
-      if (scrollbar_cur_pos == 0) {                                   // top position     (min)
-        u8g.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y0 + 1                                                     , (_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-      }
-      else if (scrollbar_cur_pos == (scrollbar_max-1)) {            // bottom position  (max)
-        u8g.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y1 - scrollbar_block_length                                , (_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-      }
-      else {                                                                // between top and bottom
-        u8g.drawBox(_LCDML_DISP_box_x1 - (_LCDML_DISP_scrollbar_w-1), _LCDML_DISP_box_y0 + (scrollbar_block_length * scrollbar_cur_pos + 1),(_LCDML_DISP_scrollbar_w-2)  , scrollbar_block_length);
-      }
-    }
-  } while ( u8g.nextPage() );
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menuFunction.ino
deleted file mode 100644
index 728d8d5..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,378 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    u8g.setFont(_LCDML_DISP_font);
-    u8g.firstPage();
-    do {
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 1), F("To close this"));
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 2), F("function press"));
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 3), F("any button or use"));
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 4), F("back button"));
-    } while( u8g.nextPage() );
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    g_func_timer_info = 20;       // reset and set timer
-
-    char buf[20];
-    sprintf (buf, "wait %d seconds", g_func_timer_info);
-
-    u8g.setFont(_LCDML_DISP_font);
-    u8g.firstPage();
-    do {
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 1), buf);
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 2), F("or press back button"));
-    } while( u8g.nextPage() );
-
-
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000))
-    {
-      g_timer_1 = millis();
-      g_func_timer_info--;                // increment the value every second
-      char buf[20];
-      sprintf (buf, "wait %d seconds", g_func_timer_info);
-
-      u8g.setFont(_LCDML_DISP_font);
-      u8g.firstPage();
-      do {
-        u8g.drawStr( 0, (_LCDML_DISP_font_h * 1), buf);
-        u8g.drawStr( 0, (_LCDML_DISP_font_h * 2), F("or press back button"));
-      } while( u8g.nextPage() );
-
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    char buf[17];
-    sprintf (buf, "count: %d of 3", 0);
-
-    u8g.setFont(_LCDML_DISP_font);
-    u8g.firstPage();
-    do {
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 1), F("press a or w button"));
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 2), buf);
-    } while( u8g.nextPage() );
-
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        char buf[17];
-        sprintf (buf, "count: %d of 3", g_button_value);
-
-        u8g.setFont(_LCDML_DISP_font);
-        u8g.firstPage();
-        do {
-          u8g.drawStr( 0, (_LCDML_DISP_font_h * 1), F("press a or w button"));
-          u8g.drawStr( 0, (_LCDML_DISP_font_h * 2), buf);
-        } while( u8g.nextPage() );
-      }
-    }
-
-   // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    u8g.setFont(_LCDML_DISP_font);
-    u8g.firstPage();
-    do {
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 1), F("screensaver"));
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 2), F("press any key"));
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 3), F("to leave it"));
-    } while( u8g.nextPage() );
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())              // ****** LOOP *********
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())            // ****** STABLE END *********
-  {
-    // The screensaver go to the root menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function and go a layer back
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    char buf[20];
-    sprintf (buf, "parameter: %d", param);
-
-    // setup function
-    u8g.setFont(_LCDML_DISP_font);
-    u8g.firstPage();
-    do {
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 1), buf);
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 2), F("press any key"));
-      u8g.drawStr( 0, (_LCDML_DISP_font_h * 3), F("to leave it"));
-    } while( u8g.nextPage() );
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())          // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())        // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_u8glib.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_u8glib.ino
deleted file mode 100644
index c4b8a10..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/glcd/LCDML_u8glib/LCDML_u8glib.ino
+++ /dev/null
@@ -1,188 +0,0 @@
-// ============================================================
-// Example:     LCDML: graphic display with u8g
-// ============================================================
-// Author:      Nils Feldkämper
-// Last update: 21.01.2018
-// License:     MIT
-// ============================================================
-// Description:
-// This example shows how to use the u8glib with the LCDMenuLib
-// The menu can placed in a box that can be placed anywhere on
-// the screen.
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-//#define _LCDML_cfg_use_ram 
-
-  // include libs
-  #include <LCDMenuLib2.h>
-  #include <U8glib.h>
-
-// *********************************************************************
-// U8GLIB
-// *********************************************************************
-  // setup u8g object, please remove comment from one of the following constructor calls
-  // IMPORTANT NOTE: The following list is incomplete. The complete list of supported
-  // devices with all constructor calls is here: https://github.com/olikraus/u8glib/wiki/device
-  U8GLIB_ST7920_128X64 u8g(52, 51, 53, U8G_PIN_NONE);
-
-  // settings for u8g lib and LCD
-  #define _LCDML_DISP_w                 128            // LCD width
-  #define _LCDML_DISP_h                 64             // LCD height
-  // font settings
-  #define _LCDML_DISP_font              u8g_font_6x13  // u8glib font (more fonts under u8g.h line 1520 ...)
-  #define _LCDML_DISP_font_w            6              // font width
-  #define _LCDML_DISP_font_h            13             // font height
-  // cursor settings
-  #define _LCDML_DISP_cursor_char       "X"            // cursor char
-  #define _LCDML_DISP_cur_space_before  2              // cursor space between
-  #define _LCDML_DISP_cur_space_behind  4              // cursor space between
-  // menu position and size
-  #define _LCDML_DISP_box_x0            0              // start point (x0, y0)
-  #define _LCDML_DISP_box_y0            0              // start point (x0, y0)
-  #define _LCDML_DISP_box_x1            128            // width x  (x0 + width)
-  #define _LCDML_DISP_box_y1            64             // hight y  (y0 + height)
-  #define _LCDML_DISP_draw_frame        1              // draw a box around the menu
-   // scrollbar width
-  #define _LCDML_DISP_scrollbar_w       6  // scrollbar width (if this value is < 3, the scrollbar is disabled)
-
-  // nothing change here
-  #define _LCDML_DISP_cols_max          ((_LCDML_DISP_box_x1-_LCDML_DISP_box_x0)/_LCDML_DISP_font_w)
-  #define _LCDML_DISP_rows_max          ((_LCDML_DISP_box_y1-_LCDML_DISP_box_y0-((_LCDML_DISP_box_y1-_LCDML_DISP_box_y0)/_LCDML_DISP_font_h))/_LCDML_DISP_font_h)
-
-  // rows and cols
-  // when you use more rows or cols as allowed change in LCDMenuLib.h the define "_LCDML_DISP_cfg_max_rows" and "_LCDML_DISP_cfg_max_string_length"
-  // the program needs more ram with this changes
-  #define _LCDML_DISP_rows              _LCDML_DISP_rows_max  // max rows
-  #define _LCDML_DISP_cols              20                   // max cols
-
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-
-
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Enable Menu Rollover
-    LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    // this function must called here, do not delete it
-    LCDML.loop();
-  }
-
-
-// *********************************************************************
-// check some errors - do not change here anything
-// *********************************************************************
-# if(_LCDML_glcd_tft_box_x1 > _LCDML_glcd_tft_w)
-# error _LCDML_glcd_tft_box_x1 is to big
-# endif
-
-# if(_LCDML_glcd_tft_box_y1 > _LCDML_glcd_tft_h)
-# error _LCDML_glcd_tft_box_y1 is to big
-# endif
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menu.ino
deleted file mode 100644
index d4a420a..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menu.ino
+++ /dev/null
@@ -1,125 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  lcd.clear();
-  lcd.setCursor(0, 0);
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate()) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = _LCDML_DISP_rows + i;
-    uint8_t n = 0;
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            lcd.setCursor(1, n);
-            lcd.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-
-  if(LCDML.DISP_checkMenuCursorUpdate())
-  {
-    // init vars
-    uint8_t n_max             = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-    uint8_t scrollbar_min     = 0;
-    uint8_t scrollbar_max     = LCDML.MENU_getChilds();
-    uint8_t scrollbar_cur_pos = LCDML.MENU_getCursorPosAbs();
-    uint8_t scroll_pos        = ((1.*n_max * _LCDML_DISP_rows) / (scrollbar_max - 1) * scrollbar_cur_pos);
-
-
-    // display rows
-    for (uint8_t n = 0; n < n_max; n++)
-    {
-      //set cursor
-      lcd.setCursor(0, n);
-
-      //set cursor char
-      if (n == LCDML.MENU_getCursorPos()) {
-        lcd.write(_LCDML_DISP_cfg_cursor);
-      } else {
-        lcd.write(' ');
-      }
-
-      // delete or reset scrollbar
-      if (_LCDML_DISP_cfg_scrollbar == 1) {
-        if (scrollbar_max > n_max) {
-          lcd.setCursor((_LCDML_DISP_cols - 1), n);
-          lcd.write((uint8_t)0);
-        }
-        else {
-          lcd.setCursor((_LCDML_DISP_cols - 1), n);
-          lcd.print(' ');
-        }
-      }
-    }
-
-    // display scrollbar
-    if (_LCDML_DISP_cfg_scrollbar == 1) {
-      if (scrollbar_max > n_max) {
-        //set scroll position
-        if (scrollbar_cur_pos == scrollbar_min) {
-          // min pos
-          lcd.setCursor((_LCDML_DISP_cols - 1), 0);
-          lcd.write((uint8_t)1);
-        } else if (scrollbar_cur_pos == (scrollbar_max - 1)) {
-          // max pos
-          lcd.setCursor((_LCDML_DISP_cols - 1), (n_max - 1));
-          lcd.write((uint8_t)4);
-        } else {
-          // between
-          lcd.setCursor((_LCDML_DISP_cols - 1), scroll_pos / n_max);
-          lcd.write((uint8_t)(scroll_pos % n_max) + 1);
-        }
-      }
-    }
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menuFunction.ino
deleted file mode 100644
index cac3f3c..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,289 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    lcd.setCursor(0, 0);
-    lcd.print(F("To close this"));
-    lcd.setCursor(0, 1);
-    lcd.print(F("function press"));
-    lcd.setCursor(0, 2);
-    lcd.print(F("any button or use"));
-    lcd.setCursor(0, 3);
-    lcd.print(F("back button"));
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    lcd.print(F("20 sec wait")); // print some content on first row
-    g_func_timer_info = 20;       // reset and set timer
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000)) {
-      g_func_timer_info--;                // increment the value every second
-      lcd.setCursor(0, 0);                // set cursor pos
-      lcd.print(F("  "));
-      lcd.setCursor(0, 0);                // set cursor pos
-      lcd.print(g_func_timer_info);       // print the time counter value
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    // print LCD content
-    lcd.setCursor(0, 0);
-    lcd.print(F("press left or up"));
-    lcd.setCursor(0, 1);
-    lcd.print(F("count: 0 of 3"));
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        // update LCD content
-        lcd.setCursor(7, 1); // set cursor
-        lcd.print(g_button_value); // print change content
-      }
-    }
-
-    // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // update LCD content
-    lcd.setCursor(0, 0); // set cursor
-    lcd.print(F("screensaver")); // print change content
-    lcd.setCursor(0, 1); // set cursor
-    lcd.print(F("press any key"));
-    lcd.setCursor(0, 2); // set cursor
-    lcd.print(F("to leave it"));
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())
-  {
-    // The screensaver go to the root menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function and go a layer back
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_i2c_display_20x4.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_i2c_display_20x4.ino
deleted file mode 100644
index 1071b26..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_i2c_display_20x4/LCDML_i2c_display_20x4.ino
+++ /dev/null
@@ -1,153 +0,0 @@
-// ============================================================
-// Example:     DisplayType - I2C LiquidCrystal 
-// ============================================================
-// Description:
-// This example includes the complete functionality over some
-// tabs. All Tabs which are started with "LCDML_display_.."
-// generates an output on the display / console / ....
-// This example is for the author to test the complete functionality
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <Wire.h>
-  #include <LiquidCrystal_I2C.h>
-  #include <LCDMenuLib2.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  20
-  #define _LCDML_DISP_rows  4
-
-  #define _LCDML_DISP_cfg_cursor                     0x7E   // cursor Symbol
-  #define _LCDML_DISP_cfg_scrollbar                  1      // enable a scrollbar
-
-  // LCD object
-  // for i2c there are many different steps for initialization, some are listed here
-  // when the rows and cols are not set here, they have to be set in the setup
-  //LiquidCrystal_I2C lcd(0x27);  // Set the LCD I2C address
-  //LiquidCrystal_I2C lcd(0x27, BACKLIGHT_PIN, POSITIVE);  // Set the LCD I2C address
-  LiquidCrystal_I2C lcd(0x27,_LCDML_DISP_cols,_LCDML_DISP_rows);
-  //LiquidCrystal_I2C lcd(0x27, 2, 1, 0, 4, 5, 6, 7, 3, POSITIVE);  // Set the LCD I2C address
-
-  const uint8_t scroll_bar[5][8] = {
-    {B10001, B10001, B10001, B10001, B10001, B10001, B10001, B10001}, // scrollbar top
-    {B11111, B11111, B10001, B10001, B10001, B10001, B10001, B10001}, // scroll state 1
-    {B10001, B10001, B11111, B11111, B10001, B10001, B10001, B10001}, // scroll state 2
-    {B10001, B10001, B10001, B10001, B11111, B11111, B10001, B10001}, // scroll state 3
-    {B10001, B10001, B10001, B10001, B10001, B10001, B11111, B11111}  // scrollbar bottom
-  };
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Global variables
-// *********************************************************************
-
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (16 , LCDML_0         , 5  , "Dummy B"          , NULL);                    // NULL = no menu function
-  LCDML_add         (17 , LCDML_0         , 6  , "Screensaver"      , mFunc_screensaver);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    17
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCD Begin
-    lcd.init();
-    lcd.backlight();
-    //lcd.begin(_LCDML_DISP_cols,_LCDML_DISP_rows);  // some display types needs here the initialization
-
-
-    // set special chars for scrollbar
-    lcd.createChar(0, (uint8_t*)scroll_bar[0]);
-    lcd.createChar(1, (uint8_t*)scroll_bar[1]);
-    lcd.createChar(2, (uint8_t*)scroll_bar[2]);
-    lcd.createChar(3, (uint8_t*)scroll_bar[3]);
-    lcd.createChar(4, (uint8_t*)scroll_bar[4]);
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    LCDML.loop();
-  }
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_condition.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_condition.ino
deleted file mode 100644
index 4ddf48e..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_condition.ino
+++ /dev/null
@@ -1,15 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Conditions to show or hide a menu element on the display              *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-
-// *********************************************************************
-boolean COND_hide()  // hide a menu element
-// *********************************************************************
-{
-  return false;  // hidden
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_control.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_control.ino
deleted file mode 100644
index bb48c10..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_control.ino
+++ /dev/null
@@ -1,621 +0,0 @@
-// =====================================================================
-//
-// CONTROL v2.2.0
-//
-// =====================================================================
-// *********************************************************************
-// Features 
-// - max 6 Buttons with special names (enter, quit, up, down, left, right)
-// new Features on v2.2.0
-// - max 64 Events, this could be a button ore something (Counter 0 - 63) 
-// - standard buttons and events can be used at the same time
-// - Event 0 - 3 can be used with a menu callback function (when set this event, the function is called)
-// - The range from 0 - 3 can be changed in LCDMenuLib2.h
-// Attention!!
-// - events have to be reset manual over LCDML.CE_reset(number) ore LCDML.CE_resetAll();
-// - they will not be reseted from the menu library
-// *********************************************************************
-// content:
-// (0) Control over serial interface  with asdw_e_q
-// (1) Control over one analog input
-// (2) Control over 4 - 6 digital input pins (internal pullups enabled)
-// (3) Control over encoder [third party lib] (Download: https://github.com/PaulStoffregen/Encoder)
-// (4) Control with Keypad  [third party lib] (Download: http://playground.arduino.cc/Main/KeypadTutorial )
-// (5) Control with an IRMP remote [third party lib] (Download: https://github.com/ukw100/IRMP )
-// (6) Control with a joystick
-// (7) Control over I2C PCF8574
-// *********************************************************************
-
-#define _LCDML_CONTROL_cfg      0
-
-// theory:
-// "#if" is a preprocessor directive and no error, look here:
-// (English) https://en.wikipedia.org/wiki/C_preprocessor
-// (German)  https://de.wikipedia.org/wiki/C-Pr%C3%A4prozessor
-
-// *********************************************************************
-// *************** (0) CONTROL OVER SERIAL INTERFACE *******************
-// *********************************************************************
-#if(_LCDML_CONTROL_cfg == 0)
-// settings
-  # define _LCDML_CONTROL_serial_enter           'e'
-  # define _LCDML_CONTROL_serial_up              'w'
-  # define _LCDML_CONTROL_serial_down            's'
-  # define _LCDML_CONTROL_serial_left            'a'
-  # define _LCDML_CONTROL_serial_right           'd'
-  # define _LCDML_CONTROL_serial_quit            'q'
-
-  // example for the useage of events (not needed everywhere)
-  // this defines are only for examples and can be renamed
-  # define _LCDML_EVENT_command                'c'
-  # define _LCDML_EVENT_char_0                 '0'
-  # define _LCDML_EVENT_char_1                 '1'
-  # define _LCDML_EVENT_char_2                 '2'
-  # define _LCDML_EVENT_char_3                 '3'
-  # define _LCDML_EVENT_char_4                 '4'
-  # define _LCDML_EVENT_char_5                 '5'
-  # define _LCDML_EVENT_char_6                 '6'
-  # define _LCDML_EVENT_char_7                 '7'
-  # define _LCDML_EVENT_char_8                 '8'
-  # define _LCDML_EVENT_char_9                 '9'
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once 
-  }
-
-  if(LCDML.CE_setup()) {
-    // runs only once
-    Serial.println("CE_setup()");
-  }
-
-  // check if new serial input is available
-  if (Serial.available()) {
-    // read one char from input buffer    
-    switch (Serial.read())
-    {
-      case _LCDML_CONTROL_serial_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_serial_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_serial_down:   LCDML.BT_down();  break;
-      case _LCDML_CONTROL_serial_left:   LCDML.BT_left();  break;
-      case _LCDML_CONTROL_serial_right:  LCDML.BT_right(); break;
-      case _LCDML_CONTROL_serial_quit:   LCDML.BT_quit();  break;
-      // example for event handling 
-      // custom event handling
-      // is is also possible to enable more the one event on the same time
-      // but when more then one events with callback functions are active 
-      // only the first callback function is called. (first = by number)
-      case _LCDML_EVENT_command:  LCDML.CE_set(0);   break;
-      case _LCDML_EVENT_char_0:   LCDML.CE_set(1);   break;
-      case _LCDML_EVENT_char_1:   LCDML.CE_set(2);   break;
-      case _LCDML_EVENT_char_2:   LCDML.CE_set(3);   break;
-      case _LCDML_EVENT_char_3:   LCDML.CE_set(4);   break;
-      case _LCDML_EVENT_char_4:   LCDML.CE_set(5);   break;
-      case _LCDML_EVENT_char_5:   LCDML.CE_set(6);   break;
-      case _LCDML_EVENT_char_6:   LCDML.CE_set(7);   break;
-      case _LCDML_EVENT_char_7:   LCDML.CE_set(8);   break;
-      case _LCDML_EVENT_char_8:   LCDML.CE_set(9);   break;
-      case _LCDML_EVENT_char_9:   LCDML.CE_set(10);  break;
-      default: break;
-    }
-  }
-}
-
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (1) CONTROL OVER ONE ANALOG PIN *********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 1)
-
-  unsigned long g_LCDML_DISP_press_time = 0;
-// settings
-  #define _LCDML_CONTROL_analog_pin              0
-  // when you did not use a button set the value to zero
-  #define _LCDML_CONTROL_analog_enter_min        850     // Button Enter
-  #define _LCDML_CONTROL_analog_enter_max        920
-  #define _LCDML_CONTROL_analog_up_min           520     // Button Up
-  #define _LCDML_CONTROL_analog_up_max           590
-  #define _LCDML_CONTROL_analog_down_min         700     // Button Down
-  #define _LCDML_CONTROL_analog_down_max         770
-  #define _LCDML_CONTROL_analog_back_min         950     // Button Back
-  #define _LCDML_CONTROL_analog_back_max         1020
-  #define _LCDML_CONTROL_analog_left_min         430     // Button Left
-  #define _LCDML_CONTROL_analog_left_max         500
-  #define _LCDML_CONTROL_analog_right_min        610     // Button Right
-  #define _LCDML_CONTROL_analog_right_max        680
-// *********************************************************************
-
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t value = analogRead(_LCDML_CONTROL_analog_pin);  // analog pin for keypad
-
-    if (value >= _LCDML_CONTROL_analog_enter_min && value <= _LCDML_CONTROL_analog_enter_max) { LCDML.BT_enter(); }
-    if (value >= _LCDML_CONTROL_analog_up_min    && value <= _LCDML_CONTROL_analog_up_max)    { LCDML.BT_up();    }
-    if (value >= _LCDML_CONTROL_analog_down_min  && value <= _LCDML_CONTROL_analog_down_max)  { LCDML.BT_down();  }
-    if (value >= _LCDML_CONTROL_analog_left_min  && value <= _LCDML_CONTROL_analog_left_max)  { LCDML.BT_left();  }
-    if (value >= _LCDML_CONTROL_analog_right_min && value <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }
-    if (value >= _LCDML_CONTROL_analog_back_min  && value <= _LCDML_CONTROL_analog_back_max)  { LCDML.BT_quit();  }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (2) CONTROL OVER DIGITAL PINS ***********************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 2)
-// settings
-  unsigned long g_LCDML_DISP_press_time = 0;
-
-  #define _LCDML_CONTROL_digital_low_active      0    // 0 = high active (pulldown) button, 1 = low active (pullup)
-                                                      // http://playground.arduino.cc/CommonTopics/PullUpDownResistor
-  #define _LCDML_CONTROL_digital_enable_quit     1
-  #define _LCDML_CONTROL_digital_enable_lr       1
-  #define _LCDML_CONTROL_digital_enter           8
-  #define _LCDML_CONTROL_digital_up              9
-  #define _LCDML_CONTROL_digital_down            10
-  #define _LCDML_CONTROL_digital_quit            11
-  #define _LCDML_CONTROL_digital_left            12
-  #define _LCDML_CONTROL_digital_right           13
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    // init buttons
-    pinMode(_LCDML_CONTROL_digital_enter      , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_up         , INPUT_PULLUP);
-    pinMode(_LCDML_CONTROL_digital_down       , INPUT_PULLUP);
-    # if(_LCDML_CONTROL_digital_enable_quit == 1)
-      pinMode(_LCDML_CONTROL_digital_quit     , INPUT_PULLUP);
-    # endif
-    # if(_LCDML_CONTROL_digital_enable_lr == 1)
-      pinMode(_LCDML_CONTROL_digital_left     , INPUT_PULLUP);
-      pinMode(_LCDML_CONTROL_digital_right    , INPUT_PULLUP);
-    # endif
-  }
-
-  #if(_LCDML_CONTROL_digital_low_active == 1)
-  #  define _LCDML_CONTROL_digital_a !
-  #else
-  #  define _LCDML_CONTROL_digital_a
-  #endif
-
-  uint8_t but_stat = 0x00;
-
-  bitWrite(but_stat, 0, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_enter)));
-  bitWrite(but_stat, 1, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_up)));
-  bitWrite(but_stat, 2, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_down)));
-  #if(_LCDML_CONTROL_digital_enable_quit == 1)
-  bitWrite(but_stat, 3, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_quit)));
-  #endif
-  #if(_LCDML_CONTROL_digital_enable_lr == 1)
-  bitWrite(but_stat, 4, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_left)));
-  bitWrite(but_stat, 5, _LCDML_CONTROL_digital_a(digitalRead(_LCDML_CONTROL_digital_right)));
-  #endif
-
-  if (but_stat > 0) {
-    if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-      if (bitRead(but_stat, 0)) { LCDML.BT_enter(); }
-      if (bitRead(but_stat, 1)) { LCDML.BT_up();    }
-      if (bitRead(but_stat, 2)) { LCDML.BT_down();  }
-      if (bitRead(but_stat, 3)) { LCDML.BT_quit();  }
-      if (bitRead(but_stat, 4)) { LCDML.BT_left();  }
-      if (bitRead(but_stat, 5)) { LCDML.BT_right(); }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-
-// *********************************************************************
-// *************** (3) CONTROL WITH ENCODER ****************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 3)
-  /*
-   * Thanks to "MuchMore" (Arduino forum) to add this encoder functionality
-   *
-   * rotate left = Up
-   * rotate right = Down
-   * push = Enter
-   * push long = Quit
-   * push + rotate left = Left
-   * push + rotate right = Right
-   */
-
-  /* encoder connection
-   * button * (do not use an external resistor, the internal pullup resistor is used)
-   * .-------o  Arduino Pin
-   * |
-   * |
-   * o  /
-   *   /
-   *  /
-   * o
-   * |
-   * '-------o   GND
-   *
-   * encoder * (do not use an external resistor, the internal pullup resistors are used)
-   *
-   * .---------------o  Arduino Pin A
-   * |        .------o  Arduino Pin B
-   * |        |
-   * o  /     o  /
-   *   /        /
-   *  /        /
-   * o        o
-   * |        |
-   * '--------o----o   GND (common pin)
-   */
-
-  // global defines
-  #define encoder_A_pin       20    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_B_pin       21    // physical pin has to be 2 or 3 to use interrupts (on mega e.g. 20 or 21), use internal pullups
-  #define encoder_button_pin  49    // physical pin , use internal pullup
-
-  #define g_LCDML_CONTROL_button_long_press    800   // ms
-  #define g_LCDML_CONTROL_button_short_press   120   // ms
-
-  #define ENCODER_OPTIMIZE_INTERRUPTS //Only when using pin2/3 (or 20/21 on mega)
-  #include <Encoder.h> //for Encoder    Download:  https://github.com/PaulStoffregen/Encoder
-
-  Encoder ENCODER(encoder_A_pin, encoder_B_pin);
-
-  unsigned long  g_LCDML_CONTROL_button_press_time = 0;
-  bool  g_LCDML_CONTROL_button_prev       = HIGH;
-
-// *********************************************************************
-void lcdml_menu_control(void)
-// *********************************************************************
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup())
-  {
-    // runs only once
-
-    // init pins
-    pinMode(encoder_A_pin      , INPUT_PULLUP);
-    pinMode(encoder_B_pin      , INPUT_PULLUP);
-    pinMode(encoder_button_pin  , INPUT_PULLUP);
-  }
-
-  //Volatile Variable
-  long g_LCDML_CONTROL_Encoder_position = ENCODER.read();
-  bool button                           = digitalRead(encoder_button_pin);
-
-  if(g_LCDML_CONTROL_Encoder_position <= -3) {
-
-    if(!button)
-    {
-      LCDML.BT_left();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_down();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position+4);
-  }
-  else if(g_LCDML_CONTROL_Encoder_position >= 3)
-  {
-
-    if(!button)
-    {
-      LCDML.BT_right();
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = -1;
-    }
-    else
-    {
-      LCDML.BT_up();
-    }
-    ENCODER.write(g_LCDML_CONTROL_Encoder_position-4);
-  }
-  else
-  {
-    if(!button && g_LCDML_CONTROL_button_prev)  //falling edge, button pressed
-    {
-      g_LCDML_CONTROL_button_prev = LOW;
-      g_LCDML_CONTROL_button_press_time = millis();
-    }
-    else if(button && !g_LCDML_CONTROL_button_prev) //rising edge, button not active
-    {
-       g_LCDML_CONTROL_button_prev = HIGH;
-
-       if(g_LCDML_CONTROL_button_press_time < 0)
-       {
-         g_LCDML_CONTROL_button_press_time = millis();
-         //Reset for left right action
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_long_press)
-       {
-         LCDML.BT_quit();
-       }
-       else if((millis() - g_LCDML_CONTROL_button_press_time) >= g_LCDML_CONTROL_button_short_press)
-       {
-         LCDML.BT_enter();
-       }
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-
-
-// *********************************************************************
-// *************** (4) CONTROL WITH A KEYPAD ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 4)
-// include
-  // more information under http://playground.arduino.cc/Main/KeypadTutorial
-  #include <Keypad.h>
-// settings
-  #define _LCDML_CONTROL_keypad_rows 4 // Four rows
-  #define _LCDML_CONTROL_keypad_cols 3 // Three columns
-// global vars
-  char keys[_LCDML_CONTROL_keypad_rows][_LCDML_CONTROL_keypad_cols] = {
-    {'1','2','3'},
-    {'4','5','6'},
-    {'7','8','9'},
-    {'#','0','*'}
-  };
-  byte rowPins[_LCDML_CONTROL_keypad_rows] = { 9, 8, 7, 6 };  // Connect keypad COL0, COL1 and COL2 to these Arduino pins.
-  byte colPins[_LCDML_CONTROL_keypad_cols] = { 12, 11, 10 };  // Create the Keypad
-// objects
-  Keypad kpd = Keypad( makeKeymap(keys), rowPins, colPins, _LCDML_CONTROL_keypad_rows, _LCDML_CONTROL_keypad_cols );
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-  char key = kpd.getKey();
-  if(key)  // Check for a valid key.
-  {
-    switch (key)
-    {
-      // this is the default configuration 
-      case '#': LCDML.BT_enter(); break;
-      case '2': LCDML.BT_up();    break;
-      case '8': LCDML.BT_down();  break;
-      case '4': LCDML.BT_left();  break;
-      case '6': LCDML.BT_right(); break;
-      case '*': LCDML.BT_quit();  break;
-
-      // when you want to use all characters you have to use the CE_ functionality
-      // CE stands for "custom event" and you can define 64 evetns
-      // the following code is only an example      
-      /*
-      case '1': LCDML.CE_set(2); break;
-      case '2': LCDML.CE_set(3); LCDML.BT_up();    break;
-      case '3': LCDML.CE_set(4); break; 
-      case '4': LCDML.CE_set(5); LCDML.BT_left();  break;
-      case '5': LCDML.CE_set(6); break; 
-      case '6': LCDML.CE_set(7); LCDML.BT_right(); break;
-      case '7': LCDML.CE_set(8); break; 
-      case '8': LCDML.CE_set(9); LCDML.BT_down();  break;
-      case '9': LCDML.CE_set(10); break; 
-      case '0': LCDML.CE_set(1); break; 
-      case '#': LCDML.CE_set(12); LCDML.BT_enter(); break;
-      case '*': LCDML.CE_set(11); LCDML.BT_quit();  break;
-      */      
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-// *********************************************************************
-// *************** (5) CONTROL WITH IR REMOTE ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 5)
-    // IR include (this lib have to be installed)
-    // Download path: https://github.com/ukw100/IRMP
-    #define IRMP_INPUT_PIN PA0
-    #define IRMP_PROTOCOL_NAMES 1 // Enable protocol number mapping to protocol strings - needs some FLASH. Must before #include <irmp*>
-    #include <irmpSelectMain15Protocols.h> // This enables 15 main protocols
-
-    #include <irmp.c.h>
-
-    IRMP_DATA irmp_data[1];
-
-    #define STR_HELPER(x) #x
-    #define STR(x) STR_HELPER(x)
-
-    void handleReceivedIRData();
-
-// *********************************************************************
-// change in this function the IR values to your values
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    irmp_init();
-  }
-
-  if (irmp_get_data(&irmp_data[0]))
-  {
-    // comment this line out, to check the correct code
-    //Serial.println(results.value, HEX);
-
-    // in this switch case you have to change the value 0x...1 to the correct IR code
-    switch (irmp_data[0].command)
-    {
-      case 0x52: LCDML.BT_enter(); break;
-      case 0x50: LCDML.BT_up();    break;
-      case 0x51: LCDML.BT_down();  break;
-      case 0x55: LCDML.BT_left();  break;
-      case 0x56: LCDML.BT_right(); break;
-      case 0x23: LCDML.BT_quit();  break;
-      default: break;
-    }
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-
-// *********************************************************************
-// *************** (6) CONTROL OVER JOYSTICK ***************************
-// *********************************************************************
-#elif(_LCDML_CONTROL_cfg == 6)
-  unsigned long g_LCDML_DISP_press_time = 0;
-    // settings
-    #define _LCDML_CONTROL_analog_pinx A0
-    #define _LCDML_CONTROL_analog_piny A1
-    #define _LCDML_CONTROL_digitalread 33 //don't work with u8glib
-
-    // when you did not use a button set the value to zero
-    #define _LCDML_CONTROL_analog_up_min 612 // Button Up
-    #define _LCDML_CONTROL_analog_up_max 1023
-    #define _LCDML_CONTROL_analog_down_min 0 // Button Down
-    #define _LCDML_CONTROL_analog_down_max 412
-    #define _LCDML_CONTROL_analog_left_min 612 // Button Left
-    #define _LCDML_CONTROL_analog_left_max 1023
-    #define _LCDML_CONTROL_analog_right_min 0 // Button Right
-    #define _LCDML_CONTROL_analog_right_max 412
-// *********************************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-    pinMode (_LCDML_CONTROL_digitalread, INPUT);
-  }
-  // check debounce timer
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-    g_LCDML_DISP_press_time = millis(); // reset debounce timer
-
-    uint16_t valuex = analogRead(_LCDML_CONTROL_analog_pinx);  // analogpinx
-    uint16_t valuey = analogRead(_LCDML_CONTROL_analog_piny);  // analogpinx
-    uint16_t valuee = digitalRead(_LCDML_CONTROL_digitalread);  //digitalpinenter
-
-
-    if (valuey >= _LCDML_CONTROL_analog_up_min && valuey <= _LCDML_CONTROL_analog_up_max) { LCDML.BT_up(); }        // up
-    if (valuey >= _LCDML_CONTROL_analog_down_min && valuey <= _LCDML_CONTROL_analog_down_max) { LCDML.BT_down(); }    // down
-    if (valuex >= _LCDML_CONTROL_analog_left_min && valuex <= _LCDML_CONTROL_analog_left_max) { LCDML.BT_left(); }     // left
-    if (valuex >= _LCDML_CONTROL_analog_right_min && valuex <= _LCDML_CONTROL_analog_right_max) { LCDML.BT_right(); }    // right
-
-    if(valuee == true) {LCDML.BT_enter();}    // enter
-
-    // back buttons have to be included as menu item
-    // lock at the example LCDML_back_button
-  }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-// *********************************************************************
-// *************** (7) CONTROL OVER PCF8574 ****************************
-// *********************************************************************
-
-#elif(_LCDML_CONTROL_cfg == 7)
-  unsigned long g_LCDML_DISP_press_time = 0;
-  #define PCF8574_1 0x26 // I2C address for the buttons
-
-  #define PCF8574_Pin0 254
-  #define PCF8574_Pin1 253
-  #define PCF8574_Pin2 251
-  #define PCF8574_Pin3 247
-  #define PCF8574_Pin4 239
-  #define PCF8574_Pin5 223
-  #define PCF8574_Pin6 191
-  #define PCF8574_Pin7 127
-
-  // Specify the PCF8574 pins here
-  #define _LCDML_CONTROL_PCF8574_enable_quit    0
-  #define _LCDML_CONTROL_PCF8574_enable_lr      0
-  
-  #define _LCDML_CONTROL_PCF8574_enter          PCF8574_Pin0
-  #define _LCDML_CONTROL_PCF8574_up             PCF8574_Pin1
-  #define _LCDML_CONTROL_PCF8574_down           PCF8574_Pin2
-  #define _LCDML_CONTROL_PCF8574_left           PCF8574_Pin3
-  #define _LCDML_CONTROL_PCF8574_right          PCF8574_Pin4
-  #define _LCDML_CONTROL_PCF8574_quit           PCF8574_Pin5
-// **********************************************************
-void lcdml_menu_control(void)
-{
-  // If something must init, put in in the setup condition
-  if(LCDML.BT_setup()) {
-    // runs only once
-  }
-
-  if((millis() - g_LCDML_DISP_press_time) >= 200) {
-      g_LCDML_DISP_press_time = millis(); // reset press time
-
-    Wire.write(0xff); // All pins as input?
-    Wire.requestFrom(PCF8574_1, 1);
-   if (Wire.available()) {
-    switch (Wire.read())
-    {
-      case _LCDML_CONTROL_PCF8574_enter:  LCDML.BT_enter(); break;
-      case _LCDML_CONTROL_PCF8574_up:     LCDML.BT_up();    break;
-      case _LCDML_CONTROL_PCF8574_down:   LCDML.BT_down();  break;
-    #if(_LCDML_CONTROL_PCF8574_enable_quit == 1)
-      case _LCDML_CONTROL_PCF8574_quit:   LCDML.BT_quit();  break;
-    #endif
-    
-    #if(_LCDML_CONTROL_PCF8574_enable_lr   == 1)
-      case _LCDML_CONTROL_PCF8574_left: LCDML.BT_left(); break;
-      case _LCDML_CONTROL_PCF8574_right:   LCDML.BT_right();  break;
-    #endif
-    
-      default: break;
-    }
-  }
- }
-}
-// *********************************************************************
-// ******************************* END *********************************
-// *********************************************************************
-
-
-#else
-  #error _LCDML_CONTROL_cfg is not defined or not in range
-#endif
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_dynFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_dynFunction.ino
deleted file mode 100644
index 310017a..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_dynFunction.ino
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Dynamic content                                                       *
- *                                                                       *
- * ===================================================================== *
- */
-
-
-uint8_t g_dynParam = 100; // when this value comes from an EEPROM, load it in setup
-                          // at the moment here is no setup function (To-Do)
-void mDyn_para(uint8_t line)
-// *********************************************************************
-{
-  // check if this function is active (cursor stands on this line)
-  if (line == LCDML.MENU_getCursorPos())
-  {
-    // make only an action when the cursor stands on this menu item
-    //check Button
-    if(LCDML.BT_checkAny())
-    {
-      if(LCDML.BT_checkEnter())
-      {
-        // this function checks returns the scroll disable status (0 = menu scrolling enabled, 1 = menu scrolling disabled)
-        if(LCDML.MENU_getScrollDisableStatus() == 0)
-        {
-          // disable the menu scroll function to catch the cursor on this point
-          // now it is possible to work with BT_checkUp and BT_checkDown in this function
-          // this function can only be called in a menu, not in a menu function
-          LCDML.MENU_disScroll();
-        }
-        else
-        {
-          // enable the normal menu scroll function
-          LCDML.MENU_enScroll();
-        }
-
-        // do something
-        // ...
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkUp())
-      {
-        g_dynParam++;
-      }
-
-      // This check have only an effect when MENU_disScroll is set
-      if(LCDML.BT_checkDown())
-      {
-        g_dynParam--;
-      }
-
-
-      if(LCDML.BT_checkLeft())
-      {
-        g_dynParam++;
-      }
-      if(LCDML.BT_checkRight())
-      {
-        g_dynParam--;
-      }
-    }
-  }
-
-  char buf[20];
-  sprintf (buf, "dynValue: %d", g_dynParam);
-
-  // use the line from function parameters
-  lcd.setCursor(1, line);
-  lcd.print(buf);
-
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menu.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menu.ino
deleted file mode 100644
index d4a420a..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menu.ino
+++ /dev/null
@@ -1,125 +0,0 @@
-// =====================================================================
-//
-// Output function
-//
-// =====================================================================
-
-/* ******************************************************************** */
-void lcdml_menu_clear()
-/* ******************************************************************** */
-{
-  lcd.clear();
-  lcd.setCursor(0, 0);
-}
-
-/* ******************************************************************** */
-void lcdml_menu_display()
-/* ******************************************************************** */
-{
-  // update content
-  // ***************
-  if (LCDML.DISP_checkMenuUpdate()) {
-    // clear menu
-    // ***************
-    LCDML.DISP_clear();
-
-    // declaration of some variables
-    // ***************
-    // content variable
-    char content_text[_LCDML_DISP_cols];  // save the content text of every menu element
-    // menu element object
-    LCDMenuLib2_menu *tmp;
-    // some limit values
-    uint8_t i = LCDML.MENU_getScroll();
-    uint8_t maxi = _LCDML_DISP_rows + i;
-    uint8_t n = 0;
-
-    // check if this element has children
-    if ((tmp = LCDML.MENU_getDisplayedObj()) != NULL)
-    {
-      // loop to display lines
-      do
-      {
-        // check if a menu element has a condition and if the condition be true
-        if (tmp->checkCondition())
-        {
-          // check the type off a menu element
-          if(tmp->checkType_menu() == true)
-          {
-            // display normal content
-            LCDML_getContent(content_text, tmp->getID());
-            lcd.setCursor(1, n);
-            lcd.print(content_text);
-          }
-          else
-          {
-            if(tmp->checkType_dynParam()) {
-              tmp->callback(n);
-            }
-          }
-          // increment some values
-          i++;
-          n++;
-        }
-      // try to go to the next sibling and check the number of displayed rows
-      } while (((tmp = tmp->getSibling(1)) != NULL) && (i < maxi));
-    }
-  }
-
-  if(LCDML.DISP_checkMenuCursorUpdate())
-  {
-    // init vars
-    uint8_t n_max             = (LCDML.MENU_getChilds() >= _LCDML_DISP_rows) ? _LCDML_DISP_rows : (LCDML.MENU_getChilds());
-    uint8_t scrollbar_min     = 0;
-    uint8_t scrollbar_max     = LCDML.MENU_getChilds();
-    uint8_t scrollbar_cur_pos = LCDML.MENU_getCursorPosAbs();
-    uint8_t scroll_pos        = ((1.*n_max * _LCDML_DISP_rows) / (scrollbar_max - 1) * scrollbar_cur_pos);
-
-
-    // display rows
-    for (uint8_t n = 0; n < n_max; n++)
-    {
-      //set cursor
-      lcd.setCursor(0, n);
-
-      //set cursor char
-      if (n == LCDML.MENU_getCursorPos()) {
-        lcd.write(_LCDML_DISP_cfg_cursor);
-      } else {
-        lcd.write(' ');
-      }
-
-      // delete or reset scrollbar
-      if (_LCDML_DISP_cfg_scrollbar == 1) {
-        if (scrollbar_max > n_max) {
-          lcd.setCursor((_LCDML_DISP_cols - 1), n);
-          lcd.write((uint8_t)0);
-        }
-        else {
-          lcd.setCursor((_LCDML_DISP_cols - 1), n);
-          lcd.print(' ');
-        }
-      }
-    }
-
-    // display scrollbar
-    if (_LCDML_DISP_cfg_scrollbar == 1) {
-      if (scrollbar_max > n_max) {
-        //set scroll position
-        if (scrollbar_cur_pos == scrollbar_min) {
-          // min pos
-          lcd.setCursor((_LCDML_DISP_cols - 1), 0);
-          lcd.write((uint8_t)1);
-        } else if (scrollbar_cur_pos == (scrollbar_max - 1)) {
-          // max pos
-          lcd.setCursor((_LCDML_DISP_cols - 1), (n_max - 1));
-          lcd.write((uint8_t)4);
-        } else {
-          // between
-          lcd.setCursor((_LCDML_DISP_cols - 1), scroll_pos / n_max);
-          lcd.write((uint8_t)(scroll_pos % n_max) + 1);
-        }
-      }
-    }
-  }
-}
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menuFunction.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menuFunction.ino
deleted file mode 100644
index 2fa83be..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_display_menuFunction.ino
+++ /dev/null
@@ -1,345 +0,0 @@
-/* ===================================================================== *
- *                                                                       *
- * Menu Callback Function                                                *
- *                                                                       *
- * ===================================================================== *
- *
- * EXAMPLE CODE:
-
-// *********************************************************************
-void your_function_name(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    //LCDML_UNUSED(param);
-    // setup
-    // is called only if it is started
-
-    // starts a trigger event for the loop function every 100 milliseconds
-    LCDML.FUNC_setLoopInterval(100);
-
-    // uncomment this line when the menu should go back to the last called position
-    // this could be a cursor position or the an active menu function
-    // GBA means => go back advanced
-    //LCDML.FUNC_setGBA() 
-
-    //
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop
-    // is called when it is triggered
-    // - with LCDML_DISP_triggerMenu( milliseconds )
-    // - with every button or event status change
-
-    // uncomment this line when the screensaver should not be called when this function is running
-    // reset screensaver timer
-    //LCDML.SCREEN_resetTimer();
-
-    // check if any button is pressed (enter, up, down, left, right)
-    if(LCDML.BT_checkAny()) {
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // loop end
-    // you can here reset some global vars or delete it
-    // this function is always called when the functions ends.
-    // this means when you are calling a jumpTo ore a goRoot function
-    // that this part is called before a function is closed
-  }
-}
-
-
- * ===================================================================== *
- */
-
-
-// *********************************************************************
-void mFunc_information(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    lcd.setCursor(0, 0);
-    lcd.print(F("To close this"));
-    lcd.setCursor(0, 1);
-    lcd.print(F("function press"));
-    lcd.setCursor(0, 2);
-    lcd.print(F("any button or use"));
-    lcd.setCursor(0, 3);
-    lcd.print(F("back button"));
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if(LCDML.BT_checkAny()) { // check if any button is pressed (enter, up, down, left, right)
-      // LCDML_goToMenu stops a running menu function and goes to the menu
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_func_timer_info = 0;  // time counter (global variable)
-unsigned long g_timer_1 = 0;    // timer variable (global variable)
-void mFunc_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    lcd.print(F("20 sec wait")); // print some content on first row
-    g_func_timer_info = 20;       // reset and set timer
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-
-    LCDML.TIMER_msReset(g_timer_1);
-  }
-
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // loop function, can be run in a loop when LCDML_DISP_triggerMenu(xx) is set
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-
-    // reset screensaver timer
-    LCDML.SCREEN_resetTimer();
-
-    // this function is called every 100 milliseconds
-
-    // this method checks every 1000 milliseconds if it is called
-    if(LCDML.TIMER_ms(g_timer_1, 1000)) {
-      g_func_timer_info--;                // increment the value every second
-      lcd.setCursor(0, 0);                // set cursor pos
-      lcd.print(F("  "));
-      lcd.setCursor(0, 0);                // set cursor pos
-      lcd.print(g_func_timer_info);       // print the time counter value
-    }
-
-    // this function can only be ended when quit button is pressed or the time is over
-    // check if the function ends normally
-    if (g_func_timer_info <= 0)
-    {
-      // leave this function
-      LCDML.FUNC_goBackToMenu();
-    }
-  }
-
-  if(LCDML.FUNC_close())      // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-// *********************************************************************
-uint8_t g_button_value = 0; // button value counter (global variable)
-void mFunc_p2(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // setup function
-    // print LCD content
-    // print LCD content
-    lcd.setCursor(0, 0);
-    lcd.print(F("press left or up"));
-    lcd.setCursor(0, 1);
-    lcd.print(F("count: 0 of 3"));
-    // Reset Button Value
-    g_button_value = 0;
-
-    // Disable the screensaver for this function until it is closed
-    LCDML.FUNC_disableScreensaver();
-
-  }
-
-  if(LCDML.FUNC_loop())           // ****** LOOP *********
-  {
-    // the quit button works in every DISP function without any checks; it starts the loop_end function
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      if (LCDML.BT_checkLeft() || LCDML.BT_checkUp()) // check if button left is pressed
-      {
-        LCDML.BT_resetLeft(); // reset the left button
-        LCDML.BT_resetUp(); // reset the left button
-        g_button_value++;
-
-        // update LCD content
-        // update LCD content
-        lcd.setCursor(7, 1); // set cursor
-        lcd.print(g_button_value); // print change content
-      }
-    }
-
-    // check if button count is three
-    if (g_button_value >= 3) {
-      LCDML.FUNC_goBackToMenu();      // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())     // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_screensaver(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // update LCD content
-    lcd.setCursor(0, 0); // set cursor
-    lcd.print(F("screensaver")); // print change content
-    lcd.setCursor(0, 1); // set cursor
-    lcd.print(F("press any key"));
-    lcd.setCursor(0, 2); // set cursor
-    lcd.print(F("to leave it"));
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())
-  {
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())
-  {
-    // The screensaver go to the root menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-
-
-// *********************************************************************
-void mFunc_back(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // end function and go an layer back
-    LCDML.FUNC_goBackToMenu(1);      // leave this function and go a layer back
-  }
-}
-
-
-// *********************************************************************
-void mFunc_goToRootMenu(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-
-    // go to root and display menu
-    LCDML.MENU_goRoot();
-  }
-}
-
-// *********************************************************************
-void mFunc_jumpTo_timer_info(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-    // remmove compiler warnings when the param variable is not used:
-    LCDML_UNUSED(param);
-    
-    // Jump to main screen
-    LCDML.OTHER_jumpToFunc(mFunc_timer_info);
-  }
-}
-
-
-// *********************************************************************
-void mFunc_para(uint8_t param)
-// *********************************************************************
-{
-  if(LCDML.FUNC_setup())          // ****** SETUP *********
-  {
-
-    char buf[20];
-    sprintf (buf, "parameter: %d", param);
-
-    lcd.setCursor(0, 0);
-    lcd.print(buf);
-    lcd.setCursor(0, 1);
-    lcd.print(F("press any key"));
-    lcd.setCursor(0, 2);
-    lcd.print(F("to leave it"));
-
-    LCDML.FUNC_setLoopInterval(100);  // starts a trigger event for the loop function every 100 milliseconds
-  }
-
-  if(LCDML.FUNC_loop())          // ****** LOOP *********
-  {
-    // For example
-    switch(param)
-    {
-      case 10:
-        // do something
-        break;
-
-      case 20:
-        // do something
-        break;
-
-      case 30:
-        // do something
-        break;
-
-      default:
-        // do nothing
-        break;
-    }
-
-
-    if (LCDML.BT_checkAny()) // check if any button is pressed (enter, up, down, left, right)
-    {
-      LCDML.FUNC_goBackToMenu();  // leave this function
-    }
-  }
-
-  if(LCDML.FUNC_close())        // ****** STABLE END *********
-  {
-    // you can here reset some global vars or do nothing
-  }
-}
-
diff --git a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_liquidcrystal_20x4.ino b/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_liquidcrystal_20x4.ino
deleted file mode 100644
index a3b7dd2..0000000
--- a/third-party/LCDMenuLib2.old/examples/03_displaytypes/lcd/LCDML_liquidcrystal_20x4/LCDML_liquidcrystal_20x4.ino
+++ /dev/null
@@ -1,169 +0,0 @@
-// ============================================================
-// Example:     LCDML DisplayType - LiquidCrystal 
-// ============================================================
-// Description:
-// This example includes the complete functionality over some
-// tabs. All Tabs which are started with "LCDML_display_.."
-// generates an output on the display / console / ....
-// This example is for the author to test the complete functionality
-// ============================================================
-// *********************************************************************
-// special settings
-// *********************************************************************
-// enable this line when you are not usigng a standard arduino
-// for example when your chip is an ESP or a STM or SAM or something else
-
-//#define _LCDML_cfg_use_ram 
-
-// *********************************************************************
-// includes
-// *********************************************************************
-  #include <LiquidCrystal.h>
-  #include <LCDMenuLib2.h>
-
-// *********************************************************************
-// LCDML display settings
-// *********************************************************************
-  // settings for LCD
-  #define _LCDML_DISP_cols  20
-  #define _LCDML_DISP_rows  4
-
-  #define _LCDML_DISP_cfg_cursor                     0x7E   // cursor Symbol
-  #define _LCDML_DISP_cfg_scrollbar                  1      // enable a scrollbar
-
-  // LCD object
-  // liquid crystal needs (rs, e, dat4, dat5, dat6, dat7)
-  LiquidCrystal lcd(22, 24, 9, 10, 11, 12);
-
-  const uint8_t scroll_bar[5][8] = {
-    {B10001, B10001, B10001, B10001, B10001, B10001, B10001, B10001}, // scrollbar top
-    {B11111, B11111, B10001, B10001, B10001, B10001, B10001, B10001}, // scroll state 1
-    {B10001, B10001, B11111, B11111, B10001, B10001, B10001, B10001}, // scroll state 2
-    {B10001, B10001, B10001, B10001, B11111, B11111, B10001, B10001}, // scroll state 3
-    {B10001, B10001, B10001, B10001, B10001, B10001, B11111, B11111}  // scrollbar bottom
-  };
-
-// *********************************************************************
-// Prototypes
-// *********************************************************************
-  void lcdml_menu_display();
-  void lcdml_menu_clear();
-  void lcdml_menu_control();
-
-// *********************************************************************
-// Global variables
-// *********************************************************************
-
-
-// *********************************************************************
-// Objects
-// *********************************************************************
-  LCDMenuLib2_menu LCDML_0 (255, 0, 0, NULL, NULL); // root menu element (do not change)
-  LCDMenuLib2 LCDML(LCDML_0, _LCDML_DISP_rows, _LCDML_DISP_cols, lcdml_menu_display, lcdml_menu_clear, lcdml_menu_control);
-
-// *********************************************************************
-// LCDML MENU/DISP
-// *********************************************************************
-  // LCDML_0        => layer 0
-  // LCDML_0_X      => layer 1
-  // LCDML_0_X_X    => layer 2
-  // LCDML_0_X_X_X  => layer 3
-  // LCDML_0_...      => layer ...
-
-  // For beginners
-  // LCDML_add(id, prev_layer, new_num, lang_char_array, callback_function)
-  LCDML_add         (0  , LCDML_0         , 1  , "Information"      , mFunc_information);       // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (1  , LCDML_0         , 2  , "Time info"        , mFunc_timer_info);        // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (2  , LCDML_0         , 3  , "Program"          , NULL);                    // NULL = no menu function
-  LCDML_add         (3  , LCDML_0_3       , 1  , "Program 1"        , NULL);                    // NULL = no menu function
-  LCDML_add         (4  , LCDML_0_3_1     , 1  , "P1 dummy"         , NULL);                    // NULL = no menu function
-  LCDML_add         (5  , LCDML_0_3_1     , 2  , "P1 Settings"      , NULL);                    // NULL = no menu function
-  LCDML_add         (6  , LCDML_0_3_1_2   , 1  , "Warm"             , NULL);                    // NULL = no menu function
-  LCDML_add         (7  , LCDML_0_3_1_2   , 2  , "Cold"             , NULL);                    // NULL = no menu function
-  LCDML_add         (8  , LCDML_0_3_1_2   , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (9  , LCDML_0_3_1     , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (10 , LCDML_0_3       , 2  , "Program 2"        , mFunc_p2);                // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (11 , LCDML_0_3       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (12 , LCDML_0         , 4  , "Special"          , NULL);                    // NULL = no menu function
-  LCDML_add         (13 , LCDML_0_4       , 1  , "Go to Root"       , mFunc_goToRootMenu);      // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (14 , LCDML_0_4       , 2  , "Jump to Time info", mFunc_jumpTo_timer_info); // this menu function can be found on "LCDML_display_menuFunction" tab
-  LCDML_add         (15 , LCDML_0_4       , 3  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Advanced menu (for profit) part with more settings
-  // Example for one function and different parameters
-  // It is recommend to use parameters for switching settings like, (small drink, medium drink, big drink) or (200ml, 400ml, 600ml, 800ml) ...
-  // the parameter change can also be released with dynParams on the next example
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (16 , LCDML_0         , 5  , NULL,          "Parameter"      , NULL,                0,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (17 , LCDML_0_5       , 1  , NULL,          "Parameter 1"      , mFunc_para,       10,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (18 , LCDML_0_5       , 2  , NULL,          "Parameter 2"      , mFunc_para,       20,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_addAdvanced (19 , LCDML_0_5       , 3  , NULL,          "Parameter 3"      , mFunc_para,       30,            _LCDML_TYPE_default);                    // NULL = no menu function
-  LCDML_add         (20 , LCDML_0_5       , 4  , "Back"             , mFunc_back);              // this menu function can be found on "LCDML_display_menuFunction" tab
-
-
-  // Example for dynamic content
-  // 1. set the string to ""
-  // 2. use type  _LCDML_TYPE_dynParam   instead of    _LCDML_TYPE_default
-  // this function type can not be used in combination with different parameters
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (21 , LCDML_0         , 6  , NULL,          ""                  , mDyn_para,                0,   _LCDML_TYPE_dynParam);                     // NULL = no menu function
-
-  // Example for conditions (for example for a screensaver)
-  // 1. define a condition as a function of a boolean type -> return false = not displayed, return true = displayed
-  // 2. set the function name as callback (remove the braces '()' it gives bad errors)
-  // LCDMenuLib_add(id, prev_layer,     new_num, condition,   lang_char_array, callback_function, parameter (0-255), menu function type  )
-  LCDML_addAdvanced (22 , LCDML_0         , 7  , COND_hide,  "screensaver"        , mFunc_screensaver,        0,   _LCDML_TYPE_default);       // this menu function can be found on "LCDML_display_menuFunction" tab
-
-  // ***TIP*** Try to update _LCDML_DISP_cnt when you add a menu element.
-
-  // menu element count - last element id
-  // this value must be the same as the last menu element
-  #define _LCDML_DISP_cnt    22
-
-  // create menu
-  LCDML_createMenu(_LCDML_DISP_cnt);
-
-// *********************************************************************
-// SETUP
-// *********************************************************************
-  void setup()
-  {
-    // serial init; only be needed if serial control is used
-    Serial.begin(9600);                // start serial
-    Serial.println(F(_LCDML_VERSION)); // only for examples
-
-    // LCD Begin
-    lcd.begin(_LCDML_DISP_cols,_LCDML_DISP_rows);
-    // set special chars for scrollbar
-    lcd.createChar(0, (uint8_t*)scroll_bar[0]);
-    lcd.createChar(1, (uint8_t*)scroll_bar[1]);
-    lcd.createChar(2, (uint8_t*)scroll_bar[2]);
-    lcd.createChar(3, (uint8_t*)scroll_bar[3]);
-    lcd.createChar(4, (uint8_t*)scroll_bar[4]);
-
-    // LCDMenuLib Setup
-    LCDML_setup(_LCDML_DISP_cnt);
-
-    // Some settings which can be used
-
-    // Enable Menu Rollover
-    LCDML.MENU_enRollover();
-
-    // Enable Screensaver (screensaver menu function, time to activate in ms)
-    LCDML.SCREEN_enable(mFunc_screensaver, 10000); // set to 10 seconds
-    //LCDML.SCREEN_disable();
-
-    // Some needful methods
-
-    // You can jump to a menu function from anywhere with
-    //LCDML.OTHER_jumpToFunc(mFunc_p2); // the parameter is the function name
-  }
-
-// *********************************************************************
-// LOOP
-// *********************************************************************
-  void loop()
-  {
-    LCDML.loop();
-  }
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/extras/img/20x4_1.jpg b/third-party/LCDMenuLib2.old/extras/img/20x4_1.jpg
deleted file mode 100644
index 4d66824..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/20x4_1.jpg and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/20x4_2.jpg b/third-party/LCDMenuLib2.old/extras/img/20x4_2.jpg
deleted file mode 100644
index fb005c9..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/20x4_2.jpg and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/20x4_3.jpg b/third-party/LCDMenuLib2.old/extras/img/20x4_3.jpg
deleted file mode 100644
index 4c9fc96..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/20x4_3.jpg and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/20x4_4.jpg b/third-party/LCDMenuLib2.old/extras/img/20x4_4.jpg
deleted file mode 100644
index 50c93ef..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/20x4_4.jpg and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/console_1.png b/third-party/LCDMenuLib2.old/extras/img/console_1.png
deleted file mode 100644
index dd51210..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/console_1.png and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/console_2.png b/third-party/LCDMenuLib2.old/extras/img/console_2.png
deleted file mode 100644
index 9fe44ad..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/console_2.png and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/console_3.png b/third-party/LCDMenuLib2.old/extras/img/console_3.png
deleted file mode 100644
index 4fa53f4..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/console_3.png and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/glcd_1.jpg b/third-party/LCDMenuLib2.old/extras/img/glcd_1.jpg
deleted file mode 100644
index 5a9f60d..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/glcd_1.jpg and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/glcd_2.jpg b/third-party/LCDMenuLib2.old/extras/img/glcd_2.jpg
deleted file mode 100644
index 5ac2321..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/glcd_2.jpg and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/glcd_3.jpg b/third-party/LCDMenuLib2.old/extras/img/glcd_3.jpg
deleted file mode 100644
index 5fb1d3a..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/glcd_3.jpg and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/extras/img/glcd_4.jpg b/third-party/LCDMenuLib2.old/extras/img/glcd_4.jpg
deleted file mode 100644
index 8781a0f..0000000
Binary files a/third-party/LCDMenuLib2.old/extras/img/glcd_4.jpg and /dev/null differ
diff --git a/third-party/LCDMenuLib2.old/keywords.txt b/third-party/LCDMenuLib2.old/keywords.txt
deleted file mode 100644
index 243aa21..0000000
--- a/third-party/LCDMenuLib2.old/keywords.txt
+++ /dev/null
@@ -1,312 +0,0 @@
-# ##############################################################################
-#                        LCDMenuLib (LCDML)
-# ##############################################################################
-#
-# MIT License
-#
-# Copyright (c) [2020] [Nils Feldkämper]
-#
-# 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:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-# ##############################################################################
-#
-# BUG / ISSUES REPORTING
-#    https://github.com/Jomelo/LCDMenuLib/issues
-#
-# ARDUINO FORUM
-#    http://forum.arduino.cc/index.php?topic=73816.0
-#
-# ##############################################################################
-
-
-#######################################
-# LCDML
-#######################################
-
-LCDMenuLib2	KEYWORD1
-LCDMenuLib2_menu	KEYWORD1
-
-LCDML	KEYWORD3
-LCDBL	KEYWORD3
-
-LCDML_0	KEYWORD3
-LCDBL_0	KEYWORD3
-
-
-#######################################
-# CONTROL / BUTTONS
-#######################################
-
-_LCDML_CONTROL_cfg	LITERAL1
-
-_LCDML_DISP_cfg_scrollbar	LITERAL1
-
-_LCDML_VERSION	LITERAL1
-
-_LCDML_NO_FUNC	LITERAL1
-_LCDML_FIRST_ELEMENT_ID	LITERAL1
-
-_LCDML_CONTROL_serial_enter	LITERAL1
-_LCDML_CONTROL_serial_up	LITERAL1
-_LCDML_CONTROL_serial_down	LITERAL1
-_LCDML_CONTROL_serial_left	LITERAL1
-_LCDML_CONTROL_serial_right	LITERAL1
-_LCDML_CONTROL_serial_quit	LITERAL1
-
-_LCDML_CONTROL_analog_pin	LITERAL1
-_LCDML_CONTROL_analog_enter_min	LITERAL1
-_LCDML_CONTROL_analog_enter_max	LITERAL1
-_LCDML_CONTROL_analog_up_min	LITERAL1
-_LCDML_CONTROL_analog_up_max	LITERAL1
-_LCDML_CONTROL_analog_down_min	LITERAL1
-_LCDML_CONTROL_analog_down_max	LITERAL1
-_LCDML_CONTROL_analog_enable_quit	LITERAL1
-_LCDML_CONTROL_analog_back_min	LITERAL1
-_LCDML_CONTROL_analog_back_max	LITERAL1
-_LCDML_CONTROL_analog_enable_lr	LITERAL1
-_LCDML_CONTROL_analog_left_min	LITERAL1
-_LCDML_CONTROL_analog_left_max	LITERAL1
-_LCDML_CONTROL_analog_right_min	LITERAL1
-_LCDML_CONTROL_analog_right_max	LITERAL1
-
-_LCDML_CONTROL_digital_low_active	LITERAL1
-_LCDML_CONTROL_digital_a	LITERAL1
-_LCDML_CONTROL_digital_enable_quit	LITERAL1
-_LCDML_CONTROL_digital_enable_lr	LITERAL1
-_LCDML_CONTROL_digital_enter	LITERAL1
-_LCDML_CONTROL_digital_up	LITERAL1
-_LCDML_CONTROL_digital_down	LITERAL1
-_LCDML_CONTROL_digital_quit	LITERAL1
-_LCDML_CONTROL_digital_left	LITERAL1
-_LCDML_CONTROL_digital_right	LITERAL1
-
-_LCDML_CONTROL_encoder_enable	LITERAL1
-_LCDML_CONTROL_encoder_pin_a	LITERAL1
-_LCDML_CONTROL_encoder_pin_b	LITERAL1
-_LCDML_CONTROL_encoder_pin_button	LITERAL1
-_LCDML_CONTROL_encoder_high_active	LITERAL1
-
-_LCDML_CONTROL_keypad_rows	LITERAL1
-_LCDML_CONTROL_keypad_cols	LITERAL1
-
-
-_LCDML_u8g_lcd_w	LITERAL1
-_LCDML_u8g_lcd_h	LITERAL1
-_LCDML_u8g_font	LITERAL1
-_LCDML_u8g_font_w	LITERAL1
-_LCDML_u8g_font_h	LITERAL1
-_LCDML_u8g_cols_max	LITERAL1
-_LCDML_u8g_rows_max	LITERAL1
-_LCDML_u8g_rows	LITERAL1
-_LCDML_u8g_cols	LITERAL1
-_LCDML_u8g_scrollbar_w	LITERAL1
-
-
-_LCDML_DISP_w	LITERAL1
-_LCDML_DISP_h	LITERAL1
-_LCDML_DISP_font	LITERAL1
-_LCDML_DISP_font_w	LITERAL1
-_LCDML_DISP_font_h	LITERAL1
-_LCDML_DISP_cursor_char	LITERAL1
-_LCDML_DISP_cur_space_before	LITERAL1
-_LCDML_DISP_cur_space_behind	LITERAL1
-_LCDML_DISP_box_x0	LITERAL1
-_LCDML_DISP_box_y0	LITERAL1
-_LCDML_DISP_box_x1	LITERAL1
-_LCDML_DISP_box_y1	LITERAL1
-_LCDML_DISP_draw_frame	LITERAL1
-_LCDML_DISP_scrollbar_w	LITERAL1
-_LCDML_DISP_cols_max	LITERAL1
-_LCDML_DISP_rows_max	LITERAL1
-
-
-_LCDML_DISP_cols	LITERAL1
-_LCDML_DISP_rows	LITERAL1
-_LCDML_DSIP_use_header	LITERAL1
-_LCDML_DISP_rs	LITERAL1
-_LCDML_DISP_e	LITERAL1
-_LCDML_DISP_rw	LITERAL1
-_LCDML_DISP_dat0	LITERAL1
-_LCDML_DISP_dat1	LITERAL1
-_LCDML_DISP_dat2	LITERAL1
-_LCDML_DISP_dat3	LITERAL1
-_LCDML_DISP_dat4	LITERAL1
-_LCDML_DISP_dat5	LITERAL1
-_LCDML_DISP_dat6	LITERAL1
-_LCDML_DISP_dat7	LITERAL1
-_LCDML_DISP_backlight	LITERAL1
-_LCDML_DISP_backlight_pol	LITERAL1
-_LCDML_DISP_addr	LITERAL1
-_LCDML_DISP_srdata	LITERAL1
-_LCDML_DISP_srclk	LITERAL1
-_LCDML_DISP_strobe	LITERAL1
-_LCDML_DISP_enable	LITERAL1
-_LCDML_DogLCD_type	LITERAL1
-_LCDML_DogLCD_SI	LITERAL1
-_LCDML_DogLCD_CLK	LITERAL1
-_LCDML_DogLCD_RS	LITERAL1
-_LCDML_DogLCD_CSB	LITERAL1
-_LCDML_DogLCD_RESET	LITERAL1
-_LCDML_DogLCD_LIGHT	LITERAL1
-
-_LCDML_DISP_cfg_control	LITERAL1
-
-_LCDML_DISP_cfg_cursor	LITERAL1
-
-_LCDML_DISP_cnt	LITERAL1
-
-_LCDML_TYPE_dynParam	LITERAL1
-_LCDML_TYPE_default	LITERAL1
-
-LCDML_UNUSED	LITERAL1
-
-
-#######################################
-# MENU
-#######################################
-
-getChild	KEYWORD2
-getParam	KEYWORD2
-checkCallback	KEYWORD2
-getID	KEYWORD2
-getSibling	KEYWORD2
-callback	KEYWORD2
-checkCondition	KEYWORD2
-checkType_menu	KEYWORD2
-checkType_dynParam	KEYWORD2
-
-
-#######################################
-# DISPLAY / MENU
-#######################################
-
-# class methods
-init	KEYWORD2
-loop_menu	KEYWORD2
-loop_control	KEYWORD2
-
-MENU_display	KEYWORD2
-MENU_goRoot	KEYWORD2
-MENU_goBack	KEYWORD2
-MENU_getLayer	KEYWORD2
-MENU_getCursorPos	KEYWORD2
-MENU_getChilds	KEYWORD2
-MENU_getCursorPosAbs	KEYWORD2
-MENU_getParentID	KEYWORD2
-MENU_enRollover	KEYWORD2
-MENU_disRollover	KEYWORD2
-MENU_getDisplayedObj	KEYWORD2
-MENU_getCurrentObj	KEYWORD2
-MENU_getRootObj	KEYWORD2
-MENU_getScroll	KEYWORD2
-MENU_enScroll	KEYWORD2
-MENU_disScroll	KEYWORD2
-MENU_getScrollDisableStatus	KEYWORD2
-MENU_setDynContent	KEYWORD2
-MENU_checkDynContent	KEYWORD2
-MENU_resetActiveMenu	KEYWORD2
-MENU_getLastActivFunctionID	KEYWORD2
-MENU_getLastCursorPositionID	KEYWORD2
-MENU_getElementIDFromCursorPos	KEYWORD2
-
-BT_setup	KEYWORD2
-BT_enter	KEYWORD2
-BT_up	KEYWORD2
-BT_down	KEYWORD2
-BT_left	KEYWORD2
-BT_right	KEYWORD2
-BT_quit	KEYWORD2
-
-BT_checkAll	KEYWORD2
-BT_checkAny	KEYWORD2
-BT_checkLeft	KEYWORD2
-BT_checkRight	KEYWORD2
-BT_checkUp	KEYWORD2
-BT_checkDown	KEYWORD2
-BT_checkEnter	KEYWORD2
-
-BT_resetAll	KEYWORD2
-BT_resetEnter	KEYWORD2
-BT_resetLeft	KEYWORD2
-BT_resetRight	KEYWORD2
-BT_resetUp	KEYWORD2
-BT_resetDown	KEYWORD2
-
-CE_setup	KEYWORD2
-CE_set	KEYWORD2
-CE_resetAll	KEYWORD2
-CE_reset	KEYWORD2
-CE_checkAny	KEYWORD2
-CE_check	KEYWORD2
-CE_setOnChangeCbFunction	KEYWORD2
-CE_clearOnChangeCbFunction	KEYWORD2
-
-DISP_update	KEYWORD2
-DISP_menuUpdate	KEYWORD2
-DISP_clear	KEYWORD2
-DISP_checkMenuUpdate	KEYWORD2
-DISP_checkMenuCursorUpdate	KEYWORD2
-DISP_getMenuContentId	KEYWORD2
-
-FUNC_setup	KEYWORD2
-FUNC_loop	KEYWORD2
-FUNC_close	KEYWORD2
-FUNC_goBackToMenu	KEYWORD2
-FUNC_getID	KEYWORD2
-FUNC_setLoopInterval	KEYWORD2
-FUNC_disableScreensaver	KEYWORD2
-FUNC_setGBAToLastFunc	KEYWORD2
-FUNC_setGBAToLastCursorPos	KEYWORD2
-FUNC_setGBA	KEYWORD2
-FUNC_setCEMask	KEYWORD2
-
-OTHER_jumpToFunc	KEYWORD2
-OTHER_jumpToID	KEYWORD2
-OTHER_setCursorToFunc	KEYWORD2
-OTHER_setCursorToID	KEYWORD2
-OTHER_getIDFromFunction	KEYWORD2
-OTHER_updateFunc	KEYWORD2
-
-TIMER_ms	KEYWORD2
-TIMER_msReset	KEYWORD2
-TIMER_us	KEYWORD2
-TIMER_usReset	KEYWORD2
-
-SCREEN_enable	KEYWORD2
-SCREEN_disable	KEYWORD2
-SCREEN_resetTimer	KEYWORD2
-SCREEN_start	KEYWORD2
-
-
-#######################################
-# MACROS
-#######################################
-
-LCDML_getContent	KEYWORD2
-LCDML_createMenu	KEYWORD2
-LCDML_getElementName	KEYWORD2
-LCDML_getCustomElementName	KEYWORD2
-LCDML_add	KEYWORD2
-LCDML_addAdvanced	KEYWORD2
-LCDML_setup	KEYWORD2
-
-LCDML_createCustomLang	KEYWORD2
-LCDML_getCustomContent	KEYWORD2
-LCDML_langDef	KEYWORD2
-
diff --git a/third-party/LCDMenuLib2.old/library.properties b/third-party/LCDMenuLib2.old/library.properties
deleted file mode 100644
index 702cd63..0000000
--- a/third-party/LCDMenuLib2.old/library.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-name=LCDMenuLib2
-version=2.2.4
-author=Nils Feldkaemper <nilsfeld@gmail.com>
-maintainer=Nils Feldkaemper <nilsfeld@gmail.com>
-sentence=Easy creation of a tree based menu with screensaver and multi layers.
-paragraph=Examples for the basic function and different output types [serial monitor, liquidcrystal, i2c, graphic displays (u8glib / u8g2lib... )]
-category=Display
-url=https://github.com/Jomelo/LCDMenuLib2
-architectures=*
-includes=LCDMenuLib2.h
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/src/LCDMenuLib2.cpp b/third-party/LCDMenuLib2.old/src/LCDMenuLib2.cpp
deleted file mode 100644
index 88e3722..0000000
--- a/third-party/LCDMenuLib2.old/src/LCDMenuLib2.cpp
+++ /dev/null
@@ -1,2965 +0,0 @@
-/* ******************************************************************************
- *                        LCDMenuLib2 (LCDML)
- * ******************************************************************************
- *
- * MIT License
- *
- * Copyright (c) [2020] [Nils Feldkämper]
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * ******************************************************************************
- *
- * BUG / ISSUES REPORTING
- *    https://github.com/Jomelo/LCDMenuLib2/issues
- *
- * ARDUINO FORUM
- *    http://forum.arduino.cc/index.php?topic=73816.0
- *
- * ******************************************************************************
- */
-
-#include "LCDMenuLib2.h"
-#include "LCDMenuLib2_typedef.h"
-
-/* ******************************************************************** */
-LCDMenuLib2::LCDMenuLib2(LCDMenuLib2_menu &p_r, const uint8_t p_rows, const uint8_t p_cols, LCDML_FuncPtr contentUpdate, LCDML_FuncPtr contentClear, LCDML_FuncPtr   menuControl)
-/* ******************************************************************** */
-{
-    // unused variables
-    LCDML_UNUSED(p_cols);
-
-    // initialization   
-    curMenu                 = &p_r;    
-    window_rows             = p_rows;    
-
-    callback_contentUpdate  = contentUpdate;  // callback update content
-    callback_contentClear   = contentClear;   // callback clear content
-    callback_menuControl    = menuControl;    // callback buttons
-}
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* init methods                                                         */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-/* ******************************************************************** */
-void LCDMenuLib2::init(uint8_t p_last_element_id)
-/* ******************************************************************** */
-{
-    // init some variables
-    REG_control             = 0;            
-    REG_MenuFunction        = 0;
-    REG_button              = 0;
-    REG_custom_event        = 0;
-    REG_special             = 0;
-    REG_update              = 0;
-    cursor_pos              = 0;
-    layer                   = 0;    
-    cursor_obj_pos          = 0;
-    cursor_pos_abs          = 0;
-    menuFunction_loopTimer  = 0;
-    last_element_id         = p_last_element_id;       
-
-    MENU_resetActiveMenu();
-
-    // reset custom events callback functions
-    for(uint8_t i=0; i<_LCDML_CE_cb_function_cnt; i++)
-    {
-        ce_cb[i] = NULL;
-    }
-
-    // enable called from menu
-    bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu);
-
-    // reset all buttons
-    BT_resetAll();
-
-    // set the cursor object position to the right postion
-    // this is needed when the first and following elements are hidden
-    MENU_initFirstElement();
-
-    // update the current cursor possition
-    // paramter 10 => do not scroll
-    MENU_doScroll(10);
-    // update the menu    
-    MENU_display();
-    DISP_menuUpdate();
-}
-
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* LOOP methods                                                         */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-
-/* ******************************************************************** */
-void LCDMenuLib2::loop(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_LOOP, F("LCDML.loop"));
-
-    // call this function together
-    loop_control();
-    loop_menu();
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::loop_control(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_LOOP, F("LCDML.loop_control"));
-
-    // check callback
-    // check if this function is valid
-    if(callback_menuControl != NULL)
-    {        
-        // in this function the user defined button control is hanedled
-        callback_menuControl();
-    }
-    else
-    {
-        // do nothing
-    }    
-
-    // check if a "jumpTo - setCursoTo" function is active
-    // this check is necessary because there can be a bad timing between a timebased function call or a event and
-    // another OTHER_...() function.
-    if(bitRead(REG_special, _LCDML_REG_special_OTHER_function_active) == false)
-    {
-        // debug information
-        DBG_println(LCDML_DBG_function_name_LOOP, F("LCDML.loop_control - check screensaver"));
-
-        // screensaver handling
-        // check if the screensaver is enabled and a callback function is defined
-        if(cb_screensaver != NULL && bitRead(REG_special, _LCDML_REG_special_disable_screensaver) == false)
-        {
-            // check the state when menu is active do another handling as when a function is active
-            if(actMenu_id != _LCDML_NO_FUNC)
-            {
-                // a menu function is active
-                // when the screensaver function is active do nothing otherwise close the old function and call the screensaver 
-                if(actMenu_cb_function != cb_screensaver) 
-                {
-                    if(TIMER_ms(screensaver_timer, screensaver_default_time))
-                    {  
-                        // close the running function 
-                        FUNC_goBackToMenu(); 
-                        loop_control();
-                        BT_resetAll(); 
-
-                        // debug information
-                        DBG_println(LCDML_DBG_function_name_LOOP, F("LCDML.loop_control - jump to screensaver"));
-
-                        // open the screensaver                                        
-                        OTHER_jumpToFunc(cb_screensaver);                        
-                    }
-                    else
-                    {
-                        // do nothing
-                    }
-                }
-                else
-                {
-                    // do nothing
-                }
-            }
-            else
-            {
-                // only the menu is active
-                if(TIMER_ms(screensaver_timer, screensaver_default_time))
-                {
-                    // reset all button states
-                    BT_resetAll();
-
-                    // debug information
-                    DBG_println(LCDML_DBG_function_name_LOOP, F("LCDML.loop_control - jump to screensaver"));
-
-                    // open the screensaver
-                    OTHER_jumpToFunc(cb_screensaver);
-                }
-                else
-                {
-                    // do nothing
-                }
-            }
-        }
-
-        // check custom event handling
-        if(CE_checkAny() == true)
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_LOOP, F("LCDML.loop_control - check event"));
-
-            for(uint8_t i=0; i<_LCDML_CE_cb_function_cnt; i++)
-            {
-                // event found
-                if(CE_check(i) == true)
-                {               
-                    // callback function found
-                    if(ce_cb[i] != NULL)
-                    {                   
-                        // check if a function is running
-                        if(actMenu_id == _LCDML_NO_FUNC)
-                        {
-                            // debug information
-                            DBG_println(LCDML_DBG_function_name_LOOP, F("LCDML.loop_control - jump to event"));
-
-                            // no function is active
-                            // switch to new callback function
-                            OTHER_jumpToFunc(ce_cb[i]);
-                        }
-                        else
-                        {
-                            // a function is active
-                            // check if function is running
-                            if(actMenu_cb_function != ce_cb[i])
-                            {
-                                // debug information
-                                DBG_println(LCDML_DBG_function_name_LOOP, F("LCDML.loop_control - jump to event"));
-
-                                // switch to new callback function
-                                OTHER_jumpToFunc(ce_cb[i]);
-                            }
-                            else
-                            {
-                                // do nothing, function is running
-                            }
-                        }                   
-                    }
-                    else
-                    {
-                        // do nothing
-                    }
-                }
-                else
-                {
-                    // do nothing
-                }
-            }
-        }
-        else
-        {
-            // do nothing
-        } 
-    }
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::loop_menu(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_LOOP, F("LCDML.loop_menu"));
-
-    // local declaration
-    uint8_t cnt     = 0;   
-    uint8_t found   = _LCDML_FIRST_ELEMENT_ID; 
-    LCDMenuLib2_menu *tmp;
-
-    // ============================================
-    // check control activity
-    // ============================================
-    if(BT_checkAny() == true)
-    {
-        SCREEN_resetTimer();       
-
-        if(actMenu_id == _LCDML_NO_FUNC) 
-        {
-            // -- ENTER --
-            if(BT_checkEnter() == true)
-            {
-                //menu is active
-                MENU_goInto();
-                bitSet(REG_control, _LCDML_REG_control_update_direct);
-            }
-            else
-            {
-                // do nothing
-            }
-
-            // -- UP --
-            if(bitRead(REG_special, _LCDML_REG_special_disable_scroll) == false)
-            {
-                if(BT_checkUp() == true)
-                {  
-                    MENU_doScroll(0); 
-                }
-                else
-                {
-                    // do nothing
-                }
-
-                // -- DOWN --
-                if(BT_checkDown() == true)
-                {       
-                    MENU_doScroll(1);                    
-                }
-                else
-                {
-                    // do nothing
-                }
-            }
-            else
-            {   
-                if(BT_checkUp() == true || BT_checkDown() == true)
-                {                   
-                    DISP_update();
-                }
-                else
-                {
-                    // do nothing
-                }
-            } 
-
-            // -- LEFT or RIGHT --
-            if(BT_checkLeft() == true or BT_checkRight() == true)
-            {
-                DISP_update();
-            }
-            else
-            {
-                // do nothing
-            }
-
-            // -- QUIT Part 1 --
-            if(BT_checkQuit() == true)
-            {
-                MENU_enScroll();
-
-                if(layer > 0)
-                {
-                    MENU_goBack();
-                    DISP_update();
-                }
-                else
-                {
-                    // do nothing
-                }
-            }
-            else
-            {
-                // do nothing
-            }         
-        }
-        else
-        {
-            // -- QUIT Part 2 --
-            if(BT_checkQuit() == true)
-            {
-                MENU_enScroll();
-                FUNC_goBackToMenu();
-                BT_resetQuit();
-            }
-            else
-            {
-                // do nothing
-            }
-        }
-    }
-
-    // ============================================
-    // check control activity
-    // ============================================
-    if(CE_checkAny() == true)
-    {     
-        // reset screensaver timer
-        SCREEN_resetTimer();        
-    }
-    
-    // ============================================
-    // jump to handling
-    // ============================================
-    if(bitRead(REG_special, _LCDML_REG_special_OTHER_function_active))
-    {
-        // debug information
-        DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpTo.. / LCDML.OTHER_setCursorTo... - is active"));
-
-        MENU_enScroll();
-
-        bitClear(REG_special, _LCDML_REG_special_OTHER_function_active); 
-        bitClear(REG_control, _LCDML_REG_control_dynMenuDisplayed);        
- 
-        // stop running function and go back to the menu
-        if(actMenu_id != _LCDML_NO_FUNC)
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpTo.. / LCDML.OTHER_setCursorTo... - close active function"));
-
-            // this function called be recursive (only once)
-            // set this bit to call the FUNC_close function when the goRoot function is called
-            bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_end);            
-
-            if(bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_close_active) == false)
-            {
-                FUNC_call();    // call active function to bring it on a stable state;
-            }
-            else
-            {
-                // do nothing
-            }
-
-            BT_resetAll();
-
-            // Reset active menu
-            MENU_resetActiveMenu();                                                     
-            
-            bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_close_active);            
-            bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_end);
-            bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_setup);
-
-            bitClear(REG_special, _LCDML_REG_special_disable_screensaver);                    
-        }
-        else
-        {
-            // do nothing            
-        }
-
-        // reset the old parameter from the closed function / this parameter is set when a new jumpTo.. function is called
-        jT_paramOld     = 0;
-        
-        // Root Menu
-        curMenu         = MENU_getRootObj();
-        layer           = 0;
-        cursor_pos      = 0;
-        cursor_obj_pos  = 0;
-        cursor_pos_abs  = 0;
-        window_start    = 0; 
-
-        // Check if this Menu have childs
-        if((curMenu = curMenu->getChild(0)) != NULL)
-        {  
-            // This loop runs through the menu structure and stops after checking the last element
-            while(true)
-            { 
-                // Debug information
-                DBG_print(LCDML_DBG_function_name_OTHER, F("ID: "));
-                DBG_println(LCDML_DBG_function_name_OTHER, curMenu->getID());               
-
-                // ***
-                // check loop end condetions
-                // ***
-
-                // check if something is found:
-                if(jT_function != NULL)
-                {
-                    // Debug information
-                    DBG_println(LCDML_DBG_function_name_OTHER, F("check function"));
-                           
-                    if(curMenu->getCbFunction() == jT_function)
-                    {
-                        // something found                                               
-                        found       = curMenu->getID();
-                        break;
-                    }
-                }
-                else
-                {
-                    // Debug Information
-                    DBG_println(LCDML_DBG_function_name_OTHER, F("check id"));
-
-                    if(curMenu->getID() == jT_id)
-                    {
-                        // something found                       
-                        found   = curMenu->getID();
-                        break;
-                    }  
-                } 
-                
-                // check if the last item is reached
-                if(last_element_id == curMenu->getID())
-                {
-                    // Debug information                           
-                    DBG_print(LCDML_DBG_function_name_OTHER, F("nothing found: endpoint (C) / ID: "));
-                    DBG_println(LCDML_DBG_function_name_OTHER, curMenu->getID()); 
-
-                    break;
-                }
-
-                // ***
-                // set the next item
-                // ***
-
-                // check childs for childs
-                if(curMenu->getChild(0) != NULL)
-                {
-                    // Debug information 
-                    DBG_println(LCDML_DBG_function_name_OTHER, F("gointo an element"));
-
-                    // -- GO INTO --
-                    layer++;                    
-
-                    // set next child for check
-                    curMenu = curMenu->getChild(0);
-                }
-                else
-                {
-                    if(curMenu->getSibling(1) != NULL)
-                    {
-                        // Debug information 
-                        DBG_println(LCDML_DBG_function_name_OTHER, F("set next sibling"));
-
-                        // set next sibling for check
-                        curMenu = curMenu->getSibling(1); 
-                    }
-                    else
-                    { 
-                        // check parent element
-                        if(curMenu->getParent()->getID() == _LCDML_FIRST_ELEMENT_ID)
-                        { 
-                            // Debug information                           
-                            DBG_print(LCDML_DBG_function_name_OTHER, F("nothing found: endpoint (A) / ID: "));
-                            DBG_println(LCDML_DBG_function_name_OTHER, curMenu->getID()); 
-
-                            // Here stands no break, because this element have to be checked (id - function_name)                                                   
-                        }
-                        else
-                        {
-                            // Debug information 
-                            DBG_println(LCDML_DBG_function_name_OTHER, F("gointo an element"));
-
-                            // all childs are checked
-                            do
-                            {
-                                // set next parent for check
-                                curMenu = curMenu->getParent(); 
-
-                                // -- GO Back --
-                                layer--;  
-
-                                // Debug information 
-                                DBG_println(LCDML_DBG_function_name_OTHER, F("goback to parent element"));                          
-                                
-                                // check if the parent element have siblings
-                                if(curMenu->getSibling(1) != NULL)
-                                {
-                                    // set next sibling
-                                    curMenu = curMenu->getSibling(1);
-                                    break;                                
-                                }
-                                else
-                                {                                    
-                                    if(curMenu->getParent()->getID() == _LCDML_FIRST_ELEMENT_ID)
-                                    {                                         
-                                        break;
-                                    }
-                                    else
-                                    {
-                                        // continue                                        
-                                    }                                                                        
-                                }
-                            } while (true);
-
-                            /*
-                            // check if next sibling exits, stop the loop
-                            if(layer == 0 && curMenu->getSibling(1) == NULL)
-                            {
-                                DBG_print(LCDML_DBG_function_name_OTHER, F("nothing found: endpoint (B) / ID: "));
-                                DBG_println(LCDML_DBG_function_name_OTHER, curMenu->getID());
-
-                                break;
-                            }
-                            */
-                        }
-                    }
-                }
-            }
-
-            // set menu back to the parent layer
-            curMenu = curMenu->getParent();
-        }
-
-        // check element handling
-        if(found != _LCDML_FIRST_ELEMENT_ID)
-        { 
-            // debug information
-            DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpTo.. / LCDML.OTHER_setCursorTo... - element found"));
-             
-            tmp = curMenu->getChild(0);
-            // get the current obj position in this layer             
-            do
-            {                            
-                if(tmp->getID() == found)
-                {                                                                                                                               
-                    break; 
-                }
-                else
-                {
-                    // do nothing
-                }
-
-                // count elements
-                cnt++;       
-            }
-            while((tmp = tmp->getSibling(1)) != NULL); 
-            
-            // tmp have here the pointer to the right position
-            //tmp = --pointer_position--
-            cursor_pos_abs =  cnt;
-            cursor_obj_pos =  cnt;             
-            
-            if(bitRead(REG_special, _LCDML_REG_special_setCursorTo) == false)
-            {
-                // OTHER jump to function ...
-
-                // check if element is a menu function and no dynamic function
-                if(tmp->checkCallback() == false || tmp->checkType_menu() == false)
-                {  
-                    // only set the cursor to this element because it is not callable                        
-                    // do nothing else here
-                } 
-                else
-                {
-                    // open menu element
-                    MENU_goInto();
-                }
-            } 
-            else
-            {
-                // OTHER set cursor to ... 
-                if(tmp->checkCondition() == false)
-                {    
-                    // Debug information                 
-                    DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_setCursorTo.. - element is hidden, the cursor cannot be set to this possition: go back to root menu")); 
-                    
-                    MENU_goRoot();                       
-                } 
-                else
-                {                        
-                    // do nothing
-                }                   
-            }
-
-            // update the menu
-            DISP_update();
-
-            // set current cursor possition with hidden elements
-            tmp = curMenu->getChild(0);            
-            cnt = 0;
-
-            do
-            {   
-                if(tmp->checkCondition())
-                {
-                    if(tmp->getID() == found)
-                    {
-                        cursor_pos_abs =  cnt;                           
-                        if(cursor_pos_abs - (window_rows-1) > 0)
-                        {
-                            window_start = cursor_pos_abs-(window_rows-1);
-                        }
-                        else
-                        {
-                            window_start = 0;
-                        }
-                        MENU_doScroll(10);                                                                    
-                        break; 
-                    }
-                    else
-                    {
-                        // do nothing
-                    }
-                    // count visible elments
-                    cnt++;
-                }
-                else
-                { 
-                    // do nothing                                
-                }                           
-            }
-            while((tmp = tmp->getSibling(1)) != NULL);
-        }
-        else
-        {
-            // do nothing
-            // debug information
-            DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpTo.. / LCDML.OTHER_setCursorTo... - nothing found -> goRoot"));
-            MENU_goRoot();
-
-            // update the menu
-            DISP_update();
-        }
-    }
-    else
-    {
-        // do nothing
-    }
-    
-
-    // ============================================
-    // check if a menu function is active
-    // ============================================
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        // check if the running function should be closed
-        if(bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_end) == false && bitRead(REG_special, _LCDML_REG_special_goRoot) == false)
-        {
-            // => do not close the running function
-            // check if a loop time was set or a button was pressed or the function is called the first time
-            if( TIMER_ms(menuFunction_loopTimer, actMenu_default_time) == true || 
-                bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_setup) == false || 
-                BT_checkAny() > 0 || 
-                CE_checkAny() > 0 ||
-                bitRead(REG_update, _LCDML_REG_update_menu_function_content)
-              )
-            {
-                // reset update flag
-                bitClear(REG_update, _LCDML_REG_update_menu_function_content);
-
-                // call the current menu function
-                FUNC_call();                
-            }
-            else
-            {
-                // do nothing
-            }
-        }
-        else
-        {
-            // close the running function 
-
-            // set this bit to call the FUNC_close function when the goRoot function is called
-            bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_end);
-
-            if(bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_close_active) == false)
-            {
-                FUNC_call();    // call active function to bring it on a stable state;
-            }
-            else
-            {
-                // do nothing
-            }  
-
-            // Reset active menu
-            MENU_resetActiveMenu();                                    
-
-            // reset the custom parameter
-            jT_param    = 0;            
-            
-            bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_close_active);
-            bitClear(REG_special, _LCDML_REG_special_disable_screensaver);
-            bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_end);
-            bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_setup);            
-
-            if(bitRead(REG_special, _LCDML_REG_special_goRoot) == true)
-            {
-                // set the cursor to the root position
-                bitClear(REG_special, _LCDML_REG_special_goRoot);
-
-                MENU_goRoot();              
-            }
-            else
-            {
-                // check go back                
-                for(; goBackCnt > 0; goBackCnt--)
-                {
-                    MENU_goBack();
-                }                                              
-                
-                // check if the cursor stands on the correct possition                 
-                if(layer == 0)
-                {
-                    if(curMenu->getChild(cursor_obj_pos)->checkCondition() == false)
-                    {
-                        MENU_goRoot();
-                    }
-                    else
-                    {
-                        // do nothing
-                    }
-                }
-                else
-                {                    
-                    // on going back, when the parent element is hidden, the condition is checken
-                    // if the element is hidden, go to the next parent element and so on ... 
-                    while(layer > 0 && MENU_countChilds(curMenu) == 0)
-                    {
-                        MENU_goBack();
-                    }                    
-                }
-            }            
-            
-            // only update the content when no jump function is active
-            DISP_update();            
-        }
-    }
-    else
-    {
-       // do nothing
-    }
-
-    // ============================================
-    // check update handling
-    // ============================================
-    if(bitRead(REG_update, _LCDML_REG_update_menu) == true || bitRead(REG_update, _LCDML_REG_update_cursor) == true)
-    {   
-        // save last cursor position
-        if(bitRead(REG_update, _LCDML_REG_update_cursor) == true)
-        {
-            actMenu_lastCursorPositionID = actMenu_cursorPositionID;
-            actMenu_cursorPositionID = curMenu->getChild(MENU_getCursorPosAbs())->getID();
-        }
-
-        if(actMenu_id == _LCDML_NO_FUNC)
-        {            
-            if(bitRead(REG_special, _LCDML_REG_special_disable_scroll) == false)
-            {
-                // clear button status from scrolling
-                BT_resetUp();
-                BT_resetDown();
-            }
-            else
-            {
-                // do nothing
-            }
-
-            callback_contentUpdate();
-            
-            BT_resetAll();
-        }  
-        else
-        {            
-            // do nothing
-        }       
-
-        // reset both values here because it can be happen on some examples, that not all values are reset
-        bitClear(REG_update, _LCDML_REG_update_menu);
-        bitClear(REG_update, _LCDML_REG_update_cursor);
-    } 
-    else
-    {
-        // reset all button actions
-        BT_resetAll();      
-    }       
-}
-
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* MENU methods                                                         */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-
-/* ******************************************************************** */
-void        LCDMenuLib2::MENU_initFirstElement(void)
-/* ******************************************************************** */
-{
-    // 
-    uint8_t obj_pos = cursor_obj_pos;
-    LCDMenuLib2_menu *tmp;
-
-    // get the current object
-    if((tmp = curMenu->getChild(cursor_obj_pos)) != NULL)
-    {
-        do
-        {   
-            if(tmp->checkCondition())
-            {                
-                cursor_obj_pos = obj_pos;                
-                break;
-            }
-            else
-            { 
-                // do nothing                                
-            }
-
-            obj_pos++;             
-        }
-        while((tmp = tmp->getSibling(1)) != NULL);
-    }
-    else
-    {
-        // do nothing
-    }
-
-}
-
-/* ******************************************************************** */
-void        LCDMenuLib2::MENU_goRoot(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_goRoot"));
-
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        bitSet(REG_special, _LCDML_REG_special_goRoot);
-    }
-    else
-    {
-        // check if root position is reached
-        BT_resetAll();
-
-        curMenu         = MENU_getRootObj();
-        layer           = 0;
-        cursor_pos      = 0;
-        cursor_obj_pos  = 0;
-        cursor_pos_abs  = 0;
-        window_start    = 0;
-
-        MENU_initFirstElement();
-
-        MENU_doScroll(10);
-        MENU_display();        
-    }
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_resetActiveMenu(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_resetActiveMenu"));
-
-    // reset callback function
-    actMenu_cb_function = NULL;
-
-    // save last active function
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        actMenu_lastFuncID = actMenu_id; 
-    }
-
-    // reset variables                                   
-    actMenu_id              = _LCDML_NO_FUNC;                             
-    actMenu_param           = 0; 
-    actMenu_default_time    = 0xFFFFFFFF; // 32 Bit
-    actMenu_ce_mask         = 0xFFFFFFFFFFFFFFFF; // 64 Bit    
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_goBack(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_goBack"));
-
-    //declare variables
-    LCDMenuLib2_menu *tmp;    
-    uint8_t old_id = 0;
-    uint8_t j = 0;
-    uint8_t obj_pos = 0;
-    bool found_visible = false;
-
-    old_id  = curMenu->getID();
-    tmp     = curMenu->getParent();
-    
-    // set the curMenu pointer to a other menu element
-    curMenu = curMenu->getParent();   
-    
-    // update the layer counter
-    if(layer > 0)
-    {
-        layer--;
-    }
-    else
-    {
-        // do nothing
-    }       
-
-    // init the cursor_position variables to 0
-    cursor_obj_pos = 0;
-    cursor_pos_abs = 0;
-
-    // get childs from the current menu element
-    if((tmp = curMenu->getChild(0)) != NULL)
-    {
-        // search the current possition of the cursor
-        do
-        {             
-            // check conditions
-            if (tmp->checkCondition())
-            {                    
-                // when the current element id is the same as the old_id the current cursor position is found
-                if(tmp->getID() == old_id)
-                {
-                    cursor_pos_abs =  j;
-                    cursor_obj_pos =  obj_pos;
-                    if(cursor_pos_abs - (window_rows-1) > 0)
-                    {
-                        window_start = cursor_pos_abs-(window_rows-1);
-                    }
-                    else
-                    {
-                        window_start = 0;
-                    }                        
-
-                    MENU_doScroll(10);
-                    found_visible = true;                                                
-                    break; 
-                }
-                else
-                {
-                    // do nothing
-                }
-
-                // count all visible elements
-                j++;
-            }
-            else
-            {
-                // do nothing
-            }
-
-            obj_pos++;
-        // select the next sibling when it exists                
-        } while ((tmp = tmp->getSibling(1)) != NULL);
-
-        if(found_visible == false)
-        {
-            MENU_goRoot();
-        }
-    }
-    else
-    {
-        // Something is wrong, go to a stable state (root menu)
-        MENU_goRoot();
-    }    
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_goInto(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_goInto"));
-
-    // check if a menu function is not active
-    if (actMenu_id == _LCDML_NO_FUNC)
-    {
-        // check if element is a menu function
-        if(curMenu->getChild(cursor_obj_pos)->checkCallback() == true && curMenu->getChild(cursor_obj_pos)->checkType_menu() == true)
-        {
-            // Menu function found
-            actMenu_cb_function     = curMenu->getChild(cursor_obj_pos)->getCbFunction(); 
-            actMenu_id              = curMenu->getChild(cursor_obj_pos)->getID();                             
-            actMenu_param           = curMenu->getChild(cursor_obj_pos)->getParam();            
-        }
-        else
-        {
-            if(curMenu->getChild(cursor_obj_pos)->checkType_dynParam() == true)
-            {               
-                DISP_update();
-            }
-            else
-            {               
-                if(curMenu->getChild(cursor_obj_pos)->getChild(0) != NULL)
-                {
-                    //check if element has visible children 
-                    if(MENU_countChilds(curMenu->getChild(cursor_obj_pos)) > 0)
-                    { 
-                        // set the curMenu pointer to a other menu element
-                        curMenu = curMenu->getChild(cursor_obj_pos);
-                        
-                        // new layer
-                        window_start = 0;        
-                        cursor_obj_pos = 0;
-                        cursor_pos_abs = 0;
-
-                        MENU_initFirstElement();
-
-                        // update the layer counter
-                        layer++;                        
-
-                        BT_resetAll(); // reset all buttons                            
-                        DISP_update();                                               
-                    }
-                    else
-                    {
-                        // do nothing
-                    }
-                }
-                else
-                {
-                    // do nothing
-                }
-            }
-        }
-    }
-    else
-    {
-        // do nothing
-    }
-}
-
-
-/* ******************************************************************** */
-LCDMenuLib2_menu * LCDMenuLib2::MENU_getCurrentObj(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getCurrentObj"));
-
-    return curMenu;
-}
-
-
-/* ******************************************************************** */
-LCDMenuLib2_menu * LCDMenuLib2::MENU_getRootObj(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getRootObj"));
-    
-    LCDMenuLib2_menu *tmp;
-
-    if(curMenu->getID() != _LCDML_FIRST_ELEMENT_ID)
-    {  
-        tmp = curMenu;         
-            
-        while(true)
-        {
-            if(tmp->getID() != _LCDML_FIRST_ELEMENT_ID)
-            {   
-                tmp = tmp->getParent();             
-            }
-            else
-            {            
-                return tmp;
-            }            
-        }
-
-        return tmp;
-    }
-    else
-    {       
-        return curMenu;
-    }
-}
-
-
-/* ******************************************************************** */
-LCDMenuLib2_menu * LCDMenuLib2::MENU_getDisplayedObj(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getDisplayedObj"));
-    
-    LCDMenuLib2_menu *tmp;
-    uint8_t obj_pos = 0;
-    uint8_t cnt_visible = 0;
-
-    if(window_start > 0)
-    {
-        // get the current object
-        if((tmp = curMenu->getChild(0)) != NULL)
-        {
-            do
-            { 
-                if(tmp->checkCondition())
-                { 
-                    if(cnt_visible == window_start)
-                    {                        
-                        break;
-                    } 
-                    else
-                    {
-                        cnt_visible++;  
-                    }               
-                }
-                else
-                { 
-                    // do nothing                              
-                }
-                obj_pos++;
-
-            }
-            while((tmp = tmp->getSibling(1)) != NULL);
-        }
-        else
-        {
-            // do nothing
-        }
-    }
-    else
-    {
-        obj_pos = 0;
-    }   
-
-    return curMenu->getChild(obj_pos);
-}
-   
-
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_display(uint8_t update)
-/* ******************************************************************** */
-{
-    // update is unused because of compatibility it is not removed
-    LCDML_UNUSED(update);
-
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_display"));
-
-    //check children
-         
-    bitSet(REG_update, _LCDML_REG_update_menu);    
-   
-}
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2::MENU_getScroll(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getScroll"));
-
-    return window_start;
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_doScroll(uint8_t state)
-/* ******************************************************************** */
-{ 
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_doScroll"));    
-
-    LCDMenuLib2_menu *tmp;
-  
-    uint8_t cnt_visible = 0;
-    uint8_t obj_pos = 0;
-    uint8_t last_valid_obj_pos = 0;
-    bool rollover = false;   
-
-    //content:
-    // 0 = scroll up
-    // 1 = scroll down
-
-    // 10 = update cursor postion 
-
-    switch(state)
-    {
-        case 0: // up
-
-            obj_pos = 0;
-
-            if(cursor_pos_abs > 0)
-            {
-                if((tmp = curMenu->getChild(0)) != NULL)
-                {
-                    do
-                    { 
-                        if(obj_pos == cursor_obj_pos)
-                        {                           
-                            if(cnt_visible > 0)
-                            {
-                                cursor_pos_abs--;
-                                cursor_obj_pos = last_valid_obj_pos;
-                                //update = true;
-                            }
-                            else
-                            {    
-                                // rollover is possible                            
-                                rollover = true;
-                            }
-                            break;
-                        }
-                        else
-                        {
-                            if(tmp->checkCondition() == true)
-                            {
-                                cnt_visible++; 
-                                last_valid_obj_pos = obj_pos; 
-                                //update = true;                         
-                            } 
-                            else
-                            {
-                                // do nothing
-                            } 
-                        }
-
-                        obj_pos++;
-                    }
-                    while((tmp = tmp->getSibling(1)) != NULL);
-                } 
-                else
-                {
-                    // do nothing 
-                }
-            } 
-            else
-            {
-               // rollover is possible 
-               rollover = true;            
-            }
-
-            if(bitRead(REG_control, _LCDML_REG_control_rollover) && rollover == true)
-            {
-                // rollover the menu
-                if((tmp = curMenu->getChild(0)) != NULL)
-                {
-                    do
-                    {  
-                        if(tmp->checkCondition() == true)
-                        {
-                            cnt_visible++; 
-                            last_valid_obj_pos = obj_pos; 
-                            //update = true;                         
-                        } 
-                        else
-                        {
-                            // do nothing
-                        }                    
-
-                        obj_pos++;
-                    }
-                    while((tmp = tmp->getSibling(1)) != NULL);
-
-                    cursor_pos_abs = cnt_visible-1;
-                    cursor_obj_pos = last_valid_obj_pos;
-                    if(cursor_pos_abs - (window_rows-1) > 0)
-                    {
-                        window_start = cursor_pos_abs-(window_rows-1);
-                    }
-                    else
-                    {
-                        window_start = 0;
-                    }
-                } 
-                else
-                {
-                    // do nothing 
-                }
-            }
-            else
-            {
-                // do nothing
-            }
-
-            BT_resetUp();
-
-            // reset the button state here or update the menu
-            bitSet(REG_update, _LCDML_REG_update_menu);
-
-        break;
-
-
-
-        case 1: // down
-
-            obj_pos = cursor_obj_pos;
-
-            // get the next object if it exists
-            if((tmp = curMenu->getChild(cursor_obj_pos)) != NULL)
-            {                
-                
-                while((tmp = tmp->getSibling(1)) != NULL)
-                {  
-                    obj_pos++;
-
-                    if(tmp->checkCondition())
-                    {
-                        cnt_visible++;
-                        cursor_pos_abs++;
-                        cursor_obj_pos = obj_pos;
-                        //update = true;
-                        break;
-                    }
-                    else
-                    { 
-                        // do nothing                    
-                    }
-                }  
-
-                if(cnt_visible == 0)
-                {
-                    rollover = true;
-                }           
-            }
-            else
-            {
-                rollover = true;
-            }
-
-            if(bitRead(REG_control, _LCDML_REG_control_rollover) && rollover == true)
-            {
-                cursor_obj_pos  = 0;
-                cursor_pos_abs  = 0;
-                window_start    = 0;
-                MENU_initFirstElement();
-            }
-            else
-            {
-                // do nothing
-            }            
-
-            // reset the button state here and update the menu
-            BT_resetDown();
-            bitSet(REG_update, _LCDML_REG_update_menu);
-
-        break;       
-
-        default: // all others
-            // do nothing
-        break;
-    }   
-
-    // update window possition
-    // only update the window position when no the menu is not rolled over
-    if(rollover == false)
-    {
-        if(cursor_pos_abs - (window_rows-1) > 0 || window_start > 0)
-        {
-            switch(state)
-            {
-                case 0: // up
-                    if(cursor_pos == 0) 
-                    {
-                        if(window_start > 0)
-                        {
-                            window_start--;
-                        }
-                        else
-                        {
-                            // do nothing
-                        }                   
-                    }
-                    else
-                    {
-                        // do nothing
-                    }
-                break;
-
-                case 1: // down                
-                    if(cursor_pos == (window_rows-1))
-                    {
-                        window_start = cursor_pos_abs - (window_rows-1);
-                    }
-                    else
-                    {
-                        // do nothing
-                    }                
-                break;
-
-                default: // all others 
-                break;                  
-            } 
-        }
-        else
-        {
-            window_start = 0;
-        }
-    }
-    else
-    {
-        // do nothing
-    }
-    
-    // update cursor position
-    cursor_pos = cursor_pos_abs - window_start;         
-  
-    // check if the cursor position is updated
-    if(actMenu_id == _LCDML_NO_FUNC)
-    {       
-        bitSet(REG_update, _LCDML_REG_update_cursor);     
-    }   
-    else
-    {
-        // do nothing
-    }
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_enRollover(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_enRollover"));
-
-    bitSet(REG_control, _LCDML_REG_control_rollover);
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_disRollover(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_disRollover"));
-
-    bitClear(REG_control, _LCDML_REG_control_rollover);
-}
-
-/* ******************************************************************** */
-uint8_t    LCDMenuLib2::MENU_getLayer(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getLayer"));
-
-    return layer;
-}
-
-/* ******************************************************************** */
-uint8_t    LCDMenuLib2::MENU_getCursorPos(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getCursorPos"));
-
-    return (cursor_pos); //return the current cursor position
-}
-
-/* ******************************************************************** */
-uint8_t    LCDMenuLib2::MENU_getCursorPosAbs(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getCursorPosAbs"));
-
-    return cursor_pos_abs; //return the current cursor position
-}
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2::MENU_countChilds(LCDMenuLib2_menu *menu, uint8_t all)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_countChilds"));
-
-    //declaration
-    uint8_t j = 0;
-    LCDMenuLib2_menu *tmp;
-
-    //check if element has children
-    if(menu != NULL)
-    {
-        if ((tmp = menu->getChild(0)) != NULL)
-        {
-            do
-            { 
-                if (tmp->checkCondition() || all == true)
-                {
-                    j++;
-                }
-                else
-                {
-                    // do nothing
-                }
-            } while ((tmp = tmp->getSibling(1)) != NULL);
-        }
-        else
-        {
-            // do nothing
-        }
-    } 
-    else
-    {
-        // do nothing
-    }
-
-    return j;
-}
-
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2::MENU_getChilds(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getChilds"));
-    
-    return MENU_countChilds(curMenu);
-}
-
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2::MENU_getParentID(uint8_t p_layer)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getParentID"));
-    LCDMenuLib2_menu *tmp;
-
-    if((tmp = curMenu->getChild(0)) != NULL)
-    {
-        for(uint8_t i=0; i<p_layer; i++)
-        {
-            if(tmp->getParent()->getID() != _LCDML_FIRST_ELEMENT_ID)
-            {
-                tmp = tmp->getParent();
-            }
-            else
-            {
-                return _LCDML_FIRST_ELEMENT_ID;
-                break;
-            }
-        }
-
-        return tmp->getParent()->getID();
-    }
-    else
-    {
-        return _LCDML_FIRST_ELEMENT_ID;
-    }   
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_setDynContent(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_setDynContent"));
-
-    bitSet(REG_control, _LCDML_REG_control_dynMenuDisplayed);
-}
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2::MENU_checkDynContent(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_checkDynContent"));
-
-    if(bitRead(REG_control, _LCDML_REG_control_dynMenuDisplayed))
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_enScroll(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_enScroll"));
-
-    bitClear(REG_special, _LCDML_REG_special_disable_scroll);
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::MENU_disScroll(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_disScroll"));
-
-    if(actMenu_id == _LCDML_NO_FUNC)
-    {
-        bitSet(REG_special, _LCDML_REG_special_disable_scroll);
-    }
-    else
-    {
-        bitClear(REG_special, _LCDML_REG_special_disable_scroll);
-    }
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::MENU_getScrollDisableStatus(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getScrollDisableStatus"));
-
-    return bitRead(REG_special, _LCDML_REG_special_disable_scroll);
-}
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2::MENU_getLastActiveFunctionID(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getLastActiveFunctionID"));
-
-    return actMenu_lastFuncID;
-}                   
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2::MENU_getLastCursorPositionID(void)                    
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getLastCursorPositionID"));
-
-    return actMenu_lastCursorPositionID;
-}
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2::MENU_getElementIDFromCursorPos(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_MENU, F("LCDML.MENU_getElementIDFromCursorPosition"));
-
-    if(curMenu->getChild(cursor_obj_pos) != NULL)
-    {
-        return curMenu->getChild(cursor_obj_pos)->getID();
-    }
-    else
-    {
-        return _LCDML_FIRST_ELEMENT_ID;
-    }    
-}
-
-
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* DISP methods                                                         */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-
-/* ******************************************************************** */
-void LCDMenuLib2::DISP_menuUpdate(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_DISP, F("LCDML.DISP_menuUpdate"));
-
-    bitSet(REG_update, _LCDML_REG_update_menu);    
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::DISP_clear(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_DISP, F("LCDML.DISP_clear"));
-    
-    callback_contentClear();    
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::DISP_checkMenuUpdate(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_DISP, F("LCDML.DISP_checkMenuUpdate"));
-
-    if (bitRead(REG_update, _LCDML_REG_update_menu)) 
-    {
-        bitClear(REG_update, _LCDML_REG_update_menu);       
-        bitClear(REG_control, _LCDML_REG_control_dynMenuDisplayed);
-        return true;
-    } 
-    else 
-    {
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::DISP_checkMenuCursorUpdate(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_DISP, F("LCDML.DISP_checkMenuCursorUpdate"));
-
-    if(bitRead(REG_update, _LCDML_REG_update_cursor)) 
-    {  
-        bitClear(REG_update, _LCDML_REG_update_cursor);       
-        return true;
-    } 
-    else 
-    {
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::DISP_update(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_DISP, F("LCDML.DISP_update"));
-
-    MENU_doScroll(10);
-    MENU_display();
-    
-    bitSet(REG_update, _LCDML_REG_update_menu);        
-}
-
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* FUNC methods                                                         */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-
-/* ******************************************************************** */
-uint8_t    LCDMenuLib2::FUNC_getID(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_getID"));
-     
-    if(actMenu_id != _LCDML_NO_FUNC) 
-    {
-        return actMenu_id;
-    } 
-    else 
-    {
-        if(curMenu->getChild(cursor_obj_pos) != NULL)
-        {
-            if(curMenu->getChild(cursor_obj_pos)->checkType_dynParam() == true)
-            {
-                return curMenu->getChild(cursor_obj_pos)->getID();
-            }
-            else
-            {
-                return _LCDML_NO_FUNC;
-            }
-        }
-        else
-        {
-            return _LCDML_NO_FUNC;
-        }
-    }
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::FUNC_setLoopInterval(unsigned long p_t)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_setLoopInterval"));
-
-    actMenu_default_time = p_t;
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::FUNC_call(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_call"));
-
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        if(jT_paramOld > 0)
-        {
-            actMenu_cb_function(jT_paramOld);            
-        }
-        else if(jT_param > 0)
-        {
-            actMenu_cb_function(jT_param);
-        }
-        else
-        {
-            actMenu_cb_function(actMenu_param);
-        }
-    }
-    else
-    {
-        // do nothing
-    }
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::FUNC_setup(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_setup - check"));
-
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        // function active
-        if(bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_setup) == 0) 
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_setup - check: true"));
-
-            bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_setup); // run setup
-            DISP_clear();
-            BT_resetAll();
-            return true;
-        }
-        else
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_setup - check: false"));
-            return false;
-        }
-    }
-    else
-    {
-        bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_setup); // run setup
-		
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::FUNC_loop(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_loop - check"));
-
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        if(bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_end) == false)
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_loop - check: true"));
-            return true;
-        }
-        else
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_loop - check: false"));
-            return false;
-        }
-    }
-    else
-    {
-        bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_end);
-		
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::FUNC_close(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_close - check"));
-
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        if(bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_end) == true)
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_close - check: true"));
-
-            bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_close_active);
-            return true;
-        }
-        else
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_close - check: false"));
-            return false;
-        }
-    }
-    else
-    {
-        bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_end);
-		
-        return false;
-    }
-}
-
-
-/* ******************************************************************** */
-void LCDMenuLib2::FUNC_goBackToMenu(uint8_t p_goBackCnt)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_goBackToMenu"));
-
-    // special handling
-    if(bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_goBackToFuncID) == true)
-    {
-        bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_goBackToFuncID);        
-        OTHER_jumpToID(actMenu_lastFuncID);
-    } 
-    
-    // special handling
-    if(bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_setCursorToID) == true)
-    {
-        bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_setCursorToID);
-        OTHER_setCursorToID(actMenu_lastCursorPositionID);
-    }        
-
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        goBackCnt = p_goBackCnt;
-        bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_end);
-    }
-    else
-    {
-        // do nothing
-    }
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::FUNC_disableScreensaver(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_disableScreensaver"));
-
-    bitSet(REG_special, _LCDML_REG_special_disable_screensaver);
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::FUNC_setGBAToLastCursorPos(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_setGBAToLastCursorPos"));
-
-    // delte other configurations
-    bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_goBackToFuncID);
-
-    // set new configuration
-    bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_setCursorToID);
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::FUNC_setGBAToLastFunc(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_setGBAToLastFunc"));
-
-    // delete other configurations
-    bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_setCursorToID);
-
-    // set new configuration
-    bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_goBackToFuncID);
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::FUNC_setGBA(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_setGBA"));
-
-    // decide which option is better (to function or to last cursor option)
-    if(bitRead(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu) == true)
-    {
-        FUNC_setGBAToLastCursorPos();
-    }
-    else
-    {
-        FUNC_setGBAToLastFunc();
-    }           
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::FUNC_setCEMask(unsigned long p_mask)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_FUNC, F("LCDML.FUNC_setCEMask"));
-
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        actMenu_ce_mask = p_mask;
-    }
-    else
-    {
-        actMenu_ce_mask = 0xFFFFFFFFFFFFFFFF;
-    }
-}
-
-
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* BT methods                                                           */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-
-/* ******************************************************************** */
-bool LCDMenuLib2::BT_setup(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_setup"));
-
-    // check if the button initialisation was done
-    if(bitRead(REG_control, _LCDML_REG_control_bt_init_setup) == false)
-    {
-        bitSet(REG_control, _LCDML_REG_control_bt_init_setup);
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_enter(void)            
-/* ******************************************************************** */
-{
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_enter"));       
-    
-    bitSet(REG_button, _LCDML_REG_button_enter);    
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_up(void)               
-/* ******************************************************************** */
-{ 
-    // debug information
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_up"));  
-
-    bitSet(REG_button, _LCDML_REG_button_up);       
-
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_down(void)             
-/* ******************************************************************** */
-{ 
-    // debug information
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_down")); 
-
-    bitSet(REG_button, _LCDML_REG_button_down);     
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_left(void)             
-/* ******************************************************************** */
-{ 
-    // debug information
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_left")); 
-
-    bitSet(REG_button, _LCDML_REG_button_left);     
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_right(void)            
-/* ******************************************************************** */
-{ 
-    // debug information
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_right"));  
-
-    bitSet(REG_button, _LCDML_REG_button_right);    
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_quit(void)             
-/* ******************************************************************** */
-{ 
-    // debug information
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_quit")); 
-
-    bitSet(REG_button, _LCDML_REG_button_quit);     
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::BT_checkAny(void)      
-/* ******************************************************************** */
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_checkAny")); 
-
-    if(REG_button > 0) 
-    { 
-        return true; 
-    } 
-    else 
-    { 
-        return false; 
-    }                            
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::BT_checkEnter(void)    
-/* ******************************************************************** */
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_checkEnter"));  
-    
-    if(bitRead(REG_button, _LCDML_REG_button_enter)) 
-    { 
-        return true; 
-    } 
-    else 
-    { 
-        return false; 
-    }    
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::BT_checkUp(void)       
-/* ******************************************************************** */
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_checkUp"));     
-    
-    if(bitRead(REG_button, _LCDML_REG_button_up)) 
-    { 
-        return true; 
-    } 
-    else 
-    { 
-        return false; 
-    }       
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::BT_checkDown(void) 
-/* ******************************************************************** */    
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_checkDown")); 
-
-    if(bitRead(REG_button, _LCDML_REG_button_down)) 
-    { 
-        return true; 
-    } 
-    else 
-    { 
-        return false; 
-    }     
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::BT_checkLeft(void)     
-/* ******************************************************************** */
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_checkLeft"));   
-    
-    if(bitRead(REG_button, _LCDML_REG_button_left)) 
-    { 
-        return true; 
-    } 
-    else 
-    { 
-        return false; 
-    }    
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::BT_checkRight(void)  
-/* ******************************************************************** */  
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_checkRight"));  
-    
-    if(bitRead(REG_button, _LCDML_REG_button_right)) 
-    { 
-        return true; 
-    } 
-    else 
-    { 
-        return false; 
-    }    
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::BT_checkQuit(void)     
-/* ******************************************************************** */
-{ 
-    // debug information     
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_checkQuit"));
-
-    if(bitRead(REG_button, _LCDML_REG_button_quit)) 
-    { 
-        return true; 
-    } 
-    else 
-    { 
-        return false; 
-    }     
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_resetAll(void)  
-/* ******************************************************************** */       
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_resetAll"));    
-    
-    REG_button = 0;
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_resetEnter(void)   
-/* ******************************************************************** */    
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_resetEnter"));  
-    
-    bitClear(REG_button, _LCDML_REG_button_enter);    
-}
-/* ******************************************************************** */
-void LCDMenuLib2::BT_resetUp(void)          
-/* ******************************************************************** */
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_resetUp"));     
-    
-    bitClear(REG_button, _LCDML_REG_button_up);       
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_resetDown(void)        
-/* ******************************************************************** */
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_resetDown"));   
-    
-    bitClear(REG_button, _LCDML_REG_button_down);     
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_resetLeft(void)        
-/* ******************************************************************** */
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_resetLeft"));   
-    
-    bitClear(REG_button, _LCDML_REG_button_left);     
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_resetRight(void)
-/* ******************************************************************** */
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_resetRight"));  
-    
-    bitClear(REG_button, _LCDML_REG_button_right);    
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::BT_resetQuit(void)        
-/* ******************************************************************** */
-{ 
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.BT_resetQuit"));   
-    
-    bitClear(REG_button, _LCDML_REG_button_quit);     
-}
-
-
-
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* Custom Event Handling                                                */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-/* ******************************************************************** */
-bool LCDMenuLib2::CE_setup(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_BT, F("LCDML.CE_setup"));
-
-    // check if the button initialisation was done
-    if(bitRead(REG_control, _LCDML_REG_control_ce_init_setup) == false)
-    {
-        bitSet(REG_control, _LCDML_REG_control_ce_init_setup);
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::CE_set(uint8_t p_event)         
-/* ******************************************************************** */
-{
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_CE, F("LCDML.CE_set")); 
-
-    if(p_event < _LCDML_CE_events_cnt)
-    {
-        bitSet(REG_custom_event, p_event);
-    }    
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::CE_resetAll(void)
-/* ******************************************************************** */
-{
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_CE, F("LCDML.CE_resetAll")); 
-    
-    // reset all
-    REG_custom_event = 0;
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::CE_reset(uint8_t p_event)         
-/* ******************************************************************** */
-{
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_CE, F("LCDML.CE_reset"));
-
-    if(p_event < _LCDML_CE_events_cnt)
-    {
-        bitClear(REG_custom_event, p_event);
-    }   
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::CE_checkAny(void)
-/* ******************************************************************** */
-{
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_CE, F("LCDML.CE_checkAny"));
-    
-    if((REG_custom_event & actMenu_ce_mask) > 0)
-    {              
-        return true;
-    } 
-    else
-    {        
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::CE_check(uint8_t p_event)
-/* ******************************************************************** */
-{
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_CE, F("LCDML.CE_check"));
-
-    if(p_event < _LCDML_CE_events_cnt)
-    {
-        return bitRead(REG_custom_event, p_event);
-    }
-    else
-    {
-        return false;
-    }  
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::CE_setOnChangeCbFunction(uint8_t p_event, LCDML_FuncPtr_pu8 p_function)
-/* ******************************************************************** */
-{
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_CE, F("LCDML.CE_setOnChangeCbFunction"));
-    
-    if(p_event < _LCDML_CE_cb_function_cnt) 
-    {
-        ce_cb[p_event] = p_function;
-    }
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::CE_clearOnChangeCbFunction(uint8_t p_event)
-/* ******************************************************************** */
-{
-    // debug information 
-    DBG_println(LCDML_DBG_function_name_CE, F("LCDML.CE_clearOnChangeCbFunction"));
-    
-    if(p_event < _LCDML_CE_cb_function_cnt) 
-    {
-        ce_cb[p_event] = NULL;
-    }
-}
-
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* TIMER methods                                                        */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-
-/* ******************************************************************** */
-void    LCDMenuLib2::TIMER_msReset(unsigned long &p_var)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_TIMER, F("LCDML.TIMER_msReset"));
-
-    p_var = millis();
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::TIMER_ms(unsigned long &p_var, unsigned long p_t)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_TIMER, F("LCDML.TIMER_ms"));
-
-    if((millis() - p_var) >= p_t)
-    {
-        p_var = millis();
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::TIMER_usReset(unsigned long &p_var)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_TIMER, F("LCDML.TIMER_usReset"));
-
-    p_var = micros();
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2::TIMER_us(unsigned long &p_var, unsigned long p_t)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_TIMER, F("LCDML.TIMER_us"));
-
-    if((micros() - p_var) >= p_t)
-    {
-        p_var = micros();
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* OTHER methods                                                        */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-/* ******************************************************************** */
-void LCDMenuLib2::OTHER_jumpToFunc(LCDML_FuncPtr_pu8 p_search, uint8_t p_para)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToFunc"));
-
-    if(bitRead(REG_special, _LCDML_REG_special_OTHER_function_active) == true)
-    {
-        // debug information
-        DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToFunc - is still activ"));
-    } 
-    else 
-    {
-        // check if this menu function is active - do nothing   
-        if(p_search == actMenu_cb_function)
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToFunc - function is still running")); 
-        }   
-        else
-        { 
-            // debug information
-            DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToFunc - start"));
-
-            bitSet(REG_special, _LCDML_REG_special_OTHER_function_active);
-            bitClear(REG_special, _LCDML_REG_special_setCursorTo); 
-            
-            // Save last active Menu ID
-            actMenu_lastFuncID = actMenu_id;
-
-            if(actMenu_id != _LCDML_NO_FUNC)
-            {
-                // handle parameters            
-                jT_paramOld = jT_param;
-                bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu);
-            }
-            else
-            {
-                // handle parameters
-                jT_paramOld = 0;
-                bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu);
-
-                // Save last cursor position
-                actMenu_lastCursorPositionID = actMenu_cursorPositionID;
-                actMenu_cursorPositionID = curMenu->getChild(MENU_getCursorPosAbs())->getID();            
-            }
-
-            // enable jump to Func
-            jT_id       = 0;        
-            jT_param    = p_para;
-            jT_function = p_search;
-        }
-    }    
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::OTHER_jumpToID(uint8_t p_id, uint8_t p_para)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToID"));
-
-    if(p_id != _LCDML_NO_FUNC && p_id <= last_element_id)
-    {
-        if(bitRead(REG_special, _LCDML_REG_special_OTHER_function_active) == true)
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToID - is still activ"));
-        } 
-        else 
-        {
-            // check if this menu function is active - do nothing  
-            if(p_id == actMenu_id)
-            {
-                // debug information
-                DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToFunc - function is still running"));
-            }
-            else
-            {
-                // debug information
-                DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToID - start"));
-
-                bitSet(REG_special, _LCDML_REG_special_OTHER_function_active);                
-                bitClear(REG_special, _LCDML_REG_special_setCursorTo);               
-
-                // Save last active Menu ID           
-                actMenu_lastFuncID = actMenu_id;
-                
-                if(actMenu_id != _LCDML_NO_FUNC)
-                {
-                    // handle parameters
-                    jT_paramOld = jT_param;
-                    bitClear(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu);
-                }
-                else
-                {
-                    // handle parameters
-                    jT_paramOld = 0;
-
-                    bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu);
-
-                    // Save last cursor position
-                    actMenu_lastCursorPositionID = actMenu_cursorPositionID;
-                    actMenu_cursorPositionID = curMenu->getChild(MENU_getCursorPosAbs())->getID();
-                    
-                }
-
-                // enable jump to ID 
-                jT_id       = p_id;
-                jT_param    = p_para;
-                jT_function = NULL;
-            }
-        }
-    }
-    else
-    {
-        // debug information
-        DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToID - stop - ID range is wrong"));        
-    }
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::OTHER_setCursorToFunc(LCDML_FuncPtr_pu8 p_search)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_setCursorToFunc"));
-
-    if(bitRead(REG_special, _LCDML_REG_special_OTHER_function_active) == true)
-    {
-        // debug information
-        DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_setCursorToFunc - is still activ"));
-    } 
-    else 
-    {
-        // debug information
-        DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_setCursorToFunc - start"));
-
-        // enable jump to Func
-        bitSet(REG_special, _LCDML_REG_special_OTHER_function_active);
-        bitSet(REG_special, _LCDML_REG_special_setCursorTo);
-        jT_id       = 0;
-
-        // Save last active Menu ID           
-        actMenu_lastFuncID = actMenu_id;
-      
-        if(actMenu_id != _LCDML_NO_FUNC)
-        {
-            // handle parameters            
-            jT_paramOld = jT_param; 
-            bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu);          
-        }
-        else
-        {
-            // handle parameters
-            jT_paramOld = 0;
-
-            bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu);
-
-            // Save last cursor position
-            actMenu_lastCursorPositionID = actMenu_cursorPositionID;
-            actMenu_cursorPositionID = curMenu->getChild(MENU_getCursorPosAbs())->getID();            
-        } 
-        
-        jT_param    = 0;
-        jT_function = p_search;
-    }
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2::OTHER_setCursorToID(uint8_t p_id)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_setCursorToID"));
-
-    if(p_id != _LCDML_NO_FUNC && p_id <= last_element_id)
-    {
-        if(bitRead(REG_special, _LCDML_REG_special_OTHER_function_active) == true)
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_setCursorToID - is still activ"));
-        } 
-        else 
-        {
-            // debug information
-            DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_setCursorToID - start"));
-
-            // enable jump to Func
-            bitSet(REG_special, _LCDML_REG_special_OTHER_function_active);
-            bitSet(REG_special, _LCDML_REG_special_setCursorTo);
-            jT_id       = p_id;
-
-            // Save last active Menu ID           
-            actMenu_lastFuncID = actMenu_id;       
-
-            if(actMenu_id != _LCDML_NO_FUNC)
-            {
-                // handle paramerts
-                jT_paramOld = jT_param;
-                bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu);            
-            }
-            else
-            {
-                // handle parameters
-                jT_paramOld = 0;
-
-                bitSet(REG_MenuFunction, _LCDML_REG_MenuFunction_called_from_menu);
-
-                // save last cursor position
-                actMenu_lastCursorPositionID = actMenu_cursorPositionID;
-                actMenu_cursorPositionID = curMenu->getChild(MENU_getCursorPosAbs())->getID();                
-            } 
-            
-            jT_param    = 0;
-            jT_function = NULL;  
-        } 
-    }
-    else
-    {
-        // debug information
-        DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_jumpToID - stop - ID range is wrong")); 
-    }
-}
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2::OTHER_getIDFromFunction(LCDML_FuncPtr_pu8 p_function_name)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_getIDFromFunction"));
-    
-    // define local variables
-    LCDMenuLib2_menu *tmp;
-
-    // set object
-    tmp = MENU_getRootObj();     
-
-    // Check if this Menu have childs
-    if((tmp = tmp->getChild(0)) != NULL)
-    {  
-        // This loop runs through the menu structure and stops after checking the last element
-        while(true)
-        { 
-            // Debug information
-            DBG_print(LCDML_DBG_function_name_OTHER, F("ID: "));
-            DBG_println(LCDML_DBG_function_name_OTHER, tmp->getID());               
-
-            // ***
-            // check loop end condetions
-            // ***
-
-            // check if something is found:
-            
-            // Debug information
-            DBG_println(LCDML_DBG_function_name_OTHER, F("check function"));
-                    
-            if(tmp->getCbFunction() == p_function_name)
-            {
-                // something found                                               
-                return tmp->getID();                
-            }
-                 
-
-            if(last_element_id == curMenu->getID())
-            {
-                // Debug information                           
-                DBG_print(LCDML_DBG_function_name_OTHER, F("nothing found: endpoint (C) / ID: "));
-                DBG_println(LCDML_DBG_function_name_OTHER, curMenu->getID()); 
-
-                break;
-            }
-
-            // ***
-            // set the next item
-            // ***
-
-            // check childs for childs
-            if(tmp->getChild(0) != NULL)
-            {
-                // Debug information 
-                DBG_println(LCDML_DBG_function_name_OTHER, F("gointo an element"));
-
-                // -- GO INTO --
-
-                // set next child for check
-                tmp = tmp->getChild(0);
-            }
-            else
-            {
-                if(tmp->getSibling(1) != NULL)
-                {
-                    // set next sibling for check
-                    tmp = tmp->getSibling(1); 
-                }
-                else
-                { 
-                    // check parent element
-                    if(tmp->getParent()->getID() == _LCDML_FIRST_ELEMENT_ID)
-                    { 
-                        // Debug information                           
-                        DBG_print(LCDML_DBG_function_name_OTHER, F("end point: (A) / ID: "));
-                        DBG_println(LCDML_DBG_function_name_OTHER, tmp->getID());                                                    
-                    }
-                    else
-                    {
-                        do
-                        {
-                            // set next parent for check
-                            tmp = tmp->getParent(); 
-
-                            // -- GO Back --                          
-
-                            // Debug information 
-                            DBG_println(LCDML_DBG_function_name_OTHER, F("goback to parent element"));                          
-                            
-                            // check if the parent element have siblings
-                            if(tmp->getSibling(1) != NULL)
-                            {
-                                // set next sibling
-                                tmp = tmp->getSibling(1);
-                                break;                                
-                            }
-                            else
-                            {                                    
-                                if(tmp->getParent()->getID() == _LCDML_FIRST_ELEMENT_ID)
-                                {
-                                    break;
-                                }
-                                else
-                                {
-                                    // continue
-                                }     
-                            }
-                        } while (true);                                                
-                    }
-                }
-            }
-        }        
-    }
-
-    // nothing found
-    return _LCDML_NO_FUNC;
-}
-
-
-/* ******************************************************************** */
-void    LCDMenuLib2::OTHER_updateFunc(void)                               
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_OTHER, F("LCDML.OTHER_updateFunc"));
-
-    if(actMenu_id != _LCDML_NO_FUNC)
-    {
-        bitSet(REG_update, _LCDML_REG_update_menu_function_content);
-    }
-    else
-    {
-        // do nothing
-    }
-}
-
-
-/* ******************************************************************** */
-/* ******************************************************************** */
-/* SCREEN methods                                                       */
-/* ******************************************************************** */
-/* ******************************************************************** */
-
-
-/* ******************************************************************** */
-void    LCDMenuLib2::SCREEN_enable(LCDML_FuncPtr_pu8 function, unsigned long p_t)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_SCREEN, F("LCDML.SCREEN_enable"));
-
-    if(function != NULL)
-    {
-        cb_screensaver           = function;
-        screensaver_default_time = p_t;
-    }
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::SCREEN_disable(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_SCREEN, F("LCDML.SCREEN_disable"));
-
-    cb_screensaver = NULL;
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::SCREEN_resetTimer(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_SCREEN, F("LCDML.SCREEN_resetTimer"));
-
-    TIMER_msReset(screensaver_timer);
-}
-
-/* ******************************************************************** */
-void    LCDMenuLib2::SCREEN_start(void)
-/* ******************************************************************** */
-{
-    // debug information
-    DBG_println(LCDML_DBG_function_name_SCREEN, F("LCDML.SCREEN_start"));
-
-    screensaver_timer = millis() + 1000;
-}
\ No newline at end of file
diff --git a/third-party/LCDMenuLib2.old/src/LCDMenuLib2.h b/third-party/LCDMenuLib2.old/src/LCDMenuLib2.h
deleted file mode 100644
index 3bb1497..0000000
--- a/third-party/LCDMenuLib2.old/src/LCDMenuLib2.h
+++ /dev/null
@@ -1,378 +0,0 @@
-/* ******************************************************************************
- *                        LCDMenuLib2 (LCDML)
- * ******************************************************************************
- *
- * MIT License
- *
- * Copyright (c) [2020] [Nils Feldkämper]
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * ******************************************************************************
- *
- * BUG / ISSUES REPORTING
- *    https://github.com/Jomelo/LCDMenuLib2/issues
- *
- * ARDUINO FORUM
- *    http://forum.arduino.cc/index.php?topic=73816.0
- *
- * ******************************************************************************
- */
-
-// File header
-#ifndef LCDMenuLib2_h
-    #define LCDMenuLib2_h
-
-    // ####################### //
-    // This following defines can be changed
-    // ####################### //
-
-    // you can change this parameters
-    #define _LCDML_cfg_use_ram                   // enable this line when you want to use the ram mode 
-
-    // set the number of custom events (this could be a button ore something else)    
-    #define _LCDML_CE_cb_function_cnt           4   // this is the number of custom event callback functions which are supported
-                                                    // 4 = default 
-
-    // enable debug strings (remove comments from this line)
-    //#define LCDML_DBG                          1
-
-    // debug special method groups          // enable a flag to control the function call order
-    #define LCDML_DBG_function_name_LOOP        0
-    #define LCDML_DBG_function_name_MENU        0
-    #define LCDML_DBG_function_name_FUNC        0
-    #define LCDML_DBG_function_name_BT          0
-    #define LCDML_DBG_function_name_CE          0
-    #define LCDML_DBG_function_name_OTHER       0
-    #define LCDML_DBG_function_name_DISP        0
-    #define LCDML_DBG_function_name_TIMER       0
-    #define LCDML_DBG_function_name_SCREEN      0
-
-    // ####################### //
-    // Do nothing change here
-    // ####################### //
-
-    // create DBG_print makro when debugging is enabled
-    #ifdef LCDML_DBG
-        #define DBG_print(enable, str)                  if(enable == 1) { Serial.print(str); }
-        #define DBG_println(enable, str)                if(enable == 1) { Serial.println(str); }
-        #define DBG_printstrln(enable, str, val, form)  if(enable == 1) { Serial.print(str); Serial.println(val, form);}
-    #else
-        #define DBG_print(enable, str)
-        #define DBG_println(enable, str)
-        #define DBG_printstrln(enable, str, val, form)
-    #endif
-
-    // Version
-    #define _LCDML_VERSION                       "LCDML2 v2.2.4"
-
-    // this makro is for unused variables which exists for compatibility tings ...
-    #define LCDML_UNUSED(expr) do { (void)(expr); } while (0)
-
-    // Include Arduino ios
-    #include "Arduino.h"
-
-    // Arduino specific settings
-    #if ARDUINO >= 160
-        #define _LCDMenuLib2_arduino_version         1    // for new Arduino version like 1.6.0 or higher
-    #else
-        #define _LCDMenuLib2_arduino_version         0    // for old Arduino version like 1.0.6 or 1.0.5
-    #endif
-
-    // ESP specific settings
-    #if defined( ESP8266 ) || defined( ESP32 )
-        #ifndef _LCDML_cfg_use_ram
-            #define _LCDML_cfg_use_ram           
-        #endif
-    #endif
-
-    // 64 this is the number of events which are supported
-    #define _LCDML_CE_events_cnt                            64  
-
-    // No function constant
-    #define _LCDML_NO_FUNC                                  255
-    #define _LCDML_FIRST_ELEMENT_ID                         255
-
-    // Bit pos control flags
-    #define _LCDML_REG_control_dynMenuDisplayed             7
-    #define _LCDML_REG_control_ce_init_setup                6
-    #define _LCDML_REG_control_free_5                       5
-    #define _LCDML_REG_control_bt_init_setup                4
-    #define _LCDML_REG_control_update_direct                3
-    #define _LCDML_REG_control_free_2                       2
-    #define _LCDML_REG_control_rollover                     1
-    #define _LCDML_REG_control_free_0                       0
-
-    // screensaver, jump to function, go Root, ...
-    #define _LCDML_REG_special_setCursorTo                  7
-    #define _LCDML_REG_special_OTHER_function_active        6 
-    #define _LCDML_REG_special_free_5                       5 
-    #define _LCDML_REG_special_free_4                       4 
-    #define _LCDML_REG_special_free_3                       3 
-    #define _LCDML_REG_special_goRoot                       2 
-    #define _LCDML_REG_special_disable_scroll               1 
-    #define _LCDML_REG_special_disable_screensaver          0   
-
-    // menu function flags
-    #define _LCDML_REG_MenuFunction_called_from_menu        7
-    #define _LCDML_REG_MenuFunction_free_6                  6
-    #define _LCDML_REG_MenuFunction_free_5                  5
-    #define _LCDML_REG_MenuFunction_goBackToFuncID          4
-    #define _LCDML_REG_MenuFunction_setCursorToID           3
-    #define _LCDML_REG_MenuFunction_close_active            2
-    #define _LCDML_REG_MenuFunction_setup                   1
-    #define _LCDML_REG_MenuFunction_end                     0
-
-    // button flags
-    #define _LCDML_REG_button_do_not_use_1                  7
-    #define _LCDML_REG_button_do_not_use_2                  6
-    #define _LCDML_REG_button_quit                          5
-    #define _LCDML_REG_button_enter                         4
-    #define _LCDML_REG_button_up                            3
-    #define _LCDML_REG_button_down                          2
-    #define _LCDML_REG_button_left                          1
-    #define _LCDML_REG_button_right                         0
-
-    // display update handling
-    #define _LCDML_REG_update_content                       7
-    #define _LCDML_REG_update_cursor                        6
-    #define _LCDML_REG_update_menu                          5
-    #define _LCDML_REG_update_menu_function_content         4
-    #define _LCDML_REG_update_free_3                        3
-    #define _LCDML_REG_update_free_2                        2
-    #define _LCDML_REG_update_free_1                        1
-    #define _LCDML_REG_update_free_0                        0
-
-    // Configure Arduino flash lib and load it*/
-    #ifndef __PROG_TYPES_COMPAT__
-        #define __PROG_TYPES_COMPAT__
-    #endif
-
-    // Include PGMSPACE
-    #ifndef _LCDML_cfg_use_ram
-        #include <avr/pgmspace.h>
-    #endif
-
-    // Include menu class
-    #include "LCDMenuLib2_typedef.h"
-    #include "LCDMenuLib2_menu.h"
-  
-    // types for advanced menu function (this types are used by the menu element initialisation)
-    #define _LCDML_TYPE_f7                      128
-    #define _LCDML_TYPE_f6                      64
-    #define _LCDML_TYPE_f5                      32
-    #define _LCDML_TYPE_f4                      16
-    #define _LCDML_TYPE_f3                      8
-    #define _LCDML_TYPE_f2                      4
-    #define _LCDML_TYPE_dynParam                2
-    #define _LCDML_TYPE_default                 1
-
-    // Include macros for this lib
-    #include "LCDMenuLib2_macros.h"
-
-//# =======================
-//# LCD Menu Lib
-//# =======================
-    class LCDMenuLib2
-    {
-        private:
-            // object pointer            
-            LCDMenuLib2_menu *curMenu;                                  // currrent menu structure
-
-            // callback functions
-            LCDML_FuncPtr       callback_menuControl;                   // a callback function which checks the input buttons
-            LCDML_FuncPtr       callback_contentUpdate;                 // a callback function which contains the menu function content
-            LCDML_FuncPtr       callback_contentClear;                  // a callback function which clears the display
-            LCDML_FuncPtr_pu8   cb_screensaver;                         // a callback function as screensaver (a normal menu function, but a defined name)
-
-            LCDML_FuncPtr_pu8   ce_cb[_LCDML_CE_cb_function_cnt];       // callback functions for custom events
-
-            // activ menu values
-            LCDML_FuncPtr_pu8   actMenu_cb_function;                    // Menu Function callback            
-            uint8_t             actMenu_id;                             // Name of this menu
-            uint8_t             actMenu_param;                          // Parameter this menu
-            uint8_t             actMenu_lastFuncID;                     // History of the last three active menu functions  
-            uint8_t             actMenu_cursorPositionID;               // current cursor position id          
-            uint8_t             actMenu_lastCursorPositionID;           // Save the last Cursor position before a new function was called
-            unsigned long       actMenu_default_time;                   // default loop time 
-            uint64_t            actMenu_ce_mask;                        // ce mask          
-
-            // jump To variables          
-            uint8_t             jT_id;                                  // contains the jumpTo id
-            uint8_t             jT_param;                               // contains the jumpTo param
-            uint8_t             jT_paramOld;                            // contains the jumpTo param
-            LCDML_FuncPtr_pu8   jT_function;                            // contains the jumpTo function
-
-            // menu intern values
-            uint8_t             last_element_id;                        // the id of the last element
-            uint8_t             window_rows;                            // the maximum rows of the current windows  (1 is the minium)
-            uint8_t             window_start;                           // the window start
-            
-            uint8_t             cursor_obj_pos;
-            uint8_t             cursor_pos;                             // the current cursor position on the lcd
-            uint8_t             cursor_pos_abs;
-
-            uint8_t             layer;                                  // contains the current layer
-            
-            // variables with bitfields => bit register
-            uint8_t             REG_button;                             // control flags for button actions            
-            uint8_t             REG_control;                            // control flags 
-            uint8_t             REG_MenuFunction;                       // control flags for menu functions
-            uint8_t             REG_special;                            // control flags for special function like screensaver, jumpTo, setCursorTo, goRoot, ..
-            uint8_t             REG_update;                             // control flags to update the content
-            uint64_t            REG_custom_event;                       // control flags for custom event actions
-
-            // variables for handling with menu function            
-            uint8_t             goBackCnt;                              // save the layer to go back
-
-            // timer variable for the loop time of a menu function
-            unsigned long       menuFunction_loopTimer;
-
-            // timer variable for the screensaver
-            unsigned long       screensaver_timer;
-            unsigned long       screensaver_default_time;
-
-            // private methods
-            void                MENU_goInto(void);                                              // activate the menu under the cursor
-            void                MENU_goBack(void);                                              // move to the parent menu
-            void                MENU_doScroll(uint8_t state);                                   // scroll the menu
-            uint8_t             MENU_countChilds(LCDMenuLib2_menu *menu, uint8_t all=false);    // how many children exists on next layer
-            void                MENU_initFirstElement(void);                                    // set counter to the first object child
-            void                MENU_resetActiveMenu(void);                                     // clear all neccessary variables
-                                 
-            // callback function
-            void                FUNC_call(void);            
-
-        public:
-
-            // constructor
-            LCDMenuLib2(LCDMenuLib2_menu &p_r ,const uint8_t p_rows, const uint8_t p_cols, LCDML_FuncPtr contentUpdate, LCDML_FuncPtr contentClear, LCDML_FuncPtr menuControl);
-
-            // init method
-            void                init(uint8_t);                          // initialisation of the menu / reset the complete menu
-
-            // loop methods
-            void                loop(void);                             // call the loop_menu and the loop_control function
-            void                loop_control(void);                     // call callback function to control the menu 
-            void                loop_menu(void);                        // checks if a button or a menu function are needed and call them
-
-            // menu methods            
-            void                MENU_display(uint8_t update=0);         // update the current menu structure but do not display it
-            void                MENU_goRoot(void);                      // set the cursor to the root element
-            void                MENU_enRollover(void);                  // enable menu rollover (first to last or last to first element on a layer)
-            void                MENU_disRollover(void);                 // disable the menu rollover function
-            void                MENU_enScroll(void);                    // enable the scroll function (this function can be disabled on dyn content elements and when a encoder is used)
-            void                MENU_disScroll(void);                   // disable the scroll function to catch the cursor to an dyn content element when a encoder is used
-            void                MENU_setDynContent(void);               // set this value when dyn content is shown on the current windows of the display                          
-            uint8_t             MENU_checkDynContent(void);             // check if dyn content is displayed 
-            bool                MENU_getScrollDisableStatus(void);      // check if the scroll function is disabled
-            uint8_t             MENU_getLayer(void);                    // get the current layer of the menu
-            uint8_t             MENU_getCursorPos(void);                // get the current cursor position (row 0, row 1, row 2, ...)
-            uint8_t             MENU_getCursorPosAbs(void);             // get the current cursor postion absolute (..., row 10, row 11, ..) based on the menu structure
-            uint8_t             MENU_getChilds(void);                   // get the current number of childs on this layer
-            uint8_t             MENU_getParentID(uint8_t p_layer=0);    // get the parent id of a selected higher layer
-            uint8_t             MENU_getScroll(void);                   // get the current scroll value
-            uint8_t             MENU_getLastActiveFunctionID(void);     // returns the id of the last active function
-            uint8_t             MENU_getLastCursorPositionID(void);     // returns the last cursor position function id
-            uint8_t             MENU_getElementIDFromCursorPos(void);   // returns the menu element id from current cursor position            
-            
-            LCDMenuLib2_menu *  MENU_getDisplayedObj(void);             // get the objection with the current content to display                    
-            LCDMenuLib2_menu *  MENU_getCurrentObj(void);               // get the current menu child object
-            LCDMenuLib2_menu *  MENU_getRootObj(void);                  // get the root menu object
-
-            // BT = button methods
-            bool                BT_setup(void);                         // check if the button initialisation was done
-            void                BT_enter(void);                         // set button enter
-            void                BT_up(void);                            // set button up
-            void                BT_down(void);                          // set button down
-            void                BT_left(void);                          // set button left
-            void                BT_right(void);                         // set button right
-            void                BT_quit(void);                          // set button quit
-            //
-            void                BT_resetAll(void);                      // reset all button states
-            void                BT_resetEnter(void);                    // reset enter button state
-            void                BT_resetUp(void);                       // reset up button state
-            void                BT_resetDown(void);                     // reset down button state
-            void                BT_resetLeft(void);                     // reset left button state
-            void                BT_resetRight(void);                    // reset right button state
-            void                BT_resetQuit(void);                     // reset quit button state
-            //
-            bool                BT_checkAny(void);                      // check if any button was pressed
-            bool                BT_checkEnter(void);                    // check enter button
-            bool                BT_checkUp(void);                       // check up button
-            bool                BT_checkDown(void);                     // check down button
-            bool                BT_checkLeft(void);                     // check left button
-            bool                BT_checkRight(void);                    // check right button
-            bool                BT_checkQuit(void);                     // check quit button        
-
-            // CE = custom event
-            bool                CE_setup(void);                         // check if the button initialisation was done
-            void                CE_set(uint8_t p_event);                // set button enter           
-            //
-            void                CE_resetAll(void);                      // reset all button states
-            void                CE_reset(uint8_t p_event);              // reset enter button state            
-            //
-            bool                CE_checkAny(void);                      // check if any button was pressed
-            bool                CE_check(uint8_t p_event);              // check enter button
-            //
-            void                CE_setOnChangeCbFunction(uint8_t p_event, LCDML_FuncPtr_pu8 p_function);    // add callback function
-            void                CE_clearOnChangeCbFunction(uint8_t p_event);                                // remove callback function
-           
-            // display methods
-            void                DISP_update(void);                                  // display the content and update the menu structure 
-            void                DISP_menuUpdate(void);                              // display the content but do not update the menu structure
-            void                DISP_clear(void);                                   // calls the callback function to clear the display
-            bool                DISP_checkMenuUpdate(void);                         // check if there is new content to display
-            bool                DISP_checkMenuCursorUpdate(void);                   // check if the cursor was moved
-            uint8_t             DISP_getMenuContentId(uint8_t n);                   // get the id`s from a contentelement for a special line 
-
-            // menu function methods
-            bool                FUNC_setup(void);                                   // check if a menu function is called the first time to init some things
-            bool                FUNC_loop(void);                                    // check if a menu function is running in a loop
-            bool                FUNC_close(void);                                   // check if a menu function is closed to reach a stable state                     
-            void                FUNC_goBackToMenu(uint8_t p_goBackCnt=0);           // close the current menu function (the FUNC_close check is true when this is set)
-            uint8_t             FUNC_getID(void);                                   // get the ID of the current menu function
-            void                FUNC_setLoopInterval(unsigned long p_t);            // set a loop intervall for the current menu function the default loop intervall is 100000000 ms
-            void                FUNC_disableScreensaver(void);                      // disable the screensaver for the current menu function 
-            void                FUNC_setGBAToLastCursorPos(void);                   // set a special "go back handling" 
-            void                FUNC_setGBAToLastFunc(void);                        // set a special "go back handling"
-            void                FUNC_setGBA(void);                                  // set a special "go back handling" which decide between the two function above 
-            void                FUNC_setCEMask(unsigned long p_mask);               // set a mask to enable only special events for a menu function
-            
-            // timer methods
-            bool                TIMER_ms(unsigned long &p_var, unsigned long p_t);  // a small timer based on the millis() function
-            void                TIMER_msReset(unsigned long &p_var);                // reset the millis timer 
-            bool                TIMER_us(unsigned long &p_var, unsigned long p_t);  // a small timer based on the micros() function
-            void                TIMER_usReset(unsigned long &p_var);                // reset the micros timer
-
-            // other methods
-            void                OTHER_jumpToFunc(LCDML_FuncPtr_pu8 p_search, uint8_t p_para = 0);   // jumpTo a defined function based on the function name 
-            void                OTHER_jumpToID(uint8_t p_search, uint8_t p_para = 0);               // jumpTo a defined function based on the function id
-            void                OTHER_setCursorToID(uint8_t p_search);                              // set the cursor to a defined function based on the id
-            void                OTHER_setCursorToFunc(LCDML_FuncPtr_pu8 p_search);                  // set the cursor to a defined function based on the function name
-            uint8_t             OTHER_getIDFromFunction(LCDML_FuncPtr_pu8 p_search);                // get the menu element id from a menu element function name 
-            void                OTHER_updateFunc(void);                                             // update a menu function directly when it runs             
-
-            // screensaver methods
-            void                SCREEN_enable(LCDML_FuncPtr_pu8 p_function, unsigned long p_t);     // enable the screensaver feature 
-            void                SCREEN_disable(void);                                               // disable the screensaver feature
-            void                SCREEN_resetTimer(void);                                            // reset the screensaver timer 
-            void                SCREEN_start(void);                                                 // start the screensaver directly
-    };
-#endif
diff --git a/third-party/LCDMenuLib2.old/src/LCDMenuLib2_macros.h b/third-party/LCDMenuLib2.old/src/LCDMenuLib2_macros.h
deleted file mode 100644
index d962ed3..0000000
--- a/third-party/LCDMenuLib2.old/src/LCDMenuLib2_macros.h
+++ /dev/null
@@ -1,662 +0,0 @@
-/* ******************************************************************************
- *                        LCDMenuLib2 (LCDML)
- * ******************************************************************************
- *
- * MIT License
- *
- * Copyright (c) [2020] [Nils Feldkämper]
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * ******************************************************************************
- *
- * BUG / ISSUES REPORTING
- *    https://github.com/Jomelo/LCDMenuLib2/issues
- *
- * ARDUINO FORUM
- *    http://forum.arduino.cc/index.php?topic=73816.0
- *
- * ******************************************************************************
- */
-
-#ifndef _LCDML_macros_h
-    #define _LCDML_macros_h
-
-    /* ------------------
-     * Include Arduino IOS
-     * ------------------
-     */
-    #include <Arduino.h>
-
-
-    /* ------------------
-     * DISP / MENU
-     * ------------------
-     */
-
-    // get global language variable for name xyz
-    #define LCDML_DISP_lang(name, lang)           g_LCDML_DISP_lang_ ## lang ## _ ## name ## _var
-
-    // call repeat of function
-    #define LCDML_DISP_initFunction(N)      LCDML_DISP_func_repeat(N);
-
-    #ifndef _LCDML_cfg_use_ram
-        // stored in flash (Arduino)
-        #define LCDML_langDef(name, lang, content) \
-            const char g_LCDML_DISP_lang_ ## lang ## _ ## name ##_var[] PROGMEM = {content}
-
-         #define LCDML_getCustomContent(lang, var, id) \
-            if(id < _LCDML_NO_FUNC) {\
-                strcpy_P(var, (char*)pgm_read_word(&(g_LCDML_DISP_lang_ ## lang ## _table[id]))); \
-            }     
-
-        #define LCDML_createCustomLang(N, lang) \
-            const char * const g_LCDML_DISP_lang_ ## lang ## _table[] PROGMEM = { LCDML_DISP_lang_repeat(N, lang) }
-
-        #define LCDML_getCustomElementName(lang, var, element_id) \
-            if(element_id < _LCDML_NO_FUNC && (sizeof(g_LCDML_DISP_lang_ ## lang ## _table)-1) >= element_id) {\
-                strcpy_P(var, (char*)pgm_read_word(&(g_LCDML_DISP_lang_ ## lang ## _table[element_id])));\
-            }
-
-    #else
-        // stored in ram (esp, stm, other controllers)
-        #define LCDML_langDef(name, lang, content) \
-            char g_LCDML_DISP_lang_ ## lang ## _ ## name ##_var[] = {content}       
-
-        #define LCDML_getCustomContent(lang, var, id) \
-            if(id < _LCDML_NO_FUNC) {\
-                strcpy(var, g_LCDML_DISP_lang_ ## lang ## _table[id]); \
-            }
-
-         #define LCDML_createCustomLang(N, lang) \
-            char * g_LCDML_DISP_lang_ ## lang ## _table[] = { LCDML_DISP_lang_repeat(N, lang) }
-
-        #define LCDML_getCustomElementName(lang, var, element_id) \
-            if(element_id < _LCDML_NO_FUNC && (sizeof(g_LCDML_DISP_lang_ ## lang ## _table)-1) >= element_id) {\
-                strcpy(var, g_LCDML_DISP_lang_ ## lang ## _table[element_id]);\
-            }
-
-    #endif
-
-    #define LCDML_getElementName(var, element_id) \
-        LCDML_getCustomElementName(lcdml, var, element_id)
-
-    #define LCDML_createMenu(N)\
-        LCDML_createCustomLang(N, lcdml)        
-
-    #define LCDML_getContent(var, id) \
-        LCDML_getCustomContent(lcdml, var, id)
-
-    //Menu Item Types
-    #ifndef _LCDML_cfg_not_use_arduino_ide
-    #define LCDML_addAdvanced(id, parent, child, p_condition, p_content, p_callback, p_param, p_settings) \
-        LCDML_langDef(id, lcdml, p_content); \
-        LCDMenuLib2_menu parent ## _ ## child(id, p_param, p_settings, p_callback, p_condition ); \
-        void LCDML_DISP_ ## id ## _function() { \
-            parent.addChild(parent ## _ ## child); \
-        }
-    #else
-    #define LCDML_addAdvanced(id, parent, child, p_condition, p_content, p_callback, p_param, p_settings) \
-        LCDML_langDef(id, lcdml, p_content); \
-        static LCDMenuLib2_menu parent ## _ ## child(id, p_param, p_settings, p_callback, p_condition ); \
-        static void LCDML_DISP_ ## id ## _function() { \
-            parent.addChild(parent ## _ ## child); \
-        }
-    #endif
-
-    #define LCDML_add(id, parent, child, content, callback) \
-        LCDML_addAdvanced(id, parent, child, NULL, content, callback, 0, _LCDML_TYPE_default)
-
-    #define LCDML_setup(N)\
-        LCDML_DISP_initFunction(N); \
-        LCDML.init(N)
-        
-
-
-    /* ---------------------------------------
-     * lang repeat
-     * ---------------------------------------
-     */
-    #define LCDML_DISP_lang_repeat_255(lang) LCDML_DISP_lang_repeat_254(lang) LCDML_DISP_lang(255, lang),
-    #define LCDML_DISP_lang_repeat_254(lang) LCDML_DISP_lang_repeat_253(lang) LCDML_DISP_lang(254, lang),
-    #define LCDML_DISP_lang_repeat_253(lang) LCDML_DISP_lang_repeat_252(lang) LCDML_DISP_lang(253, lang),
-    #define LCDML_DISP_lang_repeat_252(lang) LCDML_DISP_lang_repeat_251(lang) LCDML_DISP_lang(252, lang),
-    #define LCDML_DISP_lang_repeat_251(lang) LCDML_DISP_lang_repeat_250(lang) LCDML_DISP_lang(251, lang),
-    #define LCDML_DISP_lang_repeat_250(lang) LCDML_DISP_lang_repeat_249(lang) LCDML_DISP_lang(250, lang),
-    #define LCDML_DISP_lang_repeat_249(lang) LCDML_DISP_lang_repeat_248(lang) LCDML_DISP_lang(249, lang),
-    #define LCDML_DISP_lang_repeat_248(lang) LCDML_DISP_lang_repeat_247(lang) LCDML_DISP_lang(248, lang),
-    #define LCDML_DISP_lang_repeat_247(lang) LCDML_DISP_lang_repeat_246(lang) LCDML_DISP_lang(247, lang),
-    #define LCDML_DISP_lang_repeat_246(lang) LCDML_DISP_lang_repeat_245(lang) LCDML_DISP_lang(246, lang),
-    #define LCDML_DISP_lang_repeat_245(lang) LCDML_DISP_lang_repeat_244(lang) LCDML_DISP_lang(245, lang),
-    #define LCDML_DISP_lang_repeat_244(lang) LCDML_DISP_lang_repeat_243(lang) LCDML_DISP_lang(244, lang),
-    #define LCDML_DISP_lang_repeat_243(lang) LCDML_DISP_lang_repeat_242(lang) LCDML_DISP_lang(243, lang),
-    #define LCDML_DISP_lang_repeat_242(lang) LCDML_DISP_lang_repeat_241(lang) LCDML_DISP_lang(242, lang),
-    #define LCDML_DISP_lang_repeat_241(lang) LCDML_DISP_lang_repeat_240(lang) LCDML_DISP_lang(241, lang),
-    #define LCDML_DISP_lang_repeat_240(lang) LCDML_DISP_lang_repeat_239(lang) LCDML_DISP_lang(240, lang),
-    #define LCDML_DISP_lang_repeat_239(lang) LCDML_DISP_lang_repeat_238(lang) LCDML_DISP_lang(239, lang),
-    #define LCDML_DISP_lang_repeat_238(lang) LCDML_DISP_lang_repeat_237(lang) LCDML_DISP_lang(238, lang),
-    #define LCDML_DISP_lang_repeat_237(lang) LCDML_DISP_lang_repeat_236(lang) LCDML_DISP_lang(237, lang),
-    #define LCDML_DISP_lang_repeat_236(lang) LCDML_DISP_lang_repeat_235(lang) LCDML_DISP_lang(236, lang),
-    #define LCDML_DISP_lang_repeat_235(lang) LCDML_DISP_lang_repeat_234(lang) LCDML_DISP_lang(235, lang),
-    #define LCDML_DISP_lang_repeat_234(lang) LCDML_DISP_lang_repeat_233(lang) LCDML_DISP_lang(234, lang),
-    #define LCDML_DISP_lang_repeat_233(lang) LCDML_DISP_lang_repeat_232(lang) LCDML_DISP_lang(233, lang),
-    #define LCDML_DISP_lang_repeat_232(lang) LCDML_DISP_lang_repeat_231(lang) LCDML_DISP_lang(232, lang),
-    #define LCDML_DISP_lang_repeat_231(lang) LCDML_DISP_lang_repeat_230(lang) LCDML_DISP_lang(231, lang),
-    #define LCDML_DISP_lang_repeat_230(lang) LCDML_DISP_lang_repeat_229(lang) LCDML_DISP_lang(230, lang),
-    #define LCDML_DISP_lang_repeat_229(lang) LCDML_DISP_lang_repeat_228(lang) LCDML_DISP_lang(229, lang),
-    #define LCDML_DISP_lang_repeat_228(lang) LCDML_DISP_lang_repeat_227(lang) LCDML_DISP_lang(228, lang),
-    #define LCDML_DISP_lang_repeat_227(lang) LCDML_DISP_lang_repeat_226(lang) LCDML_DISP_lang(227, lang),
-    #define LCDML_DISP_lang_repeat_226(lang) LCDML_DISP_lang_repeat_225(lang) LCDML_DISP_lang(226, lang),
-    #define LCDML_DISP_lang_repeat_225(lang) LCDML_DISP_lang_repeat_224(lang) LCDML_DISP_lang(225, lang),
-    #define LCDML_DISP_lang_repeat_224(lang) LCDML_DISP_lang_repeat_223(lang) LCDML_DISP_lang(224, lang),
-    #define LCDML_DISP_lang_repeat_223(lang) LCDML_DISP_lang_repeat_222(lang) LCDML_DISP_lang(223, lang),
-    #define LCDML_DISP_lang_repeat_222(lang) LCDML_DISP_lang_repeat_221(lang) LCDML_DISP_lang(222, lang),
-    #define LCDML_DISP_lang_repeat_221(lang) LCDML_DISP_lang_repeat_220(lang) LCDML_DISP_lang(221, lang),
-    #define LCDML_DISP_lang_repeat_220(lang) LCDML_DISP_lang_repeat_219(lang) LCDML_DISP_lang(220, lang),
-    #define LCDML_DISP_lang_repeat_219(lang) LCDML_DISP_lang_repeat_218(lang) LCDML_DISP_lang(219, lang),
-    #define LCDML_DISP_lang_repeat_218(lang) LCDML_DISP_lang_repeat_217(lang) LCDML_DISP_lang(218, lang),
-    #define LCDML_DISP_lang_repeat_217(lang) LCDML_DISP_lang_repeat_216(lang) LCDML_DISP_lang(217, lang),
-    #define LCDML_DISP_lang_repeat_216(lang) LCDML_DISP_lang_repeat_215(lang) LCDML_DISP_lang(216, lang),
-    #define LCDML_DISP_lang_repeat_215(lang) LCDML_DISP_lang_repeat_214(lang) LCDML_DISP_lang(215, lang),
-    #define LCDML_DISP_lang_repeat_214(lang) LCDML_DISP_lang_repeat_213(lang) LCDML_DISP_lang(214, lang),
-    #define LCDML_DISP_lang_repeat_213(lang) LCDML_DISP_lang_repeat_212(lang) LCDML_DISP_lang(213, lang),
-    #define LCDML_DISP_lang_repeat_212(lang) LCDML_DISP_lang_repeat_211(lang) LCDML_DISP_lang(212, lang),
-    #define LCDML_DISP_lang_repeat_211(lang) LCDML_DISP_lang_repeat_210(lang) LCDML_DISP_lang(211, lang),
-    #define LCDML_DISP_lang_repeat_210(lang) LCDML_DISP_lang_repeat_209(lang) LCDML_DISP_lang(210, lang),
-    #define LCDML_DISP_lang_repeat_209(lang) LCDML_DISP_lang_repeat_208(lang) LCDML_DISP_lang(209, lang),
-    #define LCDML_DISP_lang_repeat_208(lang) LCDML_DISP_lang_repeat_207(lang) LCDML_DISP_lang(208, lang),
-    #define LCDML_DISP_lang_repeat_207(lang) LCDML_DISP_lang_repeat_206(lang) LCDML_DISP_lang(207, lang),
-    #define LCDML_DISP_lang_repeat_206(lang) LCDML_DISP_lang_repeat_205(lang) LCDML_DISP_lang(206, lang),
-    #define LCDML_DISP_lang_repeat_205(lang) LCDML_DISP_lang_repeat_204(lang) LCDML_DISP_lang(205, lang),
-    #define LCDML_DISP_lang_repeat_204(lang) LCDML_DISP_lang_repeat_203(lang) LCDML_DISP_lang(204, lang),
-    #define LCDML_DISP_lang_repeat_203(lang) LCDML_DISP_lang_repeat_202(lang) LCDML_DISP_lang(203, lang),
-    #define LCDML_DISP_lang_repeat_202(lang) LCDML_DISP_lang_repeat_201(lang) LCDML_DISP_lang(202, lang),
-    #define LCDML_DISP_lang_repeat_201(lang) LCDML_DISP_lang_repeat_200(lang) LCDML_DISP_lang(201, lang),
-    #define LCDML_DISP_lang_repeat_200(lang) LCDML_DISP_lang_repeat_199(lang) LCDML_DISP_lang(200, lang),
-    #define LCDML_DISP_lang_repeat_199(lang) LCDML_DISP_lang_repeat_198(lang) LCDML_DISP_lang(199, lang),
-    #define LCDML_DISP_lang_repeat_198(lang) LCDML_DISP_lang_repeat_197(lang) LCDML_DISP_lang(198, lang),
-    #define LCDML_DISP_lang_repeat_197(lang) LCDML_DISP_lang_repeat_196(lang) LCDML_DISP_lang(197, lang),
-    #define LCDML_DISP_lang_repeat_196(lang) LCDML_DISP_lang_repeat_195(lang) LCDML_DISP_lang(196, lang),
-    #define LCDML_DISP_lang_repeat_195(lang) LCDML_DISP_lang_repeat_194(lang) LCDML_DISP_lang(195, lang),
-    #define LCDML_DISP_lang_repeat_194(lang) LCDML_DISP_lang_repeat_193(lang) LCDML_DISP_lang(194, lang),
-    #define LCDML_DISP_lang_repeat_193(lang) LCDML_DISP_lang_repeat_192(lang) LCDML_DISP_lang(193, lang),
-    #define LCDML_DISP_lang_repeat_192(lang) LCDML_DISP_lang_repeat_191(lang) LCDML_DISP_lang(192, lang),
-    #define LCDML_DISP_lang_repeat_191(lang) LCDML_DISP_lang_repeat_190(lang) LCDML_DISP_lang(191, lang),
-    #define LCDML_DISP_lang_repeat_190(lang) LCDML_DISP_lang_repeat_189(lang) LCDML_DISP_lang(190, lang),
-    #define LCDML_DISP_lang_repeat_189(lang) LCDML_DISP_lang_repeat_188(lang) LCDML_DISP_lang(189, lang),
-    #define LCDML_DISP_lang_repeat_188(lang) LCDML_DISP_lang_repeat_187(lang) LCDML_DISP_lang(188, lang),
-    #define LCDML_DISP_lang_repeat_187(lang) LCDML_DISP_lang_repeat_186(lang) LCDML_DISP_lang(187, lang),
-    #define LCDML_DISP_lang_repeat_186(lang) LCDML_DISP_lang_repeat_185(lang) LCDML_DISP_lang(186, lang),
-    #define LCDML_DISP_lang_repeat_185(lang) LCDML_DISP_lang_repeat_184(lang) LCDML_DISP_lang(185, lang),
-    #define LCDML_DISP_lang_repeat_184(lang) LCDML_DISP_lang_repeat_183(lang) LCDML_DISP_lang(184, lang),
-    #define LCDML_DISP_lang_repeat_183(lang) LCDML_DISP_lang_repeat_182(lang) LCDML_DISP_lang(183, lang),
-    #define LCDML_DISP_lang_repeat_182(lang) LCDML_DISP_lang_repeat_181(lang) LCDML_DISP_lang(182, lang),
-    #define LCDML_DISP_lang_repeat_181(lang) LCDML_DISP_lang_repeat_180(lang) LCDML_DISP_lang(181, lang),
-    #define LCDML_DISP_lang_repeat_180(lang) LCDML_DISP_lang_repeat_179(lang) LCDML_DISP_lang(180, lang),
-    #define LCDML_DISP_lang_repeat_179(lang) LCDML_DISP_lang_repeat_178(lang) LCDML_DISP_lang(179, lang),
-    #define LCDML_DISP_lang_repeat_178(lang) LCDML_DISP_lang_repeat_177(lang) LCDML_DISP_lang(178, lang),
-    #define LCDML_DISP_lang_repeat_177(lang) LCDML_DISP_lang_repeat_176(lang) LCDML_DISP_lang(177, lang),
-    #define LCDML_DISP_lang_repeat_176(lang) LCDML_DISP_lang_repeat_175(lang) LCDML_DISP_lang(176, lang),
-    #define LCDML_DISP_lang_repeat_175(lang) LCDML_DISP_lang_repeat_174(lang) LCDML_DISP_lang(175, lang),
-    #define LCDML_DISP_lang_repeat_174(lang) LCDML_DISP_lang_repeat_173(lang) LCDML_DISP_lang(174, lang),
-    #define LCDML_DISP_lang_repeat_173(lang) LCDML_DISP_lang_repeat_172(lang) LCDML_DISP_lang(173, lang),
-    #define LCDML_DISP_lang_repeat_172(lang) LCDML_DISP_lang_repeat_171(lang) LCDML_DISP_lang(172, lang),
-    #define LCDML_DISP_lang_repeat_171(lang) LCDML_DISP_lang_repeat_170(lang) LCDML_DISP_lang(171, lang),
-    #define LCDML_DISP_lang_repeat_170(lang) LCDML_DISP_lang_repeat_169(lang) LCDML_DISP_lang(170, lang),
-    #define LCDML_DISP_lang_repeat_169(lang) LCDML_DISP_lang_repeat_168(lang) LCDML_DISP_lang(169, lang),
-    #define LCDML_DISP_lang_repeat_168(lang) LCDML_DISP_lang_repeat_167(lang) LCDML_DISP_lang(168, lang),
-    #define LCDML_DISP_lang_repeat_167(lang) LCDML_DISP_lang_repeat_166(lang) LCDML_DISP_lang(167, lang),
-    #define LCDML_DISP_lang_repeat_166(lang) LCDML_DISP_lang_repeat_165(lang) LCDML_DISP_lang(166, lang),
-    #define LCDML_DISP_lang_repeat_165(lang) LCDML_DISP_lang_repeat_164(lang) LCDML_DISP_lang(165, lang),
-    #define LCDML_DISP_lang_repeat_164(lang) LCDML_DISP_lang_repeat_163(lang) LCDML_DISP_lang(164, lang),
-    #define LCDML_DISP_lang_repeat_163(lang) LCDML_DISP_lang_repeat_162(lang) LCDML_DISP_lang(163, lang),
-    #define LCDML_DISP_lang_repeat_162(lang) LCDML_DISP_lang_repeat_161(lang) LCDML_DISP_lang(162, lang),
-    #define LCDML_DISP_lang_repeat_161(lang) LCDML_DISP_lang_repeat_160(lang) LCDML_DISP_lang(161, lang),
-    #define LCDML_DISP_lang_repeat_160(lang) LCDML_DISP_lang_repeat_159(lang) LCDML_DISP_lang(160, lang),
-    #define LCDML_DISP_lang_repeat_159(lang) LCDML_DISP_lang_repeat_158(lang) LCDML_DISP_lang(159, lang),
-    #define LCDML_DISP_lang_repeat_158(lang) LCDML_DISP_lang_repeat_157(lang) LCDML_DISP_lang(158, lang),
-    #define LCDML_DISP_lang_repeat_157(lang) LCDML_DISP_lang_repeat_156(lang) LCDML_DISP_lang(157, lang),
-    #define LCDML_DISP_lang_repeat_156(lang) LCDML_DISP_lang_repeat_155(lang) LCDML_DISP_lang(156, lang),
-    #define LCDML_DISP_lang_repeat_155(lang) LCDML_DISP_lang_repeat_154(lang) LCDML_DISP_lang(155, lang),
-    #define LCDML_DISP_lang_repeat_154(lang) LCDML_DISP_lang_repeat_153(lang) LCDML_DISP_lang(154, lang),
-    #define LCDML_DISP_lang_repeat_153(lang) LCDML_DISP_lang_repeat_152(lang) LCDML_DISP_lang(153, lang),
-    #define LCDML_DISP_lang_repeat_152(lang) LCDML_DISP_lang_repeat_151(lang) LCDML_DISP_lang(152, lang),
-    #define LCDML_DISP_lang_repeat_151(lang) LCDML_DISP_lang_repeat_150(lang) LCDML_DISP_lang(151, lang),
-    #define LCDML_DISP_lang_repeat_150(lang) LCDML_DISP_lang_repeat_149(lang) LCDML_DISP_lang(150, lang),
-    #define LCDML_DISP_lang_repeat_149(lang) LCDML_DISP_lang_repeat_148(lang) LCDML_DISP_lang(149, lang),
-    #define LCDML_DISP_lang_repeat_148(lang) LCDML_DISP_lang_repeat_147(lang) LCDML_DISP_lang(148, lang),
-    #define LCDML_DISP_lang_repeat_147(lang) LCDML_DISP_lang_repeat_146(lang) LCDML_DISP_lang(147, lang),
-    #define LCDML_DISP_lang_repeat_146(lang) LCDML_DISP_lang_repeat_145(lang) LCDML_DISP_lang(146, lang),
-    #define LCDML_DISP_lang_repeat_145(lang) LCDML_DISP_lang_repeat_144(lang) LCDML_DISP_lang(145, lang),
-    #define LCDML_DISP_lang_repeat_144(lang) LCDML_DISP_lang_repeat_143(lang) LCDML_DISP_lang(144, lang),
-    #define LCDML_DISP_lang_repeat_143(lang) LCDML_DISP_lang_repeat_142(lang) LCDML_DISP_lang(143, lang),
-    #define LCDML_DISP_lang_repeat_142(lang) LCDML_DISP_lang_repeat_141(lang) LCDML_DISP_lang(142, lang),
-    #define LCDML_DISP_lang_repeat_141(lang) LCDML_DISP_lang_repeat_140(lang) LCDML_DISP_lang(141, lang),
-    #define LCDML_DISP_lang_repeat_140(lang) LCDML_DISP_lang_repeat_139(lang) LCDML_DISP_lang(140, lang),
-    #define LCDML_DISP_lang_repeat_139(lang) LCDML_DISP_lang_repeat_138(lang) LCDML_DISP_lang(139, lang),
-    #define LCDML_DISP_lang_repeat_138(lang) LCDML_DISP_lang_repeat_137(lang) LCDML_DISP_lang(138, lang),
-    #define LCDML_DISP_lang_repeat_137(lang) LCDML_DISP_lang_repeat_136(lang) LCDML_DISP_lang(137, lang),
-    #define LCDML_DISP_lang_repeat_136(lang) LCDML_DISP_lang_repeat_135(lang) LCDML_DISP_lang(136, lang),
-    #define LCDML_DISP_lang_repeat_135(lang) LCDML_DISP_lang_repeat_134(lang) LCDML_DISP_lang(135, lang),
-    #define LCDML_DISP_lang_repeat_134(lang) LCDML_DISP_lang_repeat_133(lang) LCDML_DISP_lang(134, lang),
-    #define LCDML_DISP_lang_repeat_133(lang) LCDML_DISP_lang_repeat_132(lang) LCDML_DISP_lang(133, lang),
-    #define LCDML_DISP_lang_repeat_132(lang) LCDML_DISP_lang_repeat_131(lang) LCDML_DISP_lang(132, lang),
-    #define LCDML_DISP_lang_repeat_131(lang) LCDML_DISP_lang_repeat_130(lang) LCDML_DISP_lang(131, lang),
-    #define LCDML_DISP_lang_repeat_130(lang) LCDML_DISP_lang_repeat_129(lang) LCDML_DISP_lang(130, lang),
-    #define LCDML_DISP_lang_repeat_129(lang) LCDML_DISP_lang_repeat_128(lang) LCDML_DISP_lang(129, lang),
-    #define LCDML_DISP_lang_repeat_128(lang) LCDML_DISP_lang_repeat_127(lang) LCDML_DISP_lang(128, lang),
-    #define LCDML_DISP_lang_repeat_127(lang) LCDML_DISP_lang_repeat_126(lang) LCDML_DISP_lang(127, lang),
-    #define LCDML_DISP_lang_repeat_126(lang) LCDML_DISP_lang_repeat_125(lang) LCDML_DISP_lang(126, lang),
-    #define LCDML_DISP_lang_repeat_125(lang) LCDML_DISP_lang_repeat_124(lang) LCDML_DISP_lang(125, lang),
-    #define LCDML_DISP_lang_repeat_124(lang) LCDML_DISP_lang_repeat_123(lang) LCDML_DISP_lang(124, lang),
-    #define LCDML_DISP_lang_repeat_123(lang) LCDML_DISP_lang_repeat_122(lang) LCDML_DISP_lang(123, lang),
-    #define LCDML_DISP_lang_repeat_122(lang) LCDML_DISP_lang_repeat_121(lang) LCDML_DISP_lang(122, lang),
-    #define LCDML_DISP_lang_repeat_121(lang) LCDML_DISP_lang_repeat_120(lang) LCDML_DISP_lang(121, lang),
-    #define LCDML_DISP_lang_repeat_120(lang) LCDML_DISP_lang_repeat_119(lang) LCDML_DISP_lang(120, lang),
-    #define LCDML_DISP_lang_repeat_119(lang) LCDML_DISP_lang_repeat_118(lang) LCDML_DISP_lang(119, lang),
-    #define LCDML_DISP_lang_repeat_118(lang) LCDML_DISP_lang_repeat_117(lang) LCDML_DISP_lang(118, lang),
-    #define LCDML_DISP_lang_repeat_117(lang) LCDML_DISP_lang_repeat_116(lang) LCDML_DISP_lang(117, lang),
-    #define LCDML_DISP_lang_repeat_116(lang) LCDML_DISP_lang_repeat_115(lang) LCDML_DISP_lang(116, lang),
-    #define LCDML_DISP_lang_repeat_115(lang) LCDML_DISP_lang_repeat_114(lang) LCDML_DISP_lang(115, lang),
-    #define LCDML_DISP_lang_repeat_114(lang) LCDML_DISP_lang_repeat_113(lang) LCDML_DISP_lang(114, lang),
-    #define LCDML_DISP_lang_repeat_113(lang) LCDML_DISP_lang_repeat_112(lang) LCDML_DISP_lang(113, lang),
-    #define LCDML_DISP_lang_repeat_112(lang) LCDML_DISP_lang_repeat_111(lang) LCDML_DISP_lang(112, lang),
-    #define LCDML_DISP_lang_repeat_111(lang) LCDML_DISP_lang_repeat_110(lang) LCDML_DISP_lang(111, lang),
-    #define LCDML_DISP_lang_repeat_110(lang) LCDML_DISP_lang_repeat_109(lang) LCDML_DISP_lang(110, lang),
-    #define LCDML_DISP_lang_repeat_109(lang) LCDML_DISP_lang_repeat_108(lang) LCDML_DISP_lang(109, lang),
-    #define LCDML_DISP_lang_repeat_108(lang) LCDML_DISP_lang_repeat_107(lang) LCDML_DISP_lang(108, lang),
-    #define LCDML_DISP_lang_repeat_107(lang) LCDML_DISP_lang_repeat_106(lang) LCDML_DISP_lang(107, lang),
-    #define LCDML_DISP_lang_repeat_106(lang) LCDML_DISP_lang_repeat_105(lang) LCDML_DISP_lang(106, lang),
-    #define LCDML_DISP_lang_repeat_105(lang) LCDML_DISP_lang_repeat_104(lang) LCDML_DISP_lang(105, lang),
-    #define LCDML_DISP_lang_repeat_104(lang) LCDML_DISP_lang_repeat_103(lang) LCDML_DISP_lang(104, lang),
-    #define LCDML_DISP_lang_repeat_103(lang) LCDML_DISP_lang_repeat_102(lang) LCDML_DISP_lang(103, lang),
-    #define LCDML_DISP_lang_repeat_102(lang) LCDML_DISP_lang_repeat_101(lang) LCDML_DISP_lang(102, lang),
-    #define LCDML_DISP_lang_repeat_101(lang) LCDML_DISP_lang_repeat_100(lang) LCDML_DISP_lang(101, lang),
-    #define LCDML_DISP_lang_repeat_100(lang) LCDML_DISP_lang_repeat_99(lang)  LCDML_DISP_lang(100, lang),
-    #define LCDML_DISP_lang_repeat_99(lang)  LCDML_DISP_lang_repeat_98(lang)  LCDML_DISP_lang(99, lang),
-    #define LCDML_DISP_lang_repeat_98(lang)  LCDML_DISP_lang_repeat_97(lang)  LCDML_DISP_lang(98, lang),
-    #define LCDML_DISP_lang_repeat_97(lang)  LCDML_DISP_lang_repeat_96(lang)  LCDML_DISP_lang(97, lang),
-    #define LCDML_DISP_lang_repeat_96(lang)  LCDML_DISP_lang_repeat_95(lang)  LCDML_DISP_lang(96, lang),
-    #define LCDML_DISP_lang_repeat_95(lang)  LCDML_DISP_lang_repeat_94(lang)  LCDML_DISP_lang(95, lang),
-    #define LCDML_DISP_lang_repeat_94(lang)  LCDML_DISP_lang_repeat_93(lang)  LCDML_DISP_lang(94, lang),
-    #define LCDML_DISP_lang_repeat_93(lang)  LCDML_DISP_lang_repeat_92(lang)  LCDML_DISP_lang(93, lang),
-    #define LCDML_DISP_lang_repeat_92(lang)  LCDML_DISP_lang_repeat_91(lang)  LCDML_DISP_lang(92, lang),
-    #define LCDML_DISP_lang_repeat_91(lang)  LCDML_DISP_lang_repeat_90(lang)  LCDML_DISP_lang(91, lang),
-    #define LCDML_DISP_lang_repeat_90(lang)  LCDML_DISP_lang_repeat_89(lang)  LCDML_DISP_lang(90, lang),
-    #define LCDML_DISP_lang_repeat_89(lang)  LCDML_DISP_lang_repeat_88(lang)  LCDML_DISP_lang(89, lang),
-    #define LCDML_DISP_lang_repeat_88(lang)  LCDML_DISP_lang_repeat_87(lang)  LCDML_DISP_lang(88, lang),
-    #define LCDML_DISP_lang_repeat_87(lang)  LCDML_DISP_lang_repeat_86(lang)  LCDML_DISP_lang(87, lang),
-    #define LCDML_DISP_lang_repeat_86(lang)  LCDML_DISP_lang_repeat_85(lang)  LCDML_DISP_lang(86, lang),
-    #define LCDML_DISP_lang_repeat_85(lang)  LCDML_DISP_lang_repeat_84(lang)  LCDML_DISP_lang(85, lang),
-    #define LCDML_DISP_lang_repeat_84(lang)  LCDML_DISP_lang_repeat_83(lang)  LCDML_DISP_lang(84, lang),
-    #define LCDML_DISP_lang_repeat_83(lang)  LCDML_DISP_lang_repeat_82(lang)  LCDML_DISP_lang(83, lang),
-    #define LCDML_DISP_lang_repeat_82(lang)  LCDML_DISP_lang_repeat_81(lang)  LCDML_DISP_lang(82, lang),
-    #define LCDML_DISP_lang_repeat_81(lang)  LCDML_DISP_lang_repeat_80(lang)  LCDML_DISP_lang(81, lang),
-    #define LCDML_DISP_lang_repeat_80(lang)  LCDML_DISP_lang_repeat_79(lang)  LCDML_DISP_lang(80, lang),
-    #define LCDML_DISP_lang_repeat_79(lang)  LCDML_DISP_lang_repeat_78(lang)  LCDML_DISP_lang(79, lang),
-    #define LCDML_DISP_lang_repeat_78(lang)  LCDML_DISP_lang_repeat_77(lang)  LCDML_DISP_lang(78, lang),
-    #define LCDML_DISP_lang_repeat_77(lang)  LCDML_DISP_lang_repeat_76(lang)  LCDML_DISP_lang(77, lang),
-    #define LCDML_DISP_lang_repeat_76(lang)  LCDML_DISP_lang_repeat_75(lang)  LCDML_DISP_lang(76, lang),
-    #define LCDML_DISP_lang_repeat_75(lang)  LCDML_DISP_lang_repeat_74(lang)  LCDML_DISP_lang(75, lang),
-    #define LCDML_DISP_lang_repeat_74(lang)  LCDML_DISP_lang_repeat_73(lang)  LCDML_DISP_lang(74, lang),
-    #define LCDML_DISP_lang_repeat_73(lang)  LCDML_DISP_lang_repeat_72(lang)  LCDML_DISP_lang(73, lang),
-    #define LCDML_DISP_lang_repeat_72(lang)  LCDML_DISP_lang_repeat_71(lang)  LCDML_DISP_lang(72, lang),
-    #define LCDML_DISP_lang_repeat_71(lang)  LCDML_DISP_lang_repeat_70(lang)  LCDML_DISP_lang(71, lang),
-    #define LCDML_DISP_lang_repeat_70(lang)  LCDML_DISP_lang_repeat_69(lang)  LCDML_DISP_lang(70, lang),
-    #define LCDML_DISP_lang_repeat_69(lang)  LCDML_DISP_lang_repeat_68(lang)  LCDML_DISP_lang(69, lang),
-    #define LCDML_DISP_lang_repeat_68(lang)  LCDML_DISP_lang_repeat_67(lang)  LCDML_DISP_lang(68, lang),
-    #define LCDML_DISP_lang_repeat_67(lang)  LCDML_DISP_lang_repeat_66(lang)  LCDML_DISP_lang(67, lang),
-    #define LCDML_DISP_lang_repeat_66(lang)  LCDML_DISP_lang_repeat_65(lang)  LCDML_DISP_lang(66, lang),
-    #define LCDML_DISP_lang_repeat_65(lang)  LCDML_DISP_lang_repeat_64(lang)  LCDML_DISP_lang(65, lang),
-    #define LCDML_DISP_lang_repeat_64(lang)  LCDML_DISP_lang_repeat_63(lang)  LCDML_DISP_lang(64, lang),
-    #define LCDML_DISP_lang_repeat_63(lang)  LCDML_DISP_lang_repeat_62(lang)  LCDML_DISP_lang(63, lang),
-    #define LCDML_DISP_lang_repeat_62(lang)  LCDML_DISP_lang_repeat_61(lang)  LCDML_DISP_lang(62, lang),
-    #define LCDML_DISP_lang_repeat_61(lang)  LCDML_DISP_lang_repeat_60(lang)  LCDML_DISP_lang(61, lang),
-    #define LCDML_DISP_lang_repeat_60(lang)  LCDML_DISP_lang_repeat_59(lang)  LCDML_DISP_lang(60, lang),
-    #define LCDML_DISP_lang_repeat_59(lang)  LCDML_DISP_lang_repeat_58(lang)  LCDML_DISP_lang(59, lang),
-    #define LCDML_DISP_lang_repeat_58(lang)  LCDML_DISP_lang_repeat_57(lang)  LCDML_DISP_lang(58, lang),
-    #define LCDML_DISP_lang_repeat_57(lang)  LCDML_DISP_lang_repeat_56(lang)  LCDML_DISP_lang(57, lang),
-    #define LCDML_DISP_lang_repeat_56(lang)  LCDML_DISP_lang_repeat_55(lang)  LCDML_DISP_lang(56, lang),
-    #define LCDML_DISP_lang_repeat_55(lang)  LCDML_DISP_lang_repeat_54(lang)  LCDML_DISP_lang(55, lang),
-    #define LCDML_DISP_lang_repeat_54(lang)  LCDML_DISP_lang_repeat_53(lang)  LCDML_DISP_lang(54, lang),
-    #define LCDML_DISP_lang_repeat_53(lang)  LCDML_DISP_lang_repeat_52(lang)  LCDML_DISP_lang(53, lang),
-    #define LCDML_DISP_lang_repeat_52(lang)  LCDML_DISP_lang_repeat_51(lang)  LCDML_DISP_lang(52, lang),
-    #define LCDML_DISP_lang_repeat_51(lang)  LCDML_DISP_lang_repeat_50(lang)  LCDML_DISP_lang(51, lang),
-    #define LCDML_DISP_lang_repeat_50(lang)  LCDML_DISP_lang_repeat_49(lang)  LCDML_DISP_lang(50, lang),
-    #define LCDML_DISP_lang_repeat_49(lang)  LCDML_DISP_lang_repeat_48(lang)  LCDML_DISP_lang(49, lang),
-    #define LCDML_DISP_lang_repeat_48(lang)  LCDML_DISP_lang_repeat_47(lang)  LCDML_DISP_lang(48, lang),
-    #define LCDML_DISP_lang_repeat_47(lang)  LCDML_DISP_lang_repeat_46(lang)  LCDML_DISP_lang(47, lang),
-    #define LCDML_DISP_lang_repeat_46(lang)  LCDML_DISP_lang_repeat_45(lang)  LCDML_DISP_lang(46, lang),
-    #define LCDML_DISP_lang_repeat_45(lang)  LCDML_DISP_lang_repeat_44(lang)  LCDML_DISP_lang(45, lang),
-    #define LCDML_DISP_lang_repeat_44(lang)  LCDML_DISP_lang_repeat_43(lang)  LCDML_DISP_lang(44, lang),
-    #define LCDML_DISP_lang_repeat_43(lang)  LCDML_DISP_lang_repeat_42(lang)  LCDML_DISP_lang(43, lang),
-    #define LCDML_DISP_lang_repeat_42(lang)  LCDML_DISP_lang_repeat_41(lang)  LCDML_DISP_lang(42, lang),
-    #define LCDML_DISP_lang_repeat_41(lang)  LCDML_DISP_lang_repeat_40(lang)  LCDML_DISP_lang(41, lang),
-    #define LCDML_DISP_lang_repeat_40(lang)  LCDML_DISP_lang_repeat_39(lang)  LCDML_DISP_lang(40, lang),
-    #define LCDML_DISP_lang_repeat_39(lang)  LCDML_DISP_lang_repeat_38(lang)  LCDML_DISP_lang(39, lang),
-    #define LCDML_DISP_lang_repeat_38(lang)  LCDML_DISP_lang_repeat_37(lang)  LCDML_DISP_lang(38, lang),
-    #define LCDML_DISP_lang_repeat_37(lang)  LCDML_DISP_lang_repeat_36(lang)  LCDML_DISP_lang(37, lang),
-    #define LCDML_DISP_lang_repeat_36(lang)  LCDML_DISP_lang_repeat_35(lang)  LCDML_DISP_lang(36, lang),
-    #define LCDML_DISP_lang_repeat_35(lang)  LCDML_DISP_lang_repeat_34(lang)  LCDML_DISP_lang(35, lang),
-    #define LCDML_DISP_lang_repeat_34(lang)  LCDML_DISP_lang_repeat_33(lang)  LCDML_DISP_lang(34, lang),
-    #define LCDML_DISP_lang_repeat_33(lang)  LCDML_DISP_lang_repeat_32(lang)  LCDML_DISP_lang(33, lang),
-    #define LCDML_DISP_lang_repeat_32(lang)  LCDML_DISP_lang_repeat_31(lang)  LCDML_DISP_lang(32, lang),
-    #define LCDML_DISP_lang_repeat_31(lang)  LCDML_DISP_lang_repeat_30(lang)  LCDML_DISP_lang(31, lang),
-    #define LCDML_DISP_lang_repeat_30(lang)  LCDML_DISP_lang_repeat_29(lang)  LCDML_DISP_lang(30, lang),
-    #define LCDML_DISP_lang_repeat_29(lang)  LCDML_DISP_lang_repeat_28(lang)  LCDML_DISP_lang(29, lang),
-    #define LCDML_DISP_lang_repeat_28(lang)  LCDML_DISP_lang_repeat_27(lang)  LCDML_DISP_lang(28, lang),
-    #define LCDML_DISP_lang_repeat_27(lang)  LCDML_DISP_lang_repeat_26(lang)  LCDML_DISP_lang(27, lang),
-    #define LCDML_DISP_lang_repeat_26(lang)  LCDML_DISP_lang_repeat_25(lang)  LCDML_DISP_lang(26, lang),
-    #define LCDML_DISP_lang_repeat_25(lang)  LCDML_DISP_lang_repeat_24(lang)  LCDML_DISP_lang(25, lang),
-    #define LCDML_DISP_lang_repeat_24(lang)  LCDML_DISP_lang_repeat_23(lang)  LCDML_DISP_lang(24, lang),
-    #define LCDML_DISP_lang_repeat_23(lang)  LCDML_DISP_lang_repeat_22(lang)  LCDML_DISP_lang(23, lang),
-    #define LCDML_DISP_lang_repeat_22(lang)  LCDML_DISP_lang_repeat_21(lang)  LCDML_DISP_lang(22, lang),
-    #define LCDML_DISP_lang_repeat_21(lang)  LCDML_DISP_lang_repeat_20(lang)  LCDML_DISP_lang(21, lang),
-    #define LCDML_DISP_lang_repeat_20(lang)  LCDML_DISP_lang_repeat_19(lang)  LCDML_DISP_lang(20, lang),
-    #define LCDML_DISP_lang_repeat_19(lang)  LCDML_DISP_lang_repeat_18(lang)  LCDML_DISP_lang(19, lang),
-    #define LCDML_DISP_lang_repeat_18(lang)  LCDML_DISP_lang_repeat_17(lang)  LCDML_DISP_lang(18, lang),
-    #define LCDML_DISP_lang_repeat_17(lang)  LCDML_DISP_lang_repeat_16(lang)  LCDML_DISP_lang(17, lang),
-    #define LCDML_DISP_lang_repeat_16(lang)  LCDML_DISP_lang_repeat_15(lang)  LCDML_DISP_lang(16, lang),
-    #define LCDML_DISP_lang_repeat_15(lang)  LCDML_DISP_lang_repeat_14(lang)  LCDML_DISP_lang(15, lang),
-    #define LCDML_DISP_lang_repeat_14(lang)  LCDML_DISP_lang_repeat_13(lang)  LCDML_DISP_lang(14, lang),
-    #define LCDML_DISP_lang_repeat_13(lang)  LCDML_DISP_lang_repeat_12(lang)  LCDML_DISP_lang(13, lang),
-    #define LCDML_DISP_lang_repeat_12(lang)  LCDML_DISP_lang_repeat_11(lang)  LCDML_DISP_lang(12, lang),
-    #define LCDML_DISP_lang_repeat_11(lang)  LCDML_DISP_lang_repeat_10(lang)  LCDML_DISP_lang(11, lang),
-    #define LCDML_DISP_lang_repeat_10(lang)  LCDML_DISP_lang_repeat_9(lang)   LCDML_DISP_lang(10, lang),
-    #define LCDML_DISP_lang_repeat_9(lang)   LCDML_DISP_lang_repeat_8(lang)   LCDML_DISP_lang(9, lang),
-    #define LCDML_DISP_lang_repeat_8(lang)   LCDML_DISP_lang_repeat_7(lang)   LCDML_DISP_lang(8, lang),
-    #define LCDML_DISP_lang_repeat_7(lang)   LCDML_DISP_lang_repeat_6(lang)   LCDML_DISP_lang(7, lang),
-    #define LCDML_DISP_lang_repeat_6(lang)   LCDML_DISP_lang_repeat_5(lang)   LCDML_DISP_lang(6, lang),
-    #define LCDML_DISP_lang_repeat_5(lang)   LCDML_DISP_lang_repeat_4(lang)   LCDML_DISP_lang(5, lang),
-    #define LCDML_DISP_lang_repeat_4(lang)   LCDML_DISP_lang_repeat_3(lang)   LCDML_DISP_lang(4, lang),
-    #define LCDML_DISP_lang_repeat_3(lang)   LCDML_DISP_lang_repeat_2(lang)   LCDML_DISP_lang(3, lang),
-    #define LCDML_DISP_lang_repeat_2(lang)   LCDML_DISP_lang_repeat_1(lang)   LCDML_DISP_lang(2, lang),
-    #define LCDML_DISP_lang_repeat_1(lang)   LCDML_DISP_lang_repeat_0(lang)   LCDML_DISP_lang(1, lang),
-    #define LCDML_DISP_lang_repeat_0(lang)   LCDML_DISP_lang(0, lang),
-    #define LCDML_DISP_lang_repeat(N, lang)     LCDML_DISP_lang_repeat_##N (lang)
-
-
-
-
-
-
-
-    /* ---------------------------------------
-     * func repeat
-     * ---------------------------------------
-     */
-    #define LCDML_DISP_func_repeat_255() LCDML_DISP_func_repeat_254() LCDML_DISP_255_function();
-    #define LCDML_DISP_func_repeat_254() LCDML_DISP_func_repeat_253() LCDML_DISP_254_function();
-    #define LCDML_DISP_func_repeat_253() LCDML_DISP_func_repeat_252() LCDML_DISP_253_function();
-    #define LCDML_DISP_func_repeat_252() LCDML_DISP_func_repeat_251() LCDML_DISP_252_function();
-    #define LCDML_DISP_func_repeat_251() LCDML_DISP_func_repeat_250() LCDML_DISP_251_function();
-    #define LCDML_DISP_func_repeat_250() LCDML_DISP_func_repeat_249() LCDML_DISP_250_function();
-    #define LCDML_DISP_func_repeat_249() LCDML_DISP_func_repeat_248() LCDML_DISP_249_function();
-    #define LCDML_DISP_func_repeat_248() LCDML_DISP_func_repeat_247() LCDML_DISP_248_function();
-    #define LCDML_DISP_func_repeat_247() LCDML_DISP_func_repeat_246() LCDML_DISP_247_function();
-    #define LCDML_DISP_func_repeat_246() LCDML_DISP_func_repeat_245() LCDML_DISP_246_function();
-    #define LCDML_DISP_func_repeat_245() LCDML_DISP_func_repeat_244() LCDML_DISP_245_function();
-    #define LCDML_DISP_func_repeat_244() LCDML_DISP_func_repeat_243() LCDML_DISP_244_function();
-    #define LCDML_DISP_func_repeat_243() LCDML_DISP_func_repeat_242() LCDML_DISP_243_function();
-    #define LCDML_DISP_func_repeat_242() LCDML_DISP_func_repeat_241() LCDML_DISP_242_function();
-    #define LCDML_DISP_func_repeat_241() LCDML_DISP_func_repeat_240() LCDML_DISP_241_function();
-    #define LCDML_DISP_func_repeat_240() LCDML_DISP_func_repeat_239() LCDML_DISP_240_function();
-    #define LCDML_DISP_func_repeat_239() LCDML_DISP_func_repeat_238() LCDML_DISP_239_function();
-    #define LCDML_DISP_func_repeat_238() LCDML_DISP_func_repeat_237() LCDML_DISP_238_function();
-    #define LCDML_DISP_func_repeat_237() LCDML_DISP_func_repeat_236() LCDML_DISP_237_function();
-    #define LCDML_DISP_func_repeat_236() LCDML_DISP_func_repeat_235() LCDML_DISP_236_function();
-    #define LCDML_DISP_func_repeat_235() LCDML_DISP_func_repeat_234() LCDML_DISP_235_function();
-    #define LCDML_DISP_func_repeat_234() LCDML_DISP_func_repeat_233() LCDML_DISP_234_function();
-    #define LCDML_DISP_func_repeat_233() LCDML_DISP_func_repeat_232() LCDML_DISP_233_function();
-    #define LCDML_DISP_func_repeat_232() LCDML_DISP_func_repeat_231() LCDML_DISP_232_function();
-    #define LCDML_DISP_func_repeat_231() LCDML_DISP_func_repeat_230() LCDML_DISP_231_function();
-    #define LCDML_DISP_func_repeat_230() LCDML_DISP_func_repeat_229() LCDML_DISP_230_function();
-    #define LCDML_DISP_func_repeat_229() LCDML_DISP_func_repeat_228() LCDML_DISP_229_function();
-    #define LCDML_DISP_func_repeat_228() LCDML_DISP_func_repeat_227() LCDML_DISP_228_function();
-    #define LCDML_DISP_func_repeat_227() LCDML_DISP_func_repeat_226() LCDML_DISP_227_function();
-    #define LCDML_DISP_func_repeat_226() LCDML_DISP_func_repeat_225() LCDML_DISP_226_function();
-    #define LCDML_DISP_func_repeat_225() LCDML_DISP_func_repeat_224() LCDML_DISP_225_function();
-    #define LCDML_DISP_func_repeat_224() LCDML_DISP_func_repeat_223() LCDML_DISP_224_function();
-    #define LCDML_DISP_func_repeat_223() LCDML_DISP_func_repeat_222() LCDML_DISP_223_function();
-    #define LCDML_DISP_func_repeat_222() LCDML_DISP_func_repeat_221() LCDML_DISP_222_function();
-    #define LCDML_DISP_func_repeat_221() LCDML_DISP_func_repeat_220() LCDML_DISP_221_function();
-    #define LCDML_DISP_func_repeat_220() LCDML_DISP_func_repeat_219() LCDML_DISP_220_function();
-    #define LCDML_DISP_func_repeat_219() LCDML_DISP_func_repeat_218() LCDML_DISP_219_function();
-    #define LCDML_DISP_func_repeat_218() LCDML_DISP_func_repeat_217() LCDML_DISP_218_function();
-    #define LCDML_DISP_func_repeat_217() LCDML_DISP_func_repeat_216() LCDML_DISP_217_function();
-    #define LCDML_DISP_func_repeat_216() LCDML_DISP_func_repeat_215() LCDML_DISP_216_function();
-    #define LCDML_DISP_func_repeat_215() LCDML_DISP_func_repeat_214() LCDML_DISP_215_function();
-    #define LCDML_DISP_func_repeat_214() LCDML_DISP_func_repeat_213() LCDML_DISP_214_function();
-    #define LCDML_DISP_func_repeat_213() LCDML_DISP_func_repeat_212() LCDML_DISP_213_function();
-    #define LCDML_DISP_func_repeat_212() LCDML_DISP_func_repeat_211() LCDML_DISP_212_function();
-    #define LCDML_DISP_func_repeat_211() LCDML_DISP_func_repeat_210() LCDML_DISP_211_function();
-    #define LCDML_DISP_func_repeat_210() LCDML_DISP_func_repeat_209() LCDML_DISP_210_function();
-    #define LCDML_DISP_func_repeat_209() LCDML_DISP_func_repeat_208() LCDML_DISP_209_function();
-    #define LCDML_DISP_func_repeat_208() LCDML_DISP_func_repeat_207() LCDML_DISP_208_function();
-    #define LCDML_DISP_func_repeat_207() LCDML_DISP_func_repeat_206() LCDML_DISP_207_function();
-    #define LCDML_DISP_func_repeat_206() LCDML_DISP_func_repeat_205() LCDML_DISP_206_function();
-    #define LCDML_DISP_func_repeat_205() LCDML_DISP_func_repeat_204() LCDML_DISP_205_function();
-    #define LCDML_DISP_func_repeat_204() LCDML_DISP_func_repeat_203() LCDML_DISP_204_function();
-    #define LCDML_DISP_func_repeat_203() LCDML_DISP_func_repeat_202() LCDML_DISP_203_function();
-    #define LCDML_DISP_func_repeat_202() LCDML_DISP_func_repeat_201() LCDML_DISP_202_function();
-    #define LCDML_DISP_func_repeat_201() LCDML_DISP_func_repeat_200() LCDML_DISP_201_function();
-    #define LCDML_DISP_func_repeat_200() LCDML_DISP_func_repeat_199() LCDML_DISP_200_function();
-    #define LCDML_DISP_func_repeat_199() LCDML_DISP_func_repeat_198() LCDML_DISP_199_function();
-    #define LCDML_DISP_func_repeat_198() LCDML_DISP_func_repeat_197() LCDML_DISP_198_function();
-    #define LCDML_DISP_func_repeat_197() LCDML_DISP_func_repeat_196() LCDML_DISP_197_function();
-    #define LCDML_DISP_func_repeat_196() LCDML_DISP_func_repeat_195() LCDML_DISP_196_function();
-    #define LCDML_DISP_func_repeat_195() LCDML_DISP_func_repeat_194() LCDML_DISP_195_function();
-    #define LCDML_DISP_func_repeat_194() LCDML_DISP_func_repeat_193() LCDML_DISP_194_function();
-    #define LCDML_DISP_func_repeat_193() LCDML_DISP_func_repeat_192() LCDML_DISP_193_function();
-    #define LCDML_DISP_func_repeat_192() LCDML_DISP_func_repeat_191() LCDML_DISP_192_function();
-    #define LCDML_DISP_func_repeat_191() LCDML_DISP_func_repeat_190() LCDML_DISP_191_function();
-    #define LCDML_DISP_func_repeat_190() LCDML_DISP_func_repeat_189() LCDML_DISP_190_function();
-    #define LCDML_DISP_func_repeat_189() LCDML_DISP_func_repeat_188() LCDML_DISP_189_function();
-    #define LCDML_DISP_func_repeat_188() LCDML_DISP_func_repeat_187() LCDML_DISP_188_function();
-    #define LCDML_DISP_func_repeat_187() LCDML_DISP_func_repeat_186() LCDML_DISP_187_function();
-    #define LCDML_DISP_func_repeat_186() LCDML_DISP_func_repeat_185() LCDML_DISP_186_function();
-    #define LCDML_DISP_func_repeat_185() LCDML_DISP_func_repeat_184() LCDML_DISP_185_function();
-    #define LCDML_DISP_func_repeat_184() LCDML_DISP_func_repeat_183() LCDML_DISP_184_function();
-    #define LCDML_DISP_func_repeat_183() LCDML_DISP_func_repeat_182() LCDML_DISP_183_function();
-    #define LCDML_DISP_func_repeat_182() LCDML_DISP_func_repeat_181() LCDML_DISP_182_function();
-    #define LCDML_DISP_func_repeat_181() LCDML_DISP_func_repeat_180() LCDML_DISP_181_function();
-    #define LCDML_DISP_func_repeat_180() LCDML_DISP_func_repeat_179() LCDML_DISP_180_function();
-    #define LCDML_DISP_func_repeat_179() LCDML_DISP_func_repeat_178() LCDML_DISP_179_function();
-    #define LCDML_DISP_func_repeat_178() LCDML_DISP_func_repeat_177() LCDML_DISP_178_function();
-    #define LCDML_DISP_func_repeat_177() LCDML_DISP_func_repeat_176() LCDML_DISP_177_function();
-    #define LCDML_DISP_func_repeat_176() LCDML_DISP_func_repeat_175() LCDML_DISP_176_function();
-    #define LCDML_DISP_func_repeat_175() LCDML_DISP_func_repeat_174() LCDML_DISP_175_function();
-    #define LCDML_DISP_func_repeat_174() LCDML_DISP_func_repeat_173() LCDML_DISP_174_function();
-    #define LCDML_DISP_func_repeat_173() LCDML_DISP_func_repeat_172() LCDML_DISP_173_function();
-    #define LCDML_DISP_func_repeat_172() LCDML_DISP_func_repeat_171() LCDML_DISP_172_function();
-    #define LCDML_DISP_func_repeat_171() LCDML_DISP_func_repeat_170() LCDML_DISP_171_function();
-    #define LCDML_DISP_func_repeat_170() LCDML_DISP_func_repeat_169() LCDML_DISP_170_function();
-    #define LCDML_DISP_func_repeat_169() LCDML_DISP_func_repeat_168() LCDML_DISP_169_function();
-    #define LCDML_DISP_func_repeat_168() LCDML_DISP_func_repeat_167() LCDML_DISP_168_function();
-    #define LCDML_DISP_func_repeat_167() LCDML_DISP_func_repeat_166() LCDML_DISP_167_function();
-    #define LCDML_DISP_func_repeat_166() LCDML_DISP_func_repeat_165() LCDML_DISP_166_function();
-    #define LCDML_DISP_func_repeat_165() LCDML_DISP_func_repeat_164() LCDML_DISP_165_function();
-    #define LCDML_DISP_func_repeat_164() LCDML_DISP_func_repeat_163() LCDML_DISP_164_function();
-    #define LCDML_DISP_func_repeat_163() LCDML_DISP_func_repeat_162() LCDML_DISP_163_function();
-    #define LCDML_DISP_func_repeat_162() LCDML_DISP_func_repeat_161() LCDML_DISP_162_function();
-    #define LCDML_DISP_func_repeat_161() LCDML_DISP_func_repeat_160() LCDML_DISP_161_function();
-    #define LCDML_DISP_func_repeat_160() LCDML_DISP_func_repeat_159() LCDML_DISP_160_function();
-    #define LCDML_DISP_func_repeat_159() LCDML_DISP_func_repeat_158() LCDML_DISP_159_function();
-    #define LCDML_DISP_func_repeat_158() LCDML_DISP_func_repeat_157() LCDML_DISP_158_function();
-    #define LCDML_DISP_func_repeat_157() LCDML_DISP_func_repeat_156() LCDML_DISP_157_function();
-    #define LCDML_DISP_func_repeat_156() LCDML_DISP_func_repeat_155() LCDML_DISP_156_function();
-    #define LCDML_DISP_func_repeat_155() LCDML_DISP_func_repeat_154() LCDML_DISP_155_function();
-    #define LCDML_DISP_func_repeat_154() LCDML_DISP_func_repeat_153() LCDML_DISP_154_function();
-    #define LCDML_DISP_func_repeat_153() LCDML_DISP_func_repeat_152() LCDML_DISP_153_function();
-    #define LCDML_DISP_func_repeat_152() LCDML_DISP_func_repeat_151() LCDML_DISP_152_function();
-    #define LCDML_DISP_func_repeat_151() LCDML_DISP_func_repeat_150() LCDML_DISP_151_function();
-    #define LCDML_DISP_func_repeat_150() LCDML_DISP_func_repeat_149() LCDML_DISP_150_function();
-    #define LCDML_DISP_func_repeat_149() LCDML_DISP_func_repeat_148() LCDML_DISP_149_function();
-    #define LCDML_DISP_func_repeat_148() LCDML_DISP_func_repeat_147() LCDML_DISP_148_function();
-    #define LCDML_DISP_func_repeat_147() LCDML_DISP_func_repeat_146() LCDML_DISP_147_function();
-    #define LCDML_DISP_func_repeat_146() LCDML_DISP_func_repeat_145() LCDML_DISP_146_function();
-    #define LCDML_DISP_func_repeat_145() LCDML_DISP_func_repeat_144() LCDML_DISP_145_function();
-    #define LCDML_DISP_func_repeat_144() LCDML_DISP_func_repeat_143() LCDML_DISP_144_function();
-    #define LCDML_DISP_func_repeat_143() LCDML_DISP_func_repeat_142() LCDML_DISP_143_function();
-    #define LCDML_DISP_func_repeat_142() LCDML_DISP_func_repeat_141() LCDML_DISP_142_function();
-    #define LCDML_DISP_func_repeat_141() LCDML_DISP_func_repeat_140() LCDML_DISP_141_function();
-    #define LCDML_DISP_func_repeat_140() LCDML_DISP_func_repeat_139() LCDML_DISP_140_function();
-    #define LCDML_DISP_func_repeat_139() LCDML_DISP_func_repeat_138() LCDML_DISP_139_function();
-    #define LCDML_DISP_func_repeat_138() LCDML_DISP_func_repeat_137() LCDML_DISP_138_function();
-    #define LCDML_DISP_func_repeat_137() LCDML_DISP_func_repeat_136() LCDML_DISP_137_function();
-    #define LCDML_DISP_func_repeat_136() LCDML_DISP_func_repeat_135() LCDML_DISP_136_function();
-    #define LCDML_DISP_func_repeat_135() LCDML_DISP_func_repeat_134() LCDML_DISP_135_function();
-    #define LCDML_DISP_func_repeat_134() LCDML_DISP_func_repeat_133() LCDML_DISP_134_function();
-    #define LCDML_DISP_func_repeat_133() LCDML_DISP_func_repeat_132() LCDML_DISP_133_function();
-    #define LCDML_DISP_func_repeat_132() LCDML_DISP_func_repeat_131() LCDML_DISP_132_function();
-    #define LCDML_DISP_func_repeat_131() LCDML_DISP_func_repeat_130() LCDML_DISP_131_function();
-    #define LCDML_DISP_func_repeat_130() LCDML_DISP_func_repeat_129() LCDML_DISP_130_function();
-    #define LCDML_DISP_func_repeat_129() LCDML_DISP_func_repeat_128() LCDML_DISP_129_function();
-    #define LCDML_DISP_func_repeat_128() LCDML_DISP_func_repeat_127() LCDML_DISP_128_function();
-    #define LCDML_DISP_func_repeat_127() LCDML_DISP_func_repeat_126() LCDML_DISP_127_function();
-    #define LCDML_DISP_func_repeat_126() LCDML_DISP_func_repeat_125() LCDML_DISP_126_function();
-    #define LCDML_DISP_func_repeat_125() LCDML_DISP_func_repeat_124() LCDML_DISP_125_function();
-    #define LCDML_DISP_func_repeat_124() LCDML_DISP_func_repeat_123() LCDML_DISP_124_function();
-    #define LCDML_DISP_func_repeat_123() LCDML_DISP_func_repeat_122() LCDML_DISP_123_function();
-    #define LCDML_DISP_func_repeat_122() LCDML_DISP_func_repeat_121() LCDML_DISP_122_function();
-    #define LCDML_DISP_func_repeat_121() LCDML_DISP_func_repeat_120() LCDML_DISP_121_function();
-    #define LCDML_DISP_func_repeat_120() LCDML_DISP_func_repeat_119() LCDML_DISP_120_function();
-    #define LCDML_DISP_func_repeat_119() LCDML_DISP_func_repeat_118() LCDML_DISP_119_function();
-    #define LCDML_DISP_func_repeat_118() LCDML_DISP_func_repeat_117() LCDML_DISP_118_function();
-    #define LCDML_DISP_func_repeat_117() LCDML_DISP_func_repeat_116() LCDML_DISP_117_function();
-    #define LCDML_DISP_func_repeat_116() LCDML_DISP_func_repeat_115() LCDML_DISP_116_function();
-    #define LCDML_DISP_func_repeat_115() LCDML_DISP_func_repeat_114() LCDML_DISP_115_function();
-    #define LCDML_DISP_func_repeat_114() LCDML_DISP_func_repeat_113() LCDML_DISP_114_function();
-    #define LCDML_DISP_func_repeat_113() LCDML_DISP_func_repeat_112() LCDML_DISP_113_function();
-    #define LCDML_DISP_func_repeat_112() LCDML_DISP_func_repeat_111() LCDML_DISP_112_function();
-    #define LCDML_DISP_func_repeat_111() LCDML_DISP_func_repeat_110() LCDML_DISP_111_function();
-    #define LCDML_DISP_func_repeat_110() LCDML_DISP_func_repeat_109() LCDML_DISP_110_function();
-    #define LCDML_DISP_func_repeat_109() LCDML_DISP_func_repeat_108() LCDML_DISP_109_function();
-    #define LCDML_DISP_func_repeat_108() LCDML_DISP_func_repeat_107() LCDML_DISP_108_function();
-    #define LCDML_DISP_func_repeat_107() LCDML_DISP_func_repeat_106() LCDML_DISP_107_function();
-    #define LCDML_DISP_func_repeat_106() LCDML_DISP_func_repeat_105() LCDML_DISP_106_function();
-    #define LCDML_DISP_func_repeat_105() LCDML_DISP_func_repeat_104() LCDML_DISP_105_function();
-    #define LCDML_DISP_func_repeat_104() LCDML_DISP_func_repeat_103() LCDML_DISP_104_function();
-    #define LCDML_DISP_func_repeat_103() LCDML_DISP_func_repeat_102() LCDML_DISP_103_function();
-    #define LCDML_DISP_func_repeat_102() LCDML_DISP_func_repeat_101() LCDML_DISP_102_function();
-    #define LCDML_DISP_func_repeat_101() LCDML_DISP_func_repeat_100() LCDML_DISP_101_function();
-    #define LCDML_DISP_func_repeat_100() LCDML_DISP_func_repeat_99()  LCDML_DISP_100_function();
-    #define LCDML_DISP_func_repeat_99() LCDML_DISP_func_repeat_98() LCDML_DISP_99_function();
-    #define LCDML_DISP_func_repeat_98() LCDML_DISP_func_repeat_97() LCDML_DISP_98_function();
-    #define LCDML_DISP_func_repeat_97() LCDML_DISP_func_repeat_96() LCDML_DISP_97_function();
-    #define LCDML_DISP_func_repeat_96() LCDML_DISP_func_repeat_95() LCDML_DISP_96_function();
-    #define LCDML_DISP_func_repeat_95() LCDML_DISP_func_repeat_94() LCDML_DISP_95_function();
-    #define LCDML_DISP_func_repeat_94() LCDML_DISP_func_repeat_93() LCDML_DISP_94_function();
-    #define LCDML_DISP_func_repeat_93() LCDML_DISP_func_repeat_92() LCDML_DISP_93_function();
-    #define LCDML_DISP_func_repeat_92() LCDML_DISP_func_repeat_91() LCDML_DISP_92_function();
-    #define LCDML_DISP_func_repeat_91() LCDML_DISP_func_repeat_90() LCDML_DISP_91_function();
-    #define LCDML_DISP_func_repeat_90() LCDML_DISP_func_repeat_89() LCDML_DISP_90_function();
-    #define LCDML_DISP_func_repeat_89() LCDML_DISP_func_repeat_88() LCDML_DISP_89_function();
-    #define LCDML_DISP_func_repeat_88() LCDML_DISP_func_repeat_87() LCDML_DISP_88_function();
-    #define LCDML_DISP_func_repeat_87() LCDML_DISP_func_repeat_86() LCDML_DISP_87_function();
-    #define LCDML_DISP_func_repeat_86() LCDML_DISP_func_repeat_85() LCDML_DISP_86_function();
-    #define LCDML_DISP_func_repeat_85() LCDML_DISP_func_repeat_84() LCDML_DISP_85_function();
-    #define LCDML_DISP_func_repeat_84() LCDML_DISP_func_repeat_83() LCDML_DISP_84_function();
-    #define LCDML_DISP_func_repeat_83() LCDML_DISP_func_repeat_82() LCDML_DISP_83_function();
-    #define LCDML_DISP_func_repeat_82() LCDML_DISP_func_repeat_81() LCDML_DISP_82_function();
-    #define LCDML_DISP_func_repeat_81() LCDML_DISP_func_repeat_80() LCDML_DISP_81_function();
-    #define LCDML_DISP_func_repeat_80() LCDML_DISP_func_repeat_79() LCDML_DISP_80_function();
-    #define LCDML_DISP_func_repeat_79() LCDML_DISP_func_repeat_78() LCDML_DISP_79_function();
-    #define LCDML_DISP_func_repeat_78() LCDML_DISP_func_repeat_77() LCDML_DISP_78_function();
-    #define LCDML_DISP_func_repeat_77() LCDML_DISP_func_repeat_76() LCDML_DISP_77_function();
-    #define LCDML_DISP_func_repeat_76() LCDML_DISP_func_repeat_75() LCDML_DISP_76_function();
-    #define LCDML_DISP_func_repeat_75() LCDML_DISP_func_repeat_74() LCDML_DISP_75_function();
-    #define LCDML_DISP_func_repeat_74() LCDML_DISP_func_repeat_73() LCDML_DISP_74_function();
-    #define LCDML_DISP_func_repeat_73() LCDML_DISP_func_repeat_72() LCDML_DISP_73_function();
-    #define LCDML_DISP_func_repeat_72() LCDML_DISP_func_repeat_71() LCDML_DISP_72_function();
-    #define LCDML_DISP_func_repeat_71() LCDML_DISP_func_repeat_70() LCDML_DISP_71_function();
-    #define LCDML_DISP_func_repeat_70() LCDML_DISP_func_repeat_69() LCDML_DISP_70_function();
-    #define LCDML_DISP_func_repeat_69() LCDML_DISP_func_repeat_68() LCDML_DISP_69_function();
-    #define LCDML_DISP_func_repeat_68() LCDML_DISP_func_repeat_67() LCDML_DISP_68_function();
-    #define LCDML_DISP_func_repeat_67() LCDML_DISP_func_repeat_66() LCDML_DISP_67_function();
-    #define LCDML_DISP_func_repeat_66() LCDML_DISP_func_repeat_65() LCDML_DISP_66_function();
-    #define LCDML_DISP_func_repeat_65() LCDML_DISP_func_repeat_64() LCDML_DISP_65_function();
-    #define LCDML_DISP_func_repeat_64() LCDML_DISP_func_repeat_63() LCDML_DISP_64_function();
-    #define LCDML_DISP_func_repeat_63() LCDML_DISP_func_repeat_62() LCDML_DISP_63_function();
-    #define LCDML_DISP_func_repeat_62() LCDML_DISP_func_repeat_61() LCDML_DISP_62_function();
-    #define LCDML_DISP_func_repeat_61() LCDML_DISP_func_repeat_60() LCDML_DISP_61_function();
-    #define LCDML_DISP_func_repeat_60() LCDML_DISP_func_repeat_59() LCDML_DISP_60_function();
-    #define LCDML_DISP_func_repeat_59() LCDML_DISP_func_repeat_58() LCDML_DISP_59_function();
-    #define LCDML_DISP_func_repeat_58() LCDML_DISP_func_repeat_57() LCDML_DISP_58_function();
-    #define LCDML_DISP_func_repeat_57() LCDML_DISP_func_repeat_56() LCDML_DISP_57_function();
-    #define LCDML_DISP_func_repeat_56() LCDML_DISP_func_repeat_55() LCDML_DISP_56_function();
-    #define LCDML_DISP_func_repeat_55() LCDML_DISP_func_repeat_54() LCDML_DISP_55_function();
-    #define LCDML_DISP_func_repeat_54() LCDML_DISP_func_repeat_53() LCDML_DISP_54_function();
-    #define LCDML_DISP_func_repeat_53() LCDML_DISP_func_repeat_52() LCDML_DISP_53_function();
-    #define LCDML_DISP_func_repeat_52() LCDML_DISP_func_repeat_51() LCDML_DISP_52_function();
-    #define LCDML_DISP_func_repeat_51() LCDML_DISP_func_repeat_50() LCDML_DISP_51_function();
-    #define LCDML_DISP_func_repeat_50() LCDML_DISP_func_repeat_49() LCDML_DISP_50_function();
-    #define LCDML_DISP_func_repeat_49() LCDML_DISP_func_repeat_48() LCDML_DISP_49_function();
-    #define LCDML_DISP_func_repeat_48() LCDML_DISP_func_repeat_47() LCDML_DISP_48_function();
-    #define LCDML_DISP_func_repeat_47() LCDML_DISP_func_repeat_46() LCDML_DISP_47_function();
-    #define LCDML_DISP_func_repeat_46() LCDML_DISP_func_repeat_45() LCDML_DISP_46_function();
-    #define LCDML_DISP_func_repeat_45() LCDML_DISP_func_repeat_44() LCDML_DISP_45_function();
-    #define LCDML_DISP_func_repeat_44() LCDML_DISP_func_repeat_43() LCDML_DISP_44_function();
-    #define LCDML_DISP_func_repeat_43() LCDML_DISP_func_repeat_42() LCDML_DISP_43_function();
-    #define LCDML_DISP_func_repeat_42() LCDML_DISP_func_repeat_41() LCDML_DISP_42_function();
-    #define LCDML_DISP_func_repeat_41() LCDML_DISP_func_repeat_40() LCDML_DISP_41_function();
-    #define LCDML_DISP_func_repeat_40() LCDML_DISP_func_repeat_39() LCDML_DISP_40_function();
-    #define LCDML_DISP_func_repeat_39() LCDML_DISP_func_repeat_38() LCDML_DISP_39_function();
-    #define LCDML_DISP_func_repeat_38() LCDML_DISP_func_repeat_37() LCDML_DISP_38_function();
-    #define LCDML_DISP_func_repeat_37() LCDML_DISP_func_repeat_36() LCDML_DISP_37_function();
-    #define LCDML_DISP_func_repeat_36() LCDML_DISP_func_repeat_35() LCDML_DISP_36_function();
-    #define LCDML_DISP_func_repeat_35() LCDML_DISP_func_repeat_34() LCDML_DISP_35_function();
-    #define LCDML_DISP_func_repeat_34() LCDML_DISP_func_repeat_33() LCDML_DISP_34_function();
-    #define LCDML_DISP_func_repeat_33() LCDML_DISP_func_repeat_32() LCDML_DISP_33_function();
-    #define LCDML_DISP_func_repeat_32() LCDML_DISP_func_repeat_31() LCDML_DISP_32_function();
-    #define LCDML_DISP_func_repeat_31() LCDML_DISP_func_repeat_30() LCDML_DISP_31_function();
-    #define LCDML_DISP_func_repeat_30() LCDML_DISP_func_repeat_29() LCDML_DISP_30_function();
-    #define LCDML_DISP_func_repeat_29() LCDML_DISP_func_repeat_28() LCDML_DISP_29_function();
-    #define LCDML_DISP_func_repeat_28() LCDML_DISP_func_repeat_27() LCDML_DISP_28_function();
-    #define LCDML_DISP_func_repeat_27() LCDML_DISP_func_repeat_26() LCDML_DISP_27_function();
-    #define LCDML_DISP_func_repeat_26() LCDML_DISP_func_repeat_25() LCDML_DISP_26_function();
-    #define LCDML_DISP_func_repeat_25() LCDML_DISP_func_repeat_24() LCDML_DISP_25_function();
-    #define LCDML_DISP_func_repeat_24() LCDML_DISP_func_repeat_23() LCDML_DISP_24_function();
-    #define LCDML_DISP_func_repeat_23() LCDML_DISP_func_repeat_22() LCDML_DISP_23_function();
-    #define LCDML_DISP_func_repeat_22() LCDML_DISP_func_repeat_21() LCDML_DISP_22_function();
-    #define LCDML_DISP_func_repeat_21() LCDML_DISP_func_repeat_20() LCDML_DISP_21_function();
-    #define LCDML_DISP_func_repeat_20() LCDML_DISP_func_repeat_19() LCDML_DISP_20_function();
-    #define LCDML_DISP_func_repeat_19() LCDML_DISP_func_repeat_18() LCDML_DISP_19_function();
-    #define LCDML_DISP_func_repeat_18() LCDML_DISP_func_repeat_17() LCDML_DISP_18_function();
-    #define LCDML_DISP_func_repeat_17() LCDML_DISP_func_repeat_16() LCDML_DISP_17_function();
-    #define LCDML_DISP_func_repeat_16() LCDML_DISP_func_repeat_15() LCDML_DISP_16_function();
-    #define LCDML_DISP_func_repeat_15() LCDML_DISP_func_repeat_14() LCDML_DISP_15_function();
-    #define LCDML_DISP_func_repeat_14() LCDML_DISP_func_repeat_13() LCDML_DISP_14_function();
-    #define LCDML_DISP_func_repeat_13() LCDML_DISP_func_repeat_12() LCDML_DISP_13_function();
-    #define LCDML_DISP_func_repeat_12() LCDML_DISP_func_repeat_11() LCDML_DISP_12_function();
-    #define LCDML_DISP_func_repeat_11() LCDML_DISP_func_repeat_10() LCDML_DISP_11_function();
-    #define LCDML_DISP_func_repeat_10() LCDML_DISP_func_repeat_9()  LCDML_DISP_10_function();
-    #define LCDML_DISP_func_repeat_9() LCDML_DISP_func_repeat_8()   LCDML_DISP_9_function();
-    #define LCDML_DISP_func_repeat_8() LCDML_DISP_func_repeat_7()   LCDML_DISP_8_function();
-    #define LCDML_DISP_func_repeat_7() LCDML_DISP_func_repeat_6()   LCDML_DISP_7_function();
-    #define LCDML_DISP_func_repeat_6() LCDML_DISP_func_repeat_5()   LCDML_DISP_6_function();
-    #define LCDML_DISP_func_repeat_5() LCDML_DISP_func_repeat_4()   LCDML_DISP_5_function();
-    #define LCDML_DISP_func_repeat_4() LCDML_DISP_func_repeat_3()   LCDML_DISP_4_function();
-    #define LCDML_DISP_func_repeat_3() LCDML_DISP_func_repeat_2()   LCDML_DISP_3_function();
-    #define LCDML_DISP_func_repeat_2() LCDML_DISP_func_repeat_1()   LCDML_DISP_2_function();
-    #define LCDML_DISP_func_repeat_1() LCDML_DISP_func_repeat_0()   LCDML_DISP_1_function();
-    #define LCDML_DISP_func_repeat_0() LCDML_DISP_0_function();
-    #define LCDML_DISP_func_repeat(N) LCDML_DISP_func_repeat_ ## N ()
-
-#endif
diff --git a/third-party/LCDMenuLib2.old/src/LCDMenuLib2_menu.cpp b/third-party/LCDMenuLib2.old/src/LCDMenuLib2_menu.cpp
deleted file mode 100644
index 4577300..0000000
--- a/third-party/LCDMenuLib2.old/src/LCDMenuLib2_menu.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/* ******************************************************************************
- *                        LCDMenuLib2 (LCDML)
- * ******************************************************************************
- *
- * MIT License
- *
- * Copyright (c) [2020] [Nils Feldkämper]
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * ******************************************************************************
- *
- * BUG / ISSUES REPORTING
- *    https://github.com/Jomelo/LCDMenuLib2/issues
- *
- * ARDUINO FORUM
- *    http://forum.arduino.cc/index.php?topic=73816.0
- *
- * ******************************************************************************
- */
-
-#include "LCDMenuLib2_menu.h"
-#include "LCDMenuLib2_typedef.h"
-
-
-/* ******************************************************************** */
-LCDMenuLib2_menu::LCDMenuLib2_menu(uint8_t p_id, uint8_t p_param, uint8_t p_configuration, LCDML_FuncPtr_pu8 p_callback_function, LCDML_FuncPtr_rb p_condition_function)
-/* ******************************************************************** */
-{
-    parent  = NULL;
-    sibling = NULL;
-    child   = NULL;
-    id      = p_id;        // element name
-    param   = p_param;     // element configuration
-    configuration= p_configuration;
-    cb_function = p_callback_function;
-    cb_condition = p_condition_function;
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2_menu::setParent(LCDMenuLib2_menu &p)
-/* ******************************************************************** */
-{
-    parent = &p;
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2_menu::addSibling(LCDMenuLib2_menu &s,LCDMenuLib2_menu &p)
-/* ******************************************************************** */
-{
-    if (sibling)
-    { // add sibling if sibling exists
-        sibling->addSibling(s,p);
-    }
-    else
-    { // add sibling and parent
-        sibling =& s;
-        sibling->setParent(p);
-    }
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2_menu::addChild(LCDMenuLib2_menu &c)
-/* ******************************************************************** */
-{
-    if (child)
-    { // add sibling if child exists
-        child->addSibling(c,*this);
-    }
-    else
-    { // add child  and parent
-        child=&c;
-        child->setParent(*this);
-    }
-}
-
-/* ******************************************************************** */
-LCDMenuLib2_menu * LCDMenuLib2_menu::getChild(uint8_t which)
-/* ******************************************************************** */
-{
-    if (child)
-    { // return child if exists
-        return child->getSibling(which);
-    }
-    else
-    { // this menu item has no children
-        return NULL;
-    }
-}
-
-/* ******************************************************************** */
-LCDMenuLib2_menu * LCDMenuLib2_menu::getSibling(uint8_t howfar)
-/* ******************************************************************** */
-{
-    if (howfar == 0)
-    { // this sibling
-        return this;
-    }
-    else if (sibling)
-    {    // get next sibling
-        return sibling->getSibling(howfar - 1);
-    }
-    else
-    { // asking for a nonexistent sibling
-        return NULL;
-    }
-}
-
-/* ******************************************************************** */
-LCDMenuLib2_menu * LCDMenuLib2_menu::getParent()
-/* ******************************************************************** */
-{
-    if (parent)
-    { // get parent if exists
-        return parent;
-    }
-    else
-    {   // root menu       
-        return this;
-    }
-}
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2_menu::getID()
-/* ******************************************************************** */
-{
-    return id;
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2_menu::checkCondition()
-/* ******************************************************************** */
-{    
-    if(cb_condition != NULL)
-    {
-        return cb_condition();
-    }
-    else
-    {
-        return true;
-    }  
-}
-
-/* ******************************************************************** */
-LCDML_FuncPtr_pu8 LCDMenuLib2_menu::getCbFunction()
-/* ******************************************************************** */
-{
-    return cb_function;
-}
-
-/* ******************************************************************** */
-uint8_t LCDMenuLib2_menu::getParam()
-/* ******************************************************************** */
-{
-    return param;
-}
-
-/* ******************************************************************** */
-void LCDMenuLib2_menu::callback(uint8_t p)
-/* ******************************************************************** */
-{
-    if(cb_function != NULL)
-    {
-        cb_function(p);
-    }
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2_menu::checkCallback()
-/* ******************************************************************** */
-{
-    if(cb_function == NULL)
-    {
-        return false;
-    }
-    else
-    {
-        return true;
-    }
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2_menu::checkType_menu()
-/* ******************************************************************** */
-{
-    if(bitRead(configuration, _LCDML_menu_default))
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-/* ******************************************************************** */
-bool LCDMenuLib2_menu::checkType_dynParam()
-/* ******************************************************************** */
-{
-    if(bitRead(configuration, _LCDML_menu_dynParam))
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
diff --git a/third-party/LCDMenuLib2.old/src/LCDMenuLib2_menu.h b/third-party/LCDMenuLib2.old/src/LCDMenuLib2_menu.h
deleted file mode 100644
index cbed13f..0000000
--- a/third-party/LCDMenuLib2.old/src/LCDMenuLib2_menu.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ******************************************************************************
- *                        LCDMenuLib2 (LCDML)
- * ******************************************************************************
- *
- * MIT License
- *
- * Copyright (c) [2020] [Nils Feldkämper]
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * ******************************************************************************
- *
- * BUG / ISSUES REPORTING
- *    https://github.com/Jomelo/LCDMenuLib2/issues
- *
- * ARDUINO FORUM
- *    http://forum.arduino.cc/index.php?topic=73816.0
- *
- * ******************************************************************************
- */
-
-#ifndef LCDMenuLib2_menu_h
-#   define LCDMenuLib2_menu_h
-
-#   include "Arduino.h"
-#   include "LCDMenuLib2_typedef.h"
-
-    #define _LCDML_menu_f7          7
-    #define _LCDML_menu_f6          6
-    #define _LCDML_menu_f5          5
-    #define _LCDML_menu_f4          4
-    #define _LCDML_menu_f3          3
-    #define _LCDML_menu_f2          2
-    #define _LCDML_menu_dynParam    1
-    #define _LCDML_menu_default     0
-
-
-    class LCDMenuLib2_menu
-    {
-        private:
-            LCDMenuLib2_menu * parent;                               // Parent menu, NULL if this is the top
-            LCDMenuLib2_menu * child;                                // First child menu, NULL if no children
-            LCDMenuLib2_menu * sibling;                              // Next sibling menu, NULL if this is the last sibling
-
-            LCDML_FuncPtr_pu8 cb_function;                          // Menu Function callback
-            LCDML_FuncPtr_rb  cb_condition;                         // Menu Condition callback
-
-            void setParent(LCDMenuLib2_menu &p);                     // Sets the menu's parent to p
-            void addSibling(LCDMenuLib2_menu &s,LCDMenuLib2_menu &p); // Adds a sibling s with parent p.  If the menu already has a sibling, ask that sibling to add it
-
-            uint8_t id;                                             // Name of this menu
-            uint8_t param;
-            uint8_t configuration;
-
-        public:
-             // Constructs the menu with a name and a NULL use function (be careful calling it)
-            LCDMenuLib2_menu(uint8_t p_id, uint8_t p_param, uint8_t p_configuration, LCDML_FuncPtr_pu8 p_callback_function, LCDML_FuncPtr_rb p_condition_function);
-
-            LCDML_FuncPtr_pu8 getCbFunction();
-
-            void addChild(LCDMenuLib2_menu &c);                      // Adds the child c to the menu.
-                                                                    // If the menu already has a child, ask the child to add it as a sibling
-            LCDMenuLib2_menu * getChild(uint8_t which);              // Returns a pointer to the which'th child of this menu
-            LCDMenuLib2_menu * getSibling(uint8_t howfar);           // Returns a pointer to the sibling how far siblings away from this menu
-            LCDMenuLib2_menu * getParent();                          // Returns this menu's parent menu.  If no parent, returns itself
-
-            uint8_t getID();                                        // return the id of a menu element
-            bool checkCondition();                                 // check menu display condition
-            uint8_t getParam();                                     // return a parameter which is set on the initialization
-            bool checkType_menu();
-            bool checkType_dynParam();
-
-            void callback(uint8_t p);                                        // call menu callback
-            bool checkCallback();                                  // check if callback can called
-    };
-#endif
diff --git a/third-party/LCDMenuLib2.old/src/LCDMenuLib2_typedef.h b/third-party/LCDMenuLib2.old/src/LCDMenuLib2_typedef.h
deleted file mode 100644
index dc178ba..0000000
--- a/third-party/LCDMenuLib2.old/src/LCDMenuLib2_typedef.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* ******************************************************************************
- *                        LCDMenuLib2 (LCDML)
- * ******************************************************************************
- *
- * MIT License
- *
- * Copyright (c) [2020] [Nils Feldkämper]
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * ******************************************************************************
- *
- * BUG / ISSUES REPORTING
- *    https://github.com/Jomelo/LCDMenuLib2/issues
- *
- * ARDUINO FORUM
- *    http://forum.arduino.cc/index.php?topic=73816.0
- *
- * ******************************************************************************
- */
-
-#ifndef _LCDML_typedef_h
-    #define _LCDML_typedef_h
-
-    typedef void    (* LCDML_FuncPtr)       ();
-    typedef void    (* LCDML_FuncPtr_pu8)   (uint8_t);  // with parameter u8
-    typedef bool    (* LCDML_FuncPtr_rb)    ();         // with return value bool
-
-#endif