mirror of
https://github.com/emsesp/EMS-ESP32.git
synced 2025-12-06 15:59:52 +03:00
update arduinoJson 7.02
This commit is contained in:
@@ -1,6 +1,11 @@
|
|||||||
ArduinoJson: change log
|
ArduinoJson: change log
|
||||||
=======================
|
=======================
|
||||||
|
|
||||||
|
v7.0.2 (2024-01-19)
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fix assertion `poolIndex < count_` after `JsonDocument::clear()` (issue #2034)
|
||||||
|
|
||||||
v7.0.1 (2024-01-10)
|
v7.0.1 (2024-01-10)
|
||||||
------
|
------
|
||||||
|
|
||||||
|
|||||||
25
lib/ArduinoJson/CMakeLists.txt
Normal file
25
lib/ArduinoJson/CMakeLists.txt
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
# ArduinoJson - https://arduinojson.org
|
||||||
|
# Copyright © 2014-2024, Benoit BLANCHON
|
||||||
|
# MIT License
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 3.15)
|
||||||
|
|
||||||
|
if(ESP_PLATFORM)
|
||||||
|
# Build ArduinoJson as an ESP-IDF component
|
||||||
|
idf_component_register(INCLUDE_DIRS src)
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
project(ArduinoJson VERSION 7.0.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()
|
||||||
13
lib/ArduinoJson/idf_component.yml
Normal file
13
lib/ArduinoJson/idf_component.yml
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
version: "7.0.2"
|
||||||
|
description: >-
|
||||||
|
A simple and efficient JSON library for embedded C++.
|
||||||
|
⭐ 6444 stars on GitHub!
|
||||||
|
Supports serialization, deserialization, MessagePack, streams, filtering, and more.
|
||||||
|
Fully tested and documented.
|
||||||
|
url: https://arduinojson.org/
|
||||||
|
files:
|
||||||
|
exclude:
|
||||||
|
- "**/.vs/**/*"
|
||||||
|
- ".devcontainer/**/*"
|
||||||
|
- "examples/**/*"
|
||||||
|
- "extras/**/*"
|
||||||
23
lib/ArduinoJson/library.json
Normal file
23
lib/ArduinoJson/library.json
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
"name": "ArduinoJson",
|
||||||
|
"keywords": "json, rest, http, web",
|
||||||
|
"description": "A simple and efficient JSON library for embedded C++. ⭐ 6444 stars on GitHub! Supports serialization, deserialization, MessagePack, streams, filtering, and more. Fully tested and documented.",
|
||||||
|
"homepage": "https://arduinojson.org/?utm_source=meta&utm_medium=library.json",
|
||||||
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/bblanchon/ArduinoJson.git"
|
||||||
|
},
|
||||||
|
"version": "7.0.2",
|
||||||
|
"authors": {
|
||||||
|
"name": "Benoit Blanchon",
|
||||||
|
"url": "https://blog.benoitblanchon.fr"
|
||||||
|
},
|
||||||
|
"export": {
|
||||||
|
"include": ["src", "examples", "LICENSE.txt", "ArduinoJson.h"]
|
||||||
|
},
|
||||||
|
"frameworks": "*",
|
||||||
|
"platforms": "*",
|
||||||
|
"build": {
|
||||||
|
"libArchive": false
|
||||||
|
}
|
||||||
|
}
|
||||||
11
lib/ArduinoJson/library.properties
Normal file
11
lib/ArduinoJson/library.properties
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
name=ArduinoJson
|
||||||
|
version=7.0.2
|
||||||
|
author=Benoit Blanchon <blog.benoitblanchon.fr>
|
||||||
|
maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
|
||||||
|
sentence=A simple and efficient JSON library for embedded C++.
|
||||||
|
paragraph=⭐ 6444 stars on GitHub! Supports serialization, deserialization, MessagePack, streams, filtering, and more. Fully tested and documented.
|
||||||
|
category=Data Processing
|
||||||
|
url=https://arduinojson.org/?utm_source=meta&utm_medium=library.properties
|
||||||
|
architectures=*
|
||||||
|
repository=https://github.com/bblanchon/ArduinoJson.git
|
||||||
|
license=MIT
|
||||||
@@ -65,7 +65,7 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Reduces the capacity of the memory pool to match the current usage.
|
// Reduces the capacity of the memory pool to match the current usage.
|
||||||
// https://arduinojson.org/v7/api/JsonDocument/shrinktofit/
|
// https://arduinojson.org/v7/api/jsondocument/shrinktofit/
|
||||||
void shrinkToFit() {
|
void shrinkToFit() {
|
||||||
resources_.shrinkToFit();
|
resources_.shrinkToFit();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ class VariantPoolList {
|
|||||||
for (PoolCount i = 0; i < count_; i++)
|
for (PoolCount i = 0; i < count_; i++)
|
||||||
pools_[i].destroy(allocator);
|
pools_[i].destroy(allocator);
|
||||||
count_ = 0;
|
count_ = 0;
|
||||||
|
freeList_ = NULL_SLOT;
|
||||||
if (pools_ != preallocatedPools_) {
|
if (pools_ != preallocatedPools_) {
|
||||||
allocator->deallocate(pools_);
|
allocator->deallocate(pools_);
|
||||||
pools_ = preallocatedPools_;
|
pools_ = preallocatedPools_;
|
||||||
|
|||||||
@@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define ARDUINOJSON_VERSION "7.0.1"
|
#define ARDUINOJSON_VERSION "7.0.2"
|
||||||
#define ARDUINOJSON_VERSION_MAJOR 7
|
#define ARDUINOJSON_VERSION_MAJOR 7
|
||||||
#define ARDUINOJSON_VERSION_MINOR 0
|
#define ARDUINOJSON_VERSION_MINOR 0
|
||||||
#define ARDUINOJSON_VERSION_REVISION 1
|
#define ARDUINOJSON_VERSION_REVISION 2
|
||||||
#define ARDUINOJSON_VERSION_MACRO V701
|
#define ARDUINOJSON_VERSION_MACRO V702
|
||||||
|
|||||||
Reference in New Issue
Block a user