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

store last value in Message with update time

Browse Source
This commit is contained in:
john30
2014-12-07 10:00:26 +01:00
parent 4ffc6155a1
commit d33cede5ea
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+8 -4
View File
@@ -35,7 +35,8 @@ Message::Message(const string clazz, const string name, const bool isSet,
: m_class(clazz), m_name(name), m_isSet(isSet),
m_isPassive(isPassive), m_comment(comment),
m_srcAddress(srcAddress), m_dstAddress(dstAddress),
m_id(id), m_data(data), m_pollPriority(pollPriority)
m_id(id), m_data(data), m_pollPriority(pollPriority),
m_lastUpdateTime(0)
{
int exp = 7;
unsigned long long key = (unsigned long long)(id.size()-2) << (8 * exp + 5);
@@ -280,9 +281,14 @@ result_t Message::decode(const PartType partType, SymbolString& data,
offset = m_id.size() - 2;
else
offset = 0;
int startPos = output.str().length();
result_t result = m_data->read(partType, data, offset, output, leadingSeparator, false, separator);
if (result != RESULT_OK)
time(&m_lastUpdateTime);
if (result != RESULT_OK) {
m_lastValue.clear();
return result;
}
m_lastValue = output.str().substr(startPos);
/*if (m_isPassive == false && answer == true) {
istringstream input; // TODO create input from database of internal variables
result_t result = m_data->write(input, masterData, m_id.size() - 2, slaveData, 0, separator);
@@ -292,7 +298,6 @@ result_t Message::decode(const PartType partType, SymbolString& data,
return RESULT_OK;
}
result_t MessageMap::add(Message* message)
{
unsigned long long pkey = message->getKey();
@@ -422,4 +427,3 @@ void MessageMap::clear()
m_passiveMessagesByKey.clear();
m_maxIdLength = 0;
}