From 57dba2cba4d155fe8bfeefe680c831a69d5f99dc Mon Sep 17 00:00:00 2001 From: john30 Date: Wed, 10 Dec 2014 21:32:40 +0100 Subject: [PATCH] add "done" to result for successful BC+MM messages without other result --- src/ebusd/baseloop.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ebusd/baseloop.cpp b/src/ebusd/baseloop.cpp index 93a78098..8098feae 100644 --- a/src/ebusd/baseloop.cpp +++ b/src/ebusd/baseloop.cpp @@ -350,10 +350,12 @@ string BaseLoop::decodeMessage(const string& data) SymbolString slave; result_t ret = m_busHandler->sendAndWait(master, slave); - if (ret == RESULT_OK) - // decode data - result << slave.getDataStr(); - + if (ret == RESULT_OK) { + if (master[1] == BROADCAST || isMaster(master[1])) + result << "done"; + else + result << slave.getDataStr(); + } if (ret != RESULT_OK) { L.log(bas, error, " %s", getResultCode(ret)); result << getResultCode(ret);