Merge branch 'master' of github.com:yuhu-/ebusd

This commit is contained in:
john30
2014-12-21 09:46:07 +01:00
+3 -3
View File
@@ -253,7 +253,7 @@ string BaseLoop::decodeMessage(const string& data)
result << getResultCode(ret); result << getResultCode(ret);
break; break;
} }
L.log(bas, trace, "read cmd: %s", master.getDataStr().c_str()); L.log(bas, trace, "read name: %s", master.getDataStr().c_str());
// send message // send message
SymbolString slave; SymbolString slave;
@@ -304,7 +304,7 @@ string BaseLoop::decodeMessage(const string& data)
result << "invalid destination"; result << "invalid destination";
break; break;
} }
L.log(bas, event, "write hex cmd: %s", master.getDataStr().c_str()); L.log(bas, event, "write hex name: %s", master.getDataStr().c_str());
// send message // send message
SymbolString slave; SymbolString slave;
@@ -339,7 +339,7 @@ string BaseLoop::decodeMessage(const string& data)
result << getResultCode(ret); result << getResultCode(ret);
break; break;
} }
L.log(bas, trace, "write cmd: %s", master.getDataStr().c_str()); L.log(bas, trace, "write name: %s", master.getDataStr().c_str());
// send message // send message
SymbolString slave; SymbolString slave;