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)
127 lines
2.7 KiB
C++
127 lines
2.7 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 "JsonBufferBase.hpp"
|
|
|
|
namespace ArduinoJson {
|
|
|
|
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 StaticJsonBufferBase {
|
|
public:
|
|
explicit StaticJsonBuffer() : 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
|