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

fix for walking through added messages

Browse Source
This commit is contained in:
john30
2014-12-06 13:46:52 +01:00
parent 73b74f1602
commit 2bd88f45db
1 changed files with 2 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
@@ -45,7 +45,7 @@ Message::Message(const string clazz, const string name, const bool isSet,
key |= 0x1fLL << (8 * exp--); // special value for active key |= 0x1fLL << (8 * exp--); // special value for active
key |= (unsigned long long)dstAddress << (8 * exp--); key |= (unsigned long long)dstAddress << (8 * exp--);
for (vector<unsigned char>::const_iterator it=id.begin(); it<id.end(); it++) for (vector<unsigned char>::const_iterator it=id.begin(); it<id.end(); it++)
key |= (unsigned long long)(*it) << (8 * exp--); key |= (unsigned long long)*it << (8 * exp--);
m_key = key; m_key = key;
} }
@@ -368,7 +368,7 @@ Message* MessageMap::find(SymbolString& master)
return NULL; return NULL;
unsigned long long sourceMask = 0x1fLL << (8 * 7); unsigned long long sourceMask = 0x1fLL << (8 * 7);
for (int idLength=maxIdLength; idLength>=m_maxIdLength; idLength--) { for (int idLength=maxIdLength; idLength>=m_minIdLength; idLength--) {
int exp = 7; int exp = 7;
unsigned long long key = (unsigned long long)idLength << (8 * exp + 5); unsigned long long key = (unsigned long long)idLength << (8 * exp + 5);
key |= (unsigned long long)getMasterNumber(master[0]) << (8 * exp--); key |= (unsigned long long)getMasterNumber(master[0]) << (8 * exp--);