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

implemented scan, nicer logging

Browse Source
This commit is contained in:
john30
2014-12-13 00:02:14 +01:00
parent 3d89fef6ae
commit 27a563ca1d
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/baseloop.cpp
+24 -17
View File
@@ -242,11 +242,11 @@ string BaseLoop::decodeMessage(const string& data)
istringstream input; istringstream input;
result_t ret = message->prepareMaster(m_ownAddress, master, input); result_t ret = message->prepareMaster(m_ownAddress, master, input);
if (ret != RESULT_OK) { if (ret != RESULT_OK) {
L.log(bas, error, " prepare message: %s", getResultCode(ret)); L.log(bas, error, " prepare read: %s", getResultCode(ret));
result << getResultCode(ret); result << getResultCode(ret);
break; break;
} }
L.log(bas, event, " msg: %s", master.getDataStr().c_str()); L.log(bas, event, " read msg: %s", master.getDataStr().c_str());
// send message // send message
SymbolString slave; SymbolString slave;
@@ -257,7 +257,7 @@ string BaseLoop::decodeMessage(const string& data)
ret = message->decode(pt_slaveData, slave, result); // decode data ret = message->decode(pt_slaveData, slave, result); // decode data
} }
if (ret != RESULT_OK) { if (ret != RESULT_OK) {
L.log(bas, error, " %s", getResultCode(ret)); L.log(bas, error, " read: %s", getResultCode(ret));
result << getResultCode(ret); result << getResultCode(ret);
} }
@@ -280,11 +280,11 @@ string BaseLoop::decodeMessage(const string& data)
istringstream input(cmd[3]); istringstream input(cmd[3]);
result_t ret = message->prepareMaster(m_ownAddress, master, input); result_t ret = message->prepareMaster(m_ownAddress, master, input);
if (ret != RESULT_OK) { if (ret != RESULT_OK) {
L.log(bas, error, " prepare message: %s", getResultCode(ret)); L.log(bas, error, " prepare write: %s", getResultCode(ret));
result << getResultCode(ret); result << getResultCode(ret);
break; break;
} }
L.log(bas, event, " msg: %s", master.getDataStr().c_str()); L.log(bas, event, " write msg: %s", master.getDataStr().c_str());
// send message // send message
SymbolString slave; SymbolString slave;
@@ -300,7 +300,7 @@ string BaseLoop::decodeMessage(const string& data)
} }
} }
if (ret != RESULT_OK) { if (ret != RESULT_OK) {
L.log(bas, error, " %s", getResultCode(ret)); L.log(bas, error, " write: %s", getResultCode(ret));
result << getResultCode(ret); result << getResultCode(ret);
} }
@@ -347,7 +347,7 @@ string BaseLoop::decodeMessage(const string& data)
msg << hex << setw(2) << setfill('0') << static_cast<unsigned>(m_ownAddress); msg << hex << setw(2) << setfill('0') << static_cast<unsigned>(m_ownAddress);
msg << cmd[1]; msg << cmd[1];
SymbolString master(msg.str()); SymbolString master(msg.str());
L.log(bas, event, " msg: %s", master.getDataStr().c_str()); L.log(bas, event, " hex msg: %s", master.getDataStr().c_str());
// send message // send message
SymbolString slave; SymbolString slave;
@@ -360,7 +360,7 @@ string BaseLoop::decodeMessage(const string& data)
result << slave.getDataStr(); result << slave.getDataStr();
} }
if (ret != RESULT_OK) { if (ret != RESULT_OK) {
L.log(bas, error, " %s", getResultCode(ret)); L.log(bas, error, " hex: %s", getResultCode(ret));
result << getResultCode(ret); result << getResultCode(ret);
} }
@@ -368,31 +368,38 @@ string BaseLoop::decodeMessage(const string& data)
break; break;
/*case ct_scan: case ct_scan:
if (cmd.size() == 1) { if (cmd.size() == 1) {
m_busloop->scan(); result_t ret = m_busHandler->startScan();
result << "done"; if (ret != RESULT_OK) {
L.log(bas, error, " scan: %s", getResultCode(ret));
result << getResultCode(ret);
}
else
result << "scan initiated";
break; break;
} }
if (strcasecmp(cmd[1].c_str(), "FULL") == 0) { if (strcasecmp(cmd[1].c_str(), "FULL") == 0) {
m_busloop->scan(true); result_t ret = m_busHandler->startScan(true);
if (ret != RESULT_OK) {
L.log(bas, error, " full scan: %s", getResultCode(ret));
result << getResultCode(ret);
}
else
result << "done"; result << "done";
break; break;
} }
if (strcasecmp(cmd[1].c_str(), "RESULT") == 0) { if (strcasecmp(cmd[1].c_str(), "RESULT") == 0) {
// TODO format scan results m_busHandler->formatScanResult(result);
for (size_t i = 0; i < m_commands->sizeScanDB(); i++)
result << m_commands->getScanData(i) << endl;
break; break;
} }
result << "usage: 'scan'" << endl result << "usage: 'scan'" << endl
<< " 'scan full'" << endl << " 'scan full'" << endl
<< " 'scan result'"; << " 'scan result'";
break;*/ break;
case ct_log: case ct_log:
if (cmd.size() != 3 ) { if (cmd.size() != 3 ) {