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

Add more loadable driver features.

pull/1095/head
Fredrik Öhrström 2023-11-12 13:23:37 +01:00
rodzic 92090073cb
commit 3696118db1
2 zmienionych plików z 9 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
src/driver_dynamic.cc
Wyświetl plik

@ -580,9 +580,9 @@ void check_set_measurement_type(const char *measurement_type_s, FieldMatcher *fm
{
if (!measurement_type_s)
{
warning("(driver) error in %s, cannot find: driver/field/measurement_type\n"
warning("(driver) error in %s, cannot find: driver/field/match/measurement_type\n"
"%s\n"
"Remember to add for example: field { ... measurement_type = Instantaneous ... }\n"
"Remember to add for example: match { measurement_type = Instantaneous ... }\n"
"Available measurement types:\n"
"Instantaneous\n"
"Minimum\n"
@ -623,9 +623,9 @@ void check_set_vif_range(const char *vif_range_s, FieldMatcher *fm, DriverDynami
{
if (!vif_range_s)
{
warning("(driver) error in %s, cannot find: driver/field/vif_range\n"
warning("(driver) error in %s, cannot find: driver/field/match/vif_range\n"
"%s\n"
"Remember to add for example: field { ... vif_range = ReturnTemperature ... }\n"
"Remember to add for example: match { ... vif_range = ReturnTemperature ... }\n"
"Available vif ranges:\n"
"%s\n"
"%s\n",

10
tests/test_bad_driver.sh
Wyświetl plik

@ -361,9 +361,9 @@ driver { name = iffo meter_type = WaterMeter default_fields = name,id,total_m3,t
EOF
cat > $TEST/test_expected.txt <<EOF
(driver) error in testoutput/driver.xmq, cannot find: driver/field/measurement_type
(driver) error in testoutput/driver.xmq, cannot find: driver/field/match/measurement_type
-------------------------------------------------------------------------------
Remember to add for example: field { ... measurement_type = Instantaneous ... }
Remember to add for example: match { measurement_type = Instantaneous ... }
Available measurement types:
Instantaneous
Minimum
@ -414,9 +414,9 @@ driver { name = iffo meter_type = WaterMeter default_fields = name,id,total_m3,t
EOF
cat > $TEST/test_expected.txt <<EOF
(driver) error in testoutput/driver.xmq, cannot find: driver/field/vif_range
(driver) error in testoutput/driver.xmq, cannot find: driver/field/match/vif_range
-------------------------------------------------------------------------------
Remember to add for example: field { ... vif_range = ReturnTemperature ... }
Remember to add for example: match { ... vif_range = ReturnTemperature ... }
Available vif ranges:
Volume
OnTime
@ -468,7 +468,7 @@ $PROG --format=hr --selectfields=name,total_m3 1844AE4C4455223399077A55000000_04
performCheck
TESTNAME="Test field matcher without vif_range"
TESTNAME="Test proper field matcher"
TESTRESULT="ERROR"
cat > $TEST/driver.xmq <<EOF
driver { name = iffo meter_type = WaterMeter default_fields = name,id,total_m3,timestamp