kopia lustrzana https://github.com/weetmuts/wmbusmeters
List fields improvement.
rodzic
203e90bb7c
commit
c16409c28a
10
src/main.cc
10
src/main.cc
|
@ -688,10 +688,16 @@ void list_fields(Configuration *config, string meter_type)
|
||||||
printf("%s The meter id number.\n", id.c_str());
|
printf("%s The meter id number.\n", id.c_str());
|
||||||
string name = padLeft("name", width);
|
string name = padLeft("name", width);
|
||||||
printf("%s Your name for the meter.\n", name.c_str());
|
printf("%s Your name for the meter.\n", name.c_str());
|
||||||
string type = padLeft("type", width);
|
string media = padLeft("media", width);
|
||||||
printf("%s Meter type/driver.\n", type.c_str());
|
printf("%s What does the meter measure?\n", media.c_str());
|
||||||
|
string meterr = padLeft("meter", width);
|
||||||
|
printf("%s Meter driver.\n", meterr.c_str());
|
||||||
string timestamp = padLeft("timestamp", width);
|
string timestamp = padLeft("timestamp", width);
|
||||||
printf("%s Timestamp when wmbusmeters received the telegram.\n", timestamp.c_str());
|
printf("%s Timestamp when wmbusmeters received the telegram.\n", timestamp.c_str());
|
||||||
|
string device = padLeft("device", width);
|
||||||
|
printf("%s The wmbus device that received the telegram.\n", device.c_str());
|
||||||
|
string rssi = padLeft("rssi_dbm", width);
|
||||||
|
printf("%s The rssi for the received telegram as reported by the device.\n", rssi.c_str());
|
||||||
for (auto &p : meter->prints())
|
for (auto &p : meter->prints())
|
||||||
{
|
{
|
||||||
if (p.vname == "") continue;
|
if (p.vname == "") continue;
|
||||||
|
|
|
@ -65,7 +65,7 @@ if [ "$TESTRESULT" = "ERROR" ]; then echo ERROR: $TESTNAME; exit 1; fi
|
||||||
TESTNAME="Test additional json from wmbusmeters.conf and from meter file"
|
TESTNAME="Test additional json from wmbusmeters.conf and from meter file"
|
||||||
TESTRESULT="ERROR"
|
TESTRESULT="ERROR"
|
||||||
|
|
||||||
$PROG --useconfig=tests/config6 --device=simulations/simulation_shell.txt --listento=t1 > $TEST/test_output.txt 2> $TEST/test_stderr.txt
|
$PROG --useconfig=tests/config6 --device=simulations/simulation_shell.txt > $TEST/test_output.txt 2> $TEST/test_stderr.txt
|
||||||
|
|
||||||
if [ "$?" = "0" ]
|
if [ "$?" = "0" ]
|
||||||
then
|
then
|
||||||
|
|
Ładowanie…
Reference in New Issue