Update to ArduinoJson 7.0.4

2024-04-19 14:44:01 +02:00
parent 1378732081
commit 81be0a689a
444 changed files with 10842 additions and 9422 deletions
--- a/lib/ArduinoJson/extras/tests/Misc/conflicts.cpp
+++ b/lib/ArduinoJson/extras/tests/Misc/conflicts.cpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License

 // Include any header that might use the conflicting macros
@@ -52,5 +52,11 @@
 #define BLOCKSIZE
 #define CAPACITY

+// issue #1905
+#define _current
+
+// issue #1914
+#define V7 7
+
 // catch.hpp mutes several warnings, this file also allows to detect them
 #include "ArduinoJson.h"