andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

update TODOs

Browse Source
This commit is contained in:
proddy
2023-03-05 14:31:14 +01:00
parent 8ee8998381
commit 9b3b758be7
3 changed files with 483 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
View File

@@ -16,16 +16,15 @@ namespace ARDUINOJSON_NAMESPACE {
template <typename TReader, typename TStringStorage>
class MsgPackDeserializer {
public:
MsgPackDeserializer(MemoryPool* pool, TReader reader,
TStringStorage stringStorage)
: _pool(pool),
_reader(reader),
_stringStorage(stringStorage),
_foundSomething(false) {}
MsgPackDeserializer(MemoryPool * pool, TReader reader, TStringStorage stringStorage)
: _pool(pool)
, _reader(reader)
, _stringStorage(stringStorage)
, _foundSomething(false) {
}
template <typename TFilter>
DeserializationError parse(VariantData& variant, TFilter filter,
NestingLimit nestingLimit) {
DeserializationError parse(VariantData & variant, TFilter filter, NestingLimit nestingLimit) {
DeserializationError::Code err;
err = parseVariant(&variant, filter, nestingLimit);
return _foundSomething ? err : DeserializationError::EmptyInput;
@@ -33,11 +32,10 @@ class MsgPackDeserializer {
private:
template <typename TFilter>
DeserializationError::Code parseVariant(VariantData* variant, TFilter filter,
NestingLimit nestingLimit) {
DeserializationError::Code parseVariant(VariantData * variant, TFilter filter, NestingLimit nestingLimit) {
DeserializationError::Code err;
uint8_t code = 0; // TODO: why do we need to initialize this variable?
uint8_t code = 0;
err = readByte(code);
if (err)
return err;
@@ -222,7 +220,7 @@ class MsgPackDeserializer {
return DeserializationError::Ok;
}
DeserializationError::Code readByte(uint8_t& value) {
DeserializationError::Code readByte(uint8_t & value) {
int c = _reader.read();
if (c < 0)
return DeserializationError::IncompleteInput;
@@ -230,15 +228,15 @@ class MsgPackDeserializer {
return DeserializationError::Ok;
}
DeserializationError::Code readBytes(uint8_t* p, size_t n) {
if (_reader.readBytes(reinterpret_cast<char*>(p), n) == n)
DeserializationError::Code readBytes(uint8_t * p, size_t n) {
if (_reader.readBytes(reinterpret_cast<char *>(p), n) == n)
return DeserializationError::Ok;
return DeserializationError::IncompleteInput;
}
template <typename T>
DeserializationError::Code readBytes(T& value) {
return readBytes(reinterpret_cast<uint8_t*>(&value), sizeof(value));
DeserializationError::Code readBytes(T & value) {
return readBytes(reinterpret_cast<uint8_t *>(&value), sizeof(value));
}
DeserializationError::Code skipBytes(size_t n) {
@@ -250,7 +248,7 @@ class MsgPackDeserializer {
}
template <typename T>
DeserializationError::Code readInteger(T& value) {
DeserializationError::Code readInteger(T & value) {
DeserializationError::Code err;
err = readBytes(value);
@@ -263,7 +261,7 @@ class MsgPackDeserializer {
}
template <typename T>
DeserializationError::Code readInteger(VariantData* variant) {
DeserializationError::Code readInteger(VariantData * variant) {
DeserializationError::Code err;
T value;
@@ -277,8 +275,7 @@ class MsgPackDeserializer {
}
template <typename T>
typename enable_if<sizeof(T) == 4, DeserializationError::Code>::type
readFloat(VariantData* variant) {
typename enable_if<sizeof(T) == 4, DeserializationError::Code>::type readFloat(VariantData * variant) {
DeserializationError::Code err;
T value;
@@ -293,8 +290,7 @@ class MsgPackDeserializer {
}
template <typename T>
typename enable_if<sizeof(T) == 8, DeserializationError::Code>::type
readDouble(VariantData* variant) {
typename enable_if<sizeof(T) == 8, DeserializationError::Code>::type readDouble(VariantData * variant) {
DeserializationError::Code err;
T value;
@@ -309,12 +305,11 @@ class MsgPackDeserializer {
}
template <typename T>
typename enable_if<sizeof(T) == 4, DeserializationError::Code>::type
readDouble(VariantData* variant) {
typename enable_if<sizeof(T) == 4, DeserializationError::Code>::type readDouble(VariantData * variant) {
DeserializationError::Code err;
uint8_t i[8]; // input is 8 bytes
T value; // output is 4 bytes
uint8_t* o = reinterpret_cast<uint8_t*>(&value);
uint8_t * o = reinterpret_cast<uint8_t *>(&value);
err = readBytes(i, 8);
if (err)
@@ -328,7 +323,7 @@ class MsgPackDeserializer {
}
template <typename T>
DeserializationError::Code readString(VariantData* variant) {
DeserializationError::Code readString(VariantData * variant) {
DeserializationError::Code err;
T size;
@@ -363,7 +358,7 @@ class MsgPackDeserializer {
return skipBytes(size);
}
DeserializationError::Code readString(VariantData* variant, size_t n) {
DeserializationError::Code readString(VariantData * variant, size_t n) {
DeserializationError::Code err;
err = readString(n);
@@ -395,8 +390,7 @@ class MsgPackDeserializer {
}
template <typename TSize, typename TFilter>
DeserializationError::Code readArray(VariantData* variant, TFilter filter,
NestingLimit nestingLimit) {
DeserializationError::Code readArray(VariantData * variant, TFilter filter, NestingLimit nestingLimit) {
DeserializationError::Code err;
TSize size;
@@ -408,9 +402,7 @@ class MsgPackDeserializer {
}
template <typename TFilter>
DeserializationError::Code readArray(VariantData* variant, size_t n,
TFilter filter,
NestingLimit nestingLimit) {
DeserializationError::Code readArray(VariantData * variant, size_t n, TFilter filter, NestingLimit nestingLimit) {
DeserializationError::Code err;
if (nestingLimit.reached())
@@ -418,12 +410,12 @@ class MsgPackDeserializer {
bool allowArray = filter.allowArray();
CollectionData* array = allowArray ? &variant->toArray() : 0;
CollectionData * array = allowArray ? &variant->toArray() : 0;
TFilter memberFilter = filter[0U];
for (; n; --n) {
VariantData* value;
VariantData * value;
if (memberFilter.allow()) {
value = array->addElement(_pool);
@@ -442,8 +434,7 @@ class MsgPackDeserializer {
}
template <typename TSize, typename TFilter>
DeserializationError::Code readObject(VariantData* variant, TFilter filter,
NestingLimit nestingLimit) {
DeserializationError::Code readObject(VariantData * variant, TFilter filter, NestingLimit nestingLimit) {
DeserializationError::Code err;
TSize size;
@@ -455,15 +446,13 @@ class MsgPackDeserializer {
}
template <typename TFilter>
DeserializationError::Code readObject(VariantData* variant, size_t n,
TFilter filter,
NestingLimit nestingLimit) {
DeserializationError::Code readObject(VariantData * variant, size_t n, TFilter filter, NestingLimit nestingLimit) {
DeserializationError::Code err;
if (nestingLimit.reached())
return DeserializationError::TooDeep;
CollectionData* object = filter.allowObject() ? &variant->toObject() : 0;
CollectionData * object = filter.allowObject() ? &variant->toObject() : 0;
for (; n; --n) {
err = readKey();
@@ -472,7 +461,7 @@ class MsgPackDeserializer {
JsonString key = _stringStorage.str();
TFilter memberFilter = filter[key.c_str()];
VariantData* member;
VariantData * member;
if (memberFilter.allow()) {
ARDUINOJSON_ASSERT(object);
@@ -481,7 +470,7 @@ class MsgPackDeserializer {
// This MUST be done before adding the slot.
key = _stringStorage.save();
VariantSlot* slot = object->addSlot(_pool);
VariantSlot * slot = object->addSlot(_pool);
if (!slot)
return DeserializationError::NoMemory;
@@ -538,7 +527,7 @@ class MsgPackDeserializer {
return skipBytes(size + 1U);
}
MemoryPool* _pool;
MemoryPool * _pool;
TReader _reader;
TStringStorage _stringStorage;
bool _foundSomething;
@@ -547,116 +536,85 @@ class MsgPackDeserializer {
// Parses a MessagePack input and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TString>
DeserializationError deserializeMsgPack(
JsonDocument& doc, const TString& input,
NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit,
AllowAllFilter());
DeserializationError deserializeMsgPack(JsonDocument & doc, const TString & input, NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, AllowAllFilter());
}
// Parses a MessagePack input, filters, and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TString>
DeserializationError deserializeMsgPack(
JsonDocument& doc, const TString& input, Filter filter,
NestingLimit nestingLimit = NestingLimit()) {
DeserializationError deserializeMsgPack(JsonDocument & doc, const TString & input, Filter filter, NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
}
// Parses a MessagePack input, filters, and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TString>
DeserializationError deserializeMsgPack(JsonDocument& doc, const TString& input,
NestingLimit nestingLimit,
Filter filter) {
DeserializationError deserializeMsgPack(JsonDocument & doc, const TString & input, NestingLimit nestingLimit, Filter filter) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
}
// Parses a MessagePack input and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TStream>
DeserializationError deserializeMsgPack(
JsonDocument& doc, TStream& input,
NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit,
AllowAllFilter());
DeserializationError deserializeMsgPack(JsonDocument & doc, TStream & input, NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, AllowAllFilter());
}
// Parses a MessagePack input, filters, and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TStream>
DeserializationError deserializeMsgPack(
JsonDocument& doc, TStream& input, Filter filter,
NestingLimit nestingLimit = NestingLimit()) {
DeserializationError deserializeMsgPack(JsonDocument & doc, TStream & input, Filter filter, NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
}
// Parses a MessagePack input, filters, and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TStream>
DeserializationError deserializeMsgPack(JsonDocument& doc, TStream& input,
NestingLimit nestingLimit,
Filter filter) {
DeserializationError deserializeMsgPack(JsonDocument & doc, TStream & input, NestingLimit nestingLimit, Filter filter) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
}
// Parses a MessagePack input and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TChar>
DeserializationError deserializeMsgPack(
JsonDocument& doc, TChar* input,
NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit,
AllowAllFilter());
DeserializationError deserializeMsgPack(JsonDocument & doc, TChar * input, NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, AllowAllFilter());
}
// Parses a MessagePack input, filters, and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TChar>
DeserializationError deserializeMsgPack(
JsonDocument& doc, TChar* input, Filter filter,
NestingLimit nestingLimit = NestingLimit()) {
DeserializationError deserializeMsgPack(JsonDocument & doc, TChar * input, Filter filter, NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
}
// Parses a MessagePack input, filters, and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TChar>
DeserializationError deserializeMsgPack(JsonDocument& doc, TChar* input,
NestingLimit nestingLimit,
Filter filter) {
DeserializationError deserializeMsgPack(JsonDocument & doc, TChar * input, NestingLimit nestingLimit, Filter filter) {
return deserialize<MsgPackDeserializer>(doc, input, nestingLimit, filter);
}
// Parses a MessagePack input and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TChar>
DeserializationError deserializeMsgPack(
JsonDocument& doc, TChar* input, size_t inputSize,
NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit,
AllowAllFilter());
DeserializationError deserializeMsgPack(JsonDocument & doc, TChar * input, size_t inputSize, NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit, AllowAllFilter());
}
// Parses a MessagePack input, filters, and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TChar>
DeserializationError deserializeMsgPack(
JsonDocument& doc, TChar* input, size_t inputSize, Filter filter,
NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit,
filter);
DeserializationError deserializeMsgPack(JsonDocument & doc, TChar * input, size_t inputSize, Filter filter, NestingLimit nestingLimit = NestingLimit()) {
return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit, filter);
}
// Parses a MessagePack input, filters, and puts the result in a JsonDocument.
// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
template <typename TChar>
DeserializationError deserializeMsgPack(JsonDocument& doc, TChar* input,
size_t inputSize,
NestingLimit nestingLimit,
Filter filter) {
return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit,
filter);
DeserializationError deserializeMsgPack(JsonDocument & doc, TChar * input, size_t inputSize, NestingLimit nestingLimit, Filter filter) {
return deserialize<MsgPackDeserializer>(doc, input, inputSize, nestingLimit, filter);
}
} // namespace ARDUINOJSON_NAMESPACE

3
lib/uuid-console/src/shell.cpp
View File

@@ -417,7 +417,6 @@ void Shell::loop_delay() {
function_copy(*this);
// TODO comment this block out like we had < v3.5?
if (running()) {
display_prompt();
}
@@ -448,7 +447,6 @@ void Shell::loop_blocking() {
stop();
}
// TODO comment this block out like we had < v3.5?
if (running()) {
display_prompt();
}
@@ -561,7 +559,6 @@ void Shell::process_command() {
}
}
// TODO comment this block out like we had < v3.5?
if (running()) {
display_prompt();
}

2
lib/uuid-syslog/src/syslog.cpp
View File

@@ -349,7 +349,7 @@ void SyslogService::loop() {
}
bool SyslogService::can_transmit() {
// TODO this should be checked for Eth
// TODO this should be checked also for Eth
if (!host_.empty() && (uint32_t)ip_ == 0) {
WiFi.hostByName(host_.c_str(), ip_);
}