Merge pull request #1555 from proddy/dev

routine updates

interface/package.json

@@ -67,7 +67,7 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "preact": "^10.19.3",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.1",
     "rollup-plugin-visualizer": "^5.12.0",
     "terser": "^5.26.0",
     "vite": "^5.0.11",

interface/yarn.lock

@@ -1861,7 +1861,7 @@ __metadata:
     lodash-es: "npm:^4.17.21"
     mime-types: "npm:^2.1.35"
     preact: "npm:^10.19.3"
-    prettier: "npm:^3.1.1"
+    prettier: "npm:^3.2.1"
     react: "npm:latest"
     react-dom: "npm:latest"
     react-dropzone: "npm:^14.2.3"
@@ -7091,12 +7091,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3.1.1":
+"prettier@npm:^3.2.1":
-  version: 3.1.1
+  version: 3.2.1
-  resolution: "prettier@npm:3.1.1"
+  resolution: "prettier@npm:3.2.1"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 26a249f321b97d26c04483f1bf2eeb22e082a76f4222a2c922bebdc60111691aad4ec3979610e83942e0b956058ec361d9e9c81c185172264eb6db9aa678082b
+  checksum: a26d26a74ba5cbf23a9741074ceef4f53a08ced03c42449dc9615ecd08ada9d19d5247ad2b0dfb15b2c8e57ec9f516074627b85b9f03270b08c184c64e7d8f64
   languageName: node
   linkType: hard
 

lib/ArduinoJson/.clang-format

@@ -1,12 +0,0 @@
-# http://clang.llvm.org/docs/ClangFormatStyleOptions.html
-
-BasedOnStyle: Google
-Standard: c++11
-AllowShortFunctionsOnASingleLine: Empty
-IncludeBlocks: Preserve
-IndentPPDirectives: AfterHash
-DerivePointerAlignment: false
-
-# Always break after if to get accurate coverage
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false

lib/ArduinoJson/.prettierignore

@@ -1 +0,0 @@
-*.md

lib/ArduinoJson/CHANGELOG.md

@@ -1,6 +1,13 @@
 ArduinoJson: change log
 =======================
 
+v7.0.1 (2024-01-10)
+------
+
+* Fix "no matching function" with `JsonObjectConst::operator[]` (issue #2019)
+* Remove unused files in the PlatformIO package
+* Fix `volatile bool` serialized as `1` or `0` instead of `true` or `false` (issue #2029)
+
 v7.0.0 (2024-01-03)
 ------
 

lib/ArduinoJson/CONTRIBUTING.md

@@ -1,10 +0,0 @@
-# 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

lib/ArduinoJson/README.md

@@ -1,155 +0,0 @@
-<p align="center">
-  <a href="https://arduinojson.org/"><img alt="ArduinoJson" src="https://arduinojson.org/images/logo.svg" width="200" /></a>
-</p>
-
----
-
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/bblanchon/ArduinoJson/ci.yml?branch=7.x&logo=github)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A7.x)
-[![Continuous Integration](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/7.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
-[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arduinojson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
-[![Coveralls branch](https://img.shields.io/coveralls/github/bblanchon/ArduinoJson/7.x?logo=coveralls)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x)  
-[![GitHub stars](https://img.shields.io/github/stars/bblanchon/ArduinoJson?style=flat&logo=github&color=orange)](https://github.com/bblanchon/ArduinoJson/stargazers)
-[![GitHub Sponsors](https://img.shields.io/github/sponsors/bblanchon?logo=github&color=orange)](https://github.com/sponsors/bblanchon)
-
-ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
-
-## Features
-
-* [JSON deserialization](https://arduinojson.org/v7/api/json/deserializejson/)
-    * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v7/api/config/decode_unicode/)
-    * [Optionally supports comments in the input](https://arduinojson.org/v7/api/config/enable_comments/)
-    * [Optionally filters the input to keep only desired values](https://arduinojson.org/v7/api/json/deserializejson/#filtering)
-    * Supports single quotes as a string delimiter
-    * Compatible with [NDJSON](http://ndjson.org/) and [JSON Lines](https://jsonlines.org/)
-* [JSON serialization](https://arduinojson.org/v7/api/json/serializejson/)
-    * [Can write to a buffer or a stream](https://arduinojson.org/v7/api/json/serializejson/)
-    * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v7/api/json/serializejsonpretty/)
-* [MessagePack serialization](https://arduinojson.org/v7/api/msgpack/serializemsgpack/)
-* [MessagePack deserialization](https://arduinojson.org/v7/api/msgpack/deserializemsgpack/)
-* Efficient
-    * [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
-    * [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
-    * [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
-    * [Deduplicates strings](https://arduinojson.org/news/2020/08/01/version-6-16-0/)
-* Versatile
-    * Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v7/how-to/use-external-ram-on-esp32/)
-    * Supports [`String`](https://arduinojson.org/v7/api/config/enable_arduino_string/), [`std::string`](https://arduinojson.org/v7/api/config/enable_std_string/), and [`std::string_view`](https://arduinojson.org/v7/api/config/enable_string_view/)
-    * Supports [`Stream`](https://arduinojson.org/v7/api/config/enable_arduino_stream/) and [`std::istream`/`std::ostream`](https://arduinojson.org/v7/api/config/enable_std_stream/)
-    * Supports [Flash strings](https://arduinojson.org/v7/api/config/enable_progmem/)
-    * Supports [custom readers](https://arduinojson.org/v7/api/json/deserializejson/#custom-reader) and [custom writers](https://arduinojson.org/v7/api/json/serializejson/#custom-writer)
-    * Supports [custom converters](https://arduinojson.org/news/2021/05/04/version-6-18-0/)
-* Portable
-    * Usable on any C++ project (not limited to Arduino)
-    * Compatible with C++11, C++14 and C++17
-    * Support for C++98/C++03 available on [ArduinoJson 6.20.x](https://github.com/bblanchon/ArduinoJson/tree/6.20.x)
-    * 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)...
-        * Soft cores: [Nios II](https://en.wikipedia.org/wiki/Nios_II)...
-    * 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/v7/how-to/use-arduinojson-with-cmake/)
-* Well designed
-    * [Elegant API](http://arduinojson.org/v7/example/)
-    * [Thread-safe](https://en.wikipedia.org/wiki/Thread_safety)
-    * Self-contained (no external dependency)
-    * `const` friendly
-    * [`for` friendly](https://arduinojson.org/v7/api/jsonobject/begin_end/)
-    * [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming)
-    * Handles [integer overflows](https://arduinojson.org/v7/api/jsonvariant/as/#integer-overflows)
-* Well tested
-    * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=7.x)
-    * Continuously tested on
-        * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/7.x)
-        * [GCC 5, 6, 7, 8, 9, 10, 11, 12](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
-        * [Clang 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10, 11, 12, 13, 14, 15](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
-    * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
-    * Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/)
-* Well documented
-    * [Tutorials](https://arduinojson.org/v7/doc/deserialization/)
-    * [Examples](https://arduinojson.org/v7/example/)
-    * [How-tos](https://arduinojson.org/v7/example/)
-    * [FAQ](https://arduinojson.org/v7/faq/)
-    * [Troubleshooter](https://arduinojson.org/v7/troubleshooter/)
-    * [Book](https://arduinojson.org/book/)
-    * [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++
-const char* json = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
-
-JsonDocument doc;
-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/v7/doc/deserialization/)
-
-### Serialization
-
-Here is a program that generates a JSON document with ArduinoJson:
-
-```c++
-JsonDocument doc;
-
-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/v7/doc/serialization/)
-
-## Sponsors
-
-ArduinoJson is thankful to its sponsors. Please give them a visit; they deserve it!
-
-<p>
-  <a href="https://www.programmingelectronics.com/" rel="sponsored">
-    <img src="https://arduinojson.org/images/2021/10/programmingeleactronicsacademy.png" alt="Programming Electronics Academy" width="200">
-  </a>
-</p>
-<p>
-  <a href="https://github.com/1technophile" rel="sponsored">
-    <img alt="1technophile" src="https://avatars.githubusercontent.com/u/12672732?s=40&v=4">
-  </a>
-</p>
-
-If you run a commercial project that embeds ArduinoJson, think about [sponsoring the library's development](https://github.com/sponsors/bblanchon): it ensures the code that your products rely on stays actively maintained. It can also give your project some exposure to the makers' community.
-
-If you are an individual user and want to support the development (or give a sign of appreciation), consider purchasing the book [Mastering ArduinoJson](https://arduinojson.org/book/)&nbsp;❤, or simply [cast a star](https://github.com/bblanchon/ArduinoJson/stargazers)&nbsp;⭐.

lib/ArduinoJson/SUPPORT.md

@@ -1,27 +0,0 @@
-# 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!

lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayConst.hpp

@@ -51,7 +51,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
   }
 
   operator JsonVariantConst() const {
-    return JsonVariantConst(collectionToVariant(data_), resources_);
+    return JsonVariantConst(getData(), resources_);
   }
 
   // Returns true if the reference is unbound.
@@ -69,7 +69,7 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
   // Returns the depth (nesting level) of the array.
   // https://arduinojson.org/v7/api/jsonarrayconst/nesting/
   FORCE_INLINE size_t nesting() const {
-    return detail::VariantData::nesting(collectionToVariant(data_), resources_);
+    return detail::VariantData::nesting(getData(), resources_);
   }
 
   // Returns the number of elements in the array.

lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectConst.hpp

@@ -27,7 +27,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
       : data_(data), resources_(resources) {}
 
   operator JsonVariantConst() const {
-    return JsonVariantConst(collectionToVariant(data_), resources_);
+    return JsonVariantConst(getData(), resources_);
   }
 
   // Returns true if the reference is unbound.
@@ -45,7 +45,7 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
   // Returns the depth (nesting level) of the object.
   // https://arduinojson.org/v7/api/jsonobjectconst/nesting/
   FORCE_INLINE size_t nesting() const {
-    return detail::VariantData::nesting(collectionToVariant(data_), resources_);
+    return detail::VariantData::nesting(getData(), resources_);
   }
 
   // Returns the number of members in the object.
@@ -101,8 +101,9 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
   FORCE_INLINE typename detail::enable_if<detail::IsString<TChar*>::value,
                                           JsonVariantConst>::type
   operator[](TChar* key) const {
-    return JsonVariantConst(
+    return JsonVariantConst(detail::ObjectData::getMember(
-        detail::ObjectData::getMember(data_, detail::adaptString(key)));
+                                data_, detail::adaptString(key), resources_),
+                            resources_);
   }
 
   // DEPRECATED: always returns zero

lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp

@@ -132,7 +132,8 @@ VariantRefBase<TDerived>::operator[](const TString& key) const {
 template <typename TDerived>
 template <typename T>
 inline bool VariantRefBase<TDerived>::set(const T& value) const {
-  Converter<T>::toJson(value, getOrCreateVariant());
+  Converter<typename detail::remove_cv<T>::type>::toJson(value,
+                                                         getOrCreateVariant());
   auto resources = getResourceManager();
   return resources && !resources->overflowed();
 }

lib/ArduinoJson/src/ArduinoJson/version.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#define ARDUINOJSON_VERSION "7.0.0"
+#define ARDUINOJSON_VERSION "7.0.1"
 #define ARDUINOJSON_VERSION_MAJOR 7
 #define ARDUINOJSON_VERSION_MINOR 0
-#define ARDUINOJSON_VERSION_REVISION 0
+#define ARDUINOJSON_VERSION_REVISION 1
-#define ARDUINOJSON_VERSION_MACRO V700
+#define ARDUINOJSON_VERSION_MACRO V701

mock-api/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@msgpack/msgpack": "^2.8.0",
     "busboy": "^1.6.0",
-    "itty-router": "^4.0.26"
+    "itty-router": "^4.0.27"
   },
   "packageManager": "yarn@4.0.2",
   "devDependencies": {

mock-api/yarn.lock

@@ -129,7 +129,7 @@ __metadata:
     "@msgpack/msgpack": "npm:^2.8.0"
     "@types/multer": "npm:^1.4.11"
     busboy: "npm:^1.6.0"
-    itty-router: "npm:^4.0.26"
+    itty-router: "npm:^4.0.27"
   languageName: unknown
   linkType: soft
 
@@ -142,10 +142,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"itty-router@npm:^4.0.26":
+"itty-router@npm:^4.0.27":
-  version: 4.0.26
+  version: 4.0.27
-  resolution: "itty-router@npm:4.0.26"
+  resolution: "itty-router@npm:4.0.27"
-  checksum: 6bd64bdd89a3508e7dd806fafcd86e0887daf306a83149d34c12443de0e518da83f76598f02caff375120aae8e40eae2234c9885e0bb3c3aaa0273a807eb4dd2
+  checksum: ebb959388b1033f3d80ba2575c2d90fa649c1d5370d977879513cc46e8fd78159b7140d2a66853af6be98f7d740f8609a2c5aa7381506eaa1f1a46268fd2a95f
   languageName: node
   linkType: hard
 

pio_local.ini_example

@@ -20,7 +20,7 @@
 ; default_envs = lolin_s3
 ; default_envs = standalone
 ; default_envs = debug
-default_envs = custom
+; default_envs = custom
 
 [env:esp32_4M]
 ; if using OTA enter your details below
@@ -29,16 +29,19 @@ default_envs = custom
 ;    --port=8266
 ;    --auth=ems-esp-neo
 ;  upload_port = ems-esp.local
-; for USB use one of these:
+; for USB, here are some examples:
 ; upload_port = /dev/ttyUSB*
 ; upload_port = COM5
+extra_scripts =
+;   pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
+  scripts/rename_fw.py
 
 [env:esp32_16M]
 
 [env:custom]
-; use for ESP-S boards with 4MB flash
+; use for baisc ESP boards with 4MB flash
 ; make sure -D TASMOTA_SDK is also enabled
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32-2023.10.03.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.00/platform-espressif32.zip
 ; use for S3 boards:
 ; platform = espressif32
 framework = arduino
@@ -68,13 +71,13 @@ build_flags =
 	-D EMSESP_TEST
 	-D EMSESP_DEBUG
  	-D CONFIG_ETH_ENABLED
-    ; -D TASMOTA_SDK
+    -D TASMOTA_SDK
 	'-DEMSESP_DEFAULT_BOARD_PROFILE="Test"'
 
 [env:lolin_s3]
-upload_port = /dev/ttyACM0
+upload_port = /dev/ttyUSB0
 extra_scripts =
-  pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
+;   pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
   scripts/rename_fw.py
 
 ; pio run -e debug

platformio.ini

@@ -2,8 +2,8 @@
 ; override any settings with your own local ones in pio_local.ini
 
 [platformio]
-; default_envs = esp32_4M
+default_envs = esp32_4M
-default_envs = lolin_s3
+; default_envs = lolin_s3
 ; default_envs = esp32_16M
 ; default_envs = standalone
 
@@ -50,11 +50,9 @@ extra_scripts =
 [espressi32_base_tasmota]
 ; use Tasmota's libary which removes some libs (like mbedtsl) and increases available heap
 ; platform = https://github.com/tasmota/platform-espressif32.git ; latest development
-; latest release with WiFi_secure.h
+; latest release with WiFi_secure.h, Arduino 2.0.14
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32-2023.10.03.zip ; latest stable
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.00/platform-espressif32.zip
-; latest arduino 2.xx release:
+; latest Arduino 3.0/IDF 5.1.(alpha 3):
-; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.11.01/platform-espressif32.zip
-; latest arduino 3.0/IDF 5.1.(alpha 3):
 ; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.12.10/platform-espressif32.zip
 framework = arduino
 board_build.filesystem = littlefs