From 48458cfe80e5e89a25a6b22b48633f038380c851 Mon Sep 17 00:00:00 2001 From: john30 Date: Sun, 11 Oct 2015 22:37:28 +0200 Subject: [PATCH] fix for overriding destination address in read command --- src/ebusd/mainloop.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ebusd/mainloop.cpp b/src/ebusd/mainloop.cpp index e1ca6616..ba4d99d4 100644 --- a/src/ebusd/mainloop.cpp +++ b/src/ebusd/mainloop.cpp @@ -251,10 +251,10 @@ result_t MainLoop::parseHexMaster(vector &args, size_t argPos, SymbolStr 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); - 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) { logError(lf_main, "prepare message: %s", getResultCode(ret)); return ret; @@ -456,7 +456,7 @@ string MainLoop::executeRead(vector &args) // read directly from bus SymbolString master(true); SymbolString slave(false); - result_t ret = readFromBus(message, master, "", slave); + result_t ret = readFromBus(message, master, "", slave, dstAddress); if (ret != RESULT_OK) return getResultCode(ret);