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

fix for reading cached values from master part

Browse Source
This commit is contained in:
john30
2015-03-20 21:21:55 +01:00
parent f3b34397cf
commit 3377c18c2b
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+4 -3
View File
@@ -395,8 +395,7 @@ result_t Message::decode(SymbolString& masterData, SymbolString& slaveData,
if (result < RESULT_OK) if (result < RESULT_OK)
return result; return result;
if (result == RESULT_EMPTY && !empty) if (result == RESULT_EMPTY && !empty)
result = RESULT_OK; result = RESULT_OK; // OK if at least one part was non-empty
time(&m_lastUpdateTime); time(&m_lastUpdateTime);
if (masterData != m_lastMasterData) { if (masterData != m_lastMasterData) {
m_lastChangeTime = m_lastUpdateTime; m_lastChangeTime = m_lastUpdateTime;
@@ -425,7 +424,9 @@ result_t Message::decodeLastData(ostringstream& output,
result = m_data->read(pt_slaveData, m_lastSlaveData, offset, output, leadingSeparator, verbose, fieldName, fieldIndex, separator); result = m_data->read(pt_slaveData, m_lastSlaveData, offset, output, leadingSeparator, verbose, fieldName, fieldIndex, separator);
if (result < RESULT_OK) if (result < RESULT_OK)
return result; return result;
if (empty && result == RESULT_EMPTY && fieldName != NULL) if (result == RESULT_EMPTY && !empty)
result = RESULT_OK; // OK if at least one part was non-empty
else if (result == RESULT_EMPTY && fieldName != NULL)
return RESULT_ERR_NOTFOUND; return RESULT_ERR_NOTFOUND;
return result; return result;
} }