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

code style

Browse Source
This commit is contained in:
John
2022-02-12 12:50:11 +01:00
parent 7ae43351da
commit d4ae0e9e46
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+4 -3
View File
@@ -193,8 +193,8 @@ static const struct argp_option argpoptions[] = {
{"latency", O_DEVLAT, "MSEC", 0, "Extra transfer latency in ms [0]", 0 }, {"latency", O_DEVLAT, "MSEC", 0, "Extra transfer latency in ms [0]", 0 },
{nullptr, 0, nullptr, 0, "Message configuration options:", 2 }, {nullptr, 0, nullptr, 0, "Message configuration options:", 2 },
{"configpath", 'c', "PATH", 0, "Read CSV config files from PATH (local folder or HTTPS URL) [" CONFIG_PATH {"configpath", 'c', "PATH", 0, "Read CSV config files from PATH (local folder or HTTPS URL) ["
"]", 0 }, CONFIG_PATH "]", 0 },
{"scanconfig", 's', "ADDR", OPTION_ARG_OPTIONAL, "Pick CSV config files matching initial scan (ADDR=" {"scanconfig", 's', "ADDR", OPTION_ARG_OPTIONAL, "Pick CSV config files matching initial scan (ADDR="
"\"none\" or empty for no initial scan message, \"full\" for full scan, or a single hex address to scan, " "\"none\" or empty for no initial scan message, \"full\" for full scan, or a single hex address to scan, "
"default is broadcast ident message). If combined with --checkconfig, you can add scan message data as " "default is broadcast ident message). If combined with --checkconfig, you can add scan message data as "
@@ -202,7 +202,8 @@ static const struct argp_option argpoptions[] = {
{"configlang", O_CFGLNG, "LANG", 0, {"configlang", O_CFGLNG, "LANG", 0,
"Prefer LANG in multilingual configuration files [system default language]", 0 }, "Prefer LANG in multilingual configuration files [system default language]", 0 },
{"checkconfig", O_CHKCFG, nullptr, 0, "Check config files, then stop", 0 }, {"checkconfig", O_CHKCFG, nullptr, 0, "Check config files, then stop", 0 },
{"dumpconfig", O_DMPCFG, "FORMAT", OPTION_ARG_OPTIONAL, "Check and dump config files in FORMAT (\"json\" or \"csv\"), then stop", 0 }, {"dumpconfig", O_DMPCFG, "FORMAT", OPTION_ARG_OPTIONAL,
"Check and dump config files in FORMAT (\"json\" or \"csv\"), then stop", 0 },
{"pollinterval", O_POLINT, "SEC", 0, "Poll for data every SEC seconds (0=disable) [5]", 0 }, {"pollinterval", O_POLINT, "SEC", 0, "Poll for data every SEC seconds (0=disable) [5]", 0 },
{"inject", 'i', nullptr, 0, "Inject remaining arguments as already seen messages (e.g. " {"inject", 'i', nullptr, 0, "Inject remaining arguments as already seen messages (e.g. "
"\"FF08070400/0AB5454850303003277201\")", 0 }, "\"FF08070400/0AB5454850303003277201\")", 0 },
src/ebusd/mqtthandler.h
+2 -1
View File
@@ -83,7 +83,8 @@ class MqttReplacer {
* is empty or not defined. * is empty or not defined.
* @return true on success, false on malformed template string. * @return true on success, false on malformed template string.
*/ */
bool parse(const string& templateStr, bool onlyKnown = false, bool noKnownDuplicates = false, bool emptyIfMissing = false); bool parse(const string& templateStr, bool onlyKnown = false, bool noKnownDuplicates = false,
bool emptyIfMissing = false);
/** /**
* Ensure the default topic parts are present (circuit and message). * Ensure the default topic parts are present (circuit and message).