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

always include help for "read -def", better error message when using "-def" if not enabled

Browse Source
This commit is contained in:
john30
2018-04-08 14:41:55 +02:00
parent 875c6488cb
commit 257fbea82b
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/mainloop.cpp
+5 -9
View File
@@ -650,7 +650,7 @@ result_t MainLoop::executeRead(const vector<string>& args, const string& levels,
hex = true; hex = true;
} else if (args[argPos] == "-def") { } else if (args[argPos] == "-def") {
if (!m_newlyDefinedMessages) { if (!m_newlyDefinedMessages) {
*ostream << "ERR: command not enabled"; *ostream << "ERR: option not enabled";
return RESULT_OK; return RESULT_OK;
} }
newDefinition = true; newDefinition = true;
@@ -764,13 +764,9 @@ result_t MainLoop::executeRead(const vector<string>& args, const string& levels,
" -i VALUE read additional message parameters from VALUE\n" " -i VALUE read additional message parameters from VALUE\n"
" NAME NAME of the message to send\n" " NAME NAME of the message to send\n"
" FIELD only retrieve the field named FIELD\n" " FIELD only retrieve the field named FIELD\n"
" N only retrieve the N'th field named FIELD (0-based)\n"; " N only retrieve the N'th field named FIELD (0-based)\n"
if (m_newlyDefinedMessages) { " -def read with explicit message definition:\n"
*ostream << " DEFINITION message definition to use instead of known definition\n"
" -def read with explicit message definition:\n"
" DEFINITION message definition to use instead of known definition\n";
}
*ostream <<
" -h send hex read message (or answer from cache):\n" " -h send hex read message (or answer from cache):\n"
" ZZ destination address\n" " ZZ destination address\n"
" PB SB primary/secondary command byte\n" " PB SB primary/secondary command byte\n"
@@ -956,7 +952,7 @@ result_t MainLoop::executeWrite(const vector<string>& args, const string levels,
hex = true; hex = true;
} else if (args[argPos] == "-def") { } else if (args[argPos] == "-def") {
if (!m_newlyDefinedMessages) { if (!m_newlyDefinedMessages) {
*ostream << "ERR: command not enabled"; *ostream << "ERR: option not enabled";
return RESULT_OK; return RESULT_OK;
} }
newDefinition = true; newDefinition = true;