nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected using fieldIndex in Message::decodeLastData(bool, ...), corrected finding field in DataFieldSet::read() with index and without name, added optional partType and fieldName to DataField::getCount()

Browse Source
This commit is contained in:
john30
2017-12-26 13:56:26 +01:00
parent 1da2611964
commit c680e87bde
3 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/data.cpp
+16 -1
View File
@@ -657,6 +657,10 @@ bool SingleDataField::hasFullByteOffset(bool after) const {
|| (after && firstBit + (m_dataType->getBitCount() % 8) >= 8);
}
size_t SingleDataField::getCount(PartType partType, const char* fieldName) const {
return isIgnored() || (partType != pt_any && partType != m_partType) || (fieldName != NULL && m_name != fieldName) ? 0 : 1;
}
const ValueListDataField* ValueListDataField::clone() const {
return new ValueListDataField(*this);
@@ -925,6 +929,17 @@ size_t DataFieldSet::getLength(PartType partType, size_t maxLength) const {
return length;
}
size_t DataFieldSet::getCount(PartType partType, const char* fieldName) const {
if (partType == pt_any && fieldName == NULL) {
return m_fields.size() - m_ignoredCount;
}
size_t count = 0;
for (auto field : m_fields) {
count += field->getCount(partType, fieldName);
}
return count;
}
string DataFieldSet::getName(ssize_t fieldIndex) const {
if (fieldIndex < (ssize_t)m_ignoredCount) {
return m_name;
@@ -988,7 +1003,7 @@ void DataFieldSet::dump(bool prependFieldSeparator, bool asJson, ostream* output
result_t DataFieldSet::read(const SymbolString& data, size_t offset,
const char* fieldName, ssize_t fieldIndex, unsigned int* output) const {
bool previousFullByteOffset = true, found = false, findFieldIndex = fieldName != NULL && fieldIndex >= 0;
bool previousFullByteOffset = true, found = false, findFieldIndex = fieldIndex >= 0;
PartType partType = data.isMaster() ? pt_masterData : pt_slaveData;
for (const auto field : m_fields) {
if (field->getPartType() != partType) {