Qrome - included ArduinoJson as part of the libs
parent
ea69172027
commit
0adead3bbf
|
|
@ -82,13 +82,14 @@ Use the Arduino guide for details on how to installing and manage libraries http
|
||||||
**Packages** -- the following packages and libraries are used (download and install):
|
**Packages** -- the following packages and libraries are used (download and install):
|
||||||
ESP8266WiFi.h
|
ESP8266WiFi.h
|
||||||
ESP8266WebServer.h
|
ESP8266WebServer.h
|
||||||
ArduinoJson.h --> https://github.com/bblanchon/ArduinoJson (Version 5.13.X)
|
|
||||||
WiFiManager.h --> https://github.com/tzapu/WiFiManager
|
WiFiManager.h --> https://github.com/tzapu/WiFiManager
|
||||||
ESP8266mDNS.h
|
ESP8266mDNS.h
|
||||||
ArduinoOTA.h --> Arduino OTA Library
|
ArduinoOTA.h --> Arduino OTA Library
|
||||||
"SSD1306Wire.h" --> https://github.com/ThingPulse/esp8266-oled-ssd1306
|
"SSD1306Wire.h" --> https://github.com/ThingPulse/esp8266-oled-ssd1306
|
||||||
"OLEDDisplayUi.h"
|
"OLEDDisplayUi.h"
|
||||||
|
|
||||||
|
Note Printer-Monitor version 2.5 and later include ArduinoJson (version 5.13.1).
|
||||||
|
|
||||||
## Initial Configuration
|
## Initial Configuration
|
||||||
All settings may be managed from the Web Interface, however, you may update the **Settings.h** file manually -- but it is not required. There is also an option to display current weather when the print is off-line.
|
All settings may be managed from the Web Interface, however, you may update the **Settings.h** file manually -- but it is not required. There is also an option to display current weather when the print is off-line.
|
||||||
* Your OctoPrint API Key from your OctoPrint -> User Settings -> Current API Key
|
* Your OctoPrint API Key from your OctoPrint -> User Settings -> Current API Key
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ SOFTWARE.
|
||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
#include <ESP8266WiFi.h>
|
#include <ESP8266WiFi.h>
|
||||||
#include <ArduinoJson.h>
|
#include "libs/ArduinoJson/ArduinoJson.h"
|
||||||
#include <base64.h>
|
#include <base64.h>
|
||||||
|
|
||||||
class OctoPrintClient {
|
class OctoPrintClient {
|
||||||
|
|
|
||||||
|
|
@ -1,90 +1,89 @@
|
||||||
/** The MIT License (MIT)
|
/** The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2018 David Payne
|
|
||||||
|
|
||||||
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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
#include <ESP8266WiFi.h>
|
|
||||||
#include <ArduinoJson.h>
|
|
||||||
|
|
||||||
class OpenWeatherMapClient {
|
|
||||||
|
|
||||||
private:
|
|
||||||
String myCityIDs = "";
|
|
||||||
String myApiKey = "";
|
|
||||||
String units = "";
|
|
||||||
String lang = "";
|
|
||||||
|
|
||||||
const char* servername = "api.openweathermap.org"; // remote server we will connect to
|
|
||||||
String result;
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
String lat;
|
|
||||||
String lon;
|
|
||||||
String dt;
|
|
||||||
String city;
|
|
||||||
String country;
|
|
||||||
String temp;
|
|
||||||
String humidity;
|
|
||||||
String condition;
|
|
||||||
String wind;
|
|
||||||
String weatherId;
|
|
||||||
String description;
|
|
||||||
String icon;
|
|
||||||
boolean cached;
|
|
||||||
String error;
|
|
||||||
} weather;
|
|
||||||
|
|
||||||
weather weathers[5];
|
|
||||||
|
|
||||||
String roundValue(String value);
|
|
||||||
|
|
||||||
public:
|
|
||||||
OpenWeatherMapClient(String ApiKey, int CityIDs[], int cityCount, boolean isMetric, String language);
|
|
||||||
void updateWeather();
|
|
||||||
void updateWeatherApiKey(String ApiKey);
|
|
||||||
void updateCityIdList(int CityIDs[], int cityCount);
|
|
||||||
void updateLanguage(String language);
|
|
||||||
void setMetric(boolean isMetric);
|
|
||||||
|
|
||||||
String getWeatherResults();
|
|
||||||
|
|
||||||
String getLat(int index);
|
|
||||||
String getLon(int index);
|
|
||||||
String getDt(int index);
|
|
||||||
String getCity(int index);
|
|
||||||
String getCountry(int index);
|
|
||||||
String getTemp(int index);
|
|
||||||
String getTempRounded(int index);
|
|
||||||
String getHumidity(int index);
|
|
||||||
String getHumidityRounded(int index);
|
|
||||||
String getCondition(int index);
|
|
||||||
String getWind(int index);
|
|
||||||
String getWindRounded(int index);
|
|
||||||
String getWeatherId(int index);
|
|
||||||
String getDescription(int index);
|
|
||||||
String getIcon(int index);
|
|
||||||
boolean getCached();
|
|
||||||
String getMyCityIDs();
|
|
||||||
String getWeatherIcon(int index);
|
|
||||||
String getError();
|
|
||||||
};
|
|
||||||
|
|
||||||
|
Copyright (c) 2018 David Payne
|
||||||
|
|
||||||
|
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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#include <ESP8266WiFi.h>
|
||||||
|
#include "libs/ArduinoJson/ArduinoJson.h"
|
||||||
|
|
||||||
|
class OpenWeatherMapClient {
|
||||||
|
|
||||||
|
private:
|
||||||
|
String myCityIDs = "";
|
||||||
|
String myApiKey = "";
|
||||||
|
String units = "";
|
||||||
|
String lang = "";
|
||||||
|
|
||||||
|
const char* servername = "api.openweathermap.org"; // remote server we will connect to
|
||||||
|
String result;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
String lat;
|
||||||
|
String lon;
|
||||||
|
String dt;
|
||||||
|
String city;
|
||||||
|
String country;
|
||||||
|
String temp;
|
||||||
|
String humidity;
|
||||||
|
String condition;
|
||||||
|
String wind;
|
||||||
|
String weatherId;
|
||||||
|
String description;
|
||||||
|
String icon;
|
||||||
|
boolean cached;
|
||||||
|
String error;
|
||||||
|
} weather;
|
||||||
|
|
||||||
|
weather weathers[5];
|
||||||
|
|
||||||
|
String roundValue(String value);
|
||||||
|
|
||||||
|
public:
|
||||||
|
OpenWeatherMapClient(String ApiKey, int CityIDs[], int cityCount, boolean isMetric, String language);
|
||||||
|
void updateWeather();
|
||||||
|
void updateWeatherApiKey(String ApiKey);
|
||||||
|
void updateCityIdList(int CityIDs[], int cityCount);
|
||||||
|
void updateLanguage(String language);
|
||||||
|
void setMetric(boolean isMetric);
|
||||||
|
|
||||||
|
String getWeatherResults();
|
||||||
|
|
||||||
|
String getLat(int index);
|
||||||
|
String getLon(int index);
|
||||||
|
String getDt(int index);
|
||||||
|
String getCity(int index);
|
||||||
|
String getCountry(int index);
|
||||||
|
String getTemp(int index);
|
||||||
|
String getTempRounded(int index);
|
||||||
|
String getHumidity(int index);
|
||||||
|
String getHumidityRounded(int index);
|
||||||
|
String getCondition(int index);
|
||||||
|
String getWind(int index);
|
||||||
|
String getWindRounded(int index);
|
||||||
|
String getWeatherId(int index);
|
||||||
|
String getDescription(int index);
|
||||||
|
String getIcon(int index);
|
||||||
|
boolean getCached();
|
||||||
|
String getMyCityIDs();
|
||||||
|
String getWeatherIcon(int index);
|
||||||
|
String getError();
|
||||||
|
};
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,5 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#include "src/ArduinoJson.h"
|
||||||
|
|
@ -0,0 +1,463 @@
|
||||||
|
ArduinoJson: change log
|
||||||
|
=======================
|
||||||
|
|
||||||
|
v5.13.1
|
||||||
|
-------
|
||||||
|
|
||||||
|
* Fixed `JsonVariant::operator|(int)` that returned the default value if the variant contained a double (issue #675)
|
||||||
|
* Allowed non-quoted key to contain underscores (issue #665)
|
||||||
|
|
||||||
|
v5.13.0
|
||||||
|
-------
|
||||||
|
|
||||||
|
* Changed the rules of string duplication (issue #658)
|
||||||
|
* `RawJson()` accepts any kind of string and obeys to the same rules for duplication
|
||||||
|
* Changed the return type of `strdup()` to `const char*` to prevent double duplication
|
||||||
|
* Marked `strdup()` as deprecated
|
||||||
|
|
||||||
|
> ### New rules for string duplication
|
||||||
|
>
|
||||||
|
> | type | duplication |
|
||||||
|
> |:---------------------------|:------------|
|
||||||
|
> | const char* | no |
|
||||||
|
> | char* | ~~no~~ yes |
|
||||||
|
> | String | yes |
|
||||||
|
> | std::string | yes |
|
||||||
|
> | const __FlashStringHelper* | yes |
|
||||||
|
>
|
||||||
|
> These new rules make `JsonBuffer::strdup()` useless.
|
||||||
|
|
||||||
|
v5.12.0
|
||||||
|
-------
|
||||||
|
|
||||||
|
* Added `JsonVariant::operator|` to return a default value (see below)
|
||||||
|
* Added a clear error message when compiled as C instead of C++ (issue #629)
|
||||||
|
* Added detection of MPLAB XC compiler (issue #629)
|
||||||
|
* Added detection of Keil ARM Compiler (issue #629)
|
||||||
|
* Added an example that shows how to save and load a configuration file
|
||||||
|
* Reworked all other examples
|
||||||
|
|
||||||
|
> ### How to use the new feature?
|
||||||
|
>
|
||||||
|
> If you have a block like this:
|
||||||
|
>
|
||||||
|
> ```c++
|
||||||
|
> const char* ssid = root["ssid"];
|
||||||
|
> if (!ssid)
|
||||||
|
> ssid = "default ssid";
|
||||||
|
> ```
|
||||||
|
>
|
||||||
|
> You can simplify like that:
|
||||||
|
>
|
||||||
|
> ```c++
|
||||||
|
> const char* ssid = root["ssid"] | "default ssid";
|
||||||
|
> ```
|
||||||
|
|
||||||
|
v5.11.2
|
||||||
|
-------
|
||||||
|
|
||||||
|
* Fixed `DynamicJsonBuffer::clear()` not resetting allocation size (issue #561)
|
||||||
|
* Fixed incorrect rounding for float values (issue #588)
|
||||||
|
|
||||||
|
v5.11.1
|
||||||
|
-------
|
||||||
|
|
||||||
|
* Removed dependency on `PGM_P` as Particle 0.6.2 doesn't define it (issue #546)
|
||||||
|
* Fixed warning "dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]"
|
||||||
|
* Fixed warning "floating constant exceeds range of 'float' [-Woverflow]" (issue #544)
|
||||||
|
* Fixed warning "this statement may fall through" [-Wimplicit-fallthrough=] (issue #539)
|
||||||
|
* Removed `ARDUINOJSON_DOUBLE_IS_64BITS` as it became useless.
|
||||||
|
* Fixed too many decimals places in float serialization (issue #543)
|
||||||
|
|
||||||
|
v5.11.0
|
||||||
|
-------
|
||||||
|
|
||||||
|
* Made `JsonBuffer` non-copyable (PR #524 by @luisrayas3)
|
||||||
|
* Added `StaticJsonBuffer::clear()`
|
||||||
|
* Added `DynamicJsonBuffer::clear()`
|
||||||
|
|
||||||
|
v5.10.1
|
||||||
|
-------
|
||||||
|
|
||||||
|
* Fixed IntelliSense errors in Visual Micro (issue #483)
|
||||||
|
* Fixed compilation in IAR Embedded Workbench (issue #515)
|
||||||
|
* Fixed reading "true" as a float (issue #516)
|
||||||
|
* Added `ARDUINOJSON_DOUBLE_IS_64BITS`
|
||||||
|
* Added `ARDUINOJSON_EMBEDDED_MODE`
|
||||||
|
|
||||||
|
v5.10.0
|
||||||
|
-------
|
||||||
|
|
||||||
|
* Removed configurable number of decimal places (issues #288, #427 and #506)
|
||||||
|
* Changed exponentiation thresholds to `1e7` and `1e-5` (issues #288, #427 and #506)
|
||||||
|
* `JsonVariant::is<double>()` now returns `true` for integers
|
||||||
|
* Fixed error `IsBaseOf is not a member of ArduinoJson::TypeTraits` (issue #495)
|
||||||
|
* Fixed error `forming reference to reference` (issue #495)
|
||||||
|
|
||||||
|
> ### BREAKING CHANGES :warning:
|
||||||
|
>
|
||||||
|
> | Old syntax | New syntax |
|
||||||
|
> |:--------------------------------|:--------------------|
|
||||||
|
> | `double_with_n_digits(3.14, 2)` | `3.14` |
|
||||||
|
> | `float_with_n_digits(3.14, 2)` | `3.14f` |
|
||||||
|
> | `obj.set("key", 3.14, 2)` | `obj["key"] = 3.14` |
|
||||||
|
> | `arr.add(3.14, 2)` | `arr.add(3.14)` |
|
||||||
|
>
|
||||||
|
> | Input | Old output | New output |
|
||||||
|
> |:----------|:-----------|:-----------|
|
||||||
|
> | `3.14159` | `3.14` | `3.14159` |
|
||||||
|
> | `42.0` | `42.00` | `42` |
|
||||||
|
> | `0.0` | `0.00` | `0` |
|
||||||
|
>
|
||||||
|
> | Expression | Old result | New result |
|
||||||
|
> |:-------------------------------|:-----------|:-----------|
|
||||||
|
> | `JsonVariant(42).is<int>()` | `true` | `true` |
|
||||||
|
> | `JsonVariant(42).is<float>()` | `false` | `true` |
|
||||||
|
> | `JsonVariant(42).is<double>()` | `false` | `true` |
|
||||||
|
|
||||||
|
v5.9.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added `JsonArray::remove(iterator)` (issue #479)
|
||||||
|
* Added `JsonObject::remove(iterator)`
|
||||||
|
* Renamed `JsonArray::removeAt(size_t)` into `remove(size_t)`
|
||||||
|
* Renamed folder `include/` to `src/`
|
||||||
|
* Fixed warnings `floating constant exceeds range of float`and `floating constant truncated to zero` (issue #483)
|
||||||
|
* Removed `Print` class and converted `printTo()` to a template method (issue #276)
|
||||||
|
* Removed example `IndentedPrintExample.ino`
|
||||||
|
* Now compatible with Particle 0.6.1, thanks to Jacob Nite (issue #294 and PR #461 by @foodbag)
|
||||||
|
|
||||||
|
v5.8.4
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added custom implementation of `strtod()` (issue #453)
|
||||||
|
* Added custom implementation of `strtol()` (issue #465)
|
||||||
|
* `char` is now treated as an integral type (issue #337, #370)
|
||||||
|
|
||||||
|
v5.8.3
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed an access violation in `DynamicJsonBuffer` when memory allocation fails (issue #433)
|
||||||
|
* Added operators `==` and `!=` for two `JsonVariant`s (issue #436)
|
||||||
|
* Fixed `JsonVariant::operator[const FlashStringHelper*]` (issue #441)
|
||||||
|
|
||||||
|
v5.8.2
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed parsing of comments (issue #421)
|
||||||
|
* Fixed ignored `Stream` timeout (issue #422)
|
||||||
|
* Made sure we don't read more that necessary (issue #422)
|
||||||
|
* Fixed error when the key of a `JsonObject` is a `char[]` (issue #423)
|
||||||
|
* Reduced code size when using `const` references
|
||||||
|
* Fixed error with string of type `unsigned char*` (issue #428)
|
||||||
|
* Added `deprecated` attribute on `asArray()`, `asObject()` and `asString()` (issue #420)
|
||||||
|
|
||||||
|
v5.8.1
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed error when assigning a `volatile int` to a `JsonVariant` (issue #415)
|
||||||
|
* Fixed errors with Variable Length Arrays (issue #416)
|
||||||
|
* Fixed error when both `ARDUINOJSON_ENABLE_STD_STREAM` and `ARDUINOJSON_ENABLE_ARDUINO_STREAM` are set to `1`
|
||||||
|
* Fixed error "Stream does not name a type" (issue #412)
|
||||||
|
|
||||||
|
v5.8.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added operator `==` to compare `JsonVariant` and strings (issue #402)
|
||||||
|
* Added support for `Stream` (issue #300)
|
||||||
|
* Reduced memory consumption by not duplicating spaces and comments
|
||||||
|
|
||||||
|
> ### BREAKING CHANGES :warning:
|
||||||
|
>
|
||||||
|
> `JsonBuffer::parseObject()` and `JsonBuffer::parseArray()` have been pulled down to the derived classes `DynamicJsonBuffer` and `StaticJsonBufferBase`.
|
||||||
|
>
|
||||||
|
> This means that if you have code like:
|
||||||
|
>
|
||||||
|
> ```c++
|
||||||
|
> void myFunction(JsonBuffer& jsonBuffer);
|
||||||
|
> ```
|
||||||
|
>
|
||||||
|
> you need to replace it with one of the following:
|
||||||
|
>
|
||||||
|
> ```c++
|
||||||
|
> void myFunction(DynamicJsonBuffer& jsonBuffer);
|
||||||
|
> void myFunction(StaticJsonBufferBase& jsonBuffer);
|
||||||
|
> template<typename TJsonBuffer> void myFunction(TJsonBuffer& jsonBuffer);
|
||||||
|
> ```
|
||||||
|
|
||||||
|
v5.7.3
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added an `printTo(char[N])` and `prettyPrintTo(char[N])` (issue #292)
|
||||||
|
* Added ability to set a nested value like this: `root["A"]["B"] = "C"` (issue #352)
|
||||||
|
* Renamed `*.ipp` to `*Impl.hpp` because they were ignored by Arduino IDE (issue #396)
|
||||||
|
|
||||||
|
v5.7.2
|
||||||
|
------
|
||||||
|
|
||||||
|
* Made PROGMEM available on more platforms (issue #381)
|
||||||
|
* Fixed PROGMEM causing an exception on ESP8266 (issue #383)
|
||||||
|
|
||||||
|
v5.7.1
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added support for PROGMEM (issue #76)
|
||||||
|
* Fixed compilation error when index is not an `int` (issue #381)
|
||||||
|
|
||||||
|
v5.7.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* Templatized all functions using `String` or `std::string`
|
||||||
|
* Removed `ArduinoJson::String`
|
||||||
|
* Removed `JsonVariant::defaultValue<T>()`
|
||||||
|
* Removed non-template `JsonObject::get()` and `JsonArray.get()`
|
||||||
|
* Fixed support for `StringSumHelper` (issue #184)
|
||||||
|
* Replaced `ARDUINOJSON_USE_ARDUINO_STRING` by `ARDUINOJSON_ENABLE_STD_STRING` and `ARDUINOJSON_ENABLE_ARDUINO_STRING` (issue #378)
|
||||||
|
* Added example `StringExample.ino` to show where `String` can be used
|
||||||
|
* Increased default nesting limit to 50 when compiled for a computer (issue #349)
|
||||||
|
|
||||||
|
> ### BREAKING CHANGES :warning:
|
||||||
|
>
|
||||||
|
> The non-template functions `JsonObject::get()` and `JsonArray.get()` have been removed. This means that you need to explicitely tell the type you expect in return.
|
||||||
|
>
|
||||||
|
> Old code:
|
||||||
|
>
|
||||||
|
> ```c++
|
||||||
|
> #define ARDUINOJSON_USE_ARDUINO_STRING 0
|
||||||
|
> JsonVariant value1 = myObject.get("myKey");
|
||||||
|
> JsonVariant value2 = myArray.get(0);
|
||||||
|
> ```
|
||||||
|
>
|
||||||
|
> New code:
|
||||||
|
>
|
||||||
|
> ```c++
|
||||||
|
> #define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
|
||||||
|
> #define ARDUINOJSON_ENABLE_STD_STRING 1
|
||||||
|
> JsonVariant value1 = myObject.get<JsonVariant>("myKey");
|
||||||
|
> JsonVariant value2 = myArray.get<JsonVariant>(0);
|
||||||
|
> ```
|
||||||
|
|
||||||
|
v5.6.7
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed `array[idx].as<JsonVariant>()` and `object[key].as<JsonVariant>()`
|
||||||
|
* Fixed return value of `JsonObject::set()` (issue #350)
|
||||||
|
* Fixed undefined behavior in `Prettyfier` and `Print` (issue #354)
|
||||||
|
* Fixed parser that incorrectly rejected floats containing a `+` (issue #349)
|
||||||
|
|
||||||
|
v5.6.6
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed `-Wparentheses` warning introduced in v5.6.5 (PR #335 by @nuket)
|
||||||
|
* Added `.mbedignore` for ARM mbdeb (PR #334 by @nuket)
|
||||||
|
* Fixed `JsonVariant::success()` which didn't propagate `JsonArray::success()` nor `JsonObject::success()` (issue #342).
|
||||||
|
|
||||||
|
v5.6.5
|
||||||
|
------
|
||||||
|
|
||||||
|
* `as<char*>()` now returns `true` when input is `null` (issue #330)
|
||||||
|
|
||||||
|
v5.6.4
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed error in float serialization (issue #324)
|
||||||
|
|
||||||
|
v5.6.3
|
||||||
|
------
|
||||||
|
|
||||||
|
* Improved speed of float serialization (about twice faster)
|
||||||
|
* Added `as<JsonArray>()` as a synonym for `as<JsonArray&>()`... (issue #291)
|
||||||
|
* Fixed `call of overloaded isinf(double&) is ambiguous` (issue #284)
|
||||||
|
|
||||||
|
v5.6.2
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed build when another lib does `#undef isnan` (issue #284)
|
||||||
|
|
||||||
|
v5.6.1
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added missing `#pragma once` (issue #310)
|
||||||
|
|
||||||
|
v5.6.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* ArduinoJson is now a header-only library (issue #199)
|
||||||
|
|
||||||
|
v5.5.1
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed compilation error with Intel Galileo (issue #299)
|
||||||
|
|
||||||
|
v5.5.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added `JsonVariant::success()` (issue #279)
|
||||||
|
* Renamed `JsonVariant::invalid<T>()` to `JsonVariant::defaultValue<T>()`
|
||||||
|
|
||||||
|
v5.4.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* Changed `::String` to `ArduinoJson::String` (issue #275)
|
||||||
|
* Changed `::Print` to `ArduinoJson::Print` too
|
||||||
|
|
||||||
|
v5.3.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added custom implementation of `ftoa` (issues #266, #267, #269 and #270)
|
||||||
|
* Added `JsonVariant JsonBuffer::parse()` (issue #265)
|
||||||
|
* Fixed `unsigned long` printed as `signed long` (issue #170)
|
||||||
|
|
||||||
|
v5.2.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added `JsonVariant::as<char*>()` as a synonym for `JsonVariant::as<const char*>()` (issue #257)
|
||||||
|
* Added example `JsonHttpClient` (issue #256)
|
||||||
|
* Added `JsonArray::copyTo()` and `JsonArray::copyFrom()` (issue #254)
|
||||||
|
* Added `RawJson()` to insert pregenerated JSON portions (issue #259)
|
||||||
|
|
||||||
|
v5.1.1
|
||||||
|
------
|
||||||
|
|
||||||
|
* Removed `String` duplication when one replaces a value in a `JsonObject` (PR #232 by @ulion)
|
||||||
|
|
||||||
|
v5.1.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added support of `long long` (issue #171)
|
||||||
|
* Moved all build settings to `ArduinoJson/Configuration.hpp`
|
||||||
|
|
||||||
|
> ### BREAKING CHANGE :warning:
|
||||||
|
>
|
||||||
|
> If you defined `ARDUINOJSON_ENABLE_STD_STREAM`, you now need to define it to `1`.
|
||||||
|
|
||||||
|
v5.0.8
|
||||||
|
------
|
||||||
|
|
||||||
|
* Made the library compatible with [PlatformIO](http://platformio.org/) (issue #181)
|
||||||
|
* Fixed `JsonVariant::is<bool>()` that was incorrectly returning false (issue #214)
|
||||||
|
|
||||||
|
v5.0.7
|
||||||
|
------
|
||||||
|
|
||||||
|
* Made library easier to use from a CMake project: simply `add_subdirectory(ArduinoJson/src)`
|
||||||
|
* Changed `String` to be a `typedef` of `std::string` (issues #142 and #161)
|
||||||
|
|
||||||
|
> ### BREAKING CHANGES :warning:
|
||||||
|
>
|
||||||
|
> - `JsonVariant(true).as<String>()` now returns `"true"` instead of `"1"`
|
||||||
|
> - `JsonVariant(false).as<String>()` now returns `"false"` instead of `"0"`
|
||||||
|
|
||||||
|
v5.0.6
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added parameter to `DynamicJsonBuffer` constructor to set initial size (issue #152)
|
||||||
|
* Fixed warning about library category in Arduino 1.6.6 (issue #147)
|
||||||
|
* Examples: Added a loop to wait for serial port to be ready (issue #156)
|
||||||
|
|
||||||
|
v5.0.5
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added overload `JsonObjectSuscript::set(value, decimals)` (issue #143)
|
||||||
|
* Use `float` instead of `double` to reduce the size of `JsonVariant` (issue #134)
|
||||||
|
|
||||||
|
v5.0.4
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed ambiguous overload with `JsonArraySubscript` and `JsonObjectSubscript` (issue #122)
|
||||||
|
|
||||||
|
v5.0.3
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed `printTo(String)` which wrote numbers instead of strings (issue #120)
|
||||||
|
* Fixed return type of `JsonArray::is<T>()` and some others (issue #121)
|
||||||
|
|
||||||
|
v5.0.2
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed segmentation fault in `parseObject(String)` and `parseArray(String)`, when the
|
||||||
|
`StaticJsonBuffer` is too small to hold a copy of the string
|
||||||
|
* Fixed Clang warning "register specifier is deprecated" (issue #102)
|
||||||
|
* Fixed GCC warning "declaration shadows a member" (issue #103)
|
||||||
|
* Fixed memory alignment, which made ESP8266 crash (issue #104)
|
||||||
|
* Fixed compilation on Visual Studio 2010 and 2012 (issue #107)
|
||||||
|
|
||||||
|
v5.0.1
|
||||||
|
------
|
||||||
|
|
||||||
|
* Fixed compilation with Arduino 1.0.6 (issue #99)
|
||||||
|
|
||||||
|
v5.0.0
|
||||||
|
------
|
||||||
|
|
||||||
|
* Added support of `String` class (issues #55, #56, #70, #77)
|
||||||
|
* Added `JsonBuffer::strdup()` to make a copy of a string (issues #10, #57)
|
||||||
|
* Implicitly call `strdup()` for `String` but not for `char*` (issues #84, #87)
|
||||||
|
* Added support of non standard JSON input (issue #44)
|
||||||
|
* Added support of comments in JSON input (issue #88)
|
||||||
|
* Added implicit cast between numerical types (issues #64, #69, #93)
|
||||||
|
* Added ability to read number values as string (issue #90)
|
||||||
|
* Redesigned `JsonVariant` to leverage converting constructors instead of assignment operators (issue #66)
|
||||||
|
* Switched to new the library layout (requires Arduino 1.0.6 or above)
|
||||||
|
|
||||||
|
> ### BREAKING CHANGES :warning:
|
||||||
|
>
|
||||||
|
> - `JsonObject::add()` was renamed to `set()`
|
||||||
|
> - `JsonArray::at()` and `JsonObject::at()` were renamed to `get()`
|
||||||
|
> - Number of digits of floating point value are now set with `double_with_n_digits()`
|
||||||
|
|
||||||
|
**Personal note about the `String` class**:
|
||||||
|
Support of the `String` class has been added to the library because many people use it in their programs.
|
||||||
|
However, you should not see this as an invitation to use the `String` class.
|
||||||
|
The `String` class is **bad** because it uses dynamic memory allocation.
|
||||||
|
Compared to static allocation, it compiles to a bigger, slower program, and is less predictable.
|
||||||
|
You certainly don't want that in an embedded environment!
|
||||||
|
|
||||||
|
v4.6
|
||||||
|
----
|
||||||
|
|
||||||
|
* Fixed segmentation fault in `DynamicJsonBuffer` when memory allocation fails (issue #92)
|
||||||
|
|
||||||
|
v4.5
|
||||||
|
----
|
||||||
|
|
||||||
|
* Fixed buffer overflow when input contains a backslash followed by a terminator (issue #81)
|
||||||
|
|
||||||
|
**Upgrading is recommended** since previous versions contain a potential security risk.
|
||||||
|
|
||||||
|
Special thanks to [Giancarlo Canales Barreto](https://github.com/gcanalesb) for finding this nasty bug.
|
||||||
|
|
||||||
|
v4.4
|
||||||
|
----
|
||||||
|
|
||||||
|
* Added `JsonArray::measureLength()` and `JsonObject::measureLength()` (issue #75)
|
||||||
|
|
||||||
|
v4.3
|
||||||
|
----
|
||||||
|
|
||||||
|
* Added `JsonArray::removeAt()` to remove an element of an array (issue #58)
|
||||||
|
* Fixed stack-overflow in `DynamicJsonBuffer` when parsing huge JSON files (issue #65)
|
||||||
|
* Fixed wrong return value of `parseArray()` and `parseObject()` when allocation fails (issue #68)
|
||||||
|
|
||||||
|
v4.2
|
||||||
|
----
|
||||||
|
|
||||||
|
* Switched back to old library layout (issues #39, #43 and #45)
|
||||||
|
* Removed global new operator overload (issue #40, #45 and #46)
|
||||||
|
* Added an example with EthernetServer
|
||||||
|
|
||||||
|
v4.1
|
||||||
|
----
|
||||||
|
|
||||||
|
* Added DynamicJsonBuffer (issue #19)
|
||||||
|
|
||||||
|
v4.0
|
||||||
|
----
|
||||||
|
|
||||||
|
* Unified parser and generator API (issue #23)
|
||||||
|
* Updated library layout, now requires Arduino 1.0.6 or newer
|
||||||
|
|
||||||
|
> ### BREAKING CHANGES :warning:
|
||||||
|
>
|
||||||
|
> API changed significantly since v3, see [Migrating code to the new API](https://arduinojson.org/doc/migration/).
|
||||||
|
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
# ArduinoJson - arduinojson.org
|
||||||
|
# Copyright Benoit Blanchon 2014-2018
|
||||||
|
# MIT License
|
||||||
|
|
||||||
|
cmake_minimum_required(VERSION 3.0)
|
||||||
|
project(ArduinoJson)
|
||||||
|
|
||||||
|
enable_testing()
|
||||||
|
|
||||||
|
if(${COVERAGE})
|
||||||
|
set(CMAKE_CXX_FLAGS "-g -O0 -fprofile-arcs -ftest-coverage")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
include_directories(${CMAKE_CURRENT_LIST_DIR}/src)
|
||||||
|
add_subdirectory(third-party/catch)
|
||||||
|
add_subdirectory(test)
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
# 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. Unit test every change in behavior
|
||||||
|
2. Use clang-format in "file" mode to format the code
|
||||||
|
3. Consider using the Continuous Integration (Travis and AppVeyor)
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
The MIT License (MIT)
|
||||||
|
---------------------
|
||||||
|
|
||||||
|
Copyright © 2014-2018 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,110 @@
|
||||||
|

|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
[](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/master) [](https://travis-ci.org/bblanchon/ArduinoJson) [](https://coveralls.io/r/bblanchon/ArduinoJson?branch=master) [](https://github.com/bblanchon/ArduinoJson)
|
||||||
|
|
||||||
|
ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
* JSON decoding (comments are supported)
|
||||||
|
* JSON encoding (with optional indentation)
|
||||||
|
* Elegant API, easy to use
|
||||||
|
* Fixed memory allocation (zero malloc)
|
||||||
|
* No data duplication (zero copy)
|
||||||
|
* Portable (written in C++98, can be used in any C++ project)
|
||||||
|
* Self-contained (no external dependency)
|
||||||
|
* Small footprint
|
||||||
|
* Input and output streams
|
||||||
|
* [100% code coverage](https://coveralls.io/github/bblanchon/ArduinoJson)
|
||||||
|
* [Header-only library](https://en.wikipedia.org/wiki/Header-only)
|
||||||
|
* [MIT License](https://en.wikipedia.org/wiki/MIT_License)
|
||||||
|
* [Comprehensive documentation](https://arduinojson.org?utm_source=github&utm_medium=readme)
|
||||||
|
|
||||||
|
## Compatibility
|
||||||
|
|
||||||
|
ArduinoJson works on the following hardware:
|
||||||
|
|
||||||
|
* <img src="https://www.arduino.cc/favicon.ico" height="16" width="16"> Arduino boards: [Uno](https://www.arduino.cc/en/Main/ArduinoBoardUno), [Due](https://www.arduino.cc/en/Main/ArduinoBoardDue), [Mini](https://www.arduino.cc/en/Main/ArduinoBoardMini), [Micro](https://www.arduino.cc/en/Main/ArduinoBoardMicro), [Yun](https://www.arduino.cc/en/Main/ArduinoBoardYun)...
|
||||||
|
* <img src="http://espressif.com/sites/all/themes/espressif/favicon.ico" height="16" width="16"> Espressif chips: [ESP8266](https://en.wikipedia.org/wiki/ESP8266), [ESP32](https://en.wikipedia.org/wiki/ESP32)
|
||||||
|
* <img src="https://www.wemos.cc/themes/martin-materialize-parallax/assets/favicon.ico" height="16" width="16"> WeMos boards: [D1](https://wiki.wemos.cc/products:d1:d1), [D1 mini](https://wiki.wemos.cc/products:d1:d1_mini), ...
|
||||||
|
* <img src="http://redbearlab.com/favicon.ico" height="16" width="16"> RedBearLab boards: [BLE Nano](http://redbearlab.com/blenano/), [BLE Mini](http://redbearlab.com/blemini/), [WiFi Micro](https://redbear.cc/product/wifi/wifi-micro.html), [LOLIN32](https://wiki.wemos.cc/products:lolin32:lolin32)...
|
||||||
|
* <img src="https://www.pjrc.com/favicon.ico" height="16" width="16"> [Teensy](https://www.pjrc.com/teensy/) boards
|
||||||
|
* <img src="https://software.intel.com/sites/all/themes/zero/favicon.ico" height="16" width="16"> Intel boards: Edison, Galileo...
|
||||||
|
* <img src="https://www-assets.particle.io/images/favicon.png" height="16" width="16"> Particle boards: [Photon](https://www.particle.io/products/hardware/photon-wifi-dev-kit), [Electron](https://www.particle.io/products/hardware/electron-cellular-dev-kit)...
|
||||||
|
* <img src="http://www.ti.com/favicon.ico" height="16" width="16"> Texas Instruments boards: [MSP430](http://www.ti.com/microcontrollers/msp430-ultra-low-power-mcus/overview/overview.html)...
|
||||||
|
|
||||||
|
ArduinoJson compiles with zero warning on the following compilers, IDEs, and platforms:
|
||||||
|
|
||||||
|
* <img src="https://www.arduino.cc/favicon.ico" height="16" width="16"> [Arduino IDE](https://www.arduino.cc/en/Main/Software)
|
||||||
|
* <img src="http://cdn.platformio.org/favicon.ico" height="16" width="16"> [PlatformIO](http://platformio.org/)
|
||||||
|
* <img src="http://energia.nu/img/favicon.ico" height="16" width="16"> [Energia](http://energia.nu/)
|
||||||
|
* <img src="http://www.visualmicro.com/pics/arduino-visual-studio-ld.png" height="16" width="16"> [Visual Micro](http://www.visualmicro.com/)
|
||||||
|
* <img src="http://www.atmel.com/Images/favicon.ico" height="16" width="16"> [Atmel Studio](http://www.atmel.com/microsite/atmel-studio/)
|
||||||
|
* <img src="https://www.iar.com/favicon.ico" height="16" width="16"> [IAR Embedded Workbench](https://www.iar.com/iar-embedded-workbench/)
|
||||||
|
* <img src="http://www.st.com/etc/clientlibs/st-site/media/app/images/favicon.png" height="16" width="16"> [Atollic TrueSTUDIO](https://atollic.com/truestudio/)
|
||||||
|
* <img src="http://www.keil.com/favicon.ico" height="16" width="16"> [Keil uVision](http://www.keil.com/)
|
||||||
|
* <img src="http://www.microchip.com/favicon.ico" height="16" width="16"> [MPLAB X IDE](http://www.microchip.com/mplab/mplab-x-ide)
|
||||||
|
* <img src="https://gcc.gnu.org/favicon.ico" height="16" width="16"> [GCC](https://gcc.gnu.org/)
|
||||||
|
* <img src="https://clang.llvm.org/favicon.ico" height="16" width="16"> [Clang](https://clang.llvm.org/)
|
||||||
|
* <img src="https://www.visualstudio.com/favicon.ico" height="16" width="16"> [Visual Studio](https://www.visualstudio.com/)
|
||||||
|
|
||||||
|
## Quickstart
|
||||||
|
|
||||||
|
### Deserialization
|
||||||
|
|
||||||
|
Here is a program that parses a JSON document with ArduinoJson.
|
||||||
|
|
||||||
|
```c++
|
||||||
|
char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
|
||||||
|
|
||||||
|
StaticJsonBuffer<200> jsonBuffer;
|
||||||
|
|
||||||
|
JsonObject& root = jsonBuffer.parseObject(json);
|
||||||
|
|
||||||
|
const char* sensor = root["sensor"];
|
||||||
|
long time = root["time"];
|
||||||
|
double latitude = root["data"][0];
|
||||||
|
double longitude = root["data"][1];
|
||||||
|
```
|
||||||
|
|
||||||
|
See the [tutorial on arduinojson.org](https://arduinojson.org/doc/decoding/?utm_source=github&utm_medium=readme)
|
||||||
|
|
||||||
|
### Serialization
|
||||||
|
|
||||||
|
Here is a program that generates a JSON document with ArduinoJson:
|
||||||
|
|
||||||
|
```c++
|
||||||
|
StaticJsonBuffer<200> jsonBuffer;
|
||||||
|
|
||||||
|
JsonObject& root = jsonBuffer.createObject();
|
||||||
|
root["sensor"] = "gps";
|
||||||
|
root["time"] = 1351824120;
|
||||||
|
|
||||||
|
JsonArray& data = root.createNestedArray("data");
|
||||||
|
data.add(48.756080);
|
||||||
|
data.add(2.302038);
|
||||||
|
|
||||||
|
root.printTo(Serial);
|
||||||
|
// This prints:
|
||||||
|
// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
|
||||||
|
```
|
||||||
|
|
||||||
|
See the [tutorial on arduinojson.org](https://arduinojson.org/doc/encoding/?utm_source=github&utm_medium=readme)
|
||||||
|
|
||||||
|
## Documentation
|
||||||
|
|
||||||
|
The documentation is available on [arduinojson.org](https://arduinojson.org/?utm_source=github&utm_medium=readme), here are some shortcuts:
|
||||||
|
|
||||||
|
* The [Examples](https://arduinojson.org/example/?utm_source=github&utm_medium=readme) show how to use the library in various situations.
|
||||||
|
* The [API Reference](https://arduinojson.org/api/?utm_source=github&utm_medium=readme) contains the description of each class and function.
|
||||||
|
* The [FAQ](https://arduinojson.org/faq/?utm_source=github&utm_medium=readme) has the answer to virtually every question.
|
||||||
|
* The [ArduinoJson Assistant](https://arduinojson.org/assistant/?utm_source=github&utm_medium=readme) writes programs for you!
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
Do you like this library? Please [star this project on GitHub](https://github.com/bblanchon/ArduinoJson/stargazers)!
|
||||||
|
|
||||||
|
What? You don't like it but you *love* it?
|
||||||
|
We don't take donations anymore, but [we sell a book](https://arduinojson.org/book/?utm_source=github&utm_medium=readme), so you can help and learn at the same time!
|
||||||
|
|
@ -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,20 @@
|
||||||
|
version: 5.13.1.{build}
|
||||||
|
environment:
|
||||||
|
matrix:
|
||||||
|
- 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 --output-on-failure .
|
||||||
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 32 KiB |
|
|
@ -0,0 +1,15 @@
|
||||||
|
JsonArray KEYWORD1
|
||||||
|
JsonObject KEYWORD1
|
||||||
|
JsonVariant KEYWORD1
|
||||||
|
StaticJsonBuffer KEYWORD1
|
||||||
|
DynamicJsonBuffer KEYWORD1
|
||||||
|
add KEYWORD2
|
||||||
|
createArray KEYWORD2
|
||||||
|
createNestedArray KEYWORD2
|
||||||
|
createNestedObject KEYWORD2
|
||||||
|
createObject KEYWORD2
|
||||||
|
parseArray KEYWORD2
|
||||||
|
parseObject KEYWORD2
|
||||||
|
prettyPrintTo KEYWORD2
|
||||||
|
printTo KEYWORD2
|
||||||
|
success KEYWORD2
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
|
||||||
|
#include "ArduinoJson.hpp"
|
||||||
|
|
||||||
|
using namespace ArduinoJson;
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
#error ArduinoJson requires a C++ compiler, please change file extension to .cc or .cpp
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "ArduinoJson/DynamicJsonBuffer.hpp"
|
||||||
|
#include "ArduinoJson/JsonArray.hpp"
|
||||||
|
#include "ArduinoJson/JsonObject.hpp"
|
||||||
|
#include "ArduinoJson/StaticJsonBuffer.hpp"
|
||||||
|
|
||||||
|
#include "ArduinoJson/Deserialization/JsonParserImpl.hpp"
|
||||||
|
#include "ArduinoJson/JsonArrayImpl.hpp"
|
||||||
|
#include "ArduinoJson/JsonBufferImpl.hpp"
|
||||||
|
#include "ArduinoJson/JsonObjectImpl.hpp"
|
||||||
|
#include "ArduinoJson/JsonVariantImpl.hpp"
|
||||||
|
#include "ArduinoJson/Serialization/JsonSerializerImpl.hpp"
|
||||||
|
|
@ -0,0 +1,151 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
// Small or big machine?
|
||||||
|
#ifndef ARDUINOJSON_EMBEDDED_MODE
|
||||||
|
#if defined(ARDUINO) || defined(__IAR_SYSTEMS_ICC__) || defined(__XC) || \
|
||||||
|
defined(__ARMCC_VERSION)
|
||||||
|
#define ARDUINOJSON_EMBEDDED_MODE 1
|
||||||
|
#else
|
||||||
|
#define ARDUINOJSON_EMBEDDED_MODE 0
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ARDUINOJSON_EMBEDDED_MODE
|
||||||
|
|
||||||
|
// Store floats by default to reduce the memory usage (issue #134)
|
||||||
|
#ifndef ARDUINOJSON_USE_DOUBLE
|
||||||
|
#define ARDUINOJSON_USE_DOUBLE 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Store longs by default, because they usually match the size of a float.
|
||||||
|
#ifndef ARDUINOJSON_USE_LONG_LONG
|
||||||
|
#define ARDUINOJSON_USE_LONG_LONG 0
|
||||||
|
#endif
|
||||||
|
#ifndef ARDUINOJSON_USE_INT64
|
||||||
|
#define ARDUINOJSON_USE_INT64 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Embedded systems usually don't have std::string
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_STD_STRING
|
||||||
|
#define ARDUINOJSON_ENABLE_STD_STRING 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Embedded systems usually don't have std::stream
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
#define ARDUINOJSON_ENABLE_STD_STREAM 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Limit nesting as the stack is likely to be small
|
||||||
|
#ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
|
||||||
|
#define ARDUINOJSON_DEFAULT_NESTING_LIMIT 10
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else // ARDUINOJSON_EMBEDDED_MODE
|
||||||
|
|
||||||
|
// On a computer we have plenty of memory so we can use doubles
|
||||||
|
#ifndef ARDUINOJSON_USE_DOUBLE
|
||||||
|
#define ARDUINOJSON_USE_DOUBLE 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Use long long when available
|
||||||
|
#ifndef ARDUINOJSON_USE_LONG_LONG
|
||||||
|
#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1800)
|
||||||
|
#define ARDUINOJSON_USE_LONG_LONG 1
|
||||||
|
#else
|
||||||
|
#define ARDUINOJSON_USE_LONG_LONG 0
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Use _int64 on old versions of Visual Studio
|
||||||
|
#ifndef ARDUINOJSON_USE_INT64
|
||||||
|
#if defined(_MSC_VER) && _MSC_VER <= 1700
|
||||||
|
#define ARDUINOJSON_USE_INT64 1
|
||||||
|
#else
|
||||||
|
#define ARDUINOJSON_USE_INT64 0
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// On a computer, we can use std::string
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_STD_STRING
|
||||||
|
#define ARDUINOJSON_ENABLE_STD_STRING 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// On a computer, we can assume std::stream
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
#define ARDUINOJSON_ENABLE_STD_STREAM 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// On a computer, the stack is large so we can increase nesting limit
|
||||||
|
#ifndef ARDUINOJSON_DEFAULT_NESTING_LIMIT
|
||||||
|
#define ARDUINOJSON_DEFAULT_NESTING_LIMIT 50
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // ARDUINOJSON_EMBEDDED_MODE
|
||||||
|
|
||||||
|
#ifdef ARDUINO
|
||||||
|
|
||||||
|
// Enable support for Arduino String
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
|
||||||
|
#define ARDUINOJSON_ENABLE_ARDUINO_STRING 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Enable support for Arduino Stream
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
|
||||||
|
#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else // ARDUINO
|
||||||
|
|
||||||
|
// Disable support for Arduino String
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_ARDUINO_STRING
|
||||||
|
#define ARDUINOJSON_ENABLE_ARDUINO_STRING 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Disable support for Arduino Stream
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_ARDUINO_STREAM
|
||||||
|
#define ARDUINOJSON_ENABLE_ARDUINO_STREAM 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // ARDUINO
|
||||||
|
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_PROGMEM
|
||||||
|
#ifdef PROGMEM
|
||||||
|
#define ARDUINOJSON_ENABLE_PROGMEM 1
|
||||||
|
#else
|
||||||
|
#define ARDUINOJSON_ENABLE_PROGMEM 0
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_ALIGNMENT
|
||||||
|
#ifdef ARDUINO_ARCH_AVR
|
||||||
|
// alignment isn't needed for 8-bit AVR
|
||||||
|
#define ARDUINOJSON_ENABLE_ALIGNMENT 0
|
||||||
|
#else
|
||||||
|
// but most processors need pointers to be align on word size
|
||||||
|
#define ARDUINOJSON_ENABLE_ALIGNMENT 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Enable deprecated functions by default
|
||||||
|
#ifndef ARDUINOJSON_ENABLE_DEPRECATED
|
||||||
|
#define ARDUINOJSON_ENABLE_DEPRECATED 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Control the exponentiation threshold for big numbers
|
||||||
|
// CAUTION: cannot be more that 1e9 !!!!
|
||||||
|
#ifndef ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD
|
||||||
|
#define ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD 1e7
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Control the exponentiation threshold for small numbers
|
||||||
|
#ifndef ARDUINOJSON_NEGATIVE_EXPONENTIATION_THRESHOLD
|
||||||
|
#define ARDUINOJSON_NEGATIVE_EXPONENTIATION_THRESHOLD 1e-5
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ARDUINOJSON_USE_LONG_LONG && ARDUINOJSON_USE_INT64
|
||||||
|
#error ARDUINOJSON_USE_LONG_LONG and ARDUINOJSON_USE_INT64 cannot be set together
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
class Encoding {
|
||||||
|
public:
|
||||||
|
// Optimized for code size on a 8-bit AVR
|
||||||
|
static char escapeChar(char c) {
|
||||||
|
const char *p = escapeTable(false);
|
||||||
|
while (p[0] && p[1] != c) {
|
||||||
|
p += 2;
|
||||||
|
}
|
||||||
|
return p[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
// Optimized for code size on a 8-bit AVR
|
||||||
|
static char unescapeChar(char c) {
|
||||||
|
const char *p = escapeTable(true);
|
||||||
|
for (;;) {
|
||||||
|
if (p[0] == '\0') return c;
|
||||||
|
if (p[0] == c) return p[1];
|
||||||
|
p += 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
static const char *escapeTable(bool excludeIdenticals) {
|
||||||
|
return &"\"\"\\\\b\bf\fn\nr\rt\t"[excludeIdenticals ? 4 : 0];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../JsonBuffer.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
class JsonBufferAllocated {
|
||||||
|
public:
|
||||||
|
void *operator new(size_t n, JsonBuffer *jsonBuffer) throw() {
|
||||||
|
if (!jsonBuffer) return NULL;
|
||||||
|
return jsonBuffer->alloc(n);
|
||||||
|
}
|
||||||
|
|
||||||
|
void operator delete(void *, JsonBuffer *)throw();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
#if ARDUINOJSON_USE_DOUBLE
|
||||||
|
typedef double JsonFloat;
|
||||||
|
#else
|
||||||
|
typedef float JsonFloat;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
#if ARDUINOJSON_USE_LONG_LONG
|
||||||
|
typedef long long JsonInteger;
|
||||||
|
typedef unsigned long long JsonUInt;
|
||||||
|
#elif ARDUINOJSON_USE_INT64
|
||||||
|
typedef __int64 JsonInteger;
|
||||||
|
typedef unsigned _int64 JsonUInt;
|
||||||
|
#else
|
||||||
|
typedef long JsonInteger;
|
||||||
|
typedef unsigned long JsonUInt;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A metafunction that returns the type of the value returned by
|
||||||
|
// JsonVariant::as<T>()
|
||||||
|
template <typename T>
|
||||||
|
struct JsonVariantAs {
|
||||||
|
typedef T type;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct JsonVariantAs<char*> {
|
||||||
|
typedef const char* type;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct JsonVariantAs<JsonArray> {
|
||||||
|
typedef JsonArray& type;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct JsonVariantAs<const JsonArray> {
|
||||||
|
typedef const JsonArray& type;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct JsonVariantAs<JsonObject> {
|
||||||
|
typedef JsonObject& type;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct JsonVariantAs<const JsonObject> {
|
||||||
|
typedef const JsonObject& type;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "JsonFloat.hpp"
|
||||||
|
#include "JsonInteger.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
// Forward declarations
|
||||||
|
class JsonArray;
|
||||||
|
class JsonObject;
|
||||||
|
|
||||||
|
namespace Internals {
|
||||||
|
// A union that defines the actual content of a JsonVariant.
|
||||||
|
// The enum JsonVariantType determines which member is in use.
|
||||||
|
union JsonVariantContent {
|
||||||
|
JsonFloat asFloat; // used for double and float
|
||||||
|
JsonUInt asInteger; // used for bool, char, short, int and longs
|
||||||
|
const char* asString; // asString can be null
|
||||||
|
JsonArray* asArray; // asArray cannot be null
|
||||||
|
JsonObject* asObject; // asObject cannot be null
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct JsonVariantDefault {
|
||||||
|
static T get() {
|
||||||
|
return T();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct JsonVariantDefault<const T> : JsonVariantDefault<T> {};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct JsonVariantDefault<T&> : JsonVariantDefault<T> {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
class JsonArray;
|
||||||
|
class JsonObject;
|
||||||
|
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// Enumerated type to know the current type of a JsonVariant.
|
||||||
|
// The value determines which member of JsonVariantContent is used.
|
||||||
|
enum JsonVariantType {
|
||||||
|
JSON_UNDEFINED, // JsonVariant has not been initialized
|
||||||
|
JSON_UNPARSED, // JsonVariant contains an unparsed string
|
||||||
|
JSON_STRING, // JsonVariant stores a const char*
|
||||||
|
JSON_BOOLEAN, // JsonVariant stores a bool
|
||||||
|
JSON_POSITIVE_INTEGER, // JsonVariant stores an JsonUInt
|
||||||
|
JSON_NEGATIVE_INTEGER, // JsonVariant stores an JsonUInt that must be negated
|
||||||
|
JSON_ARRAY, // JsonVariant stores a pointer to a JsonArray
|
||||||
|
JSON_OBJECT, // JsonVariant stores a pointer to a JsonObject
|
||||||
|
JSON_FLOAT // JsonVariant stores a JsonFloat
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,94 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../JsonBuffer.hpp"
|
||||||
|
#include "ListConstIterator.hpp"
|
||||||
|
#include "ListIterator.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A singly linked list of T.
|
||||||
|
// The linked list is composed of ListNode<T>.
|
||||||
|
// It is derived by JsonArray and JsonObject
|
||||||
|
template <typename T>
|
||||||
|
class List {
|
||||||
|
public:
|
||||||
|
typedef T value_type;
|
||||||
|
typedef ListNode<T> node_type;
|
||||||
|
typedef ListIterator<T> iterator;
|
||||||
|
typedef ListConstIterator<T> const_iterator;
|
||||||
|
|
||||||
|
// Creates an empty List<T> attached to a JsonBuffer.
|
||||||
|
// The JsonBuffer allows to allocate new nodes.
|
||||||
|
// When buffer is NULL, the List is not able to grow and success() returns
|
||||||
|
// false. This is used to identify bad memory allocations and parsing
|
||||||
|
// failures.
|
||||||
|
explicit List(JsonBuffer *buffer) : _buffer(buffer), _firstNode(NULL) {}
|
||||||
|
|
||||||
|
// Returns true if the object is valid
|
||||||
|
// Would return false in the following situation:
|
||||||
|
// - the memory allocation failed (StaticJsonBuffer was too small)
|
||||||
|
// - the JSON parsing failed
|
||||||
|
bool success() const {
|
||||||
|
return _buffer != NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns the numbers of elements in the list.
|
||||||
|
// For a JsonObject, it would return the number of key-value pairs
|
||||||
|
size_t size() const {
|
||||||
|
size_t nodeCount = 0;
|
||||||
|
for (node_type *node = _firstNode; node; node = node->next) nodeCount++;
|
||||||
|
return nodeCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator add() {
|
||||||
|
node_type *newNode = new (_buffer) node_type();
|
||||||
|
|
||||||
|
if (_firstNode) {
|
||||||
|
node_type *lastNode = _firstNode;
|
||||||
|
while (lastNode->next) lastNode = lastNode->next;
|
||||||
|
lastNode->next = newNode;
|
||||||
|
} else {
|
||||||
|
_firstNode = newNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
return iterator(newNode);
|
||||||
|
}
|
||||||
|
|
||||||
|
iterator begin() {
|
||||||
|
return iterator(_firstNode);
|
||||||
|
}
|
||||||
|
iterator end() {
|
||||||
|
return iterator(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
const_iterator begin() const {
|
||||||
|
return const_iterator(_firstNode);
|
||||||
|
}
|
||||||
|
const_iterator end() const {
|
||||||
|
return const_iterator(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
void remove(iterator it) {
|
||||||
|
node_type *nodeToRemove = it._node;
|
||||||
|
if (!nodeToRemove) return;
|
||||||
|
if (nodeToRemove == _firstNode) {
|
||||||
|
_firstNode = nodeToRemove->next;
|
||||||
|
} else {
|
||||||
|
for (node_type *node = _firstNode; node; node = node->next)
|
||||||
|
if (node->next == nodeToRemove) node->next = nodeToRemove->next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
JsonBuffer *_buffer;
|
||||||
|
|
||||||
|
private:
|
||||||
|
node_type *_firstNode;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,50 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "ListNode.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A read-only forward itertor for List<T>
|
||||||
|
template <typename T>
|
||||||
|
class ListConstIterator {
|
||||||
|
public:
|
||||||
|
explicit ListConstIterator(const ListNode<T> *node = NULL) : _node(node) {}
|
||||||
|
|
||||||
|
const T &operator*() const {
|
||||||
|
return _node->content;
|
||||||
|
}
|
||||||
|
const T *operator->() {
|
||||||
|
return &_node->content;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator==(const ListConstIterator<T> &other) const {
|
||||||
|
return _node == other._node;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator!=(const ListConstIterator<T> &other) const {
|
||||||
|
return _node != other._node;
|
||||||
|
}
|
||||||
|
|
||||||
|
ListConstIterator<T> &operator++() {
|
||||||
|
if (_node) _node = _node->next;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
ListConstIterator<T> &operator+=(size_t distance) {
|
||||||
|
while (_node && distance) {
|
||||||
|
_node = _node->next;
|
||||||
|
--distance;
|
||||||
|
}
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
const ListNode<T> *_node;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,60 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "ListConstIterator.hpp"
|
||||||
|
#include "ListNode.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
class List;
|
||||||
|
|
||||||
|
// A read-write forward iterator for List<T>
|
||||||
|
template <typename T>
|
||||||
|
class ListIterator {
|
||||||
|
friend class List<T>;
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit ListIterator(ListNode<T> *node = NULL) : _node(node) {}
|
||||||
|
|
||||||
|
T &operator*() const {
|
||||||
|
return _node->content;
|
||||||
|
}
|
||||||
|
T *operator->() {
|
||||||
|
return &_node->content;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator==(const ListIterator<T> &other) const {
|
||||||
|
return _node == other._node;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator!=(const ListIterator<T> &other) const {
|
||||||
|
return _node != other._node;
|
||||||
|
}
|
||||||
|
|
||||||
|
ListIterator<T> &operator++() {
|
||||||
|
if (_node) _node = _node->next;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
ListIterator<T> &operator+=(size_t distance) {
|
||||||
|
while (_node && distance) {
|
||||||
|
_node = _node->next;
|
||||||
|
--distance;
|
||||||
|
}
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
operator ListConstIterator<T>() const {
|
||||||
|
return ListConstIterator<T>(_node);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
ListNode<T> *_node;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stddef.h> // for NULL
|
||||||
|
|
||||||
|
#include "JsonBufferAllocated.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A node for a singly-linked list.
|
||||||
|
// Used by List<T> and its iterators.
|
||||||
|
template <typename T>
|
||||||
|
struct ListNode : public Internals::JsonBufferAllocated {
|
||||||
|
ListNode() throw() : next(NULL) {}
|
||||||
|
|
||||||
|
ListNode<T> *next;
|
||||||
|
T content;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A type that cannot be copied
|
||||||
|
class NonCopyable {
|
||||||
|
protected:
|
||||||
|
NonCopyable() {}
|
||||||
|
|
||||||
|
private:
|
||||||
|
// copy constructor is private
|
||||||
|
NonCopyable(const NonCopyable&);
|
||||||
|
|
||||||
|
// copy operator is private
|
||||||
|
NonCopyable& operator=(const NonCopyable&);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A type that is meant to be used by reference only (JsonArray and JsonObject)
|
||||||
|
class ReferenceType {
|
||||||
|
public:
|
||||||
|
bool operator==(const ReferenceType& other) const {
|
||||||
|
// two JsonArray are equal if they are the same instance
|
||||||
|
// (we don't compare the content)
|
||||||
|
return this == &other;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool operator!=(const ReferenceType& other) const {
|
||||||
|
return this != &other;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,52 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../JsonBuffer.hpp"
|
||||||
|
#include "../JsonVariant.hpp"
|
||||||
|
#include "../StringTraits/StringTraits.hpp"
|
||||||
|
#include "../TypeTraits/EnableIf.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename Source, typename Enable = void>
|
||||||
|
struct ValueSaver {
|
||||||
|
template <typename Destination>
|
||||||
|
static bool save(JsonBuffer*, Destination& destination, Source source) {
|
||||||
|
destination = source;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename Source>
|
||||||
|
struct ValueSaver<
|
||||||
|
Source, typename EnableIf<StringTraits<Source>::should_duplicate>::type> {
|
||||||
|
template <typename Destination>
|
||||||
|
static bool save(JsonBuffer* buffer, Destination& dest, Source source) {
|
||||||
|
if (!StringTraits<Source>::is_null(source)) {
|
||||||
|
typename StringTraits<Source>::duplicate_t dup =
|
||||||
|
StringTraits<Source>::duplicate(source, buffer);
|
||||||
|
if (!dup) return false;
|
||||||
|
dest = dup;
|
||||||
|
} else {
|
||||||
|
dest = reinterpret_cast<const char*>(0);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// const char*, const signed char*, const unsigned char*
|
||||||
|
template <typename Char>
|
||||||
|
struct ValueSaver<
|
||||||
|
Char*, typename EnableIf<!StringTraits<Char*>::should_duplicate>::type> {
|
||||||
|
template <typename Destination>
|
||||||
|
static bool save(JsonBuffer*, Destination& dest, Char* source) {
|
||||||
|
dest = reinterpret_cast<const char*>(source);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,61 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
template <typename TInput>
|
||||||
|
void skipSpacesAndComments(TInput& input) {
|
||||||
|
for (;;) {
|
||||||
|
switch (input.current()) {
|
||||||
|
// spaces
|
||||||
|
case ' ':
|
||||||
|
case '\t':
|
||||||
|
case '\r':
|
||||||
|
case '\n':
|
||||||
|
input.move();
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// comments
|
||||||
|
case '/':
|
||||||
|
switch (input.next()) {
|
||||||
|
// C-style block comment
|
||||||
|
case '*':
|
||||||
|
input.move(); // skip '/'
|
||||||
|
// no need to skip '*'
|
||||||
|
for (;;) {
|
||||||
|
input.move();
|
||||||
|
if (input.current() == '\0') return;
|
||||||
|
if (input.current() == '*' && input.next() == '/') {
|
||||||
|
input.move(); // skip '*'
|
||||||
|
input.move(); // skip '/'
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
// C++-style line comment
|
||||||
|
case '/':
|
||||||
|
// not need to skip "//"
|
||||||
|
for (;;) {
|
||||||
|
input.move();
|
||||||
|
if (input.current() == '\0') return;
|
||||||
|
if (input.current() == '\n') break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
// not a comment, just a '/'
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,103 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../JsonBuffer.hpp"
|
||||||
|
#include "../JsonVariant.hpp"
|
||||||
|
#include "../TypeTraits/IsConst.hpp"
|
||||||
|
#include "StringWriter.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// Parse JSON string to create JsonArrays and JsonObjects
|
||||||
|
// This internal class is not indended to be used directly.
|
||||||
|
// Instead, use JsonBuffer.parseArray() or .parseObject()
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
class JsonParser {
|
||||||
|
public:
|
||||||
|
JsonParser(JsonBuffer *buffer, TReader reader, TWriter writer,
|
||||||
|
uint8_t nestingLimit)
|
||||||
|
: _buffer(buffer),
|
||||||
|
_reader(reader),
|
||||||
|
_writer(writer),
|
||||||
|
_nestingLimit(nestingLimit) {}
|
||||||
|
|
||||||
|
JsonArray &parseArray();
|
||||||
|
JsonObject &parseObject();
|
||||||
|
|
||||||
|
JsonVariant parseVariant() {
|
||||||
|
JsonVariant result;
|
||||||
|
parseAnythingTo(&result);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
JsonParser &operator=(const JsonParser &); // non-copiable
|
||||||
|
|
||||||
|
static bool eat(TReader &, char charToSkip);
|
||||||
|
FORCE_INLINE bool eat(char charToSkip) {
|
||||||
|
return eat(_reader, charToSkip);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *parseString();
|
||||||
|
bool parseAnythingTo(JsonVariant *destination);
|
||||||
|
FORCE_INLINE bool parseAnythingToUnsafe(JsonVariant *destination);
|
||||||
|
|
||||||
|
inline bool parseArrayTo(JsonVariant *destination);
|
||||||
|
inline bool parseObjectTo(JsonVariant *destination);
|
||||||
|
inline bool parseStringTo(JsonVariant *destination);
|
||||||
|
|
||||||
|
static inline bool isBetween(char c, char min, char max) {
|
||||||
|
return min <= c && c <= max;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool canBeInNonQuotedString(char c) {
|
||||||
|
return isBetween(c, '0', '9') || isBetween(c, '_', 'z') ||
|
||||||
|
isBetween(c, 'A', 'Z') || c == '+' || c == '-' || c == '.';
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline bool isQuote(char c) {
|
||||||
|
return c == '\'' || c == '\"';
|
||||||
|
}
|
||||||
|
|
||||||
|
JsonBuffer *_buffer;
|
||||||
|
TReader _reader;
|
||||||
|
TWriter _writer;
|
||||||
|
uint8_t _nestingLimit;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename TJsonBuffer, typename TString, typename Enable = void>
|
||||||
|
struct JsonParserBuilder {
|
||||||
|
typedef typename StringTraits<TString>::Reader InputReader;
|
||||||
|
typedef JsonParser<InputReader, TJsonBuffer &> TParser;
|
||||||
|
|
||||||
|
static TParser makeParser(TJsonBuffer *buffer, TString &json,
|
||||||
|
uint8_t nestingLimit) {
|
||||||
|
return TParser(buffer, InputReader(json), *buffer, nestingLimit);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename TJsonBuffer, typename TChar>
|
||||||
|
struct JsonParserBuilder<TJsonBuffer, TChar *,
|
||||||
|
typename EnableIf<!IsConst<TChar>::value>::type> {
|
||||||
|
typedef typename StringTraits<TChar *>::Reader TReader;
|
||||||
|
typedef StringWriter<TChar> TWriter;
|
||||||
|
typedef JsonParser<TReader, TWriter> TParser;
|
||||||
|
|
||||||
|
static TParser makeParser(TJsonBuffer *buffer, TChar *json,
|
||||||
|
uint8_t nestingLimit) {
|
||||||
|
return TParser(buffer, TReader(json), TWriter(json), nestingLimit);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename TJsonBuffer, typename TString>
|
||||||
|
inline typename JsonParserBuilder<TJsonBuffer, TString>::TParser makeParser(
|
||||||
|
TJsonBuffer *buffer, TString &json, uint8_t nestingLimit) {
|
||||||
|
return JsonParserBuilder<TJsonBuffer, TString>::makeParser(buffer, json,
|
||||||
|
nestingLimit);
|
||||||
|
}
|
||||||
|
} // namespace Internals
|
||||||
|
} // namespace ArduinoJson
|
||||||
|
|
@ -0,0 +1,192 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Comments.hpp"
|
||||||
|
#include "JsonParser.hpp"
|
||||||
|
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::eat(
|
||||||
|
TReader &reader, char charToSkip) {
|
||||||
|
skipSpacesAndComments(reader);
|
||||||
|
if (reader.current() != charToSkip) return false;
|
||||||
|
reader.move();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
inline bool
|
||||||
|
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseAnythingTo(
|
||||||
|
JsonVariant *destination) {
|
||||||
|
if (_nestingLimit == 0) return false;
|
||||||
|
_nestingLimit--;
|
||||||
|
bool success = parseAnythingToUnsafe(destination);
|
||||||
|
_nestingLimit++;
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
inline bool
|
||||||
|
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseAnythingToUnsafe(
|
||||||
|
JsonVariant *destination) {
|
||||||
|
skipSpacesAndComments(_reader);
|
||||||
|
|
||||||
|
switch (_reader.current()) {
|
||||||
|
case '[':
|
||||||
|
return parseArrayTo(destination);
|
||||||
|
|
||||||
|
case '{':
|
||||||
|
return parseObjectTo(destination);
|
||||||
|
|
||||||
|
default:
|
||||||
|
return parseStringTo(destination);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
inline ArduinoJson::JsonArray &
|
||||||
|
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseArray() {
|
||||||
|
// Create an empty array
|
||||||
|
JsonArray &array = _buffer->createArray();
|
||||||
|
|
||||||
|
// Check opening braket
|
||||||
|
if (!eat('[')) goto ERROR_MISSING_BRACKET;
|
||||||
|
if (eat(']')) goto SUCCESS_EMPTY_ARRAY;
|
||||||
|
|
||||||
|
// Read each value
|
||||||
|
for (;;) {
|
||||||
|
// 1 - Parse value
|
||||||
|
JsonVariant value;
|
||||||
|
if (!parseAnythingTo(&value)) goto ERROR_INVALID_VALUE;
|
||||||
|
if (!array.add(value)) goto ERROR_NO_MEMORY;
|
||||||
|
|
||||||
|
// 2 - More values?
|
||||||
|
if (eat(']')) goto SUCCES_NON_EMPTY_ARRAY;
|
||||||
|
if (!eat(',')) goto ERROR_MISSING_COMMA;
|
||||||
|
}
|
||||||
|
|
||||||
|
SUCCESS_EMPTY_ARRAY:
|
||||||
|
SUCCES_NON_EMPTY_ARRAY:
|
||||||
|
return array;
|
||||||
|
|
||||||
|
ERROR_INVALID_VALUE:
|
||||||
|
ERROR_MISSING_BRACKET:
|
||||||
|
ERROR_MISSING_COMMA:
|
||||||
|
ERROR_NO_MEMORY:
|
||||||
|
return JsonArray::invalid();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseArrayTo(
|
||||||
|
JsonVariant *destination) {
|
||||||
|
JsonArray &array = parseArray();
|
||||||
|
if (!array.success()) return false;
|
||||||
|
|
||||||
|
*destination = array;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
inline ArduinoJson::JsonObject &
|
||||||
|
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseObject() {
|
||||||
|
// Create an empty object
|
||||||
|
JsonObject &object = _buffer->createObject();
|
||||||
|
|
||||||
|
// Check opening brace
|
||||||
|
if (!eat('{')) goto ERROR_MISSING_BRACE;
|
||||||
|
if (eat('}')) goto SUCCESS_EMPTY_OBJECT;
|
||||||
|
|
||||||
|
// Read each key value pair
|
||||||
|
for (;;) {
|
||||||
|
// 1 - Parse key
|
||||||
|
const char *key = parseString();
|
||||||
|
if (!key) goto ERROR_INVALID_KEY;
|
||||||
|
if (!eat(':')) goto ERROR_MISSING_COLON;
|
||||||
|
|
||||||
|
// 2 - Parse value
|
||||||
|
JsonVariant value;
|
||||||
|
if (!parseAnythingTo(&value)) goto ERROR_INVALID_VALUE;
|
||||||
|
if (!object.set(key, value)) goto ERROR_NO_MEMORY;
|
||||||
|
|
||||||
|
// 3 - More keys/values?
|
||||||
|
if (eat('}')) goto SUCCESS_NON_EMPTY_OBJECT;
|
||||||
|
if (!eat(',')) goto ERROR_MISSING_COMMA;
|
||||||
|
}
|
||||||
|
|
||||||
|
SUCCESS_EMPTY_OBJECT:
|
||||||
|
SUCCESS_NON_EMPTY_OBJECT:
|
||||||
|
return object;
|
||||||
|
|
||||||
|
ERROR_INVALID_KEY:
|
||||||
|
ERROR_INVALID_VALUE:
|
||||||
|
ERROR_MISSING_BRACE:
|
||||||
|
ERROR_MISSING_COLON:
|
||||||
|
ERROR_MISSING_COMMA:
|
||||||
|
ERROR_NO_MEMORY:
|
||||||
|
return JsonObject::invalid();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseObjectTo(
|
||||||
|
JsonVariant *destination) {
|
||||||
|
JsonObject &object = parseObject();
|
||||||
|
if (!object.success()) return false;
|
||||||
|
|
||||||
|
*destination = object;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
inline const char *
|
||||||
|
ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseString() {
|
||||||
|
typename RemoveReference<TWriter>::type::String str = _writer.startString();
|
||||||
|
|
||||||
|
skipSpacesAndComments(_reader);
|
||||||
|
char c = _reader.current();
|
||||||
|
|
||||||
|
if (isQuote(c)) { // quotes
|
||||||
|
_reader.move();
|
||||||
|
char stopChar = c;
|
||||||
|
for (;;) {
|
||||||
|
c = _reader.current();
|
||||||
|
if (c == '\0') break;
|
||||||
|
_reader.move();
|
||||||
|
|
||||||
|
if (c == stopChar) break;
|
||||||
|
|
||||||
|
if (c == '\\') {
|
||||||
|
// replace char
|
||||||
|
c = Encoding::unescapeChar(_reader.current());
|
||||||
|
if (c == '\0') break;
|
||||||
|
_reader.move();
|
||||||
|
}
|
||||||
|
|
||||||
|
str.append(c);
|
||||||
|
}
|
||||||
|
} else { // no quotes
|
||||||
|
for (;;) {
|
||||||
|
if (!canBeInNonQuotedString(c)) break;
|
||||||
|
_reader.move();
|
||||||
|
str.append(c);
|
||||||
|
c = _reader.current();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return str.c_str();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TReader, typename TWriter>
|
||||||
|
inline bool ArduinoJson::Internals::JsonParser<TReader, TWriter>::parseStringTo(
|
||||||
|
JsonVariant *destination) {
|
||||||
|
bool hasQuotes = isQuote(_reader.current());
|
||||||
|
const char *value = parseString();
|
||||||
|
if (value == NULL) return false;
|
||||||
|
if (hasQuotes) {
|
||||||
|
*destination = value;
|
||||||
|
} else {
|
||||||
|
*destination = RawJson(value);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TChar>
|
||||||
|
class StringWriter {
|
||||||
|
public:
|
||||||
|
class String {
|
||||||
|
public:
|
||||||
|
String(TChar** ptr) : _writePtr(ptr), _startPtr(*ptr) {}
|
||||||
|
|
||||||
|
void append(char c) {
|
||||||
|
*(*_writePtr)++ = TChar(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* c_str() const {
|
||||||
|
*(*_writePtr)++ = 0;
|
||||||
|
return reinterpret_cast<const char*>(_startPtr);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
TChar** _writePtr;
|
||||||
|
TChar* _startPtr;
|
||||||
|
};
|
||||||
|
|
||||||
|
StringWriter(TChar* buffer) : _ptr(buffer) {}
|
||||||
|
|
||||||
|
String startString() {
|
||||||
|
return String(&_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
TChar* _ptr;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,170 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "JsonBufferBase.hpp"
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#if defined(__clang__)
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
||||||
|
#elif defined(__GNUC__)
|
||||||
|
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#endif
|
||||||
|
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
class DefaultAllocator {
|
||||||
|
public:
|
||||||
|
void* allocate(size_t size) {
|
||||||
|
return malloc(size);
|
||||||
|
}
|
||||||
|
void deallocate(void* pointer) {
|
||||||
|
free(pointer);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename TAllocator>
|
||||||
|
class DynamicJsonBufferBase
|
||||||
|
: public JsonBufferBase<DynamicJsonBufferBase<TAllocator> > {
|
||||||
|
struct Block;
|
||||||
|
struct EmptyBlock {
|
||||||
|
Block* next;
|
||||||
|
size_t capacity;
|
||||||
|
size_t size;
|
||||||
|
};
|
||||||
|
struct Block : EmptyBlock {
|
||||||
|
uint8_t data[1];
|
||||||
|
};
|
||||||
|
|
||||||
|
public:
|
||||||
|
enum { EmptyBlockSize = sizeof(EmptyBlock) };
|
||||||
|
|
||||||
|
DynamicJsonBufferBase(size_t initialSize = 256)
|
||||||
|
: _head(NULL), _nextBlockCapacity(initialSize) {}
|
||||||
|
|
||||||
|
~DynamicJsonBufferBase() {
|
||||||
|
clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gets the number of bytes occupied in the buffer
|
||||||
|
size_t size() const {
|
||||||
|
size_t total = 0;
|
||||||
|
for (const Block* b = _head; b; b = b->next) total += b->size;
|
||||||
|
return total;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocates the specified amount of bytes in the buffer
|
||||||
|
virtual void* alloc(size_t bytes) {
|
||||||
|
alignNextAlloc();
|
||||||
|
return canAllocInHead(bytes) ? allocInHead(bytes) : allocInNewBlock(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resets the buffer.
|
||||||
|
// USE WITH CAUTION: this invalidates all previously allocated data
|
||||||
|
void clear() {
|
||||||
|
Block* currentBlock = _head;
|
||||||
|
while (currentBlock != NULL) {
|
||||||
|
_nextBlockCapacity = currentBlock->capacity;
|
||||||
|
Block* nextBlock = currentBlock->next;
|
||||||
|
_allocator.deallocate(currentBlock);
|
||||||
|
currentBlock = nextBlock;
|
||||||
|
}
|
||||||
|
_head = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
class String {
|
||||||
|
public:
|
||||||
|
String(DynamicJsonBufferBase* parent)
|
||||||
|
: _parent(parent), _start(NULL), _length(0) {}
|
||||||
|
|
||||||
|
void append(char c) {
|
||||||
|
if (_parent->canAllocInHead(1)) {
|
||||||
|
char* end = static_cast<char*>(_parent->allocInHead(1));
|
||||||
|
*end = c;
|
||||||
|
if (_length == 0) _start = end;
|
||||||
|
} else {
|
||||||
|
char* newStart =
|
||||||
|
static_cast<char*>(_parent->allocInNewBlock(_length + 1));
|
||||||
|
if (_start && newStart) memcpy(newStart, _start, _length);
|
||||||
|
if (newStart) newStart[_length] = c;
|
||||||
|
_start = newStart;
|
||||||
|
}
|
||||||
|
_length++;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* c_str() {
|
||||||
|
append(0);
|
||||||
|
return _start;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
DynamicJsonBufferBase* _parent;
|
||||||
|
char* _start;
|
||||||
|
size_t _length;
|
||||||
|
};
|
||||||
|
|
||||||
|
String startString() {
|
||||||
|
return String(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
void alignNextAlloc() {
|
||||||
|
if (_head) _head->size = this->round_size_up(_head->size);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool canAllocInHead(size_t bytes) const {
|
||||||
|
return _head != NULL && _head->size + bytes <= _head->capacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
void* allocInHead(size_t bytes) {
|
||||||
|
void* p = _head->data + _head->size;
|
||||||
|
_head->size += bytes;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
void* allocInNewBlock(size_t bytes) {
|
||||||
|
size_t capacity = _nextBlockCapacity;
|
||||||
|
if (bytes > capacity) capacity = bytes;
|
||||||
|
if (!addNewBlock(capacity)) return NULL;
|
||||||
|
_nextBlockCapacity *= 2;
|
||||||
|
return allocInHead(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool addNewBlock(size_t capacity) {
|
||||||
|
size_t bytes = EmptyBlockSize + capacity;
|
||||||
|
Block* block = static_cast<Block*>(_allocator.allocate(bytes));
|
||||||
|
if (block == NULL) return false;
|
||||||
|
block->capacity = capacity;
|
||||||
|
block->size = 0;
|
||||||
|
block->next = _head;
|
||||||
|
_head = block;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
TAllocator _allocator;
|
||||||
|
Block* _head;
|
||||||
|
size_t _nextBlockCapacity;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__clang__)
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
#elif defined(__GNUC__)
|
||||||
|
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Implements a JsonBuffer with dynamic memory allocation.
|
||||||
|
// You are strongly encouraged to consider using StaticJsonBuffer which is much
|
||||||
|
// more suitable for embedded systems.
|
||||||
|
typedef Internals::DynamicJsonBufferBase<Internals::DefaultAllocator>
|
||||||
|
DynamicJsonBuffer;
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,227 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Data/JsonBufferAllocated.hpp"
|
||||||
|
#include "Data/List.hpp"
|
||||||
|
#include "Data/ReferenceType.hpp"
|
||||||
|
#include "Data/ValueSaver.hpp"
|
||||||
|
#include "JsonVariant.hpp"
|
||||||
|
#include "Serialization/JsonPrintable.hpp"
|
||||||
|
#include "StringTraits/StringTraits.hpp"
|
||||||
|
#include "TypeTraits/EnableIf.hpp"
|
||||||
|
#include "TypeTraits/IsArray.hpp"
|
||||||
|
#include "TypeTraits/IsFloatingPoint.hpp"
|
||||||
|
#include "TypeTraits/IsSame.hpp"
|
||||||
|
|
||||||
|
// Returns the size (in bytes) of an array with n elements.
|
||||||
|
// Can be very handy to determine the size of a StaticJsonBuffer.
|
||||||
|
#define JSON_ARRAY_SIZE(NUMBER_OF_ELEMENTS) \
|
||||||
|
(sizeof(JsonArray) + (NUMBER_OF_ELEMENTS) * sizeof(JsonArray::node_type))
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
// Forward declarations
|
||||||
|
class JsonObject;
|
||||||
|
class JsonBuffer;
|
||||||
|
namespace Internals {
|
||||||
|
class JsonArraySubscript;
|
||||||
|
}
|
||||||
|
|
||||||
|
// An array of JsonVariant.
|
||||||
|
//
|
||||||
|
// The constructor is private, instances must be created via
|
||||||
|
// JsonBuffer::createArray() or JsonBuffer::parseArray().
|
||||||
|
// A JsonArray can be serialized to a JSON string via JsonArray::printTo().
|
||||||
|
// It can also be deserialized from a JSON string via JsonBuffer::parseArray().
|
||||||
|
class JsonArray : public Internals::JsonPrintable<JsonArray>,
|
||||||
|
public Internals::ReferenceType,
|
||||||
|
public Internals::NonCopyable,
|
||||||
|
public Internals::List<JsonVariant>,
|
||||||
|
public Internals::JsonBufferAllocated {
|
||||||
|
public:
|
||||||
|
// Create an empty JsonArray attached to the specified JsonBuffer.
|
||||||
|
// You should not call this constructor directly.
|
||||||
|
// Instead, use JsonBuffer::createArray() or JsonBuffer::parseArray().
|
||||||
|
explicit JsonArray(JsonBuffer *buffer) throw()
|
||||||
|
: Internals::List<JsonVariant>(buffer) {}
|
||||||
|
|
||||||
|
// Gets the value at the specified index
|
||||||
|
const Internals::JsonArraySubscript operator[](size_t index) const;
|
||||||
|
|
||||||
|
// Gets or sets the value at specified index
|
||||||
|
Internals::JsonArraySubscript operator[](size_t index);
|
||||||
|
|
||||||
|
// Adds the specified value at the end of the array.
|
||||||
|
//
|
||||||
|
// bool add(TValue);
|
||||||
|
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename T>
|
||||||
|
bool add(const T &value) {
|
||||||
|
return add_impl<const T &>(value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool add(TValue);
|
||||||
|
// TValue = char*, const char*, const FlashStringHelper*
|
||||||
|
template <typename T>
|
||||||
|
bool add(T *value) {
|
||||||
|
return add_impl<T *>(value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool add(TValue value, uint8_t decimals);
|
||||||
|
// TValue = float, double
|
||||||
|
template <typename T>
|
||||||
|
DEPRECATED("Second argument is not supported anymore")
|
||||||
|
bool add(T value, uint8_t) {
|
||||||
|
return add_impl<const JsonVariant &>(JsonVariant(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sets the value at specified index.
|
||||||
|
//
|
||||||
|
// bool add(size_t index, const TValue&);
|
||||||
|
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename T>
|
||||||
|
bool set(size_t index, const T &value) {
|
||||||
|
return set_impl<const T &>(index, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool add(size_t index, TValue);
|
||||||
|
// TValue = char*, const char*, const FlashStringHelper*
|
||||||
|
template <typename T>
|
||||||
|
bool set(size_t index, T *value) {
|
||||||
|
return set_impl<T *>(index, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(size_t index, TValue value, uint8_t decimals);
|
||||||
|
// TValue = float, double
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<Internals::IsFloatingPoint<T>::value, bool>::type
|
||||||
|
set(size_t index, T value, uint8_t decimals) {
|
||||||
|
return set_impl<const JsonVariant &>(index, JsonVariant(value, decimals));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gets the value at the specified index.
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::JsonVariantAs<T>::type get(size_t index) const {
|
||||||
|
const_iterator it = begin() += index;
|
||||||
|
return it != end() ? it->as<T>() : Internals::JsonVariantDefault<T>::get();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check the type of the value at specified index.
|
||||||
|
template <typename T>
|
||||||
|
bool is(size_t index) const {
|
||||||
|
const_iterator it = begin() += index;
|
||||||
|
return it != end() ? it->is<T>() : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Creates a JsonArray and adds a reference at the end of the array.
|
||||||
|
// It's a shortcut for JsonBuffer::createArray() and JsonArray::add()
|
||||||
|
JsonArray &createNestedArray();
|
||||||
|
|
||||||
|
// Creates a JsonObject and adds a reference at the end of the array.
|
||||||
|
// It's a shortcut for JsonBuffer::createObject() and JsonArray::add()
|
||||||
|
JsonObject &createNestedObject();
|
||||||
|
|
||||||
|
// Removes element at specified index.
|
||||||
|
void remove(size_t index) {
|
||||||
|
remove(begin() += index);
|
||||||
|
}
|
||||||
|
using Internals::List<JsonVariant>::remove;
|
||||||
|
|
||||||
|
// Returns a reference an invalid JsonArray.
|
||||||
|
// This object is meant to replace a NULL pointer.
|
||||||
|
// This is used when memory allocation or JSON parsing fail.
|
||||||
|
static JsonArray &invalid() {
|
||||||
|
static JsonArray instance(NULL);
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Imports a 1D array
|
||||||
|
template <typename T, size_t N>
|
||||||
|
bool copyFrom(T (&array)[N]) {
|
||||||
|
return copyFrom(array, N);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Imports a 1D array
|
||||||
|
template <typename T>
|
||||||
|
bool copyFrom(T *array, size_t len) {
|
||||||
|
bool ok = true;
|
||||||
|
for (size_t i = 0; i < len; i++) {
|
||||||
|
ok &= add(array[i]);
|
||||||
|
}
|
||||||
|
return ok;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Imports a 2D array
|
||||||
|
template <typename T, size_t N1, size_t N2>
|
||||||
|
bool copyFrom(T (&array)[N1][N2]) {
|
||||||
|
bool ok = true;
|
||||||
|
for (size_t i = 0; i < N1; i++) {
|
||||||
|
JsonArray &nestedArray = createNestedArray();
|
||||||
|
for (size_t j = 0; j < N2; j++) {
|
||||||
|
ok &= nestedArray.add(array[i][j]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ok;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exports a 1D array
|
||||||
|
template <typename T, size_t N>
|
||||||
|
size_t copyTo(T (&array)[N]) const {
|
||||||
|
return copyTo(array, N);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exports a 1D array
|
||||||
|
template <typename T>
|
||||||
|
size_t copyTo(T *array, size_t len) const {
|
||||||
|
size_t i = 0;
|
||||||
|
for (const_iterator it = begin(); it != end() && i < len; ++it)
|
||||||
|
array[i++] = *it;
|
||||||
|
return i;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exports a 2D array
|
||||||
|
template <typename T, size_t N1, size_t N2>
|
||||||
|
void copyTo(T (&array)[N1][N2]) const {
|
||||||
|
size_t i = 0;
|
||||||
|
for (const_iterator it = begin(); it != end() && i < N1; ++it) {
|
||||||
|
it->as<JsonArray>().copyTo(array[i++]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_DEPRECATED
|
||||||
|
DEPRECATED("use remove() instead")
|
||||||
|
FORCE_INLINE void removeAt(size_t index) {
|
||||||
|
return remove(index);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
private:
|
||||||
|
template <typename TValueRef>
|
||||||
|
bool set_impl(size_t index, TValueRef value) {
|
||||||
|
iterator it = begin() += index;
|
||||||
|
if (it == end()) return false;
|
||||||
|
return Internals::ValueSaver<TValueRef>::save(_buffer, *it, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TValueRef>
|
||||||
|
bool add_impl(TValueRef value) {
|
||||||
|
iterator it = Internals::List<JsonVariant>::add();
|
||||||
|
if (it == end()) return false;
|
||||||
|
return Internals::ValueSaver<TValueRef>::save(_buffer, *it, value);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
namespace Internals {
|
||||||
|
template <>
|
||||||
|
struct JsonVariantDefault<JsonArray> {
|
||||||
|
static JsonArray &get() {
|
||||||
|
return JsonArray::invalid();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "JsonArray.hpp"
|
||||||
|
#include "JsonArraySubscript.hpp"
|
||||||
|
#include "JsonObject.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
inline JsonArray &JsonArray::createNestedArray() {
|
||||||
|
if (!_buffer) return JsonArray::invalid();
|
||||||
|
JsonArray &array = _buffer->createArray();
|
||||||
|
add(array);
|
||||||
|
return array;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline JsonObject &JsonArray::createNestedObject() {
|
||||||
|
if (!_buffer) return JsonObject::invalid();
|
||||||
|
JsonObject &object = _buffer->createObject();
|
||||||
|
add(object);
|
||||||
|
return object;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,122 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Configuration.hpp"
|
||||||
|
#include "JsonVariantBase.hpp"
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable : 4522)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
class JsonArraySubscript : public JsonVariantBase<JsonArraySubscript> {
|
||||||
|
public:
|
||||||
|
FORCE_INLINE JsonArraySubscript(JsonArray& array, size_t index)
|
||||||
|
: _array(array), _index(index) {}
|
||||||
|
|
||||||
|
FORCE_INLINE JsonArraySubscript& operator=(const JsonArraySubscript& src) {
|
||||||
|
_array.set(_index, src);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Replaces the value
|
||||||
|
//
|
||||||
|
// operator=(const TValue&)
|
||||||
|
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename T>
|
||||||
|
FORCE_INLINE JsonArraySubscript& operator=(const T& src) {
|
||||||
|
_array.set(_index, src);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// operator=(TValue)
|
||||||
|
// TValue = char*, const char*, const FlashStringHelper*
|
||||||
|
template <typename T>
|
||||||
|
FORCE_INLINE JsonArraySubscript& operator=(T* src) {
|
||||||
|
_array.set(_index, src);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
FORCE_INLINE bool success() const {
|
||||||
|
return _index < _array.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
FORCE_INLINE typename JsonVariantAs<T>::type as() const {
|
||||||
|
return _array.get<T>(_index);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
FORCE_INLINE bool is() const {
|
||||||
|
return _array.is<T>(_index);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Replaces the value
|
||||||
|
//
|
||||||
|
// bool set(const TValue&)
|
||||||
|
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename TValue>
|
||||||
|
FORCE_INLINE bool set(const TValue& value) {
|
||||||
|
return _array.set(_index, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(TValue)
|
||||||
|
// TValue = char*, const char*, const FlashStringHelper*
|
||||||
|
template <typename TValue>
|
||||||
|
FORCE_INLINE bool set(TValue* value) {
|
||||||
|
return _array.set(_index, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(TValue, uint8_t decimals);
|
||||||
|
// TValue = float, double
|
||||||
|
template <typename TValue>
|
||||||
|
DEPRECATED("Second argument is not supported anymore")
|
||||||
|
FORCE_INLINE bool set(const TValue& value, uint8_t) {
|
||||||
|
return _array.set(_index, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
JsonArray& _array;
|
||||||
|
const size_t _index;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename TImpl>
|
||||||
|
inline JsonArraySubscript JsonVariantSubscripts<TImpl>::operator[](
|
||||||
|
size_t index) {
|
||||||
|
return impl()->template as<JsonArray>()[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TImpl>
|
||||||
|
inline const JsonArraySubscript JsonVariantSubscripts<TImpl>::operator[](
|
||||||
|
size_t index) const {
|
||||||
|
return impl()->template as<JsonArray>()[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
inline std::ostream& operator<<(std::ostream& os,
|
||||||
|
const JsonArraySubscript& source) {
|
||||||
|
return source.printTo(os);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
inline Internals::JsonArraySubscript JsonArray::operator[](size_t index) {
|
||||||
|
return Internals::JsonArraySubscript(*this, index);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline const Internals::JsonArraySubscript JsonArray::operator[](
|
||||||
|
size_t index) const {
|
||||||
|
return Internals::JsonArraySubscript(*const_cast<JsonArray*>(this), index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,78 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stddef.h> // for size_t
|
||||||
|
#include <stdint.h> // for uint8_t
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "Data/NonCopyable.hpp"
|
||||||
|
#include "JsonVariant.hpp"
|
||||||
|
#include "TypeTraits/EnableIf.hpp"
|
||||||
|
#include "TypeTraits/IsArray.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
class JsonArray;
|
||||||
|
class JsonObject;
|
||||||
|
|
||||||
|
// Entry point for using the library.
|
||||||
|
//
|
||||||
|
// Handle the memory management (done in derived classes) and calls the parser.
|
||||||
|
// This abstract class is implemented by StaticJsonBuffer which implements a
|
||||||
|
// fixed memory allocation.
|
||||||
|
class JsonBuffer : Internals::NonCopyable {
|
||||||
|
public:
|
||||||
|
// Allocates an empty JsonArray.
|
||||||
|
//
|
||||||
|
// Returns a reference to the new JsonArray or JsonArray::invalid() if the
|
||||||
|
// allocation fails.
|
||||||
|
JsonArray &createArray();
|
||||||
|
|
||||||
|
// Allocates an empty JsonObject.
|
||||||
|
//
|
||||||
|
// Returns a reference to the new JsonObject or JsonObject::invalid() if the
|
||||||
|
// allocation fails.
|
||||||
|
JsonObject &createObject();
|
||||||
|
|
||||||
|
// Duplicates a string
|
||||||
|
//
|
||||||
|
// const char* strdup(TValue);
|
||||||
|
// TValue = const std::string&, const String&,
|
||||||
|
template <typename TString>
|
||||||
|
DEPRECATED("char* are duplicated, you don't need strdup() anymore")
|
||||||
|
typename Internals::EnableIf<!Internals::IsArray<TString>::value,
|
||||||
|
const char *>::type strdup(const TString &src) {
|
||||||
|
return Internals::StringTraits<TString>::duplicate(src, this);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// const char* strdup(TValue);
|
||||||
|
// TValue = char*, const char*, const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
DEPRECATED("char* are duplicated, you don't need strdup() anymore")
|
||||||
|
const char *strdup(TString *src) {
|
||||||
|
return Internals::StringTraits<TString *>::duplicate(src, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocates n bytes in the JsonBuffer.
|
||||||
|
// Return a pointer to the allocated memory or NULL if allocation fails.
|
||||||
|
virtual void *alloc(size_t size) = 0;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
// CAUTION: NO VIRTUAL DESTRUCTOR!
|
||||||
|
// If we add a virtual constructor the Arduino compiler will add malloc()
|
||||||
|
// and free() to the binary, adding 706 useless bytes.
|
||||||
|
~JsonBuffer() {}
|
||||||
|
|
||||||
|
// Preserve aligment if necessary
|
||||||
|
static FORCE_INLINE size_t round_size_up(size_t bytes) {
|
||||||
|
#if ARDUINOJSON_ENABLE_ALIGNMENT
|
||||||
|
const size_t x = sizeof(void *) - 1;
|
||||||
|
return (bytes + x) & ~x;
|
||||||
|
#else
|
||||||
|
return bytes;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,127 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Deserialization/JsonParser.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
template <typename TDerived>
|
||||||
|
class JsonBufferBase : public JsonBuffer {
|
||||||
|
public:
|
||||||
|
// Allocates and populate a JsonArray from a JSON string.
|
||||||
|
//
|
||||||
|
// The First argument is a pointer to the JSON string, the memory must be
|
||||||
|
// writable
|
||||||
|
// because the parser will insert null-terminators and replace escaped chars.
|
||||||
|
//
|
||||||
|
// The second argument set the nesting limit
|
||||||
|
//
|
||||||
|
// Returns a reference to the new JsonObject or JsonObject::invalid() if the
|
||||||
|
// allocation fails.
|
||||||
|
// With this overload, the JsonBuffer will make a copy of the string
|
||||||
|
//
|
||||||
|
// JsonArray& parseArray(TString);
|
||||||
|
// TString = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
typename Internals::EnableIf<!Internals::IsArray<TString>::value,
|
||||||
|
JsonArray &>::type
|
||||||
|
parseArray(const TString &json,
|
||||||
|
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
||||||
|
return Internals::makeParser(that(), json, nestingLimit).parseArray();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonArray& parseArray(TString);
|
||||||
|
// TString = const char*, const char[N], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
JsonArray &parseArray(
|
||||||
|
TString *json, uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
||||||
|
return Internals::makeParser(that(), json, nestingLimit).parseArray();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonArray& parseArray(TString);
|
||||||
|
// TString = std::istream&, Stream&
|
||||||
|
template <typename TString>
|
||||||
|
JsonArray &parseArray(
|
||||||
|
TString &json, uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
||||||
|
return Internals::makeParser(that(), json, nestingLimit).parseArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocates and populate a JsonObject from a JSON string.
|
||||||
|
//
|
||||||
|
// The First argument is a pointer to the JSON string, the memory must be
|
||||||
|
// writable
|
||||||
|
// because the parser will insert null-terminators and replace escaped chars.
|
||||||
|
//
|
||||||
|
// The second argument set the nesting limit
|
||||||
|
//
|
||||||
|
// Returns a reference to the new JsonObject or JsonObject::invalid() if the
|
||||||
|
// allocation fails.
|
||||||
|
//
|
||||||
|
// JsonObject& parseObject(TString);
|
||||||
|
// TString = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
typename Internals::EnableIf<!Internals::IsArray<TString>::value,
|
||||||
|
JsonObject &>::type
|
||||||
|
parseObject(const TString &json,
|
||||||
|
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
||||||
|
return Internals::makeParser(that(), json, nestingLimit).parseObject();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonObject& parseObject(TString);
|
||||||
|
// TString = const char*, const char[N], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
JsonObject &parseObject(
|
||||||
|
TString *json, uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
||||||
|
return Internals::makeParser(that(), json, nestingLimit).parseObject();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonObject& parseObject(TString);
|
||||||
|
// TString = std::istream&, Stream&
|
||||||
|
template <typename TString>
|
||||||
|
JsonObject &parseObject(
|
||||||
|
TString &json, uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
||||||
|
return Internals::makeParser(that(), json, nestingLimit).parseObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generalized version of parseArray() and parseObject(), also works for
|
||||||
|
// integral types.
|
||||||
|
//
|
||||||
|
// JsonVariant parse(TString);
|
||||||
|
// TString = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
typename Internals::EnableIf<!Internals::IsArray<TString>::value,
|
||||||
|
JsonVariant>::type
|
||||||
|
parse(const TString &json,
|
||||||
|
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
||||||
|
return Internals::makeParser(that(), json, nestingLimit).parseVariant();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonVariant parse(TString);
|
||||||
|
// TString = const char*, const char[N], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
JsonVariant parse(TString *json,
|
||||||
|
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
||||||
|
return Internals::makeParser(that(), json, nestingLimit).parseVariant();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonVariant parse(TString);
|
||||||
|
// TString = std::istream&, Stream&
|
||||||
|
template <typename TString>
|
||||||
|
JsonVariant parse(TString &json,
|
||||||
|
uint8_t nestingLimit = ARDUINOJSON_DEFAULT_NESTING_LIMIT) {
|
||||||
|
return Internals::makeParser(that(), json, nestingLimit).parseVariant();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
~JsonBufferBase() {}
|
||||||
|
|
||||||
|
private:
|
||||||
|
TDerived *that() {
|
||||||
|
return static_cast<TDerived *>(this);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Deserialization/JsonParser.hpp"
|
||||||
|
|
||||||
|
inline ArduinoJson::JsonArray &ArduinoJson::JsonBuffer::createArray() {
|
||||||
|
JsonArray *ptr = new (this) JsonArray(this);
|
||||||
|
return ptr ? *ptr : JsonArray::invalid();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline ArduinoJson::JsonObject &ArduinoJson::JsonBuffer::createObject() {
|
||||||
|
JsonObject *ptr = new (this) JsonObject(this);
|
||||||
|
return ptr ? *ptr : JsonObject::invalid();
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,322 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Data/JsonBufferAllocated.hpp"
|
||||||
|
#include "Data/List.hpp"
|
||||||
|
#include "Data/ReferenceType.hpp"
|
||||||
|
#include "Data/ValueSaver.hpp"
|
||||||
|
#include "JsonPair.hpp"
|
||||||
|
#include "Serialization/JsonPrintable.hpp"
|
||||||
|
#include "StringTraits/StringTraits.hpp"
|
||||||
|
#include "TypeTraits/EnableIf.hpp"
|
||||||
|
#include "TypeTraits/IsArray.hpp"
|
||||||
|
#include "TypeTraits/IsFloatingPoint.hpp"
|
||||||
|
#include "TypeTraits/IsSame.hpp"
|
||||||
|
|
||||||
|
// Returns the size (in bytes) of an object with n elements.
|
||||||
|
// Can be very handy to determine the size of a StaticJsonBuffer.
|
||||||
|
#define JSON_OBJECT_SIZE(NUMBER_OF_ELEMENTS) \
|
||||||
|
(sizeof(JsonObject) + (NUMBER_OF_ELEMENTS) * sizeof(JsonObject::node_type))
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
// Forward declarations
|
||||||
|
class JsonArray;
|
||||||
|
class JsonBuffer;
|
||||||
|
namespace Internals {
|
||||||
|
template <typename>
|
||||||
|
class JsonObjectSubscript;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A dictionary of JsonVariant indexed by string (char*)
|
||||||
|
//
|
||||||
|
// The constructor is private, instances must be created via
|
||||||
|
// JsonBuffer::createObject() or JsonBuffer::parseObject().
|
||||||
|
// A JsonObject can be serialized to a JSON string via JsonObject::printTo().
|
||||||
|
// It can also be deserialized from a JSON string via JsonBuffer::parseObject().
|
||||||
|
class JsonObject : public Internals::JsonPrintable<JsonObject>,
|
||||||
|
public Internals::ReferenceType,
|
||||||
|
public Internals::NonCopyable,
|
||||||
|
public Internals::List<JsonPair>,
|
||||||
|
public Internals::JsonBufferAllocated {
|
||||||
|
public:
|
||||||
|
// Create an empty JsonArray attached to the specified JsonBuffer.
|
||||||
|
// You should not use this constructor directly.
|
||||||
|
// Instead, use JsonBuffer::createObject() or JsonBuffer.parseObject().
|
||||||
|
explicit JsonObject(JsonBuffer* buffer) throw()
|
||||||
|
: Internals::List<JsonPair>(buffer) {}
|
||||||
|
|
||||||
|
// Gets or sets the value associated with the specified key.
|
||||||
|
//
|
||||||
|
// JsonObjectSubscript operator[](TKey)
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
Internals::JsonObjectSubscript<const TString&> operator[](
|
||||||
|
const TString& key) {
|
||||||
|
return Internals::JsonObjectSubscript<const TString&>(*this, key);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonObjectSubscript operator[](TKey)
|
||||||
|
// TKey = char*, const char*, char[], const char[N], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
Internals::JsonObjectSubscript<TString*> operator[](TString* key) {
|
||||||
|
return Internals::JsonObjectSubscript<TString*>(*this, key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gets the value associated with the specified key.
|
||||||
|
//
|
||||||
|
// const JsonObjectSubscript operator[](TKey) const;
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
const Internals::JsonObjectSubscript<const TString&> operator[](
|
||||||
|
const TString& key) const {
|
||||||
|
return Internals::JsonObjectSubscript<const TString&>(
|
||||||
|
*const_cast<JsonObject*>(this), key);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// const JsonObjectSubscript operator[](TKey) const;
|
||||||
|
// TKey = const char*, const char[N], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
const Internals::JsonObjectSubscript<TString*> operator[](
|
||||||
|
TString* key) const {
|
||||||
|
return Internals::JsonObjectSubscript<TString*>(
|
||||||
|
*const_cast<JsonObject*>(this), key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sets the specified key with the specified value.
|
||||||
|
//
|
||||||
|
// bool set(TKey, TValue);
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
bool set(const TString& key, const TValue& value) {
|
||||||
|
return set_impl<const TString&, const TValue&>(key, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(TKey, TValue);
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
// TValue = char*, const char*, const FlashStringHelper*
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
bool set(const TString& key, TValue* value) {
|
||||||
|
return set_impl<const TString&, TValue*>(key, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(TKey, const TValue&);
|
||||||
|
// TKey = char*, const char*, const FlashStringHelper*
|
||||||
|
// TValue = bool, long, int, short, float, double, RawJson, JsonVariant,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
bool set(TString* key, const TValue& value) {
|
||||||
|
return set_impl<TString*, const TValue&>(key, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(TKey, TValue);
|
||||||
|
// TKey = char*, const char*, const FlashStringHelper*
|
||||||
|
// TValue = char*, const char*, const FlashStringHelper*
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
bool set(TString* key, TValue* value) {
|
||||||
|
return set_impl<TString*, TValue*>(key, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(TKey, TValue, uint8_t decimals);
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
// TValue = float, double
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
DEPRECATED("Second argument is not supported anymore")
|
||||||
|
typename Internals::EnableIf<Internals::IsFloatingPoint<TValue>::value,
|
||||||
|
bool>::type
|
||||||
|
set(const TString& key, TValue value, uint8_t) {
|
||||||
|
return set_impl<const TString&, const JsonVariant&>(key,
|
||||||
|
JsonVariant(value));
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(TKey, TValue, uint8_t decimals);
|
||||||
|
// TKey = char*, const char*, const FlashStringHelper*
|
||||||
|
// TValue = float, double
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
DEPRECATED("Second argument is not supported anymore")
|
||||||
|
typename Internals::EnableIf<Internals::IsFloatingPoint<TValue>::value,
|
||||||
|
bool>::type
|
||||||
|
set(TString* key, TValue value, uint8_t) {
|
||||||
|
return set_impl<TString*, const JsonVariant&>(key, JsonVariant(value));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gets the value associated with the specified key.
|
||||||
|
//
|
||||||
|
// TValue get<TValue>(TKey) const;
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
// TValue = bool, char, long, int, short, float, double,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
typename Internals::JsonVariantAs<TValue>::type get(
|
||||||
|
const TString& key) const {
|
||||||
|
return get_impl<const TString&, TValue>(key);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// TValue get<TValue>(TKey) const;
|
||||||
|
// TKey = char*, const char*, const FlashStringHelper*
|
||||||
|
// TValue = bool, char, long, int, short, float, double,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
typename Internals::JsonVariantAs<TValue>::type get(TString* key) const {
|
||||||
|
return get_impl<TString*, TValue>(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Checks the type of the value associated with the specified key.
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// bool is<TValue>(TKey) const;
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
// TValue = bool, char, long, int, short, float, double,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
bool is(const TString& key) const {
|
||||||
|
return is_impl<const TString&, TValue>(key);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool is<TValue>(TKey) const;
|
||||||
|
// TKey = char*, const char*, const FlashStringHelper*
|
||||||
|
// TValue = bool, char, long, int, short, float, double,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename TValue, typename TString>
|
||||||
|
bool is(TString* key) const {
|
||||||
|
return is_impl<TString*, TValue>(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Creates and adds a JsonArray.
|
||||||
|
//
|
||||||
|
// JsonArray& createNestedArray(TKey);
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
JsonArray& createNestedArray(const TString& key) {
|
||||||
|
return createNestedArray_impl<const TString&>(key);
|
||||||
|
}
|
||||||
|
// JsonArray& createNestedArray(TKey);
|
||||||
|
// TKey = char*, const char*, char[], const char[], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
JsonArray& createNestedArray(TString* key) {
|
||||||
|
return createNestedArray_impl<TString*>(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Creates and adds a JsonObject.
|
||||||
|
//
|
||||||
|
// JsonObject& createNestedObject(TKey);
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
JsonObject& createNestedObject(const TString& key) {
|
||||||
|
return createNestedObject_impl<const TString&>(key);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonObject& createNestedObject(TKey);
|
||||||
|
// TKey = char*, const char*, char[], const char[], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
JsonObject& createNestedObject(TString* key) {
|
||||||
|
return createNestedObject_impl<TString*>(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tells weither the specified key is present and associated with a value.
|
||||||
|
//
|
||||||
|
// bool containsKey(TKey);
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
bool containsKey(const TString& key) const {
|
||||||
|
return findKey<const TString&>(key) != end();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool containsKey(TKey);
|
||||||
|
// TKey = char*, const char*, char[], const char[], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
bool containsKey(TString* key) const {
|
||||||
|
return findKey<TString*>(key) != end();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Removes the specified key and the associated value.
|
||||||
|
//
|
||||||
|
// void remove(TKey);
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
void remove(const TString& key) {
|
||||||
|
remove(findKey<const TString&>(key));
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// void remove(TKey);
|
||||||
|
// TKey = char*, const char*, char[], const char[], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
void remove(TString* key) {
|
||||||
|
remove(findKey<TString*>(key));
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// void remove(iterator)
|
||||||
|
using Internals::List<JsonPair>::remove;
|
||||||
|
|
||||||
|
// Returns a reference an invalid JsonObject.
|
||||||
|
// This object is meant to replace a NULL pointer.
|
||||||
|
// This is used when memory allocation or JSON parsing fail.
|
||||||
|
static JsonObject& invalid() {
|
||||||
|
static JsonObject instance(NULL);
|
||||||
|
return instance;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
// Returns the list node that matches the specified key.
|
||||||
|
template <typename TStringRef>
|
||||||
|
iterator findKey(TStringRef key) {
|
||||||
|
iterator it;
|
||||||
|
for (it = begin(); it != end(); ++it) {
|
||||||
|
if (Internals::StringTraits<TStringRef>::equals(key, it->key)) break;
|
||||||
|
}
|
||||||
|
return it;
|
||||||
|
}
|
||||||
|
template <typename TStringRef>
|
||||||
|
const_iterator findKey(TStringRef key) const {
|
||||||
|
return const_cast<JsonObject*>(this)->findKey<TStringRef>(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TStringRef, typename TValue>
|
||||||
|
typename Internals::JsonVariantAs<TValue>::type get_impl(
|
||||||
|
TStringRef key) const {
|
||||||
|
const_iterator it = findKey<TStringRef>(key);
|
||||||
|
return it != end() ? it->value.as<TValue>()
|
||||||
|
: Internals::JsonVariantDefault<TValue>::get();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TStringRef, typename TValueRef>
|
||||||
|
bool set_impl(TStringRef key, TValueRef value) {
|
||||||
|
iterator it = findKey<TStringRef>(key);
|
||||||
|
if (it == end()) {
|
||||||
|
it = Internals::List<JsonPair>::add();
|
||||||
|
if (it == end()) return false;
|
||||||
|
|
||||||
|
bool key_ok =
|
||||||
|
Internals::ValueSaver<TStringRef>::save(_buffer, it->key, key);
|
||||||
|
if (!key_ok) return false;
|
||||||
|
}
|
||||||
|
return Internals::ValueSaver<TValueRef>::save(_buffer, it->value, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TStringRef, typename TValue>
|
||||||
|
bool is_impl(TStringRef key) const {
|
||||||
|
const_iterator it = findKey<TStringRef>(key);
|
||||||
|
return it != end() ? it->value.is<TValue>() : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TStringRef>
|
||||||
|
JsonArray& createNestedArray_impl(TStringRef key);
|
||||||
|
|
||||||
|
template <typename TStringRef>
|
||||||
|
JsonObject& createNestedObject_impl(TStringRef key);
|
||||||
|
};
|
||||||
|
|
||||||
|
namespace Internals {
|
||||||
|
template <>
|
||||||
|
struct JsonVariantDefault<JsonObject> {
|
||||||
|
static JsonObject& get() {
|
||||||
|
return JsonObject::invalid();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "JsonArray.hpp"
|
||||||
|
#include "JsonObject.hpp"
|
||||||
|
#include "JsonObjectSubscript.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
template <typename TStringRef>
|
||||||
|
inline JsonArray &JsonObject::createNestedArray_impl(TStringRef key) {
|
||||||
|
if (!_buffer) return JsonArray::invalid();
|
||||||
|
JsonArray &array = _buffer->createArray();
|
||||||
|
set(key, array);
|
||||||
|
return array;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TStringRef>
|
||||||
|
inline JsonObject &JsonObject::createNestedObject_impl(TStringRef key) {
|
||||||
|
if (!_buffer) return JsonObject::invalid();
|
||||||
|
JsonObject &object = _buffer->createObject();
|
||||||
|
set(key, object);
|
||||||
|
return object;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,110 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Configuration.hpp"
|
||||||
|
#include "JsonVariantBase.hpp"
|
||||||
|
#include "TypeTraits/EnableIf.hpp"
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(push)
|
||||||
|
#pragma warning(disable : 4522)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TStringRef>
|
||||||
|
class JsonObjectSubscript
|
||||||
|
: public JsonVariantBase<JsonObjectSubscript<TStringRef> > {
|
||||||
|
typedef JsonObjectSubscript<TStringRef> this_type;
|
||||||
|
|
||||||
|
public:
|
||||||
|
FORCE_INLINE JsonObjectSubscript(JsonObject& object, TStringRef key)
|
||||||
|
: _object(object), _key(key) {}
|
||||||
|
|
||||||
|
FORCE_INLINE this_type& operator=(const this_type& src) {
|
||||||
|
_object.set(_key, src);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the specified value
|
||||||
|
//
|
||||||
|
// operator=(const TValue&);
|
||||||
|
// TValue = bool, char, long, int, short, float, double,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename TValue>
|
||||||
|
FORCE_INLINE typename EnableIf<!IsArray<TValue>::value, this_type&>::type
|
||||||
|
operator=(const TValue& src) {
|
||||||
|
_object.set(_key, src);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// operator=(TValue);
|
||||||
|
// TValue = char*, const char*, const FlashStringHelper*
|
||||||
|
template <typename TValue>
|
||||||
|
FORCE_INLINE this_type& operator=(TValue* src) {
|
||||||
|
_object.set(_key, src);
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
FORCE_INLINE bool success() const {
|
||||||
|
return _object.containsKey(_key);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TValue>
|
||||||
|
FORCE_INLINE typename JsonVariantAs<TValue>::type as() const {
|
||||||
|
return _object.get<TValue>(_key);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TValue>
|
||||||
|
FORCE_INLINE bool is() const {
|
||||||
|
return _object.is<TValue>(_key);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sets the specified value.
|
||||||
|
//
|
||||||
|
// bool set(const TValue&);
|
||||||
|
// TValue = bool, char, long, int, short, float, double, RawJson, JsonVariant,
|
||||||
|
// std::string, String, JsonArray, JsonObject
|
||||||
|
template <typename TValue>
|
||||||
|
FORCE_INLINE typename EnableIf<!IsArray<TValue>::value, bool>::type set(
|
||||||
|
const TValue& value) {
|
||||||
|
return _object.set(_key, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(TValue);
|
||||||
|
// TValue = char*, const char, const FlashStringHelper*
|
||||||
|
template <typename TValue>
|
||||||
|
FORCE_INLINE bool set(const TValue* value) {
|
||||||
|
return _object.set(_key, value);
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool set(TValue, uint8_t decimals);
|
||||||
|
// TValue = float, double
|
||||||
|
template <typename TValue>
|
||||||
|
DEPRECATED("Second argument is not supported anymore")
|
||||||
|
FORCE_INLINE bool set(const TValue& value, uint8_t) {
|
||||||
|
return _object.set(_key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
JsonObject& _object;
|
||||||
|
TStringRef _key;
|
||||||
|
};
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
template <typename TStringRef>
|
||||||
|
inline std::ostream& operator<<(std::ostream& os,
|
||||||
|
const JsonObjectSubscript<TStringRef>& source) {
|
||||||
|
return source.printTo(os);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,16 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "JsonVariant.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
// A key value pair for JsonObject.
|
||||||
|
struct JsonPair {
|
||||||
|
const char* key;
|
||||||
|
JsonVariant value;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,355 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdint.h> // for uint8_t
|
||||||
|
|
||||||
|
#include "Data/JsonVariantContent.hpp"
|
||||||
|
#include "Data/JsonVariantDefault.hpp"
|
||||||
|
#include "Data/JsonVariantType.hpp"
|
||||||
|
#include "JsonVariantBase.hpp"
|
||||||
|
#include "RawJson.hpp"
|
||||||
|
#include "Serialization/JsonPrintable.hpp"
|
||||||
|
#include "TypeTraits/EnableIf.hpp"
|
||||||
|
#include "TypeTraits/IsChar.hpp"
|
||||||
|
#include "TypeTraits/IsFloatingPoint.hpp"
|
||||||
|
#include "TypeTraits/IsIntegral.hpp"
|
||||||
|
#include "TypeTraits/IsSame.hpp"
|
||||||
|
#include "TypeTraits/IsSignedIntegral.hpp"
|
||||||
|
#include "TypeTraits/IsUnsignedIntegral.hpp"
|
||||||
|
#include "TypeTraits/RemoveConst.hpp"
|
||||||
|
#include "TypeTraits/RemoveReference.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
// Forward declarations.
|
||||||
|
class JsonArray;
|
||||||
|
class JsonObject;
|
||||||
|
|
||||||
|
// A variant that can be a any value serializable to a JSON value.
|
||||||
|
//
|
||||||
|
// It can be set to:
|
||||||
|
// - a boolean
|
||||||
|
// - a char, short, int or a long (signed or unsigned)
|
||||||
|
// - a string (const char*)
|
||||||
|
// - a reference to a JsonArray or JsonObject
|
||||||
|
class JsonVariant : public Internals::JsonVariantBase<JsonVariant> {
|
||||||
|
template <typename Print>
|
||||||
|
friend class Internals::JsonSerializer;
|
||||||
|
|
||||||
|
public:
|
||||||
|
// Creates an uninitialized JsonVariant
|
||||||
|
JsonVariant() : _type(Internals::JSON_UNDEFINED) {}
|
||||||
|
|
||||||
|
// Create a JsonVariant containing a boolean value.
|
||||||
|
// It will be serialized as "true" or "false" in JSON.
|
||||||
|
JsonVariant(bool value) {
|
||||||
|
using namespace Internals;
|
||||||
|
_type = JSON_BOOLEAN;
|
||||||
|
_content.asInteger = static_cast<JsonUInt>(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a JsonVariant containing a floating point value.
|
||||||
|
// JsonVariant(double value);
|
||||||
|
// JsonVariant(float value);
|
||||||
|
template <typename T>
|
||||||
|
JsonVariant(T value, typename Internals::EnableIf<
|
||||||
|
Internals::IsFloatingPoint<T>::value>::type * = 0) {
|
||||||
|
using namespace Internals;
|
||||||
|
_type = JSON_FLOAT;
|
||||||
|
_content.asFloat = static_cast<JsonFloat>(value);
|
||||||
|
}
|
||||||
|
template <typename T>
|
||||||
|
DEPRECATED("Second argument is not supported anymore")
|
||||||
|
JsonVariant(T value, uint8_t,
|
||||||
|
typename Internals::EnableIf<
|
||||||
|
Internals::IsFloatingPoint<T>::value>::type * = 0) {
|
||||||
|
using namespace Internals;
|
||||||
|
_type = JSON_FLOAT;
|
||||||
|
_content.asFloat = static_cast<JsonFloat>(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a JsonVariant containing an integer value.
|
||||||
|
// JsonVariant(char)
|
||||||
|
// JsonVariant(signed short)
|
||||||
|
// JsonVariant(signed int)
|
||||||
|
// JsonVariant(signed long)
|
||||||
|
// JsonVariant(signed char)
|
||||||
|
template <typename T>
|
||||||
|
JsonVariant(
|
||||||
|
T value,
|
||||||
|
typename Internals::EnableIf<Internals::IsSignedIntegral<T>::value ||
|
||||||
|
Internals::IsSame<T, char>::value>::type * =
|
||||||
|
0) {
|
||||||
|
using namespace Internals;
|
||||||
|
if (value >= 0) {
|
||||||
|
_type = JSON_POSITIVE_INTEGER;
|
||||||
|
_content.asInteger = static_cast<JsonUInt>(value);
|
||||||
|
} else {
|
||||||
|
_type = JSON_NEGATIVE_INTEGER;
|
||||||
|
_content.asInteger = static_cast<JsonUInt>(-value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// JsonVariant(unsigned short)
|
||||||
|
// JsonVariant(unsigned int)
|
||||||
|
// JsonVariant(unsigned long)
|
||||||
|
template <typename T>
|
||||||
|
JsonVariant(T value,
|
||||||
|
typename Internals::EnableIf<
|
||||||
|
Internals::IsUnsignedIntegral<T>::value>::type * = 0) {
|
||||||
|
using namespace Internals;
|
||||||
|
_type = JSON_POSITIVE_INTEGER;
|
||||||
|
_content.asInteger = static_cast<JsonUInt>(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a JsonVariant containing a string.
|
||||||
|
// JsonVariant(const char*);
|
||||||
|
// JsonVariant(const signed char*);
|
||||||
|
// JsonVariant(const unsigned char*);
|
||||||
|
template <typename TChar>
|
||||||
|
JsonVariant(
|
||||||
|
const TChar *value,
|
||||||
|
typename Internals::EnableIf<Internals::IsChar<TChar>::value>::type * =
|
||||||
|
0) {
|
||||||
|
_type = Internals::JSON_STRING;
|
||||||
|
_content.asString = reinterpret_cast<const char *>(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a JsonVariant containing an unparsed string
|
||||||
|
JsonVariant(Internals::RawJsonString<const char *> value) {
|
||||||
|
_type = Internals::JSON_UNPARSED;
|
||||||
|
_content.asString = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a JsonVariant containing a reference to an array.
|
||||||
|
// CAUTION: we are lying about constness, because the array can be modified if
|
||||||
|
// the variant is converted back to a JsonArray&
|
||||||
|
JsonVariant(const JsonArray &array);
|
||||||
|
|
||||||
|
// Create a JsonVariant containing a reference to an object.
|
||||||
|
// CAUTION: we are lying about constness, because the object can be modified
|
||||||
|
// if the variant is converted back to a JsonObject&
|
||||||
|
JsonVariant(const JsonObject &object);
|
||||||
|
|
||||||
|
// Get the variant as the specified type.
|
||||||
|
//
|
||||||
|
// char as<char>() const;
|
||||||
|
// signed char as<signed char>() const;
|
||||||
|
// signed short as<signed short>() const;
|
||||||
|
// signed int as<signed int>() const;
|
||||||
|
// signed long as<signed long>() const;
|
||||||
|
// unsigned char as<unsigned char>() const;
|
||||||
|
// unsigned short as<unsigned short>() const;
|
||||||
|
// unsigned int as<unsigned int>() const;
|
||||||
|
// unsigned long as<unsigned long>() const;
|
||||||
|
template <typename T>
|
||||||
|
const typename Internals::EnableIf<Internals::IsIntegral<T>::value, T>::type
|
||||||
|
as() const {
|
||||||
|
return variantAsInteger<T>();
|
||||||
|
}
|
||||||
|
// bool as<bool>() const
|
||||||
|
template <typename T>
|
||||||
|
const typename Internals::EnableIf<Internals::IsSame<T, bool>::value, T>::type
|
||||||
|
as() const {
|
||||||
|
return variantAsInteger<int>() != 0;
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// double as<double>() const;
|
||||||
|
// float as<float>() const;
|
||||||
|
template <typename T>
|
||||||
|
const typename Internals::EnableIf<Internals::IsFloatingPoint<T>::value,
|
||||||
|
T>::type
|
||||||
|
as() const {
|
||||||
|
return variantAsFloat<T>();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// const char* as<const char*>() const;
|
||||||
|
// const char* as<char*>() const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<Internals::IsSame<T, const char *>::value ||
|
||||||
|
Internals::IsSame<T, char *>::value,
|
||||||
|
const char *>::type
|
||||||
|
as() const {
|
||||||
|
return variantAsString();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// std::string as<std::string>() const;
|
||||||
|
// String as<String>() const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<Internals::StringTraits<T>::has_append, T>::type
|
||||||
|
as() const {
|
||||||
|
const char *cstr = variantAsString();
|
||||||
|
if (cstr) return T(cstr);
|
||||||
|
T s;
|
||||||
|
printTo(s);
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonArray& as<JsonArray> const;
|
||||||
|
// JsonArray& as<JsonArray&> const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<
|
||||||
|
Internals::IsSame<typename Internals::RemoveReference<T>::type,
|
||||||
|
JsonArray>::value,
|
||||||
|
JsonArray &>::type
|
||||||
|
as() const {
|
||||||
|
return variantAsArray();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// const JsonArray& as<const JsonArray&> const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<
|
||||||
|
Internals::IsSame<typename Internals::RemoveReference<T>::type,
|
||||||
|
const JsonArray>::value,
|
||||||
|
const JsonArray &>::type
|
||||||
|
as() const {
|
||||||
|
return variantAsArray();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonObject& as<JsonObject> const;
|
||||||
|
// JsonObject& as<JsonObject&> const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<
|
||||||
|
Internals::IsSame<typename Internals::RemoveReference<T>::type,
|
||||||
|
JsonObject>::value,
|
||||||
|
JsonObject &>::type
|
||||||
|
as() const {
|
||||||
|
return variantAsObject();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonObject& as<const JsonObject> const;
|
||||||
|
// JsonObject& as<const JsonObject&> const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<
|
||||||
|
Internals::IsSame<typename Internals::RemoveReference<T>::type,
|
||||||
|
const JsonObject>::value,
|
||||||
|
const JsonObject &>::type
|
||||||
|
as() const {
|
||||||
|
return variantAsObject();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonVariant as<JsonVariant> const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<Internals::IsSame<T, JsonVariant>::value,
|
||||||
|
T>::type
|
||||||
|
as() const {
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tells weither the variant has the specified type.
|
||||||
|
// Returns true if the variant has type type T, false otherwise.
|
||||||
|
//
|
||||||
|
// bool is<char>() const;
|
||||||
|
// bool is<signed char>() const;
|
||||||
|
// bool is<signed short>() const;
|
||||||
|
// bool is<signed int>() const;
|
||||||
|
// bool is<signed long>() const;
|
||||||
|
// bool is<unsigned char>() const;
|
||||||
|
// bool is<unsigned short>() const;
|
||||||
|
// bool is<unsigned int>() const;
|
||||||
|
// bool is<unsigned long>() const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<Internals::IsIntegral<T>::value, bool>::type is()
|
||||||
|
const {
|
||||||
|
return variantIsInteger();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool is<double>() const;
|
||||||
|
// bool is<float>() const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<Internals::IsFloatingPoint<T>::value, bool>::type
|
||||||
|
is() const {
|
||||||
|
return variantIsFloat();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool is<bool>() const
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<Internals::IsSame<T, bool>::value, bool>::type
|
||||||
|
is() const {
|
||||||
|
return variantIsBoolean();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool is<const char*>() const;
|
||||||
|
// bool is<char*>() const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<Internals::IsSame<T, const char *>::value ||
|
||||||
|
Internals::IsSame<T, char *>::value,
|
||||||
|
bool>::type
|
||||||
|
is() const {
|
||||||
|
return variantIsString();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool is<JsonArray> const;
|
||||||
|
// bool is<JsonArray&> const;
|
||||||
|
// bool is<const JsonArray&> const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<
|
||||||
|
Internals::IsSame<typename Internals::RemoveConst<
|
||||||
|
typename Internals::RemoveReference<T>::type>::type,
|
||||||
|
JsonArray>::value,
|
||||||
|
bool>::type
|
||||||
|
is() const {
|
||||||
|
return variantIsArray();
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// bool is<JsonObject> const;
|
||||||
|
// bool is<JsonObject&> const;
|
||||||
|
// bool is<const JsonObject&> const;
|
||||||
|
template <typename T>
|
||||||
|
typename Internals::EnableIf<
|
||||||
|
Internals::IsSame<typename Internals::RemoveConst<
|
||||||
|
typename Internals::RemoveReference<T>::type>::type,
|
||||||
|
JsonObject>::value,
|
||||||
|
bool>::type
|
||||||
|
is() const {
|
||||||
|
return variantIsObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns true if the variant has a value
|
||||||
|
bool success() const {
|
||||||
|
return _type != Internals::JSON_UNDEFINED;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
JsonArray &variantAsArray() const;
|
||||||
|
JsonObject &variantAsObject() const;
|
||||||
|
const char *variantAsString() const;
|
||||||
|
template <typename T>
|
||||||
|
T variantAsFloat() const;
|
||||||
|
template <typename T>
|
||||||
|
T variantAsInteger() const;
|
||||||
|
bool variantIsBoolean() const;
|
||||||
|
bool variantIsFloat() const;
|
||||||
|
bool variantIsInteger() const;
|
||||||
|
bool variantIsArray() const {
|
||||||
|
return _type == Internals::JSON_ARRAY;
|
||||||
|
}
|
||||||
|
bool variantIsObject() const {
|
||||||
|
return _type == Internals::JSON_OBJECT;
|
||||||
|
}
|
||||||
|
bool variantIsString() const {
|
||||||
|
return _type == Internals::JSON_STRING ||
|
||||||
|
(_type == Internals::JSON_UNPARSED && _content.asString &&
|
||||||
|
!strcmp("null", _content.asString));
|
||||||
|
}
|
||||||
|
|
||||||
|
// The current type of the variant
|
||||||
|
Internals::JsonVariantType _type;
|
||||||
|
|
||||||
|
// The various alternatives for the value of the variant.
|
||||||
|
Internals::JsonVariantContent _content;
|
||||||
|
};
|
||||||
|
|
||||||
|
DEPRECATED("Decimal places are ignored, use the float value instead")
|
||||||
|
inline JsonVariant float_with_n_digits(float value, uint8_t) {
|
||||||
|
return JsonVariant(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
DEPRECATED("Decimal places are ignored, use the double value instead")
|
||||||
|
inline JsonVariant double_with_n_digits(double value, uint8_t) {
|
||||||
|
return JsonVariant(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "JsonVariantCasts.hpp"
|
||||||
|
#include "JsonVariantComparisons.hpp"
|
||||||
|
#include "JsonVariantOr.hpp"
|
||||||
|
#include "JsonVariantSubscripts.hpp"
|
||||||
|
#include "Serialization/JsonPrintable.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TImpl>
|
||||||
|
class JsonVariantBase : public JsonPrintable<TImpl>,
|
||||||
|
public JsonVariantCasts<TImpl>,
|
||||||
|
public JsonVariantComparisons<TImpl>,
|
||||||
|
public JsonVariantOr<TImpl>,
|
||||||
|
public JsonVariantSubscripts<TImpl>,
|
||||||
|
public JsonVariantTag {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,59 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Data/JsonVariantAs.hpp"
|
||||||
|
#include "Polyfills/attributes.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TImpl>
|
||||||
|
class JsonVariantCasts {
|
||||||
|
public:
|
||||||
|
#if ARDUINOJSON_ENABLE_DEPRECATED
|
||||||
|
DEPRECATED("use as<JsonArray>() instead")
|
||||||
|
FORCE_INLINE JsonArray &asArray() const {
|
||||||
|
return impl()->template as<JsonArray>();
|
||||||
|
}
|
||||||
|
|
||||||
|
DEPRECATED("use as<JsonObject>() instead")
|
||||||
|
FORCE_INLINE JsonObject &asObject() const {
|
||||||
|
return impl()->template as<JsonObject>();
|
||||||
|
}
|
||||||
|
|
||||||
|
DEPRECATED("use as<char*>() instead")
|
||||||
|
FORCE_INLINE const char *asString() const {
|
||||||
|
return impl()->template as<const char *>();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Gets the variant as an array.
|
||||||
|
// Returns a reference to the JsonArray or JsonArray::invalid() if the
|
||||||
|
// variant
|
||||||
|
// is not an array.
|
||||||
|
FORCE_INLINE operator JsonArray &() const {
|
||||||
|
return impl()->template as<JsonArray &>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gets the variant as an object.
|
||||||
|
// Returns a reference to the JsonObject or JsonObject::invalid() if the
|
||||||
|
// variant is not an object.
|
||||||
|
FORCE_INLINE operator JsonObject &() const {
|
||||||
|
return impl()->template as<JsonObject &>();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
FORCE_INLINE operator T() const {
|
||||||
|
return impl()->template as<T>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
const TImpl *impl() const {
|
||||||
|
return static_cast<const TImpl *>(this);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,138 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "StringTraits/StringTraits.hpp"
|
||||||
|
#include "TypeTraits/EnableIf.hpp"
|
||||||
|
#include "TypeTraits/IsVariant.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TImpl>
|
||||||
|
class JsonVariantComparisons {
|
||||||
|
public:
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator==(const JsonVariantComparisons &variant,
|
||||||
|
TComparand comparand) {
|
||||||
|
return variant.equals(comparand);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend typename EnableIf<!IsVariant<TComparand>::value, bool>::type
|
||||||
|
operator==(TComparand comparand, const JsonVariantComparisons &variant) {
|
||||||
|
return variant.equals(comparand);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator!=(const JsonVariantComparisons &variant,
|
||||||
|
TComparand comparand) {
|
||||||
|
return !variant.equals(comparand);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend typename EnableIf<!IsVariant<TComparand>::value, bool>::type
|
||||||
|
operator!=(TComparand comparand, const JsonVariantComparisons &variant) {
|
||||||
|
return !variant.equals(comparand);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator<=(const JsonVariantComparisons &left, TComparand right) {
|
||||||
|
return left.as<TComparand>() <= right;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator<=(TComparand comparand,
|
||||||
|
const JsonVariantComparisons &variant) {
|
||||||
|
return comparand <= variant.as<TComparand>();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator>=(const JsonVariantComparisons &variant,
|
||||||
|
TComparand comparand) {
|
||||||
|
return variant.as<TComparand>() >= comparand;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator>=(TComparand comparand,
|
||||||
|
const JsonVariantComparisons &variant) {
|
||||||
|
return comparand >= variant.as<TComparand>();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator<(const JsonVariantComparisons &varian,
|
||||||
|
TComparand comparand) {
|
||||||
|
return varian.as<TComparand>() < comparand;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator<(TComparand comparand,
|
||||||
|
const JsonVariantComparisons &variant) {
|
||||||
|
return comparand < variant.as<TComparand>();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator>(const JsonVariantComparisons &variant,
|
||||||
|
TComparand comparand) {
|
||||||
|
return variant.as<TComparand>() > comparand;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
friend bool operator>(TComparand comparand,
|
||||||
|
const JsonVariantComparisons &variant) {
|
||||||
|
return comparand > variant.as<TComparand>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
const TImpl *impl() const {
|
||||||
|
return static_cast<const TImpl *>(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
const typename JsonVariantAs<T>::type as() const {
|
||||||
|
return impl()->template as<T>();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
bool is() const {
|
||||||
|
return impl()->template is<T>();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TString>
|
||||||
|
typename EnableIf<StringTraits<TString>::has_equals, bool>::type equals(
|
||||||
|
const TString &comparand) const {
|
||||||
|
const char *value = as<const char *>();
|
||||||
|
return StringTraits<TString>::equals(comparand, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TComparand>
|
||||||
|
typename EnableIf<!IsVariant<TComparand>::value &&
|
||||||
|
!StringTraits<TComparand>::has_equals,
|
||||||
|
bool>::type
|
||||||
|
equals(const TComparand &comparand) const {
|
||||||
|
return as<TComparand>() == comparand;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TVariant2>
|
||||||
|
bool equals(const JsonVariantComparisons<TVariant2> &right) const {
|
||||||
|
using namespace Internals;
|
||||||
|
if (is<bool>() && right.template is<bool>())
|
||||||
|
return as<bool>() == right.template as<bool>();
|
||||||
|
if (is<JsonInteger>() && right.template is<JsonInteger>())
|
||||||
|
return as<JsonInteger>() == right.template as<JsonInteger>();
|
||||||
|
if (is<JsonFloat>() && right.template is<JsonFloat>())
|
||||||
|
return as<JsonFloat>() == right.template as<JsonFloat>();
|
||||||
|
if (is<JsonArray>() && right.template is<JsonArray>())
|
||||||
|
return as<JsonArray>() == right.template as<JsonArray>();
|
||||||
|
if (is<JsonObject>() && right.template is<JsonObject>())
|
||||||
|
return as<JsonObject>() == right.template as<JsonObject>();
|
||||||
|
if (is<char *>() && right.template is<char *>())
|
||||||
|
return strcmp(as<char *>(), right.template as<char *>()) == 0;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,126 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Configuration.hpp"
|
||||||
|
#include "JsonArray.hpp"
|
||||||
|
#include "JsonObject.hpp"
|
||||||
|
#include "JsonVariant.hpp"
|
||||||
|
#include "Polyfills/isFloat.hpp"
|
||||||
|
#include "Polyfills/isInteger.hpp"
|
||||||
|
#include "Polyfills/parseFloat.hpp"
|
||||||
|
#include "Polyfills/parseInteger.hpp"
|
||||||
|
|
||||||
|
#include <string.h> // for strcmp
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
inline JsonVariant::JsonVariant(const JsonArray &array) {
|
||||||
|
if (array.success()) {
|
||||||
|
_type = Internals::JSON_ARRAY;
|
||||||
|
_content.asArray = const_cast<JsonArray *>(&array);
|
||||||
|
} else {
|
||||||
|
_type = Internals::JSON_UNDEFINED;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline JsonVariant::JsonVariant(const JsonObject &object) {
|
||||||
|
if (object.success()) {
|
||||||
|
_type = Internals::JSON_OBJECT;
|
||||||
|
_content.asObject = const_cast<JsonObject *>(&object);
|
||||||
|
} else {
|
||||||
|
_type = Internals::JSON_UNDEFINED;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline JsonArray &JsonVariant::variantAsArray() const {
|
||||||
|
if (_type == Internals::JSON_ARRAY) return *_content.asArray;
|
||||||
|
return JsonArray::invalid();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline JsonObject &JsonVariant::variantAsObject() const {
|
||||||
|
if (_type == Internals::JSON_OBJECT) return *_content.asObject;
|
||||||
|
return JsonObject::invalid();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
inline T JsonVariant::variantAsInteger() const {
|
||||||
|
using namespace Internals;
|
||||||
|
switch (_type) {
|
||||||
|
case JSON_UNDEFINED:
|
||||||
|
return 0;
|
||||||
|
case JSON_POSITIVE_INTEGER:
|
||||||
|
case JSON_BOOLEAN:
|
||||||
|
return T(_content.asInteger);
|
||||||
|
case JSON_NEGATIVE_INTEGER:
|
||||||
|
return T(~_content.asInteger + 1);
|
||||||
|
case JSON_STRING:
|
||||||
|
case JSON_UNPARSED:
|
||||||
|
return parseInteger<T>(_content.asString);
|
||||||
|
default:
|
||||||
|
return T(_content.asFloat);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline const char *JsonVariant::variantAsString() const {
|
||||||
|
using namespace Internals;
|
||||||
|
if (_type == JSON_UNPARSED && _content.asString &&
|
||||||
|
!strcmp("null", _content.asString))
|
||||||
|
return NULL;
|
||||||
|
if (_type == JSON_STRING || _type == JSON_UNPARSED) return _content.asString;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
inline T JsonVariant::variantAsFloat() const {
|
||||||
|
using namespace Internals;
|
||||||
|
switch (_type) {
|
||||||
|
case JSON_UNDEFINED:
|
||||||
|
return 0;
|
||||||
|
case JSON_POSITIVE_INTEGER:
|
||||||
|
case JSON_BOOLEAN:
|
||||||
|
return static_cast<T>(_content.asInteger);
|
||||||
|
case JSON_NEGATIVE_INTEGER:
|
||||||
|
return -static_cast<T>(_content.asInteger);
|
||||||
|
case JSON_STRING:
|
||||||
|
case JSON_UNPARSED:
|
||||||
|
return parseFloat<T>(_content.asString);
|
||||||
|
default:
|
||||||
|
return static_cast<T>(_content.asFloat);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline bool JsonVariant::variantIsBoolean() const {
|
||||||
|
using namespace Internals;
|
||||||
|
if (_type == JSON_BOOLEAN) return true;
|
||||||
|
|
||||||
|
if (_type != JSON_UNPARSED || _content.asString == NULL) return false;
|
||||||
|
|
||||||
|
return !strcmp(_content.asString, "true") ||
|
||||||
|
!strcmp(_content.asString, "false");
|
||||||
|
}
|
||||||
|
|
||||||
|
inline bool JsonVariant::variantIsInteger() const {
|
||||||
|
using namespace Internals;
|
||||||
|
|
||||||
|
return _type == JSON_POSITIVE_INTEGER || _type == JSON_NEGATIVE_INTEGER ||
|
||||||
|
(_type == JSON_UNPARSED && isInteger(_content.asString));
|
||||||
|
}
|
||||||
|
|
||||||
|
inline bool JsonVariant::variantIsFloat() const {
|
||||||
|
using namespace Internals;
|
||||||
|
|
||||||
|
return _type == JSON_FLOAT || _type == JSON_POSITIVE_INTEGER ||
|
||||||
|
_type == JSON_NEGATIVE_INTEGER ||
|
||||||
|
(_type == JSON_UNPARSED && isFloat(_content.asString));
|
||||||
|
}
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
inline std::ostream &operator<<(std::ostream &os, const JsonVariant &source) {
|
||||||
|
return source.printTo(os);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
} // namespace ArduinoJson
|
||||||
|
|
@ -0,0 +1,52 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Data/JsonVariantAs.hpp"
|
||||||
|
#include "Polyfills/attributes.hpp"
|
||||||
|
#include "TypeTraits/EnableIf.hpp"
|
||||||
|
#include "TypeTraits/IsIntegral.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TImpl>
|
||||||
|
class JsonVariantOr {
|
||||||
|
public:
|
||||||
|
// Returns the default value if the JsonVariant is undefined of incompatible
|
||||||
|
template <typename T>
|
||||||
|
typename EnableIf<!IsIntegral<T>::value, T>::type operator|(
|
||||||
|
const T &defaultValue) const {
|
||||||
|
if (impl()->template is<T>())
|
||||||
|
return impl()->template as<T>();
|
||||||
|
else
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns the default value if the JsonVariant is undefined of incompatible
|
||||||
|
// Special case for string: null is treated as undefined
|
||||||
|
const char *operator|(const char *defaultValue) const {
|
||||||
|
const char *value = impl()->template as<const char *>();
|
||||||
|
return value ? value : defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns the default value if the JsonVariant is undefined of incompatible
|
||||||
|
// Special case for integers: we also accept double
|
||||||
|
template <typename Integer>
|
||||||
|
typename EnableIf<IsIntegral<Integer>::value, Integer>::type operator|(
|
||||||
|
const Integer &defaultValue) const {
|
||||||
|
if (impl()->template is<double>())
|
||||||
|
return impl()->template as<Integer>();
|
||||||
|
else
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
const TImpl *impl() const {
|
||||||
|
return static_cast<const TImpl *>(this);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
} // namespace Internals
|
||||||
|
} // namespace ArduinoJson
|
||||||
|
|
@ -0,0 +1,86 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "Data/JsonVariantAs.hpp"
|
||||||
|
#include "Polyfills/attributes.hpp"
|
||||||
|
#include "StringTraits/StringTraits.hpp"
|
||||||
|
#include "TypeTraits/EnableIf.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// Forward declarations.
|
||||||
|
class JsonArraySubscript;
|
||||||
|
template <typename TKey>
|
||||||
|
class JsonObjectSubscript;
|
||||||
|
|
||||||
|
template <typename TImpl>
|
||||||
|
class JsonVariantSubscripts {
|
||||||
|
public:
|
||||||
|
// Mimics an array or an object.
|
||||||
|
// Returns the size of the array or object if the variant has that type.
|
||||||
|
// Returns 0 if the variant is neither an array nor an object
|
||||||
|
size_t size() const {
|
||||||
|
return impl()->template as<JsonArray>().size() +
|
||||||
|
impl()->template as<JsonObject>().size();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Mimics an array.
|
||||||
|
// Returns the element at specified index if the variant is an array.
|
||||||
|
// Returns JsonVariant::invalid() if the variant is not an array.
|
||||||
|
FORCE_INLINE const JsonArraySubscript operator[](size_t index) const;
|
||||||
|
FORCE_INLINE JsonArraySubscript operator[](size_t index);
|
||||||
|
|
||||||
|
// Mimics an object.
|
||||||
|
// Returns the value associated with the specified key if the variant is
|
||||||
|
// an object.
|
||||||
|
// Return JsonVariant::invalid() if the variant is not an object.
|
||||||
|
//
|
||||||
|
// const JsonObjectSubscript operator[](TKey) const;
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
FORCE_INLINE
|
||||||
|
typename EnableIf<StringTraits<TString>::has_equals,
|
||||||
|
const JsonObjectSubscript<const TString &> >::type
|
||||||
|
operator[](const TString &key) const {
|
||||||
|
return impl()->template as<JsonObject>()[key];
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// const JsonObjectSubscript operator[](TKey) const;
|
||||||
|
// TKey = const std::string&, const String&
|
||||||
|
template <typename TString>
|
||||||
|
FORCE_INLINE typename EnableIf<StringTraits<TString>::has_equals,
|
||||||
|
JsonObjectSubscript<const TString &> >::type
|
||||||
|
operator[](const TString &key) {
|
||||||
|
return impl()->template as<JsonObject>()[key];
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonObjectSubscript operator[](TKey);
|
||||||
|
// TKey = const char*, const char[N], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
FORCE_INLINE typename EnableIf<StringTraits<const TString *>::has_equals,
|
||||||
|
JsonObjectSubscript<const TString *> >::type
|
||||||
|
operator[](const TString *key) {
|
||||||
|
return impl()->template as<JsonObject>()[key];
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// JsonObjectSubscript operator[](TKey);
|
||||||
|
// TKey = const char*, const char[N], const FlashStringHelper*
|
||||||
|
template <typename TString>
|
||||||
|
FORCE_INLINE
|
||||||
|
typename EnableIf<StringTraits<TString *>::has_equals,
|
||||||
|
const JsonObjectSubscript<const TString *> >::type
|
||||||
|
operator[](const TString *key) const {
|
||||||
|
return impl()->template as<JsonObject>()[key];
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
const TImpl *impl() const {
|
||||||
|
return static_cast<const TImpl *>(this);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,29 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#ifdef _MSC_VER // Visual Studio
|
||||||
|
|
||||||
|
#define FORCE_INLINE // __forceinline causes C4714 when returning std::string
|
||||||
|
#define NO_INLINE __declspec(noinline)
|
||||||
|
#define DEPRECATED(msg) __declspec(deprecated(msg))
|
||||||
|
|
||||||
|
#elif defined(__GNUC__) // GCC or Clang
|
||||||
|
|
||||||
|
#define FORCE_INLINE __attribute__((always_inline))
|
||||||
|
#define NO_INLINE __attribute__((noinline))
|
||||||
|
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
|
||||||
|
#define DEPRECATED(msg) __attribute__((deprecated(msg)))
|
||||||
|
#else
|
||||||
|
#define DEPRECATED(msg) __attribute__((deprecated))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else // Other compilers
|
||||||
|
|
||||||
|
#define FORCE_INLINE
|
||||||
|
#define NO_INLINE
|
||||||
|
#define DEPRECATED(msg)
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
inline bool isdigit(char c) {
|
||||||
|
return '0' <= c && c <= '9';
|
||||||
|
}
|
||||||
|
|
||||||
|
inline bool issign(char c) {
|
||||||
|
return '-' == c || c == '+';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,38 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <string.h> // for strcmp
|
||||||
|
#include "./ctype.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
inline bool isFloat(const char* s) {
|
||||||
|
if (!s) return false;
|
||||||
|
|
||||||
|
if (!strcmp(s, "NaN")) return true;
|
||||||
|
if (issign(*s)) s++;
|
||||||
|
if (!strcmp(s, "Infinity")) return true;
|
||||||
|
if (*s == '\0') return false;
|
||||||
|
|
||||||
|
while (isdigit(*s)) s++;
|
||||||
|
|
||||||
|
if (*s == '.') {
|
||||||
|
s++;
|
||||||
|
while (isdigit(*s)) s++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (*s == 'e' || *s == 'E') {
|
||||||
|
s++;
|
||||||
|
if (issign(*s)) s++;
|
||||||
|
if (!isdigit(*s)) return false;
|
||||||
|
while (isdigit(*s)) s++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return *s == '\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "./ctype.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
inline bool isInteger(const char* s) {
|
||||||
|
if (!s) return false;
|
||||||
|
if (issign(*s)) s++;
|
||||||
|
while (isdigit(*s)) s++;
|
||||||
|
return *s == '\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
template <typename T>
|
||||||
|
bool isNaN(T x) {
|
||||||
|
return x != x;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
bool isInfinity(T x) {
|
||||||
|
return x != 0.0 && x * 2 == x;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,90 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../TypeTraits/FloatTraits.hpp"
|
||||||
|
#include "./ctype.hpp"
|
||||||
|
#include "./math.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
inline T parseFloat(const char* s) {
|
||||||
|
typedef FloatTraits<T> traits;
|
||||||
|
typedef typename traits::mantissa_type mantissa_t;
|
||||||
|
typedef typename traits::exponent_type exponent_t;
|
||||||
|
|
||||||
|
if (!s) return 0; // NULL
|
||||||
|
|
||||||
|
bool negative_result = false;
|
||||||
|
switch (*s) {
|
||||||
|
case '-':
|
||||||
|
negative_result = true;
|
||||||
|
s++;
|
||||||
|
break;
|
||||||
|
case '+':
|
||||||
|
s++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (*s == 't') return 1; // true
|
||||||
|
if (*s == 'n' || *s == 'N') return traits::nan();
|
||||||
|
if (*s == 'i' || *s == 'I')
|
||||||
|
return negative_result ? -traits::inf() : traits::inf();
|
||||||
|
|
||||||
|
mantissa_t mantissa = 0;
|
||||||
|
exponent_t exponent_offset = 0;
|
||||||
|
|
||||||
|
while (isdigit(*s)) {
|
||||||
|
if (mantissa < traits::mantissa_max / 10)
|
||||||
|
mantissa = mantissa * 10 + (*s - '0');
|
||||||
|
else
|
||||||
|
exponent_offset++;
|
||||||
|
s++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (*s == '.') {
|
||||||
|
s++;
|
||||||
|
while (isdigit(*s)) {
|
||||||
|
if (mantissa < traits::mantissa_max / 10) {
|
||||||
|
mantissa = mantissa * 10 + (*s - '0');
|
||||||
|
exponent_offset--;
|
||||||
|
}
|
||||||
|
s++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int exponent = 0;
|
||||||
|
if (*s == 'e' || *s == 'E') {
|
||||||
|
s++;
|
||||||
|
bool negative_exponent = false;
|
||||||
|
if (*s == '-') {
|
||||||
|
negative_exponent = true;
|
||||||
|
s++;
|
||||||
|
} else if (*s == '+') {
|
||||||
|
s++;
|
||||||
|
}
|
||||||
|
|
||||||
|
while (isdigit(*s)) {
|
||||||
|
exponent = exponent * 10 + (*s - '0');
|
||||||
|
if (exponent + exponent_offset > traits::exponent_max) {
|
||||||
|
if (negative_exponent)
|
||||||
|
return negative_result ? -0.0f : 0.0f;
|
||||||
|
else
|
||||||
|
return negative_result ? -traits::inf() : traits::inf();
|
||||||
|
}
|
||||||
|
s++;
|
||||||
|
}
|
||||||
|
if (negative_exponent) exponent = -exponent;
|
||||||
|
}
|
||||||
|
exponent += exponent_offset;
|
||||||
|
|
||||||
|
T result = traits::make_float(static_cast<T>(mantissa), exponent);
|
||||||
|
|
||||||
|
return negative_result ? -result : result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
#include "./ctype.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
template <typename T>
|
||||||
|
T parseInteger(const char *s) {
|
||||||
|
if (!s) return 0; // NULL
|
||||||
|
|
||||||
|
if (*s == 't') return 1; // "true"
|
||||||
|
|
||||||
|
T result = 0;
|
||||||
|
bool negative_result = false;
|
||||||
|
|
||||||
|
switch (*s) {
|
||||||
|
case '-':
|
||||||
|
negative_result = true;
|
||||||
|
s++;
|
||||||
|
break;
|
||||||
|
case '+':
|
||||||
|
s++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
while (isdigit(*s)) {
|
||||||
|
result = T(result * 10 + T(*s - '0'));
|
||||||
|
s++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return negative_result ? T(~result + 1) : result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,46 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
namespace Internals {
|
||||||
|
// A special type of data that can be used to insert pregenerated JSON portions.
|
||||||
|
template <typename T>
|
||||||
|
class RawJsonString {
|
||||||
|
public:
|
||||||
|
explicit RawJsonString(T str) : _str(str) {}
|
||||||
|
operator T() const {
|
||||||
|
return _str;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
T _str;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename String>
|
||||||
|
struct StringTraits<RawJsonString<String>, void> {
|
||||||
|
static bool is_null(RawJsonString<String> source) {
|
||||||
|
return StringTraits<String>::is_null(static_cast<String>(source));
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef RawJsonString<const char*> duplicate_t;
|
||||||
|
|
||||||
|
template <typename Buffer>
|
||||||
|
static duplicate_t duplicate(RawJsonString<String> source, Buffer* buffer) {
|
||||||
|
return duplicate_t(StringTraits<String>::duplicate(source, buffer));
|
||||||
|
}
|
||||||
|
|
||||||
|
static const bool has_append = false;
|
||||||
|
static const bool has_equals = false;
|
||||||
|
static const bool should_duplicate = StringTraits<String>::should_duplicate;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
inline Internals::RawJsonString<T> RawJson(T str) {
|
||||||
|
return Internals::RawJsonString<T>(str);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A dummy Print implementation used in JsonPrintable::measureLength()
|
||||||
|
class DummyPrint {
|
||||||
|
public:
|
||||||
|
size_t print(char) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t print(const char* s) {
|
||||||
|
return strlen(s);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../StringTraits/StringTraits.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A Print implementation that allows to write in a String
|
||||||
|
template <typename TString>
|
||||||
|
class DynamicStringBuilder {
|
||||||
|
public:
|
||||||
|
DynamicStringBuilder(TString &str) : _str(str) {}
|
||||||
|
|
||||||
|
size_t print(char c) {
|
||||||
|
StringTraits<TString>::append(_str, c);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t print(const char *s) {
|
||||||
|
size_t initialLen = _str.length();
|
||||||
|
StringTraits<TString>::append(_str, s);
|
||||||
|
return _str.length() - initialLen;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
DynamicStringBuilder &operator=(const DynamicStringBuilder &);
|
||||||
|
|
||||||
|
TString &_str;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,89 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
#include "../Polyfills/math.hpp"
|
||||||
|
#include "../TypeTraits/FloatTraits.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TFloat>
|
||||||
|
struct FloatParts {
|
||||||
|
uint32_t integral;
|
||||||
|
uint32_t decimal;
|
||||||
|
int16_t exponent;
|
||||||
|
int8_t decimalPlaces;
|
||||||
|
|
||||||
|
FloatParts(TFloat value) {
|
||||||
|
uint32_t maxDecimalPart = sizeof(TFloat) >= 8 ? 1000000000 : 1000000;
|
||||||
|
decimalPlaces = sizeof(TFloat) >= 8 ? 9 : 6;
|
||||||
|
|
||||||
|
exponent = normalize(value);
|
||||||
|
|
||||||
|
integral = uint32_t(value);
|
||||||
|
// reduce number of decimal places by the number of integral places
|
||||||
|
for (uint32_t tmp = integral; tmp >= 10; tmp /= 10) {
|
||||||
|
maxDecimalPart /= 10;
|
||||||
|
decimalPlaces--;
|
||||||
|
}
|
||||||
|
|
||||||
|
TFloat remainder = (value - TFloat(integral)) * TFloat(maxDecimalPart);
|
||||||
|
|
||||||
|
decimal = uint32_t(remainder);
|
||||||
|
remainder = remainder - TFloat(decimal);
|
||||||
|
|
||||||
|
// rounding:
|
||||||
|
// increment by 1 if remainder >= 0.5
|
||||||
|
decimal += uint32_t(remainder * 2);
|
||||||
|
if (decimal >= maxDecimalPart) {
|
||||||
|
decimal = 0;
|
||||||
|
integral++;
|
||||||
|
if (exponent && integral >= 10) {
|
||||||
|
exponent++;
|
||||||
|
integral = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// remove trailing zeros
|
||||||
|
while (decimal % 10 == 0 && decimalPlaces > 0) {
|
||||||
|
decimal /= 10;
|
||||||
|
decimalPlaces--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int16_t normalize(TFloat& value) {
|
||||||
|
typedef FloatTraits<TFloat> traits;
|
||||||
|
int16_t powersOf10 = 0;
|
||||||
|
|
||||||
|
int8_t index = sizeof(TFloat) == 8 ? 8 : 5;
|
||||||
|
int bit = 1 << index;
|
||||||
|
|
||||||
|
if (value >= ARDUINOJSON_POSITIVE_EXPONENTIATION_THRESHOLD) {
|
||||||
|
for (; index >= 0; index--) {
|
||||||
|
if (value >= traits::positiveBinaryPowerOfTen(index)) {
|
||||||
|
value *= traits::negativeBinaryPowerOfTen(index);
|
||||||
|
powersOf10 = int16_t(powersOf10 + bit);
|
||||||
|
}
|
||||||
|
bit >>= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value > 0 && value <= ARDUINOJSON_NEGATIVE_EXPONENTIATION_THRESHOLD) {
|
||||||
|
for (; index >= 0; index--) {
|
||||||
|
if (value < traits::negativeBinaryPowerOfTenPlusOne(index)) {
|
||||||
|
value *= traits::positiveBinaryPowerOfTen(index);
|
||||||
|
powersOf10 = int16_t(powersOf10 - bit);
|
||||||
|
}
|
||||||
|
bit >>= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return powersOf10;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,68 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// Decorator on top of Print to allow indented output.
|
||||||
|
// This class is used by JsonPrintable::prettyPrintTo() but can also be used
|
||||||
|
// for your own purpose, like logging.
|
||||||
|
template <typename Print>
|
||||||
|
class IndentedPrint {
|
||||||
|
public:
|
||||||
|
explicit IndentedPrint(Print &p) : sink(&p) {
|
||||||
|
level = 0;
|
||||||
|
tabSize = 2;
|
||||||
|
isNewLine = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t print(char c) {
|
||||||
|
size_t n = 0;
|
||||||
|
if (isNewLine) n += writeTabs();
|
||||||
|
n += sink->print(c);
|
||||||
|
isNewLine = c == '\n';
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t print(const char *s) {
|
||||||
|
// TODO: optimize
|
||||||
|
size_t n = 0;
|
||||||
|
while (*s) n += print(*s++);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Adds one level of indentation
|
||||||
|
void indent() {
|
||||||
|
if (level < MAX_LEVEL) level++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Removes one level of indentation
|
||||||
|
void unindent() {
|
||||||
|
if (level > 0) level--;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set the number of space printed for each level of indentation
|
||||||
|
void setTabSize(uint8_t n) {
|
||||||
|
if (n < MAX_TAB_SIZE) tabSize = n & MAX_TAB_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
Print *sink;
|
||||||
|
uint8_t level : 4;
|
||||||
|
uint8_t tabSize : 3;
|
||||||
|
bool isNewLine : 1;
|
||||||
|
|
||||||
|
size_t writeTabs() {
|
||||||
|
size_t n = 0;
|
||||||
|
for (int i = 0; i < level * tabSize; i++) n += sink->print(' ');
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const int MAX_LEVEL = 15; // because it's only 4 bits
|
||||||
|
static const int MAX_TAB_SIZE = 7; // because it's only 3 bits
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,117 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
#include "../TypeTraits/EnableIf.hpp"
|
||||||
|
#include "DummyPrint.hpp"
|
||||||
|
#include "DynamicStringBuilder.hpp"
|
||||||
|
#include "IndentedPrint.hpp"
|
||||||
|
#include "JsonSerializer.hpp"
|
||||||
|
#include "JsonWriter.hpp"
|
||||||
|
#include "Prettyfier.hpp"
|
||||||
|
#include "StaticStringBuilder.hpp"
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
#include "StreamPrintAdapter.hpp"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// Implements all the overloads of printTo() and prettyPrintTo()
|
||||||
|
// Caution: this class use a template parameter to avoid virtual methods.
|
||||||
|
// This is a bit curious but allows to reduce the size of JsonVariant, JsonArray
|
||||||
|
// and JsonObject.
|
||||||
|
template <typename T>
|
||||||
|
class JsonPrintable {
|
||||||
|
public:
|
||||||
|
template <typename Print>
|
||||||
|
typename EnableIf<!StringTraits<Print>::has_append, size_t>::type printTo(
|
||||||
|
Print &print) const {
|
||||||
|
JsonWriter<Print> writer(print);
|
||||||
|
JsonSerializer<JsonWriter<Print> >::serialize(downcast(), writer);
|
||||||
|
return writer.bytesWritten();
|
||||||
|
}
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
std::ostream &printTo(std::ostream &os) const {
|
||||||
|
StreamPrintAdapter adapter(os);
|
||||||
|
printTo(adapter);
|
||||||
|
return os;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
size_t printTo(char *buffer, size_t bufferSize) const {
|
||||||
|
StaticStringBuilder sb(buffer, bufferSize);
|
||||||
|
return printTo(sb);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <size_t N>
|
||||||
|
size_t printTo(char (&buffer)[N]) const {
|
||||||
|
return printTo(buffer, N);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TString>
|
||||||
|
typename EnableIf<StringTraits<TString>::has_append, size_t>::type printTo(
|
||||||
|
TString &str) const {
|
||||||
|
DynamicStringBuilder<TString> sb(str);
|
||||||
|
return printTo(sb);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Print>
|
||||||
|
size_t prettyPrintTo(IndentedPrint<Print> &print) const {
|
||||||
|
Prettyfier<Print> p(print);
|
||||||
|
return printTo(p);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t prettyPrintTo(char *buffer, size_t bufferSize) const {
|
||||||
|
StaticStringBuilder sb(buffer, bufferSize);
|
||||||
|
return prettyPrintTo(sb);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <size_t N>
|
||||||
|
size_t prettyPrintTo(char (&buffer)[N]) const {
|
||||||
|
return prettyPrintTo(buffer, N);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Print>
|
||||||
|
typename EnableIf<!StringTraits<Print>::has_append, size_t>::type
|
||||||
|
prettyPrintTo(Print &print) const {
|
||||||
|
IndentedPrint<Print> indentedPrint(print);
|
||||||
|
return prettyPrintTo(indentedPrint);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TString>
|
||||||
|
typename EnableIf<StringTraits<TString>::has_append, size_t>::type
|
||||||
|
prettyPrintTo(TString &str) const {
|
||||||
|
DynamicStringBuilder<TString> sb(str);
|
||||||
|
return prettyPrintTo(sb);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t measureLength() const {
|
||||||
|
DummyPrint dp;
|
||||||
|
return printTo(dp);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t measurePrettyLength() const {
|
||||||
|
DummyPrint dp;
|
||||||
|
return prettyPrintTo(dp);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
const T &downcast() const {
|
||||||
|
return *static_cast<const T *>(this);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
template <typename T>
|
||||||
|
inline std::ostream &operator<<(std::ostream &os, const JsonPrintable<T> &v) {
|
||||||
|
return v.printTo(os);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "JsonWriter.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
|
||||||
|
class JsonArray;
|
||||||
|
class JsonObject;
|
||||||
|
class JsonVariant;
|
||||||
|
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
class JsonArraySubscript;
|
||||||
|
template <typename TKey>
|
||||||
|
class JsonObjectSubscript;
|
||||||
|
|
||||||
|
template <typename Writer>
|
||||||
|
class JsonSerializer {
|
||||||
|
public:
|
||||||
|
static void serialize(const JsonArray &, Writer &);
|
||||||
|
static void serialize(const JsonArraySubscript &, Writer &);
|
||||||
|
static void serialize(const JsonObject &, Writer &);
|
||||||
|
template <typename TKey>
|
||||||
|
static void serialize(const JsonObjectSubscript<TKey> &, Writer &);
|
||||||
|
static void serialize(const JsonVariant &, Writer &);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,103 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../JsonArray.hpp"
|
||||||
|
#include "../JsonArraySubscript.hpp"
|
||||||
|
#include "../JsonObject.hpp"
|
||||||
|
#include "../JsonObjectSubscript.hpp"
|
||||||
|
#include "../JsonVariant.hpp"
|
||||||
|
#include "JsonSerializer.hpp"
|
||||||
|
|
||||||
|
template <typename Writer>
|
||||||
|
inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
|
||||||
|
const JsonArray& array, Writer& writer) {
|
||||||
|
writer.beginArray();
|
||||||
|
|
||||||
|
JsonArray::const_iterator it = array.begin();
|
||||||
|
while (it != array.end()) {
|
||||||
|
serialize(*it, writer);
|
||||||
|
|
||||||
|
++it;
|
||||||
|
if (it == array.end()) break;
|
||||||
|
|
||||||
|
writer.writeComma();
|
||||||
|
}
|
||||||
|
|
||||||
|
writer.endArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Writer>
|
||||||
|
inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
|
||||||
|
const JsonArraySubscript& arraySubscript, Writer& writer) {
|
||||||
|
serialize(arraySubscript.as<JsonVariant>(), writer);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Writer>
|
||||||
|
inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
|
||||||
|
const JsonObject& object, Writer& writer) {
|
||||||
|
writer.beginObject();
|
||||||
|
|
||||||
|
JsonObject::const_iterator it = object.begin();
|
||||||
|
while (it != object.end()) {
|
||||||
|
writer.writeString(it->key);
|
||||||
|
writer.writeColon();
|
||||||
|
serialize(it->value, writer);
|
||||||
|
|
||||||
|
++it;
|
||||||
|
if (it == object.end()) break;
|
||||||
|
|
||||||
|
writer.writeComma();
|
||||||
|
}
|
||||||
|
|
||||||
|
writer.endObject();
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Writer>
|
||||||
|
template <typename TKey>
|
||||||
|
inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
|
||||||
|
const JsonObjectSubscript<TKey>& objectSubscript, Writer& writer) {
|
||||||
|
serialize(objectSubscript.template as<JsonVariant>(), writer);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename Writer>
|
||||||
|
inline void ArduinoJson::Internals::JsonSerializer<Writer>::serialize(
|
||||||
|
const JsonVariant& variant, Writer& writer) {
|
||||||
|
switch (variant._type) {
|
||||||
|
case JSON_FLOAT:
|
||||||
|
writer.writeFloat(variant._content.asFloat);
|
||||||
|
return;
|
||||||
|
|
||||||
|
case JSON_ARRAY:
|
||||||
|
serialize(*variant._content.asArray, writer);
|
||||||
|
return;
|
||||||
|
|
||||||
|
case JSON_OBJECT:
|
||||||
|
serialize(*variant._content.asObject, writer);
|
||||||
|
return;
|
||||||
|
|
||||||
|
case JSON_STRING:
|
||||||
|
writer.writeString(variant._content.asString);
|
||||||
|
return;
|
||||||
|
|
||||||
|
case JSON_UNPARSED:
|
||||||
|
writer.writeRaw(variant._content.asString);
|
||||||
|
return;
|
||||||
|
|
||||||
|
case JSON_NEGATIVE_INTEGER:
|
||||||
|
writer.writeRaw('-'); // Falls through.
|
||||||
|
|
||||||
|
case JSON_POSITIVE_INTEGER:
|
||||||
|
writer.writeInteger(variant._content.asInteger);
|
||||||
|
return;
|
||||||
|
|
||||||
|
case JSON_BOOLEAN:
|
||||||
|
writer.writeBoolean(variant._content.asInteger != 0);
|
||||||
|
return;
|
||||||
|
|
||||||
|
default: // JSON_UNDEFINED
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,155 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include "../Data/Encoding.hpp"
|
||||||
|
#include "../Data/JsonInteger.hpp"
|
||||||
|
#include "../Polyfills/attributes.hpp"
|
||||||
|
#include "../Serialization/FloatParts.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// Writes the JSON tokens to a Print implementation
|
||||||
|
// This class is used by:
|
||||||
|
// - JsonArray::writeTo()
|
||||||
|
// - JsonObject::writeTo()
|
||||||
|
// - JsonVariant::writeTo()
|
||||||
|
// Its derived by PrettyJsonWriter that overrides some members to add
|
||||||
|
// indentation.
|
||||||
|
template <typename Print>
|
||||||
|
class JsonWriter {
|
||||||
|
public:
|
||||||
|
explicit JsonWriter(Print &sink) : _sink(sink), _length(0) {}
|
||||||
|
|
||||||
|
// Returns the number of bytes sent to the Print implementation.
|
||||||
|
// This is very handy for implementations of printTo() that must return the
|
||||||
|
// number of bytes written.
|
||||||
|
size_t bytesWritten() const {
|
||||||
|
return _length;
|
||||||
|
}
|
||||||
|
|
||||||
|
void beginArray() {
|
||||||
|
writeRaw('[');
|
||||||
|
}
|
||||||
|
void endArray() {
|
||||||
|
writeRaw(']');
|
||||||
|
}
|
||||||
|
|
||||||
|
void beginObject() {
|
||||||
|
writeRaw('{');
|
||||||
|
}
|
||||||
|
void endObject() {
|
||||||
|
writeRaw('}');
|
||||||
|
}
|
||||||
|
|
||||||
|
void writeColon() {
|
||||||
|
writeRaw(':');
|
||||||
|
}
|
||||||
|
void writeComma() {
|
||||||
|
writeRaw(',');
|
||||||
|
}
|
||||||
|
|
||||||
|
void writeBoolean(bool value) {
|
||||||
|
writeRaw(value ? "true" : "false");
|
||||||
|
}
|
||||||
|
|
||||||
|
void writeString(const char *value) {
|
||||||
|
if (!value) {
|
||||||
|
writeRaw("null");
|
||||||
|
} else {
|
||||||
|
writeRaw('\"');
|
||||||
|
while (*value) writeChar(*value++);
|
||||||
|
writeRaw('\"');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void writeChar(char c) {
|
||||||
|
char specialChar = Encoding::escapeChar(c);
|
||||||
|
if (specialChar) {
|
||||||
|
writeRaw('\\');
|
||||||
|
writeRaw(specialChar);
|
||||||
|
} else {
|
||||||
|
writeRaw(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename TFloat>
|
||||||
|
void writeFloat(TFloat value) {
|
||||||
|
if (isNaN(value)) return writeRaw("NaN");
|
||||||
|
|
||||||
|
if (value < 0.0) {
|
||||||
|
writeRaw('-');
|
||||||
|
value = -value;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isInfinity(value)) return writeRaw("Infinity");
|
||||||
|
|
||||||
|
FloatParts<TFloat> parts(value);
|
||||||
|
|
||||||
|
writeInteger(parts.integral);
|
||||||
|
if (parts.decimalPlaces) writeDecimals(parts.decimal, parts.decimalPlaces);
|
||||||
|
|
||||||
|
if (parts.exponent < 0) {
|
||||||
|
writeRaw("e-");
|
||||||
|
writeInteger(-parts.exponent);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (parts.exponent > 0) {
|
||||||
|
writeRaw('e');
|
||||||
|
writeInteger(parts.exponent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename UInt>
|
||||||
|
void writeInteger(UInt value) {
|
||||||
|
char buffer[22];
|
||||||
|
char *end = buffer + sizeof(buffer) - 1;
|
||||||
|
char *ptr = end;
|
||||||
|
|
||||||
|
*ptr = 0;
|
||||||
|
do {
|
||||||
|
*--ptr = char(value % 10 + '0');
|
||||||
|
value = UInt(value / 10);
|
||||||
|
} while (value);
|
||||||
|
|
||||||
|
writeRaw(ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void writeDecimals(uint32_t value, int8_t width) {
|
||||||
|
// buffer should be big enough for all digits, the dot and the null
|
||||||
|
// terminator
|
||||||
|
char buffer[16];
|
||||||
|
char *ptr = buffer + sizeof(buffer) - 1;
|
||||||
|
|
||||||
|
// write the string in reverse order
|
||||||
|
*ptr = 0;
|
||||||
|
while (width--) {
|
||||||
|
*--ptr = char(value % 10 + '0');
|
||||||
|
value /= 10;
|
||||||
|
}
|
||||||
|
*--ptr = '.';
|
||||||
|
|
||||||
|
// and dump it in the right order
|
||||||
|
writeRaw(ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
void writeRaw(const char *s) {
|
||||||
|
_length += _sink.print(s);
|
||||||
|
}
|
||||||
|
void writeRaw(char c) {
|
||||||
|
_length += _sink.print(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
Print &_sink;
|
||||||
|
size_t _length;
|
||||||
|
|
||||||
|
private:
|
||||||
|
JsonWriter &operator=(const JsonWriter &); // cannot be assigned
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,133 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "IndentedPrint.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// Converts a compact JSON string into an indented one.
|
||||||
|
template <typename Print>
|
||||||
|
class Prettyfier {
|
||||||
|
public:
|
||||||
|
explicit Prettyfier(IndentedPrint<Print>& p) : _sink(p) {
|
||||||
|
_previousChar = 0;
|
||||||
|
_inString = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t print(char c) {
|
||||||
|
size_t n = _inString ? handleStringChar(c) : handleMarkupChar(c);
|
||||||
|
_previousChar = c;
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t print(const char* s) {
|
||||||
|
// TODO: optimize
|
||||||
|
size_t n = 0;
|
||||||
|
while (*s) n += print(*s++);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
Prettyfier& operator=(const Prettyfier&); // cannot be assigned
|
||||||
|
|
||||||
|
bool inEmptyBlock() {
|
||||||
|
return _previousChar == '{' || _previousChar == '[';
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t handleStringChar(char c) {
|
||||||
|
bool isQuote = c == '"' && _previousChar != '\\';
|
||||||
|
|
||||||
|
if (isQuote) _inString = false;
|
||||||
|
|
||||||
|
return _sink.print(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t handleMarkupChar(char c) {
|
||||||
|
switch (c) {
|
||||||
|
case '{':
|
||||||
|
case '[':
|
||||||
|
return writeBlockOpen(c);
|
||||||
|
|
||||||
|
case '}':
|
||||||
|
case ']':
|
||||||
|
return writeBlockClose(c);
|
||||||
|
|
||||||
|
case ':':
|
||||||
|
return writeColon();
|
||||||
|
|
||||||
|
case ',':
|
||||||
|
return writeComma();
|
||||||
|
|
||||||
|
case '"':
|
||||||
|
return writeQuoteOpen();
|
||||||
|
|
||||||
|
default:
|
||||||
|
return writeNormalChar(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t writeBlockClose(char c) {
|
||||||
|
size_t n = 0;
|
||||||
|
n += unindentIfNeeded();
|
||||||
|
n += _sink.print(c);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t writeBlockOpen(char c) {
|
||||||
|
size_t n = 0;
|
||||||
|
n += indentIfNeeded();
|
||||||
|
n += _sink.print(c);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t writeColon() {
|
||||||
|
size_t n = 0;
|
||||||
|
n += _sink.print(": ");
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t writeComma() {
|
||||||
|
size_t n = 0;
|
||||||
|
n += _sink.print(",\r\n");
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t writeQuoteOpen() {
|
||||||
|
_inString = true;
|
||||||
|
size_t n = 0;
|
||||||
|
n += indentIfNeeded();
|
||||||
|
n += _sink.print('"');
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t writeNormalChar(char c) {
|
||||||
|
size_t n = 0;
|
||||||
|
n += indentIfNeeded();
|
||||||
|
n += _sink.print(c);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t indentIfNeeded() {
|
||||||
|
if (!inEmptyBlock()) return 0;
|
||||||
|
|
||||||
|
_sink.indent();
|
||||||
|
return _sink.print("\r\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t unindentIfNeeded() {
|
||||||
|
if (inEmptyBlock()) return 0;
|
||||||
|
|
||||||
|
_sink.unindent();
|
||||||
|
return _sink.print("\r\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
char _previousChar;
|
||||||
|
IndentedPrint<Print>& _sink;
|
||||||
|
bool _inString;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A Print implementation that allows to write in a char[]
|
||||||
|
class StaticStringBuilder {
|
||||||
|
public:
|
||||||
|
StaticStringBuilder(char *buf, size_t size) : end(buf + size - 1), p(buf) {
|
||||||
|
*p = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t print(char c) {
|
||||||
|
if (p >= end) return 0;
|
||||||
|
*p++ = c;
|
||||||
|
*p = '\0';
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t print(const char *s) {
|
||||||
|
char *begin = p;
|
||||||
|
while (p < end && *s) *p++ = *s++;
|
||||||
|
*p = '\0';
|
||||||
|
return size_t(p - begin);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
char *end;
|
||||||
|
char *p;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,39 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
|
||||||
|
#include <ostream>
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
class StreamPrintAdapter {
|
||||||
|
public:
|
||||||
|
explicit StreamPrintAdapter(std::ostream& os) : _os(os) {}
|
||||||
|
|
||||||
|
size_t print(char c) {
|
||||||
|
_os << c;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t print(const char* s) {
|
||||||
|
_os << s;
|
||||||
|
return strlen(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
// cannot be assigned
|
||||||
|
StreamPrintAdapter& operator=(const StreamPrintAdapter&);
|
||||||
|
|
||||||
|
std::ostream& _os;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
|
@ -0,0 +1,126 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "JsonBufferBase.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
class StaticJsonBufferBase : public JsonBufferBase<StaticJsonBufferBase> {
|
||||||
|
public:
|
||||||
|
class String {
|
||||||
|
public:
|
||||||
|
String(StaticJsonBufferBase* parent) : _parent(parent) {
|
||||||
|
_start = parent->_buffer + parent->_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
void append(char c) {
|
||||||
|
if (_parent->canAlloc(1)) {
|
||||||
|
char* last = static_cast<char*>(_parent->doAlloc(1));
|
||||||
|
*last = c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* c_str() const {
|
||||||
|
if (_parent->canAlloc(1)) {
|
||||||
|
char* last = static_cast<char*>(_parent->doAlloc(1));
|
||||||
|
*last = '\0';
|
||||||
|
return _start;
|
||||||
|
} else {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
StaticJsonBufferBase* _parent;
|
||||||
|
char* _start;
|
||||||
|
};
|
||||||
|
|
||||||
|
StaticJsonBufferBase(char* buffer, size_t capa)
|
||||||
|
: _buffer(buffer), _capacity(capa), _size(0) {}
|
||||||
|
|
||||||
|
// Gets the capacity of the buffer in bytes
|
||||||
|
size_t capacity() const {
|
||||||
|
return _capacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gets the current usage of the buffer in bytes
|
||||||
|
size_t size() const {
|
||||||
|
return _size;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Allocates the specified amount of bytes in the buffer
|
||||||
|
virtual void* alloc(size_t bytes) {
|
||||||
|
alignNextAlloc();
|
||||||
|
if (!canAlloc(bytes)) return NULL;
|
||||||
|
return doAlloc(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resets the buffer.
|
||||||
|
// USE WITH CAUTION: this invalidates all previously allocated data
|
||||||
|
void clear() {
|
||||||
|
_size = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
String startString() {
|
||||||
|
return String(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
~StaticJsonBufferBase() {}
|
||||||
|
|
||||||
|
private:
|
||||||
|
void alignNextAlloc() {
|
||||||
|
_size = round_size_up(_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool canAlloc(size_t bytes) const {
|
||||||
|
return _size + bytes <= _capacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
void* doAlloc(size_t bytes) {
|
||||||
|
void* p = &_buffer[_size];
|
||||||
|
_size += bytes;
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
char* _buffer;
|
||||||
|
size_t _capacity;
|
||||||
|
size_t _size;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__clang__)
|
||||||
|
#pragma clang diagnostic push
|
||||||
|
#pragma clang diagnostic ignored "-Wnon-virtual-dtor"
|
||||||
|
#elif defined(__GNUC__)
|
||||||
|
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#endif
|
||||||
|
#pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Implements a JsonBuffer with fixed memory allocation.
|
||||||
|
// The template paramenter CAPACITY specifies the capacity of the buffer in
|
||||||
|
// bytes.
|
||||||
|
template <size_t CAPACITY>
|
||||||
|
class StaticJsonBuffer : public Internals::StaticJsonBufferBase {
|
||||||
|
public:
|
||||||
|
explicit StaticJsonBuffer()
|
||||||
|
: Internals::StaticJsonBufferBase(_buffer, CAPACITY) {}
|
||||||
|
|
||||||
|
private:
|
||||||
|
char _buffer[CAPACITY];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__clang__)
|
||||||
|
#pragma clang diagnostic pop
|
||||||
|
#elif defined(__GNUC__)
|
||||||
|
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,61 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_ARDUINO_STREAM
|
||||||
|
|
||||||
|
#include <Stream.h>
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
struct ArduinoStreamTraits {
|
||||||
|
class Reader {
|
||||||
|
Stream& _stream;
|
||||||
|
char _current, _next;
|
||||||
|
|
||||||
|
public:
|
||||||
|
Reader(Stream& stream) : _stream(stream), _current(0), _next(0) {}
|
||||||
|
|
||||||
|
void move() {
|
||||||
|
_current = _next;
|
||||||
|
_next = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
char current() {
|
||||||
|
if (!_current) _current = read();
|
||||||
|
return _current;
|
||||||
|
}
|
||||||
|
|
||||||
|
char next() {
|
||||||
|
// assumes that current() has been called
|
||||||
|
if (!_next) _next = read();
|
||||||
|
return _next;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
char read() {
|
||||||
|
// don't use _stream.read() as it ignores the timeout
|
||||||
|
char c = 0;
|
||||||
|
_stream.readBytes(&c, 1);
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static const bool has_append = false;
|
||||||
|
static const bool has_equals = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename TStream>
|
||||||
|
struct StringTraits<
|
||||||
|
TStream,
|
||||||
|
// match any type that is derived from Stream:
|
||||||
|
typename EnableIf<
|
||||||
|
IsBaseOf<Stream, typename RemoveReference<TStream>::type>::value>::type>
|
||||||
|
: ArduinoStreamTraits {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,62 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TChar>
|
||||||
|
struct CharPointerTraits {
|
||||||
|
class Reader {
|
||||||
|
const TChar* _ptr;
|
||||||
|
|
||||||
|
public:
|
||||||
|
Reader(const TChar* ptr)
|
||||||
|
: _ptr(ptr ? ptr : reinterpret_cast<const TChar*>("")) {}
|
||||||
|
|
||||||
|
void move() {
|
||||||
|
++_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
char current() const {
|
||||||
|
return char(_ptr[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
char next() const {
|
||||||
|
return char(_ptr[1]);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static bool equals(const TChar* str, const char* expected) {
|
||||||
|
return strcmp(reinterpret_cast<const char*>(str), expected) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool is_null(const TChar* str) {
|
||||||
|
return !str;
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef const char* duplicate_t;
|
||||||
|
|
||||||
|
template <typename Buffer>
|
||||||
|
static duplicate_t duplicate(const TChar* str, Buffer* buffer) {
|
||||||
|
if (!str) return NULL;
|
||||||
|
size_t size = strlen(reinterpret_cast<const char*>(str)) + 1;
|
||||||
|
void* dup = buffer->alloc(size);
|
||||||
|
if (dup != NULL) memcpy(dup, str, size);
|
||||||
|
return static_cast<duplicate_t>(dup);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const bool has_append = false;
|
||||||
|
static const bool has_equals = true;
|
||||||
|
static const bool should_duplicate = !IsConst<TChar>::value;
|
||||||
|
};
|
||||||
|
|
||||||
|
// char*, unsigned char*, signed char*
|
||||||
|
// const char*, const unsigned char*, const signed char*
|
||||||
|
template <typename TChar>
|
||||||
|
struct StringTraits<TChar*, typename EnableIf<IsChar<TChar>::value>::type>
|
||||||
|
: CharPointerTraits<TChar> {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,59 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_PROGMEM
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
template <>
|
||||||
|
struct StringTraits<const __FlashStringHelper*, void> {
|
||||||
|
class Reader {
|
||||||
|
const char* _ptr;
|
||||||
|
|
||||||
|
public:
|
||||||
|
Reader(const __FlashStringHelper* ptr)
|
||||||
|
: _ptr(reinterpret_cast<const char*>(ptr)) {}
|
||||||
|
|
||||||
|
void move() {
|
||||||
|
_ptr++;
|
||||||
|
}
|
||||||
|
|
||||||
|
char current() const {
|
||||||
|
return pgm_read_byte_near(_ptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
char next() const {
|
||||||
|
return pgm_read_byte_near(_ptr + 1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static bool equals(const __FlashStringHelper* str, const char* expected) {
|
||||||
|
return strcmp_P(expected, (const char*)str) == 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool is_null(const __FlashStringHelper* str) {
|
||||||
|
return !str;
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef const char* duplicate_t;
|
||||||
|
|
||||||
|
template <typename Buffer>
|
||||||
|
static duplicate_t duplicate(const __FlashStringHelper* str, Buffer* buffer) {
|
||||||
|
if (!str) return NULL;
|
||||||
|
size_t size = strlen_P((const char*)str) + 1;
|
||||||
|
void* dup = buffer->alloc(size);
|
||||||
|
if (dup != NULL) memcpy_P(dup, (const char*)str, size);
|
||||||
|
return static_cast<duplicate_t>(dup);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const bool has_append = false;
|
||||||
|
static const bool has_equals = true;
|
||||||
|
static const bool should_duplicate = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,60 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STREAM
|
||||||
|
|
||||||
|
#include <istream>
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
struct StdStreamTraits {
|
||||||
|
class Reader {
|
||||||
|
std::istream& _stream;
|
||||||
|
char _current, _next;
|
||||||
|
|
||||||
|
public:
|
||||||
|
Reader(std::istream& stream) : _stream(stream), _current(0), _next(0) {}
|
||||||
|
|
||||||
|
void move() {
|
||||||
|
_current = _next;
|
||||||
|
_next = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
char current() {
|
||||||
|
if (!_current) _current = read();
|
||||||
|
return _current;
|
||||||
|
}
|
||||||
|
|
||||||
|
char next() {
|
||||||
|
// assumes that current() has been called
|
||||||
|
if (!_next) _next = read();
|
||||||
|
return _next;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
Reader& operator=(const Reader&); // Visual Studio C4512
|
||||||
|
|
||||||
|
char read() {
|
||||||
|
return _stream.eof() ? '\0' : static_cast<char>(_stream.get());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
static const bool has_append = false;
|
||||||
|
static const bool has_equals = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename TStream>
|
||||||
|
struct StringTraits<
|
||||||
|
TStream,
|
||||||
|
// match any type that is derived from std::istream:
|
||||||
|
typename EnableIf<IsBaseOf<
|
||||||
|
std::istream, typename RemoveReference<TStream>::type>::value>::type>
|
||||||
|
: StdStreamTraits {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,74 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STRING || ARDUINOJSON_ENABLE_ARDUINO_STRING
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_ARDUINO_STRING
|
||||||
|
#include <WString.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STRING
|
||||||
|
#include <string>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TString>
|
||||||
|
struct StdStringTraits {
|
||||||
|
typedef const char* duplicate_t;
|
||||||
|
|
||||||
|
template <typename Buffer>
|
||||||
|
static duplicate_t duplicate(const TString& str, Buffer* buffer) {
|
||||||
|
if (!str.c_str()) return NULL; // <- Arduino string can return NULL
|
||||||
|
size_t size = str.length() + 1;
|
||||||
|
void* dup = buffer->alloc(size);
|
||||||
|
if (dup != NULL) memcpy(dup, str.c_str(), size);
|
||||||
|
return static_cast<duplicate_t>(dup);
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool is_null(const TString& str) {
|
||||||
|
// Arduino's String::c_str() can return NULL
|
||||||
|
return !str.c_str();
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Reader : CharPointerTraits<char>::Reader {
|
||||||
|
Reader(const TString& str) : CharPointerTraits<char>::Reader(str.c_str()) {}
|
||||||
|
};
|
||||||
|
|
||||||
|
static bool equals(const TString& str, const char* expected) {
|
||||||
|
return 0 == strcmp(str.c_str(), expected);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void append(TString& str, char c) {
|
||||||
|
str += c;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void append(TString& str, const char* s) {
|
||||||
|
str += s;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const bool has_append = true;
|
||||||
|
static const bool has_equals = true;
|
||||||
|
static const bool should_duplicate = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_ARDUINO_STRING
|
||||||
|
template <>
|
||||||
|
struct StringTraits<String, void> : StdStringTraits<String> {};
|
||||||
|
template <>
|
||||||
|
struct StringTraits<StringSumHelper, void> : StdStringTraits<StringSumHelper> {
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ARDUINOJSON_ENABLE_STD_STRING
|
||||||
|
template <>
|
||||||
|
struct StringTraits<std::string, void> : StdStringTraits<std::string> {};
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -0,0 +1,36 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
#include "../TypeTraits/EnableIf.hpp"
|
||||||
|
#include "../TypeTraits/IsBaseOf.hpp"
|
||||||
|
#include "../TypeTraits/IsChar.hpp"
|
||||||
|
#include "../TypeTraits/IsConst.hpp"
|
||||||
|
#include "../TypeTraits/RemoveReference.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename TString, typename Enable = void>
|
||||||
|
struct StringTraits {
|
||||||
|
static const bool has_append = false;
|
||||||
|
static const bool has_equals = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename TString>
|
||||||
|
struct StringTraits<const TString, void> : StringTraits<TString> {};
|
||||||
|
|
||||||
|
template <typename TString>
|
||||||
|
struct StringTraits<TString&, void> : StringTraits<TString> {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#include "ArduinoStream.hpp"
|
||||||
|
#include "CharPointer.hpp"
|
||||||
|
#include "FlashString.hpp"
|
||||||
|
#include "StdStream.hpp"
|
||||||
|
#include "StdString.hpp"
|
||||||
|
|
@ -0,0 +1,19 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that return the type T if Condition is true.
|
||||||
|
template <bool Condition, typename T = void>
|
||||||
|
struct EnableIf {};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct EnableIf<true, T> {
|
||||||
|
typedef T type;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,150 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdlib.h> // for size_t
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
#include "../Polyfills/math.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
template <typename T, size_t = sizeof(T)>
|
||||||
|
struct FloatTraits {};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct FloatTraits<T, 8 /*64bits*/> {
|
||||||
|
typedef int64_t mantissa_type;
|
||||||
|
static const short mantissa_bits = 52;
|
||||||
|
static const mantissa_type mantissa_max =
|
||||||
|
(static_cast<mantissa_type>(1) << mantissa_bits) - 1;
|
||||||
|
|
||||||
|
typedef int16_t exponent_type;
|
||||||
|
static const exponent_type exponent_max = 308;
|
||||||
|
|
||||||
|
template <typename TExponent>
|
||||||
|
static T make_float(T m, TExponent e) {
|
||||||
|
if (e > 0) {
|
||||||
|
for (uint8_t index = 0; e != 0; index++) {
|
||||||
|
if (e & 1) m *= positiveBinaryPowerOfTen(index);
|
||||||
|
e >>= 1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
e = TExponent(-e);
|
||||||
|
for (uint8_t index = 0; e != 0; index++) {
|
||||||
|
if (e & 1) m *= negativeBinaryPowerOfTen(index);
|
||||||
|
e >>= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
static T positiveBinaryPowerOfTen(int index) {
|
||||||
|
static T factors[] = {
|
||||||
|
1e1, 1e2, 1e4, 1e8, 1e16, 1e32,
|
||||||
|
// workaround to support platforms with single precision literals
|
||||||
|
forge(0x4D384F03, 0xE93FF9F5), forge(0x5A827748, 0xF9301D32),
|
||||||
|
forge(0x75154FDD, 0x7F73BF3C)};
|
||||||
|
return factors[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
static T negativeBinaryPowerOfTen(int index) {
|
||||||
|
static T factors[] = {
|
||||||
|
1e-1, 1e-2, 1e-4, 1e-8, 1e-16, 1e-32,
|
||||||
|
// workaround to support platforms with single precision literals
|
||||||
|
forge(0x32A50FFD, 0x44F4A73D), forge(0x255BBA08, 0xCF8C979D),
|
||||||
|
forge(0x0AC80628, 0x64AC6F43)};
|
||||||
|
return factors[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
static T negativeBinaryPowerOfTenPlusOne(int index) {
|
||||||
|
static T factors[] = {
|
||||||
|
1e0, 1e-1, 1e-3, 1e-7, 1e-15, 1e-31,
|
||||||
|
// workaround to support platforms with single precision literals
|
||||||
|
forge(0x32DA53FC, 0x9631D10D), forge(0x25915445, 0x81B7DEC2),
|
||||||
|
forge(0x0AFE07B2, 0x7DD78B14)};
|
||||||
|
return factors[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
static T nan() {
|
||||||
|
return forge(0x7ff80000, 0x00000000);
|
||||||
|
}
|
||||||
|
|
||||||
|
static T inf() {
|
||||||
|
return forge(0x7ff00000, 0x00000000);
|
||||||
|
}
|
||||||
|
|
||||||
|
static T forge(uint32_t msb, uint32_t lsb) {
|
||||||
|
union {
|
||||||
|
uint64_t integerBits;
|
||||||
|
T floatBits;
|
||||||
|
};
|
||||||
|
integerBits = (uint64_t(msb) << 32) | lsb;
|
||||||
|
return floatBits;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct FloatTraits<T, 4 /*32bits*/> {
|
||||||
|
typedef int32_t mantissa_type;
|
||||||
|
static const short mantissa_bits = 23;
|
||||||
|
static const mantissa_type mantissa_max =
|
||||||
|
(static_cast<mantissa_type>(1) << mantissa_bits) - 1;
|
||||||
|
|
||||||
|
typedef int8_t exponent_type;
|
||||||
|
static const exponent_type exponent_max = 38;
|
||||||
|
|
||||||
|
template <typename TExponent>
|
||||||
|
static T make_float(T m, TExponent e) {
|
||||||
|
if (e > 0) {
|
||||||
|
for (uint8_t index = 0; e != 0; index++) {
|
||||||
|
if (e & 1) m *= positiveBinaryPowerOfTen(index);
|
||||||
|
e >>= 1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
e = -e;
|
||||||
|
for (uint8_t index = 0; e != 0; index++) {
|
||||||
|
if (e & 1) m *= negativeBinaryPowerOfTen(index);
|
||||||
|
e >>= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return m;
|
||||||
|
}
|
||||||
|
|
||||||
|
static T positiveBinaryPowerOfTen(int index) {
|
||||||
|
static T factors[] = {1e1f, 1e2f, 1e4f, 1e8f, 1e16f, 1e32f};
|
||||||
|
return factors[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
static T negativeBinaryPowerOfTen(int index) {
|
||||||
|
static T factors[] = {1e-1f, 1e-2f, 1e-4f, 1e-8f, 1e-16f, 1e-32f};
|
||||||
|
return factors[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
static T negativeBinaryPowerOfTenPlusOne(int index) {
|
||||||
|
static T factors[] = {1e0f, 1e-1f, 1e-3f, 1e-7f, 1e-15f, 1e-31f};
|
||||||
|
return factors[index];
|
||||||
|
}
|
||||||
|
|
||||||
|
static T forge(uint32_t bits) {
|
||||||
|
union {
|
||||||
|
uint32_t integerBits;
|
||||||
|
T floatBits;
|
||||||
|
};
|
||||||
|
integerBits = bits;
|
||||||
|
return floatBits;
|
||||||
|
}
|
||||||
|
|
||||||
|
static T nan() {
|
||||||
|
return forge(0x7fc00000);
|
||||||
|
}
|
||||||
|
|
||||||
|
static T inf() {
|
||||||
|
return forge(0x7f800000);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that return the type T without the const modifier
|
||||||
|
template <typename T>
|
||||||
|
struct IsArray {
|
||||||
|
static const bool value = false;
|
||||||
|
};
|
||||||
|
template <typename T>
|
||||||
|
struct IsArray<T[]> {
|
||||||
|
static const bool value = true;
|
||||||
|
};
|
||||||
|
template <typename T, size_t N>
|
||||||
|
struct IsArray<T[N]> {
|
||||||
|
static const bool value = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that returns true if Derived inherits from TBase is an
|
||||||
|
// integral type.
|
||||||
|
template <typename TBase, typename TDerived>
|
||||||
|
class IsBaseOf {
|
||||||
|
protected: // <- to avoid GCC's "all member functions in class are private"
|
||||||
|
typedef char Yes[1];
|
||||||
|
typedef char No[2];
|
||||||
|
|
||||||
|
static Yes &probe(const TBase *);
|
||||||
|
static No &probe(...);
|
||||||
|
|
||||||
|
public:
|
||||||
|
enum {
|
||||||
|
value = sizeof(probe(reinterpret_cast<TDerived *>(0))) == sizeof(Yes)
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "IsSame.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that returns true if T is a charater
|
||||||
|
template <typename T>
|
||||||
|
struct IsChar {
|
||||||
|
static const bool value = IsSame<T, char>::value ||
|
||||||
|
IsSame<T, signed char>::value ||
|
||||||
|
IsSame<T, unsigned char>::value;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct IsChar<const T> : IsChar<T> {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that return the type T without the const modifier
|
||||||
|
template <typename T>
|
||||||
|
struct IsConst {
|
||||||
|
static const bool value = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct IsConst<const T> {
|
||||||
|
static const bool value = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "IsSame.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that returns true if T is a floating point type
|
||||||
|
template <typename T>
|
||||||
|
struct IsFloatingPoint {
|
||||||
|
static const bool value = IsSame<T, float>::value || IsSame<T, double>::value;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "IsSame.hpp"
|
||||||
|
#include "IsSignedIntegral.hpp"
|
||||||
|
#include "IsUnsignedIntegral.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that returns true if T is an integral type.
|
||||||
|
template <typename T>
|
||||||
|
struct IsIntegral {
|
||||||
|
static const bool value = IsSignedIntegral<T>::value ||
|
||||||
|
IsUnsignedIntegral<T>::value ||
|
||||||
|
IsSame<T, char>::value;
|
||||||
|
// CAUTION: differs from std::is_integral as it doesn't include bool
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct IsIntegral<const T> : IsIntegral<T> {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that returns true if types T and U are the same.
|
||||||
|
template <typename T, typename U>
|
||||||
|
struct IsSame {
|
||||||
|
static const bool value = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct IsSame<T, T> {
|
||||||
|
static const bool value = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
#include "IsSame.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that returns true if T is an integral type.
|
||||||
|
template <typename T>
|
||||||
|
struct IsSignedIntegral {
|
||||||
|
static const bool value =
|
||||||
|
IsSame<T, signed char>::value || IsSame<T, signed short>::value ||
|
||||||
|
IsSame<T, signed int>::value || IsSame<T, signed long>::value ||
|
||||||
|
#if ARDUINOJSON_USE_LONG_LONG
|
||||||
|
IsSame<T, signed long long>::value ||
|
||||||
|
#endif
|
||||||
|
#if ARDUINOJSON_USE_INT64
|
||||||
|
IsSame<T, signed __int64>::value ||
|
||||||
|
#endif
|
||||||
|
false;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "../Configuration.hpp"
|
||||||
|
#include "IsSame.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that returns true if T is an integral type.
|
||||||
|
template <typename T>
|
||||||
|
struct IsUnsignedIntegral {
|
||||||
|
static const bool value =
|
||||||
|
IsSame<T, unsigned char>::value || IsSame<T, unsigned short>::value ||
|
||||||
|
IsSame<T, unsigned int>::value || IsSame<T, unsigned long>::value ||
|
||||||
|
#if ARDUINOJSON_USE_LONG_LONG
|
||||||
|
IsSame<T, unsigned long long>::value ||
|
||||||
|
#endif
|
||||||
|
#if ARDUINOJSON_USE_INT64
|
||||||
|
IsSame<T, unsigned __int64>::value ||
|
||||||
|
#endif
|
||||||
|
false;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "IsBaseOf.hpp"
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
class JsonVariantTag {};
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
struct IsVariant : IsBaseOf<JsonVariantTag, T> {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that return the type T without the const modifier
|
||||||
|
template <typename T>
|
||||||
|
struct RemoveConst {
|
||||||
|
typedef T type;
|
||||||
|
};
|
||||||
|
template <typename T>
|
||||||
|
struct RemoveConst<const T> {
|
||||||
|
typedef T type;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
// ArduinoJson - arduinojson.org
|
||||||
|
// Copyright Benoit Blanchon 2014-2018
|
||||||
|
// MIT License
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace ArduinoJson {
|
||||||
|
namespace Internals {
|
||||||
|
|
||||||
|
// A meta-function that return the type T without the reference modifier.
|
||||||
|
template <typename T>
|
||||||
|
struct RemoveReference {
|
||||||
|
typedef T type;
|
||||||
|
};
|
||||||
|
template <typename T>
|
||||||
|
struct RemoveReference<T&> {
|
||||||
|
typedef T type;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,405 @@
|
||||||
|
[](https://travis-ci.org/ThingPulse/esp8266-oled-ssd1306)
|
||||||
|
|
||||||
|
# ESP8266 OLED SSD1306
|
||||||
|
|
||||||
|
> We just released version 4.0.0. Please have a look at our [upgrade guide](UPGRADE-4.0.md)
|
||||||
|
|
||||||
|
This is a driver for the SSD1306 based 128x64 pixel OLED display running on the Arduino/ESP8266 platform.
|
||||||
|
Can be used with either the I2C or SPI version of the display
|
||||||
|
|
||||||
|
You can either download this library as a zip file and unpack it to your Arduino/libraries folder or (once it has been added) choose it from the Arduino library manager.
|
||||||
|
|
||||||
|
It is also available as a platformio library. Just execute the following command:
|
||||||
|
```
|
||||||
|
platformio lib install 562
|
||||||
|
```
|
||||||
|
|
||||||
|
## Credits
|
||||||
|
|
||||||
|
This library has initially been written by Daniel Eichhorn (@squix78). Many thanks go to Fabrice Weinberg (@FWeinb) for optimizing and refactoring many aspects of the library. Also many thanks to the many committers who helped to add new features and who fixed many bugs.
|
||||||
|
The init sequence for the SSD1306 was inspired by Adafruit's library for the same display.
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
|
||||||
|
Check out the examples folder for a few comprehensive demonstrations how to use the library. Also check out the [ESP8266 Weather Station](https://github.com/ThingPulse/esp8266-weather-station) library which uses the OLED library to display beautiful weather information.
|
||||||
|
|
||||||
|
## Upgrade
|
||||||
|
|
||||||
|
The API changed a lot with the 3.0 release. If you were using this library with older versions please have a look at the [Upgrade Guide](UPGRADE-3.0.md).
|
||||||
|
|
||||||
|
Going from 3.x version to 4.0 a lot of internals changed and compatibility for more displays was added. Please read the [Upgrade Guide](UPGRADE-4.0.md).
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
* Draw pixels at given coordinates
|
||||||
|
* Draw lines from given coordinates to given coordinates
|
||||||
|
* Draw or fill a rectangle with given dimensions
|
||||||
|
* Draw Text at given coordinates:
|
||||||
|
* Define Alignment: Left, Right and Center
|
||||||
|
* Set the Fontface you want to use (see section Fonts below)
|
||||||
|
* Limit the width of the text by an amount of pixels. Before this widths will be reached, the renderer will wrap the text to a new line if possible
|
||||||
|
* Display content in automatically side scrolling carousel
|
||||||
|
* Define transition cycles
|
||||||
|
* Define how long one frame will be displayed
|
||||||
|
* Draw the different frames in callback methods
|
||||||
|
* One indicator per frame will be automatically displayed. The active frame will be displayed from inactive once
|
||||||
|
|
||||||
|
## Fonts
|
||||||
|
|
||||||
|
Fonts are defined in a proprietary but open format. You can create new font files by choosing from a given list
|
||||||
|
of open sourced Fonts from this web app: http://oleddisplay.squix.ch
|
||||||
|
Choose the font family, style and size, check the preview image and if you like what you see click the "Create" button. This will create the font array in a text area form where you can copy and paste it into a new or existing header file.
|
||||||
|
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
## Hardware Abstraction
|
||||||
|
|
||||||
|
The library supports different protocols to access the OLED display. Currently there is support for I2C using the built in Wire.h library, I2C by using the much faster BRZO I2C library [https://github.com/pasko-zh/brzo_i2c] written in assembler and it also supports displays which come with the SPI interface.
|
||||||
|
|
||||||
|
### I2C with Wire.h
|
||||||
|
|
||||||
|
```C++
|
||||||
|
#include <Wire.h>
|
||||||
|
#include "SSD1306Wire.h"
|
||||||
|
|
||||||
|
SSD1306Wire display(ADDRESS, SDA, SDC);
|
||||||
|
```
|
||||||
|
or for a SH1106:
|
||||||
|
```C++
|
||||||
|
#include <Wire.h>
|
||||||
|
#include "SH1106Wire.h"
|
||||||
|
|
||||||
|
SH1106Wire display(ADDRESS, SDA, SDC);
|
||||||
|
```
|
||||||
|
|
||||||
|
### I2C with brzo_i2c
|
||||||
|
|
||||||
|
```C++
|
||||||
|
#include <brzo_i2c.h>
|
||||||
|
#include "SSD1306Brzo.h"
|
||||||
|
|
||||||
|
SSD1306Brzo display(ADDRESS, SDA, SDC);
|
||||||
|
```
|
||||||
|
or for the SH1106:
|
||||||
|
```C++
|
||||||
|
#include <brzo_i2c.h>
|
||||||
|
#include "SH1106Brzo.h"
|
||||||
|
|
||||||
|
SH1106Brzo display(ADDRESS, SDA, SDC);
|
||||||
|
```
|
||||||
|
|
||||||
|
### SPI
|
||||||
|
|
||||||
|
```C++
|
||||||
|
#include <SPI.h>
|
||||||
|
#include "SSD1306Spi.h"
|
||||||
|
|
||||||
|
SSD1306Spi display(RES, DC, CS);
|
||||||
|
```
|
||||||
|
or for the SH1106:
|
||||||
|
```C++
|
||||||
|
#include <SPI.h>
|
||||||
|
#include "SH1106Spi.h"
|
||||||
|
|
||||||
|
SH1106Spi display(RES, DC, CS);
|
||||||
|
```
|
||||||
|
|
||||||
|
## API
|
||||||
|
|
||||||
|
### Display Control
|
||||||
|
|
||||||
|
```C++
|
||||||
|
// Initialize the display
|
||||||
|
void init();
|
||||||
|
|
||||||
|
// Free the memory used by the display
|
||||||
|
void end();
|
||||||
|
|
||||||
|
// Cycle through the initialization
|
||||||
|
void resetDisplay(void);
|
||||||
|
|
||||||
|
// Connect again to the display through I2C
|
||||||
|
void reconnect(void);
|
||||||
|
|
||||||
|
// Turn the display on
|
||||||
|
void displayOn(void);
|
||||||
|
|
||||||
|
// Turn the display offs
|
||||||
|
void displayOff(void);
|
||||||
|
|
||||||
|
// Clear the local pixel buffer
|
||||||
|
void clear(void);
|
||||||
|
|
||||||
|
// Write the buffer to the display memory
|
||||||
|
void display(void);
|
||||||
|
|
||||||
|
// Inverted display mode
|
||||||
|
void invertDisplay(void);
|
||||||
|
|
||||||
|
// Normal display mode
|
||||||
|
void normalDisplay(void);
|
||||||
|
|
||||||
|
// Set display contrast
|
||||||
|
// really low brightness & contrast: contrast = 10, precharge = 5, comdetect = 0
|
||||||
|
// normal brightness & contrast: contrast = 100
|
||||||
|
void setContrast(uint8_t contrast, uint8_t precharge = 241, uint8_t comdetect = 64);
|
||||||
|
|
||||||
|
// Convenience method to access
|
||||||
|
void setBrightness(uint8_t);
|
||||||
|
|
||||||
|
// Turn the display upside down
|
||||||
|
void flipScreenVertically();
|
||||||
|
|
||||||
|
// Draw the screen mirrored
|
||||||
|
void mirrorScreen();
|
||||||
|
```
|
||||||
|
|
||||||
|
## Pixel drawing
|
||||||
|
|
||||||
|
```C++
|
||||||
|
|
||||||
|
/* Drawing functions */
|
||||||
|
// Sets the color of all pixel operations
|
||||||
|
void setColor(OLEDDISPLAY_COLOR color);
|
||||||
|
|
||||||
|
// Draw a pixel at given position
|
||||||
|
void setPixel(int16_t x, int16_t y);
|
||||||
|
|
||||||
|
// Draw a line from position 0 to position 1
|
||||||
|
void drawLine(int16_t x0, int16_t y0, int16_t x1, int16_t y1);
|
||||||
|
|
||||||
|
// Draw the border of a rectangle at the given location
|
||||||
|
void drawRect(int16_t x, int16_t y, int16_t width, int16_t height);
|
||||||
|
|
||||||
|
// Fill the rectangle
|
||||||
|
void fillRect(int16_t x, int16_t y, int16_t width, int16_t height);
|
||||||
|
|
||||||
|
// Draw the border of a circle
|
||||||
|
void drawCircle(int16_t x, int16_t y, int16_t radius);
|
||||||
|
|
||||||
|
// Fill circle
|
||||||
|
void fillCircle(int16_t x, int16_t y, int16_t radius);
|
||||||
|
|
||||||
|
// Draw a line horizontally
|
||||||
|
void drawHorizontalLine(int16_t x, int16_t y, int16_t length);
|
||||||
|
|
||||||
|
// Draw a lin vertically
|
||||||
|
void drawVerticalLine(int16_t x, int16_t y, int16_t length);
|
||||||
|
|
||||||
|
// Draws a rounded progress bar with the outer dimensions given by width and height. Progress is
|
||||||
|
// a unsigned byte value between 0 and 100
|
||||||
|
void drawProgressBar(uint16_t x, uint16_t y, uint16_t width, uint16_t height, uint8_t progress);
|
||||||
|
|
||||||
|
// Draw a bitmap in the internal image format
|
||||||
|
void drawFastImage(int16_t x, int16_t y, int16_t width, int16_t height, const uint8_t *image);
|
||||||
|
|
||||||
|
// Draw a XBM
|
||||||
|
void drawXbm(int16_t x, int16_t y, int16_t width, int16_t height, const char* xbm);
|
||||||
|
```
|
||||||
|
|
||||||
|
## Text operations
|
||||||
|
|
||||||
|
``` C++
|
||||||
|
void drawString(int16_t x, int16_t y, String text);
|
||||||
|
|
||||||
|
// Draws a String with a maximum width at the given location.
|
||||||
|
// If the given String is wider than the specified width
|
||||||
|
// The text will be wrapped to the next line at a space or dash
|
||||||
|
void drawStringMaxWidth(int16_t x, int16_t y, int16_t maxLineWidth, String text);
|
||||||
|
|
||||||
|
// Returns the width of the const char* with the current
|
||||||
|
// font settings
|
||||||
|
uint16_t getStringWidth(const char* text, uint16_t length);
|
||||||
|
|
||||||
|
// Convencience method for the const char version
|
||||||
|
uint16_t getStringWidth(String text);
|
||||||
|
|
||||||
|
// Specifies relative to which anchor point
|
||||||
|
// the text is rendered. Available constants:
|
||||||
|
// TEXT_ALIGN_LEFT, TEXT_ALIGN_CENTER, TEXT_ALIGN_RIGHT, TEXT_ALIGN_CENTER_BOTH
|
||||||
|
void setTextAlignment(OLEDDISPLAY_TEXT_ALIGNMENT textAlignment);
|
||||||
|
|
||||||
|
// Sets the current font. Available default fonts
|
||||||
|
// ArialMT_Plain_10, ArialMT_Plain_16, ArialMT_Plain_24
|
||||||
|
// Or create one with the font tool at http://oleddisplay.squix.ch
|
||||||
|
void setFont(const uint8_t* fontData);
|
||||||
|
```
|
||||||
|
|
||||||
|
## Ui Library (OLEDDisplayUi)
|
||||||
|
|
||||||
|
The Ui Library is used to provide a basic set of Ui elements called, `Frames` and `Overlays`. A `Frame` is used to provide
|
||||||
|
information the default behaviour is to display a `Frame` for a defined time and than move to the next. The library also provides an `Indicator` that will be updated accordingly. An `Overlay` on the other hand is a pieces of information (e.g. a clock) that is displayed always at the same position.
|
||||||
|
|
||||||
|
|
||||||
|
```C++
|
||||||
|
/**
|
||||||
|
* Initialise the display
|
||||||
|
*/
|
||||||
|
void init();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configure the internal used target FPS
|
||||||
|
*/
|
||||||
|
void setTargetFPS(uint8_t fps);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable automatic transition to next frame after the some time can be configured with
|
||||||
|
* `setTimePerFrame` and `setTimePerTransition`.
|
||||||
|
*/
|
||||||
|
void enableAutoTransition();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disable automatic transition to next frame.
|
||||||
|
*/
|
||||||
|
void disableAutoTransition();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the direction if the automatic transitioning
|
||||||
|
*/
|
||||||
|
void setAutoTransitionForwards();
|
||||||
|
void setAutoTransitionBackwards();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the approx. time a frame is displayed
|
||||||
|
*/
|
||||||
|
void setTimePerFrame(uint16_t time);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the approx. time a transition will take
|
||||||
|
*/
|
||||||
|
void setTimePerTransition(uint16_t time);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Draw the indicator.
|
||||||
|
* This is the default state for all frames if
|
||||||
|
* the indicator was hidden on the previous frame
|
||||||
|
* it will be slided in.
|
||||||
|
*/
|
||||||
|
void enableIndicator();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Don't draw the indicator.
|
||||||
|
* This will slide out the indicator
|
||||||
|
* when transitioning to the next frame.
|
||||||
|
*/
|
||||||
|
void disableIndicator();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Enable drawing of all indicators.
|
||||||
|
*/
|
||||||
|
void enableAllIndicators();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Disable drawing of all indicators.
|
||||||
|
*/
|
||||||
|
void disableAllIndicators();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the position of the indicator bar.
|
||||||
|
*/
|
||||||
|
void setIndicatorPosition(IndicatorPosition pos);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the direction of the indicator bar. Defining the order of frames ASCENDING / DESCENDING
|
||||||
|
*/
|
||||||
|
void setIndicatorDirection(IndicatorDirection dir);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the symbol to indicate an active frame in the indicator bar.
|
||||||
|
*/
|
||||||
|
void setActiveSymbol(const char* symbol);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the symbol to indicate an inactive frame in the indicator bar.
|
||||||
|
*/
|
||||||
|
void setInactiveSymbol(const char* symbol);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configure what animation is used to transition from one frame to another
|
||||||
|
*/
|
||||||
|
void setFrameAnimation(AnimationDirection dir);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add frame drawing functions
|
||||||
|
*/
|
||||||
|
void setFrames(FrameCallback* frameFunctions, uint8_t frameCount);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add overlays drawing functions that are draw independent of the Frames
|
||||||
|
*/
|
||||||
|
void setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the function that will draw each step
|
||||||
|
* in the loading animation
|
||||||
|
*/
|
||||||
|
void setLoadingDrawFunction(LoadingDrawFunction loadingDrawFunction);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run the loading process
|
||||||
|
*/
|
||||||
|
void runLoadingProcess(LoadingStage* stages, uint8_t stagesCount);
|
||||||
|
|
||||||
|
// Manuell Controll
|
||||||
|
void nextFrame();
|
||||||
|
void previousFrame();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Switch without transition to frame `frame`.
|
||||||
|
*/
|
||||||
|
void switchToFrame(uint8_t frame);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transition to frame `frame`, when the `frame` number is bigger than the current
|
||||||
|
* frame the forward animation will be used, otherwise the backwards animation is used.
|
||||||
|
*/
|
||||||
|
void transitionToFrame(uint8_t frame);
|
||||||
|
|
||||||
|
// State Info
|
||||||
|
OLEDDisplayUiState* getUiState();
|
||||||
|
|
||||||
|
// This needs to be called in the main loop
|
||||||
|
// the returned value is the remaining time (in ms)
|
||||||
|
// you have to draw after drawing to keep the frame budget.
|
||||||
|
int8_t update();
|
||||||
|
```
|
||||||
|
|
||||||
|
## Example: SSD1306Demo
|
||||||
|
|
||||||
|
### Frame 1
|
||||||
|

|
||||||
|
|
||||||
|
This frame shows three things:
|
||||||
|
* How to draw an xbm image
|
||||||
|
* How to draw a static text which is not moved by the frame transition
|
||||||
|
* The active/inactive frame indicators
|
||||||
|
|
||||||
|
### Frame 2
|
||||||
|

|
||||||
|
|
||||||
|
Currently there are one fontface with three sizes included in the library: Arial 10, 16 and 24. Once the converter is published you will be able to convert any ttf font into the used format.
|
||||||
|
|
||||||
|
### Frame 3
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
This frame demonstrates the text alignment. The coordinates in the frame show relative to which position the texts have been rendered.
|
||||||
|
|
||||||
|
### Frame 4
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
This shows how to use define a maximum width after which the driver automatically wraps a word to the next line. This comes in very handy if you have longer texts to display.
|
||||||
|
|
||||||
|
### SPI version
|
||||||
|
|
||||||
|

|
||||||
|
|
||||||
|
This shows the code working on the SPI version of the display. See demo code for ESP8266 pins used.
|
||||||
|
|
||||||
|
## Project using this library
|
||||||
|
|
||||||
|
* [QRCode ESP8266](https://github.com/anunpanya/ESP8266_QRcode) (by @anunpanya)
|
||||||
|
* [Scan I2C](https://github.com/hallard/Scan-I2C-WiFi) (by @hallard)
|
||||||
|
* [Weather Station](https://github.com/squix78/esp8266-weather-station) (by @squix)
|
||||||
|
|
@ -0,0 +1,125 @@
|
||||||
|
# Upgrade from 2.0 to 3.0
|
||||||
|
|
||||||
|
While developing version 3.0 we made some breaking changes to the public
|
||||||
|
API of this library. This document will help you update your code to work with
|
||||||
|
version 3.0
|
||||||
|
|
||||||
|
## Font Definitions
|
||||||
|
|
||||||
|
To get better performance and a smaller font definition format, we change the memory
|
||||||
|
layout of the font definition format. If you are using custom fonts not included in
|
||||||
|
this library we updated the font generator [here](http://oleddisplay.squix.ch/#/home).
|
||||||
|
Please update your fonts to be working with 3.0 by selecting the respective version in the dropdown.
|
||||||
|
|
||||||
|
|
||||||
|
## Architectural Changes
|
||||||
|
|
||||||
|
To become a more versatile library for the SSD1306 chipset we abstracted the
|
||||||
|
hardware connection into subclasses of the base display class now called `OLEDDisplay`.
|
||||||
|
This library is currently shipping with three implementations:
|
||||||
|
|
||||||
|
* `SSD1306Wire` implementing the I2C protocol using the Wire Library.
|
||||||
|
* `SSD1306Brzo` implementing the I2C protocol using the faster [`brzo_i2c`](https://github.com/pasko-zh/brzo_i2c) library.
|
||||||
|
* `SSD1306Spi` implementing the SPI protocol.
|
||||||
|
|
||||||
|
To keep backwards compatiblity with the old API `SSD1306` is an alias of `SSD1306Wire`.
|
||||||
|
If you are not using the UI components you don't have to change anything to keep your code working.
|
||||||
|
|
||||||
|
## Name Changes
|
||||||
|
|
||||||
|
[Naming things is hard](http://martinfowler.com/bliki/TwoHardThings.html), to better reflect our intention with this library
|
||||||
|
we changed the name of the base class to `OLEDDisplay` and the UI library accordingly to `OLEDDisplayUi`.
|
||||||
|
As a consequence the type definitions of all frame and overlay related functions changed.
|
||||||
|
This means that you have to update all your frame drawing callbacks from:
|
||||||
|
|
||||||
|
```c
|
||||||
|
bool frame1(SSD1306 *display, SSD1306UiState* state, int x, int y);
|
||||||
|
```
|
||||||
|
|
||||||
|
too
|
||||||
|
|
||||||
|
```c
|
||||||
|
void frame1(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int16_t y);
|
||||||
|
```
|
||||||
|
|
||||||
|
And your overlay drawing functions from:
|
||||||
|
|
||||||
|
```c
|
||||||
|
bool overlay1(SSD1306 *display, SSD1306UiState* state);
|
||||||
|
```
|
||||||
|
|
||||||
|
too
|
||||||
|
|
||||||
|
```c
|
||||||
|
void overlay1(OLEDDisplay *display, OLEDDisplayUiState* state);
|
||||||
|
```
|
||||||
|
|
||||||
|
## New Features
|
||||||
|
|
||||||
|
### Loading Animation
|
||||||
|
|
||||||
|
While using this library ourself we noticed a pattern emerging. We want to drawing
|
||||||
|
a loading progress while connecting to WiFi and updating weather data etc.
|
||||||
|
|
||||||
|
The simplest thing was to add the function `drawProgressBar(x, y, width, height, progress)`
|
||||||
|
,where `progress` is between `0` and `100`, right to the `OLEDDisplay` class.
|
||||||
|
|
||||||
|
But we didn't stop there. We added a new feature to the `OLEDDisplayUi` called `LoadingStages`.
|
||||||
|
You can define your loading process like this:
|
||||||
|
|
||||||
|
```c++
|
||||||
|
LoadingStage loadingStages[] = {
|
||||||
|
{
|
||||||
|
.process = "Connect to WiFi",
|
||||||
|
.callback = []() {
|
||||||
|
// Connect to WiFi
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
.process = "Get time from NTP",
|
||||||
|
.callback = []() {
|
||||||
|
// Get current time via NTP
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// more steps
|
||||||
|
};
|
||||||
|
|
||||||
|
int LOADING_STAGES_COUNT = sizeof(loadingStages) / sizeof(LoadingStage);
|
||||||
|
```
|
||||||
|
|
||||||
|
After defining your array of `LoadingStages` you can then run the loading process by using
|
||||||
|
`ui.runLoadingProcess(loadingStages, LOADING_STAGES_COUNT)`. This will give you a
|
||||||
|
nice little loading animation you can see in the beginning of [this](https://vimeo.com/168362918)
|
||||||
|
video.
|
||||||
|
|
||||||
|
To further customize this you are free to define your own `LoadingDrawFunction` like this:
|
||||||
|
|
||||||
|
```c
|
||||||
|
void myLoadingDraw(OLEDDisplay *display, LoadingStage* stage, uint8_t progress) {
|
||||||
|
display->setTextAlignment(TEXT_ALIGN_CENTER);
|
||||||
|
display->setFont(ArialMT_Plain_10);
|
||||||
|
// stage->process contains the text of the current progress e.q. "Connect to WiFi"
|
||||||
|
display->drawString(64, 18, stage->process);
|
||||||
|
// you could just print the current process without the progress bar
|
||||||
|
display->drawString(64, 28, progress);
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
After defining a function like that, you can pass it to the Ui library by use
|
||||||
|
`ui.setLoadingDrawFunction(myLoadingDraw)`.
|
||||||
|
|
||||||
|
|
||||||
|
### Text Logging
|
||||||
|
|
||||||
|
It is always useful to display some text on the display without worrying to much
|
||||||
|
where it goes and managing it. In 3.0 we made the `OLEDDisplay` class implement
|
||||||
|
[`Print`](https://github.com/arduino/Arduino/blob/master/hardware/arduino/avr/cores/arduino/Print.h)
|
||||||
|
so you can use it like you would use `Serial`. We calls this feature `LogBuffer`
|
||||||
|
and the only thing you have to do is to define how many lines you want to display
|
||||||
|
and how many characters there are on average on each. This is done by calling
|
||||||
|
`setLogBuffer(lines, chars);`. If there is not enough memory the function will
|
||||||
|
return false.
|
||||||
|
|
||||||
|
After that you can draw the `LogBuffer` anywhere you want by calling `drawLogBuffer(x, y)`.
|
||||||
|
(Note: You have to call `display()` to update the screen)
|
||||||
|
We made a [video](https://www.youtube.com/watch?v=8Fiss77A3TE) showing this feature in action.
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
# Upgrade from 3.x to 4.0
|
||||||
|
|
||||||
|
There are changes that breaks compatibility with older versions.
|
||||||
|
|
||||||
|
1. You'll have to change data type for all your binary resources such as images and fonts from
|
||||||
|
|
||||||
|
```c
|
||||||
|
const char MySymbol[] PROGMEM = {
|
||||||
|
```
|
||||||
|
|
||||||
|
to
|
||||||
|
|
||||||
|
```c
|
||||||
|
const uint8_t MySymbol[] PROGMEM = {
|
||||||
|
```
|
||||||
|
|
||||||
|
1. Arguments of `setContrast` from `char` to `uint8_t`
|
||||||
|
|
||||||
|
```c++
|
||||||
|
void OLEDDisplay::setContrast(char contrast, char precharge, char comdetect);
|
||||||
|
```
|
||||||
|
|
||||||
|
to
|
||||||
|
|
||||||
|
```c++
|
||||||
|
void OLEDDisplay::setContrast(uint8_t contrast, uint8_t precharge, uint8_t comdetect);
|
||||||
|
```
|
||||||
|
|
@ -0,0 +1,24 @@
|
||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2016 by Daniel Eichhorn
|
||||||
|
Copyright (c) 2016 by Fabrice Weinberg
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
See more at http://blog.squix.ch
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 21 KiB |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue