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

Merge branch 'master' of github.com:john30/ebusd

Browse Source
This commit is contained in:
john30
2015-10-31 09:52:24 +01:00
parent 93d1dfd240 3f397c933a
commit 944feb2a2e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+3 -1
View File
@@ -521,7 +521,9 @@ string MainLoop::executeWrite(vector<string> &args)
else else
logError(lf_main, "hex write %s %s cache update: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret)); logError(lf_main, "hex write %s %s cache update: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
} }
if (master[1] == BROADCAST || isMaster(master[1])) if (master[1] == BROADCAST)
return "done broadcast";
if (isMaster(master[1]))
return getResultCode(RESULT_OK); return getResultCode(RESULT_OK);
return slave.getDataStr(); return slave.getDataStr();
} }