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

fix for previous commit fe42030 (hex cmd had last byte from answer removed)

Browse Source
This commit is contained in:
john30
2016-11-09 07:30:09 +01:00
parent 83e61de5a6
commit 70ce0302a1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+6 -6
View File
@@ -451,7 +451,7 @@ string MainLoop::executeRead(vector<string> &args)
if (message->getLastUpdateTime() + maxAge > now || (message->isPassive() && message->getLastUpdateTime() != 0)) { if (message->getLastUpdateTime() + maxAge > now || (message->isPassive() && message->getLastUpdateTime() != 0)) {
SymbolString& slave = message->getLastSlaveData(); SymbolString& slave = message->getLastSlaveData();
logNotice(lf_main, "hex read %s %s from cache", message->getCircuit().c_str(), message->getName().c_str()); logNotice(lf_main, "hex read %s %s from cache", message->getCircuit().c_str(), message->getName().c_str());
return slave.getDataStr(); return slave.getDataStr(true, false);
} }
// send message // send message
@@ -469,7 +469,7 @@ string MainLoop::executeRead(vector<string> &args)
logInfo(lf_main, "read hex %s %s cache update: %s", message->getCircuit().c_str(), message->getName().c_str(), result.str().c_str()); logInfo(lf_main, "read hex %s %s cache update: %s", message->getCircuit().c_str(), message->getName().c_str(), result.str().c_str());
else else
logError(lf_main, "read hex %s %s cache update: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret)); logError(lf_main, "read hex %s %s cache update: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
return slave.getDataStr(); return slave.getDataStr(true, false);
} }
logError(lf_main, "read hex %s %s: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret)); logError(lf_main, "read hex %s %s: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
return getResultCode(ret); return getResultCode(ret);
@@ -644,7 +644,7 @@ string MainLoop::executeWrite(vector<string> &args)
return "done broadcast"; return "done broadcast";
if (isMaster(master[1])) if (isMaster(master[1]))
return getResultCode(RESULT_OK); return getResultCode(RESULT_OK);
return slave.getDataStr(); return slave.getDataStr(true, false);
} }
logError(lf_main, "write hex %s %s: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret)); logError(lf_main, "write hex %s %s: %s", message->getCircuit().c_str(), message->getName().c_str(), getResultCode(ret));
return getResultCode(ret); return getResultCode(ret);
@@ -726,7 +726,7 @@ string MainLoop::executeHex(vector<string> &args)
return "done broadcast"; return "done broadcast";
if (isMaster(master[1])) if (isMaster(master[1]))
return getResultCode(RESULT_OK); return getResultCode(RESULT_OK);
return slave.getDataStr(); return slave.getDataStr(true, false);
} }
logError(lf_main, "hex: %s", getResultCode(ret)); logError(lf_main, "hex: %s", getResultCode(ret));
return getResultCode(ret); return getResultCode(ret);
@@ -901,13 +901,13 @@ string MainLoop::executeFind(vector<string> &args)
result << "no data stored"; result << "no data stored";
} else if (hexFormat) { } else if (hexFormat) {
result << message->getLastMasterData().getDataStr() result << message->getLastMasterData().getDataStr()
<< " / " << message->getLastSlaveData().getDataStr(); << " / " << message->getLastSlaveData().getDataStr(true, false);
} else { } else {
result_t ret = message->decodeLastData(result, verbosity); result_t ret = message->decodeLastData(result, verbosity);
if (ret!=RESULT_OK) { if (ret!=RESULT_OK) {
result << " (" << getResultCode(ret) result << " (" << getResultCode(ret)
<< " for " << message->getLastMasterData().getDataStr() << " for " << message->getLastMasterData().getDataStr()
<< " / " << message->getLastSlaveData().getDataStr() << ")"; << " / " << message->getLastSlaveData().getDataStr(true, false) << ")";
} }
} }
if (verbosity==(OF_NAMES|OF_UNITS|OF_COMMENTS)) { if (verbosity==(OF_NAMES|OF_UNITS|OF_COMMENTS)) {