5.10.0 20171201 * Upgrade library ArduinoJson to 5.11.2 * Upgrade library IRRemoteEsp8266 to 2.2.1 + 2 commits but disabled some protocols (code size reduction) * Upgrade library NeoPixelBus to 2.2.9 * Upgrade library OneWire to 2.3.3 + 6 commits and disabled CRC lookup-table (#define ONEWIRE_CRC8_TABLE 0) (code size reduction) * Update library PubSubClient to 2.6 + 9 commits and additional delay (#790) * Update core_esp8266_wiring_digital.c to latest (staged) level * Patch library I2Cdevlib-Core for esp8266-core 2.4.0-rc2 compatibility * Remove command EnergyReset 1..3 now replaced by ENergyReset1 to EnergyReset3 * Remove spaces in JSON messages (code size reduction) * Renamed xsns_05_ds18x20.ino to xsns_05_ds18x20_legacy.ino still using library OneWire and providing dynamic sensor scan * Fix possible iram1_0_seg compile error by shrinking ICACHE_RAM_ATTR code usage * Fix PWM watchdog timeout if Dimmer is set to 100 or Color set to 0xFF (#1146) * Fix Sonoff Bridge Learn Mode hang caused by unrecognised RF code (#1181) * Fix blank console log window by using XML character encoding (#1187) * Fix wrong response name for command HlwISet (#1214) * Fix DHT type sensor timeout recognition by distinguish "signal already there" from "timeout" (#1233) * Add fixed color options 1..12 to command Color * Add + (plus) and - (minus) to commands Dimmer (+10/-10), Speed and Scheme * Add + (plus) and - (minus) to command Color to select 1 out of 12 preset colors * Add + (plus) and - (minus) to command Ct to control ColdWarm led ColorTemperature (+34/-34) * Add commands EnergyReset1 0..42500, EnergyReset2 0..42500 and EnergyReset3 0..42500000 * to (Re)set Energy Today, Yesterday or Total respectively in Wh (#406, #685, #1202) * Add optional ADS1115 driver as alternative for unsupported I2Cdevlib in esp8266-core 2.4.0-rc2 * Add support for INA219 Voltage and Current sensor to be enabled in user_config.h with define USE_INA219 * Add support for Arilux LC11 (Clearing RF home code when selecting no Arilux module) * Add support for WS2812 RGBW ledstrips to be enabled in user_config.h with define USE_WS2812_CTYPE (#1156) * Add SettingsSaveAll routine to command SaveData to be used before controlled power down (#1202) * Add option PUSHBUTTON_TOGGLE (SwitchMode 7) to allow toggling on any switch change (#1221) * Add new xdrv_05_ds18x20.ino free from library OneWire and add the following features: * Add support for DS1822 * Add forced setting of 12-bit resolution for selected device types (#1222) * Add read temperature retry counter (#1215) * Fix lost sensors by performing sensor probe at restart only thereby removing dynamic sensor probe (#1215) * Fix sensor address sorting using ascending sort on sensor type followed by sensor address * Rewrite JSON resulting in shorter message allowing more sensors in default firmware image: * "DS18B20-1":{"Id":"00000483C23A","Temperature":19.5},"DS18B20-2":{"Id":"0000048EC44C","Temperature":19.6} * Add additional define in user_config.h to select either single sensor (defines disabled), new multi sensor (USE_DS18X20) or legacy multi sensor (USE_DS18X20_LEGACY) * Add clock support for more different pixel counts (#1226) * Add support for Sonoff Dual R2 (#1249) * Add FriendlyName to web page tab and add program information to web page footer (#1275)
361 lines
11 KiB
C++
361 lines
11 KiB
C++
// Copyright Benoit Blanchon 2014-2017
|
|
// MIT License
|
|
//
|
|
// Arduino JSON library
|
|
// https://bblanchon.github.io/ArduinoJson/
|
|
// If you like this project, please add a star!
|
|
|
|
#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 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 TypeTraits::EnableIf<
|
|
TypeTraits::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 TypeTraits::EnableIf<
|
|
TypeTraits::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 TypeTraits::EnableIf<
|
|
TypeTraits::IsSignedIntegral<T>::value ||
|
|
TypeTraits::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 TypeTraits::EnableIf<
|
|
TypeTraits::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 TypeTraits::EnableIf<TypeTraits::IsChar<TChar>::value>::type * =
|
|
0) {
|
|
_type = Internals::JSON_STRING;
|
|
_content.asString = reinterpret_cast<const char *>(value);
|
|
}
|
|
|
|
// Create a JsonVariant containing an unparsed string
|
|
JsonVariant(RawJson 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 TypeTraits::EnableIf<TypeTraits::IsIntegral<T>::value, T>::type
|
|
as() const {
|
|
return variantAsInteger<T>();
|
|
}
|
|
// bool as<bool>() const
|
|
template <typename T>
|
|
const typename TypeTraits::EnableIf<TypeTraits::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 TypeTraits::EnableIf<TypeTraits::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 TypeTraits::EnableIf<TypeTraits::IsSame<T, const char *>::value ||
|
|
TypeTraits::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 TypeTraits::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 TypeTraits::EnableIf<
|
|
TypeTraits::IsSame<typename TypeTraits::RemoveReference<T>::type,
|
|
JsonArray>::value,
|
|
JsonArray &>::type
|
|
as() const {
|
|
return variantAsArray();
|
|
}
|
|
//
|
|
// const JsonArray& as<const JsonArray&> const;
|
|
template <typename T>
|
|
typename TypeTraits::EnableIf<
|
|
TypeTraits::IsSame<typename TypeTraits::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 TypeTraits::EnableIf<
|
|
TypeTraits::IsSame<typename TypeTraits::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 TypeTraits::EnableIf<
|
|
TypeTraits::IsSame<typename TypeTraits::RemoveReference<T>::type,
|
|
const JsonObject>::value,
|
|
const JsonObject &>::type
|
|
as() const {
|
|
return variantAsObject();
|
|
}
|
|
//
|
|
// JsonVariant as<JsonVariant> const;
|
|
template <typename T>
|
|
typename TypeTraits::EnableIf<TypeTraits::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 TypeTraits::EnableIf<TypeTraits::IsIntegral<T>::value, bool>::type
|
|
is() const {
|
|
return variantIsInteger();
|
|
}
|
|
//
|
|
// bool is<double>() const;
|
|
// bool is<float>() const;
|
|
template <typename T>
|
|
typename TypeTraits::EnableIf<TypeTraits::IsFloatingPoint<T>::value,
|
|
bool>::type
|
|
is() const {
|
|
return variantIsFloat();
|
|
}
|
|
//
|
|
// bool is<bool>() const
|
|
template <typename T>
|
|
typename TypeTraits::EnableIf<TypeTraits::IsSame<T, bool>::value, bool>::type
|
|
is() const {
|
|
return variantIsBoolean();
|
|
}
|
|
//
|
|
// bool is<const char*>() const;
|
|
// bool is<char*>() const;
|
|
template <typename T>
|
|
typename TypeTraits::EnableIf<TypeTraits::IsSame<T, const char *>::value ||
|
|
TypeTraits::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 TypeTraits::EnableIf<
|
|
TypeTraits::IsSame<
|
|
typename TypeTraits::RemoveConst<
|
|
typename TypeTraits::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 TypeTraits::EnableIf<
|
|
TypeTraits::IsSame<
|
|
typename TypeTraits::RemoveConst<
|
|
typename TypeTraits::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);
|
|
}
|
|
}
|