Holger Wirtz
3 years ago
commit
80aa2440e4
@ -0,0 +1,5 @@ |
||||
// ArduinoJson - https://arduinojson.org
|
||||
// Copyright Benoit Blanchon 2014-2021
|
||||
// MIT License
|
||||
|
||||
#include "src/ArduinoJson.h" |
||||
File diff suppressed because it is too large
Load Diff
@ -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.3) |
||||
|
||||
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() |
||||
@ -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 |
||||
@ -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. |
||||
@ -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! |
||||
@ -0,0 +1,22 @@ |
||||
version: 6.18.3.{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 . |
||||
|
After Width: | Height: | Size: 32 KiB |
@ -0,0 +1 @@ |
||||
COMPONENT_ADD_INCLUDEDIRS := src
|
||||
@ -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 ❤❤❤❤❤
|
||||
@ -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 ❤❤❤❤❤
|
||||
@ -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 ❤❤❤❤❤
|
||||
@ -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 ❤❤❤❤❤
|
||||
@ -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 ❤❤❤❤❤
|
||||
@ -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 ❤❤❤❤❤
|
||||
@ -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 ❤❤❤❤❤
|
||||
@ -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
|
||||
} |
||||
@ -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 ❤❤❤❤❤
|
||||
@ -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 ❤❤❤❤❤
|
||||
@ -0,0 +1,4 @@ |
||||
@PACKAGE_INIT@ |
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") |
||||
check_required_components("@PROJECT_NAME@") |
||||
@ -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() |
||||
@ -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 |
||||
@ -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) |
||||
@ -0,0 +1,6 @@ |
||||
# ArduinoJson - https://arduinojson.org |
||||
# Copyright Benoit Blanchon 2014-2021 |
||||
# MIT License |
||||
|
||||
idf_component_register(SRCS "main.cpp" |
||||
INCLUDE_DIRS "") |
||||
@ -0,0 +1,4 @@ |
||||
#
|
||||
# "main" pseudo-component makefile.
|
||||
#
|
||||
# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.)
|
||||
@ -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); |
||||
} |
||||
@ -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" |
||||
@ -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() |
||||
@ -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" >> $@
|
||||
@ -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; |
||||
} |
||||
@ -0,0 +1,10 @@ |
||||
//comment |
||||
/*comment*/ |
||||
[ //comment |
||||
/*comment*/"comment"/*comment*/,//comment |
||||
/*comment*/{//comment |
||||
/* comment*/"key"//comment |
||||
: //comment |
||||
"value"//comment |
||||
}/*comment*/ |
||||
]//comment |
||||
@ -0,0 +1 @@ |
||||
[] |
||||
@ -0,0 +1 @@ |
||||
{} |
||||
@ -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]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] |
||||
@ -0,0 +1 @@ |
||||
9720730739393920739 |
||||
@ -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 |
||||
] |
||||
@ -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 |
||||
} |
||||
@ -0,0 +1,8 @@ |
||||
[ |
||||
"hello", |
||||
'hello', |
||||
hello, |
||||
{"hello":"world"}, |
||||
{'hello':'world'}, |
||||
{hello:world} |
||||
] |
||||
@ -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" |
||||
} |
||||
} |
||||
@ -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; |
||||
} |
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1 @@ |
||||
’¥hello¥world |
||||
@ -0,0 +1 @@ |
||||
«hello world |
||||
@ -0,0 +1 @@ |
||||
ﾑﾏﾇ |
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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; |
||||
} |
||||
@ -0,0 +1 @@ |
||||
name=ArduinoJsonCI |
||||
@ -0,0 +1,5 @@ |
||||
#include "ArduinoJson.h" |
||||
|
||||
void setup() {} |
||||
|
||||
void loop() {} |
||||
@ -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 |
||||
@ -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" |
||||
@ -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 |
||||
@ -0,0 +1,18 @@ |
||||
#!/bin/bash |
||||
|
||||
set -eu |
||||
|
||||
VERSION="$1" |
||||
CHANGELOG="$2" |
||||
FRONTMATTER="$3" |
||||
|
||||
cat << END |
||||
--- |
||||
branch: v6 |
||||
version: $VERSION |
||||
date: '$(date +'%Y-%m-%d')' |
||||
$(cat "$FRONTMATTER") |
||||
--- |
||||
|
||||
$(awk '/\* /{ FOUND=1; print; next } { if (FOUND) exit}' "$CHANGELOG") |
||||
END |
||||
@ -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 |
||||
@ -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 "$VERSION" "CHANGELOG.md" "../ArduinoJson-$TAG-wandbox.txt" > "../ArduinoJson-$TAG.md" |
||||
|
||||
echo "You can now copy ../ArduinoJson-$TAG.md into arduinojson.org/collections/_versions/$VERSION.md" |
||||
@ -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
|
||||
// ]
|
||||
// }
|
||||
} |
||||
@ -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; |
||||
} |
||||
@ -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; |
||||
} |
||||
@ -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" |
||||
@ -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) |
||||
@ -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" |
||||
) |
||||
@ -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); |
||||
} |
||||
} |
||||
} |
||||
@ -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); |
||||
} |
||||
} |
||||
@ -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}"); |
||||
} |
||||
@ -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}"); |
||||
} |
||||
@ -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" |
||||
) |
||||
@ -0,0 +1,89 @@ |
||||
#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); |
||||
} |
||||
|
||||
SECTION("as<std::string_view>()") { |
||||
doc["s"] = "Hello World"; |
||||
doc["i"] = 42; |
||||
REQUIRE(doc["s"].as<std::string_view>() == std::string_view("Hello World")); |
||||
REQUIRE(doc["i"].as<std::string_view>() == std::string_view()); |
||||
} |
||||
|
||||
SECTION("is<std::string_view>()") { |
||||
doc["s"] = "Hello World"; |
||||
doc["i"] = 42; |
||||
REQUIRE(doc["s"].is<std::string_view>() == true); |
||||
REQUIRE(doc["i"].is<std::string_view>() == false); |
||||
} |
||||
} |
||||
|
||||
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.size() == 5); |
||||
} |
||||
@ -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) |
||||
@ -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); |
||||
} |
||||
@ -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); |
||||
} |
||||
@ -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'; |
||||
} |
||||
@ -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; |
||||
} |
||||
@ -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>(); |
||||
} |
||||
@ -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>(); |
||||
} |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue