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

fix for overriding destination address in read command

Browse Source
This commit is contained in:
john30
2015-10-11 22:37:28 +02:00
parent c49298382e
commit 48458cfe80
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+3 -3
View File
@@ -251,10 +251,10 @@ result_t MainLoop::parseHexMaster(vector<string> &args, size_t argPos, SymbolStr
return ret; return ret;
} }
result_t MainLoop::readFromBus(Message* message, SymbolString& master, string inputStr, SymbolString& slave) result_t MainLoop::readFromBus(Message* message, SymbolString& master, string inputStr, SymbolString& slave, const unsigned char dstAddress)
{ {
istringstream input(inputStr); istringstream input(inputStr);
result_t ret = message->prepareMaster(m_address, master, input); result_t ret = message->prepareMaster(m_address, master, input, UI_FIELD_SEPARATOR, dstAddress);
if (ret != RESULT_OK) { if (ret != RESULT_OK) {
logError(lf_main, "prepare message: %s", getResultCode(ret)); logError(lf_main, "prepare message: %s", getResultCode(ret));
return ret; return ret;
@@ -456,7 +456,7 @@ string MainLoop::executeRead(vector<string> &args)
// read directly from bus // read directly from bus
SymbolString master(true); SymbolString master(true);
SymbolString slave(false); SymbolString slave(false);
result_t ret = readFromBus(message, master, "", slave); result_t ret = readFromBus(message, master, "", slave, dstAddress);
if (ret != RESULT_OK) if (ret != RESULT_OK)
return getResultCode(ret); return getResultCode(ret);