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

Use AnyEnergyVIF instead of EnergyWh or EnergyMJ.

pull/799/head
Fredrik Öhrström 2023-01-10 14:54:27 +01:00
rodzic f6345e4c46
commit e674d2ef4d
9 zmienionych plików z 23 dodań i 23 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
src/driver_amiplus.cc
Wyświetl plik

@ -46,7 +46,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
addNumericFieldWithExtractor(
@ -127,7 +127,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(TariffNr(1))
);
@ -139,7 +139,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(TariffNr(2))
);
@ -151,7 +151,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(TariffNr(3))
);

8
src/driver_c5isf.cc
Wyświetl plik

@ -75,7 +75,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
addNumericFieldWithExtractor(
@ -156,7 +156,7 @@ namespace
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(StorageNr(32+i))
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
}
@ -188,7 +188,7 @@ namespace
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(StorageNr(8))
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
addStringFieldWithExtractor(
@ -232,7 +232,7 @@ namespace
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(StorageNr(32))
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
addStringFieldWithExtractor(

2
src/driver_ebzwmbe.cc
Wyświetl plik

@ -44,7 +44,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
addNumericFieldWithExtractor(

4
src/driver_elf.cc
Wyświetl plik

@ -72,7 +72,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
addNumericFieldWithExtractor(
@ -105,7 +105,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(StorageNr(1))
);

8
src/driver_esyswm.cc
Wyświetl plik

@ -56,7 +56,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
addNumericFieldWithExtractor(
@ -78,7 +78,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.add(VIFCombinable::BackwardFlow)
);
@ -90,7 +90,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(TariffNr(1))
);
@ -102,7 +102,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(TariffNr(2))
);

8
src/driver_gransystems.cc
Wyświetl plik

@ -144,7 +144,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
addNumericFieldWithExtractor(
@ -155,7 +155,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(TariffNr(1), TariffNr(4))
);
@ -179,7 +179,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(StorageNr(2))
);
@ -191,7 +191,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(TariffNr(1), TariffNr(4))
.set(StorageNr(2))
);

2
src/driver_hydrocalm3.cc
Wyświetl plik

@ -80,7 +80,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyMJ)
.set(VIFRange::AnyEnergyVIF)
.set(IndexNr(2))
);

4
src/driver_sharky.cc
Wyświetl plik

@ -47,7 +47,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
);
addNumericFieldWithExtractor(
@ -58,7 +58,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyWh)
.set(VIFRange::AnyEnergyVIF)
.set(TariffNr(1))
);

2
src/driver_ultraheat.cc
Wyświetl plik

@ -43,7 +43,7 @@ namespace
VifScaling::Auto,
FieldMatcher::build()
.set(MeasurementType::Instantaneous)
.set(VIFRange::EnergyMJ)
.set(VIFRange::AnyEnergyVIF)
);
addNumericFieldWithExtractor(