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

added getLastMasterData(), fix for storing last master data in prepareMaster()

Browse Source
This commit is contained in:
john30
2015-10-17 12:51:10 +02:00
parent d97538b03a
commit 92a446e3bb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+2 -2
View File
@@ -380,10 +380,10 @@ result_t Message::prepareMaster(const unsigned char srcAddress, SymbolString& ma
switch (master.compareMaster(m_lastMasterData)) { switch (master.compareMaster(m_lastMasterData)) {
case 1: // completely different case 1: // completely different
m_lastChangeTime = m_lastUpdateTime; m_lastChangeTime = m_lastUpdateTime;
m_lastMasterData = masterData; m_lastMasterData = master;
break; break;
case 2: // only master address is different case 2: // only master address is different
m_lastMasterData = masterData; m_lastMasterData = master;
break; break;
} }
masterData.addAll(master); masterData.addAll(master);
src/lib/ebus/message.h
+6
View File
@@ -265,6 +265,12 @@ public:
*/ */
result_t decodeLastDataField(unsigned int& output, const char* fieldName, signed char fieldIndex=-1); result_t decodeLastDataField(unsigned int& output, const char* fieldName, signed char fieldIndex=-1);
/**
* Get the last seen master data.
* @return the last seen master @a SymbolString.
*/
SymbolString& getLastMasterData() { return m_lastMasterData; }
/** /**
* Get the last seen slave data. * Get the last seen slave data.
* @return the last seen slave @a SymbolString. * @return the last seen slave @a SymbolString.