mirror
/
wmbusmeters
kopia lustrzana https://github.com/weetmuts/wmbusmeters
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

List fields improvement.

pull/156/head
Fredrik Öhrström 2020-10-24 22:20:55 +02:00
rodzic 203e90bb7c
commit c16409c28a
2 zmienionych plików z 9 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
src/main.cc
Wyświetl plik

@ -688,10 +688,16 @@ void list_fields(Configuration *config, string meter_type)
printf("%s The meter id number.\n", id.c_str());
string name = padLeft("name", width);
printf("%s Your name for the meter.\n", name.c_str());
string type = padLeft("type", width);
printf("%s Meter type/driver.\n", type.c_str());
string media = padLeft("media", width);
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);
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())
{
if (p.vname == "") continue;

2
tests/test_additional_json.sh
Wyświetl plik

@ -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"
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" ]
then