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

added lastChangeTime

Browse Source
This commit is contained in:
john30
2015-01-03 12:11:46 +01:00
parent 92e6178ef7
commit 50e24172b1
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+10 -4
View File
@@ -41,7 +41,7 @@ Message::Message(const string clazz, const string name, const bool isWrite,
m_isPassive(isPassive), m_comment(comment),
m_srcAddress(srcAddress), m_dstAddress(dstAddress),
m_id(id), m_data(data), m_pollPriority(pollPriority),
m_lastUpdateTime(0), m_pollCount(0), m_lastPollTime(0)
m_lastUpdateTime(0), m_lastChangeTime(0), m_pollCount(0), m_lastPollTime(0)
{
int exp = 7;
unsigned long long key = (unsigned long long)(id.size()-2) << (8 * exp + 5);
@@ -62,7 +62,7 @@ Message::Message(const bool isWrite, const bool isPassive,
m_isPassive(isPassive), m_comment(),
m_srcAddress(SYN), m_dstAddress(SYN),
m_data(data), m_pollPriority(0),
m_lastUpdateTime(0), m_pollCount(0), m_lastPollTime(0)
m_lastUpdateTime(0), m_lastChangeTime(0), m_pollCount(0), m_lastPollTime(0)
{
m_id.push_back(pb);
m_id.push_back(sb);
@@ -321,7 +321,10 @@ result_t Message::decode(const PartType partType, SymbolString& data,
return result;
}
time(&m_lastUpdateTime);
m_lastValue = output.str().substr(startPos);
string value = output.str().substr(startPos);
if (value != m_lastValue)
m_lastChangeTime = m_lastUpdateTime;
m_lastValue = value;
/*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);
@@ -349,7 +352,10 @@ result_t Message::decode(SymbolString& masterData, SymbolString& slaveData,
return result;
}
time(&m_lastUpdateTime);
m_lastValue = output.str().substr(startPos);
string value = output.str().substr(startPos);
if (value != m_lastValue)
m_lastChangeTime = m_lastUpdateTime;
m_lastValue = value;
return RESULT_OK;
}
src/lib/ebus/message.h
+12 -3
View File
@@ -216,11 +216,17 @@ public:
string getLastValue() { return m_lastValue; }
/**
* @brief Get the time when @a m_lastValue was updated.
* @return the time when @a m_lastValue was updated, or 0 if this message was not decoded yet.
* @brief Get the time when @a m_lastValue was last stored.
* @return the time when @a m_lastValue was last stored, or 0 if this message was not decoded yet.
*/
time_t getLastUpdateTime() { return m_lastUpdateTime; }
/**
* @brief Get the time when @a m_lastValue was last changed.
* @return the time when @a m_lastValue was last changed, or 0 if this message was not decoded yet.
*/
time_t getLastChangeTime() { return m_lastChangeTime; }
/**
* @brief Get the time when this message was last polled for.
* @return the time when this message was last polled for, or 0 for never.
@@ -273,9 +279,12 @@ private:
/** the last decoded value. */
string m_lastValue;
/** the system time when @a m_lastValue was updated, 0 for never. */
/** the system time when @a m_lastValue was last stored, 0 for never. */
time_t m_lastUpdateTime;
/** the system time when @a m_lastValue was last changed, 0 for never. */
time_t m_lastChangeTime;
/** the number of times this messages was already polled for. */
unsigned int m_pollCount;