Skip to content

Commit

Permalink
enhance encode+decode commands
Browse files Browse the repository at this point in the history
  • Loading branch information
@john30
john30 committed Dec 24, 2024
1 parent 1fb10f0 commit da3a704
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 16 deletions.
52 changes: 38 additions & 14 deletions src/ebusd/mainloop.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1719,6 +1719,7 @@ result_t MainLoop::executeDefine(const vector<string>& args, ostringstream* ostr
result_t MainLoop::executeDecode(const vector<string>& args, ostringstream* ostream) {
size_t argPos = 1;
OutputFormat verbosity = OF_NONE;
bool toMaster = false;
while (args.size() > argPos && args[argPos][0] == '-') {
if (args[argPos] == "-v") {
if ((verbosity & VERBOSITY_3) == VERBOSITY_0) {
Expand All @@ -1732,6 +1733,8 @@ result_t MainLoop::executeDecode(const vector<string>& args, ostringstream* ostr
verbosity |= VERBOSITY_2;
} else if (args[argPos] == "-vvv" || args[argPos] == "-V") {
verbosity |= VERBOSITY_3;
} else if (args[argPos] == "-m") {
toMaster = true;
} else if (args[argPos] == "-n") {
verbosity = (verbosity & ~OF_VALUENAME) | OF_NUMERIC;
} else if (args[argPos] == "-N") {
Expand All @@ -1748,10 +1751,11 @@ result_t MainLoop::executeDecode(const vector<string>& args, ostringstream* ostr

if (argPos == 0 || args.size() != argPos + 2) {
*ostream <<
"usage: decode [-v|-V] [-n|-N] DEFINITION DD[DD]*\n"
"usage: decode [-v|-V] [-m] [-n|-N] DEFINITION DD[DD]*\n"
" Decode field(s) by definition and hex data.\n"
" -v increase verbosity (include names/units/comments)\n"
" -V be very verbose (include names, units, and comments)\n"
" -m target a master instead of a slave\n"
" -n use numeric value of value=name pairs\n"
" -N use numeric and named value of value=name pairs\n"
" DEFINITION field definition (type,divisor/values,unit,comment,...)\n"
Expand All @@ -1764,28 +1768,45 @@ result_t MainLoop::executeDecode(const vector<string>& args, ostringstream* ostr
istringstream defstr("#\n" + args[argPos]); // ensure first line is not used for determining col names
string errorDescription;
DataFieldTemplates* templates = m_scanHelper->getTemplates("*");
LoadableDataFieldSet fields("", templates);
LoadableDataFieldSet fields("", templates, toMaster);
result_t ret = fields.readFromStream(&defstr, "temporary", now, true, nullptr, &errorDescription);
if (ret != RESULT_OK) {
return ret;
}
SlaveSymbolString slave;
slave.push_back(0); // dummy length
ret = slave.parseHex(args[argPos+1]);
SlaveSymbolString sdata;
MasterSymbolString mdata;
SymbolString* data = toMaster ? &mdata : (SymbolString*)&sdata;
data->adjustHeader();
ret = data->parseHex(args[argPos+1]);
if (ret != RESULT_OK) {
return ret;
}
slave.adjustHeader();
return fields.read(slave, 0, false, nullptr, -1, verbosity, -1, ostream);
data->adjustHeader();
return fields.read(*data, 0, false, nullptr, -1, verbosity, -1, ostream);
}


result_t MainLoop::executeEncode(const vector<string>& args, ostringstream* ostream) {
size_t argPos = 1;
if (argPos == 0 || args.size() != argPos + 2) {
bool toMaster = false;
while (args.size() > argPos && args[argPos][0] == '-') {
if (args[argPos] == "-m") {
toMaster = true;
} else {
argPos = 0; // print usage
break;
}
argPos++;
}
if (args.size() != argPos + 2) {
argPos = 0; // print usage
}

if (argPos == 0) {
*ostream <<
"usage: encode DEFINITION VALUE[;VALUE]*\n"
"usage: encode [-m] DEFINITION VALUE[;VALUE]*\n"
" Encode field(s) by definition and decoded value(s).\n"
" -m target a master instead of a slave\n"
" DEFINITION field definition (type,divisor/values,unit,comment,...)\n"
" VALUE single field VALUE to encode";
return RESULT_OK;
Expand All @@ -1796,18 +1817,21 @@ result_t MainLoop::executeEncode(const vector<string>& args, ostringstream* ostr
istringstream defstr("#\n" + args[argPos]); // ensure first line is not used for determining col names
string errorDescription;
DataFieldTemplates* templates = m_scanHelper->getTemplates("*");
LoadableDataFieldSet fields("", templates);
LoadableDataFieldSet fields("", templates, toMaster);
result_t ret = fields.readFromStream(&defstr, "temporary", now, true, nullptr, &errorDescription);
if (ret != RESULT_OK) {
return ret;
}
istringstream datastr(args[argPos+1]);
SlaveSymbolString slave;
ret = fields.write(UI_FIELD_SEPARATOR, 0, &datastr, &slave, nullptr);
SlaveSymbolString sdata;
MasterSymbolString mdata;
SymbolString* data = toMaster ? &mdata : (SymbolString*)&sdata;
data->adjustHeader();
ret = fields.write(UI_FIELD_SEPARATOR, 0, &datastr, data, nullptr);
if (ret != RESULT_OK) {
return ret;
}
*ostream << slave.getStr(1);
*ostream << data->getStr(toMaster ? 5 : 1);
return ret;
}

Expand Down Expand Up @@ -2375,7 +2399,7 @@ result_t MainLoop::executeGet(const vector<string>& args, bool* connected, ostri
istringstream defstr("#\n" + def); // ensure first line is not used for determining col names
string errorDescription;
DataFieldTemplates* templates = m_scanHelper->getTemplates("*");
LoadableDataFieldSet fields("", templates);
LoadableDataFieldSet fields("", templates, false);
ret = fields.readFromStream(&defstr, "temporary", now, true, nullptr, &errorDescription);
if (ret == RESULT_OK && fields.size()) {
SlaveSymbolString slave;
Expand Down
8 changes: 6 additions & 2 deletions src/lib/ebus/data.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -792,9 +792,10 @@ class LoadableDataFieldSet : public DataFieldSet, public MappedFileReader {
* Constructs a new instance.
* @param name the field name.
* @param templates the @a DataFieldTemplates instance to use.
* @param isWrite true for a write message, false for read.
*/
LoadableDataFieldSet(const string& name, DataFieldTemplates* templates)
: DataFieldSet(name, vector<const SingleDataField*>()), MappedFileReader(false), m_templates(templates) {
LoadableDataFieldSet(const string& name, DataFieldTemplates* templates, bool isWrite)
: DataFieldSet(name, vector<const SingleDataField*>()), MappedFileReader(false), m_templates(templates), m_isWrite(isWrite) {
}

// @copydoc
Expand All @@ -807,6 +808,9 @@ class LoadableDataFieldSet : public DataFieldSet, public MappedFileReader {
private:
/** the @a DataFieldTemplates instance to use. */
DataFieldTemplates* m_templates;

/** true for a write message, false for read. */
bool m_isWrite;
};


Expand Down

0 comments on commit da3a704

Please sign in to comment.