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

better naming, updated help

Browse Source
This commit is contained in:
john30
2014-12-10 23:12:09 +01:00
parent 0bd7df2ce1
commit 83605cc24d
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/baseloop.cpp
+12 -9
View File
@@ -47,9 +47,9 @@ BaseLoop::BaseLoop()
else else
L.log(bas, error, "error reading config files: %s", getResultCode(result)); L.log(bas, error, "error reading config files: %s", getResultCode(result));
L.log(bas, event, "commands DB: %d ", m_messages->size()); L.log(bas, event, "message DB: %d ", m_messages->size());
L.log(bas, event, " cycle DB: %d ", m_messages->size(true)); L.log(bas, event, "updates DB: %d ", m_messages->size(true));
L.log(bas, event, " polling DB: %d ", m_messages->sizePoll()); L.log(bas, event, "polling DB: %d ", m_messages->sizePoll());
m_ownAddress = A.getOptVal<int>("address") & 0xff; m_ownAddress = A.getOptVal<int>("address") & 0xff;
const bool answer = A.getOptVal<bool>("answer"); const bool answer = A.getOptVal<bool>("answer");
@@ -262,7 +262,7 @@ string BaseLoop::decodeMessage(const string& data)
} }
} else { } else {
result << "ebus command not found"; result << "get command not found";
} }
break; break;
@@ -293,8 +293,11 @@ string BaseLoop::decodeMessage(const string& data)
if (ret == RESULT_OK) { if (ret == RESULT_OK) {
if (master[1] == BROADCAST || isMaster(master[1])) if (master[1] == BROADCAST || isMaster(master[1]))
result << "done"; result << "done";
else else {
ret = message->decode(pt_slaveData, slave, result); // decode data ret = message->decode(pt_slaveData, slave, result); // decode data
if (ret == RESULT_OK && result.str().empty() == true)
result << "done";
}
} }
if (ret != RESULT_OK) { if (ret != RESULT_OK) {
L.log(bas, error, " %s", getResultCode(ret)); L.log(bas, error, " %s", getResultCode(ret));
@@ -302,7 +305,7 @@ string BaseLoop::decodeMessage(const string& data)
} }
} else { } else {
result << "ebus command not found"; result << "set command not found";
} }
break; break;
@@ -326,7 +329,7 @@ string BaseLoop::decodeMessage(const string& data)
result << "no data stored"; result << "no data stored";
} }
} else { } else {
result << "ebus command not found"; result << "cyc command not found";
} }
break; break;
@@ -460,9 +463,9 @@ string BaseLoop::decodeMessage(const string& data)
case ct_help: case ct_help:
result << "commands:" << endl result << "commands:" << endl
<< " get - fetch ebus data 'get class cmd (sub)'" << endl << " get - fetch ebus data 'get [class] cmd (sub)'" << endl
<< " set - set ebus values 'set class cmd value'" << endl << " set - set ebus values 'set class cmd value'" << endl
<< " cyc - fetch cycle data 'cyc class cmd (sub)'" << endl << " cyc - fetch cycle data 'cyc [class] cmd (sub)'" << endl
<< " hex - send given hex value 'hex type value' (value: ZZPBSBNNDx)" << endl << endl << " hex - send given hex value 'hex type value' (value: ZZPBSBNNDx)" << endl << endl
<< " scan - scan ebus kown addresses 'scan'" << endl << " scan - scan ebus kown addresses 'scan'" << endl
<< " - scan ebus all addresses 'scan full'" << endl << " - scan ebus all addresses 'scan full'" << endl