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

fixed escaping and crc

Browse Source
This commit is contained in:
john30
2014-12-07 09:43:49 +01:00
parent 8089dab4b4
commit 4ffc6155a1
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/message.cpp
+12 -9
View File
@@ -242,32 +242,33 @@ result_t Message::prepareMaster(const unsigned char srcAddress, SymbolString& ma
if (m_isPassive == true) if (m_isPassive == true)
return RESULT_ERR_INVALID_ARG; // prepare not possible return RESULT_ERR_INVALID_ARG; // prepare not possible
masterData.clear(); SymbolString master;
result_t result = masterData.push_back(srcAddress, false); master.clear();
result_t result = master.push_back(srcAddress, false, false);
if (result != RESULT_OK) if (result != RESULT_OK)
return result; return result;
result = masterData.push_back(m_dstAddress, false); result = master.push_back(m_dstAddress, false, false);
if (result != RESULT_OK) if (result != RESULT_OK)
return result; return result;
result = masterData.push_back(m_id[0], false); result = master.push_back(m_id[0], false, false);
if (result != RESULT_OK) if (result != RESULT_OK)
return result; return result;
result = masterData.push_back(m_id[1], false); result = master.push_back(m_id[1], false, false);
if (result != RESULT_OK) if (result != RESULT_OK)
return result; return result;
unsigned char addData = m_data->getLength(pt_masterData); unsigned char addData = m_data->getLength(pt_masterData);
result = masterData.push_back(m_id.size() - 2 + addData, false); result = master.push_back(m_id.size() - 2 + addData, false, false);
if (result != RESULT_OK) if (result != RESULT_OK)
return result; return result;
for (size_t i=2; i<m_id.size(); i++) { for (size_t i=2; i<m_id.size(); i++) {
result = masterData.push_back(m_id[i], false); result = master.push_back(m_id[i], false, false);
if (result != RESULT_OK) if (result != RESULT_OK)
return result; return result;
} }
result = m_data->write(input, pt_masterData, masterData, m_id.size() - 2, separator); result = m_data->write(input, pt_masterData, master, m_id.size() - 2, separator);
if (result != RESULT_OK) if (result != RESULT_OK)
return result; return result;
result = masterData.push_back(masterData.getCRC(), false, false); // TODO only if calculated masterData = SymbolString(master);
return result; return result;
} }
@@ -325,6 +326,8 @@ result_t MessageMap::add(Message* message)
m_passiveMessagesByKey[pkey] = message; m_passiveMessagesByKey[pkey] = message;
} }
//m_pollMessages.push()
return RESULT_OK; return RESULT_OK;
} }