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

New version.

pull/76/head 0.9.24
weetmuts 2020-02-06 19:36:01 +01:00
rodzic ed4e6e2d34
commit 8666dd95a1
5 zmienionych plików z 16 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
CHANGES
Wyświetl plik

@ -1,3 +1,10 @@
Version 0.9.24: 2020-02-06
Added the electricity meter eBZ wMB-E01 (ebzwmbe)
Fixed bugs with detecting the wmbus dongles.
Fixed bug in im871a driver that could
get out of sync and never receive any more telegrams.
Version 0.9.23: 2020-02-02
Added the electricity meters:

6
simulations/simulation_t1.txt
Wyświetl plik

@ -101,7 +101,7 @@ telegram=|2944A511780729662366A20118001378D3B3DB8CEDD77731F25832AAF3DA8CADF9774E
# Test Hydrus water meter telegram
telegram=|4E44A5116464646470077AED004005|2F2F01FD08300C13741100007C1300000000FC101300000000FC201300000000726C00000B3B00000002FD748713025A6800C4016D3B177F2ACC011300020000|
{"media":"water","meter":"hydrus","name":"HydrusWater","id":"64646464","total_m3":1.174,"max_flow_m3h":0,"flow_temperature_c":10.4,"total_at_date_m3":0.2,"at_date":"2019-10-31 23:59","timestamp":"1111-11-11T11:11:11Z"}
|HydrusWater;64646464;1.174000;0.000000;10.400000;0.200000;2019-10-31 23:59;1111-11-11 11:11.11
|HydrusWater;64646464;1.174000;0.000000;1111-11-11 11:11.11
# Test BMeters HydroDigit water telegram
telegram=|4E44B4098686868613077AF0004005|2F2F0C1366380000046D27287E2A0F150E00000000C10000D10000E60000FD00000C01002F0100410100540100680100890000A00000B30000002F2F2F2F2F2F|
@ -111,7 +111,7 @@ telegram=|4E44B4098686868613077AF0004005|2F2F0C1366380000046D27287E2A0F150E00000
# Test Q400 water telegram (encrypted)
telegram=|2E4409077272727210077AD7102005CC2FF08D057E306D8C3078AE44AD6E3D37F8515B92FB068347783DFBB25C3C28|
{"media":"water","meter":"q400","name":"Q400Water","id":"72727272","total_m3":0,"set_date":"2019-12-01","consumption_at_set_date_m3":0,"timestamp":"1111-11-11T11:11:11Z"}
|Q400Water;72727272;0.000000;2019-12-01;0.000000;1111-11-11 11:11.11
|Q400Water;72727272;0.000000;1111-11-11 11:11.11
# Test electricity meter with eBZ wMB E01.
telegram=|5B445A149922992202378C20F6900F002C25BC9E0000BF48954821BC508D72992299225A140102F6003007102F2F040330F92A0004A9FF01FF24000004A9FF026A29000004A9FF03460600000DFD11063132333435362F2F2F2F2F2F|
@ -134,4 +134,4 @@ telegram=|7B4479169977997730378C20F0900F002C2549EE0A0077C19D3D1A08ABCD7299779977
telegram=|5344A8159955995502028C201D900F002C250C390000ED176BBBB1591ADB7A1D003007102F2F|0700583B74020000000007803CBCD70200000000000728B070200000000000042092A406002F2F2F2F2F2F2F2F2F|
{"media":"electricity","meter":"ehzp","name":"Elen3","id":"55995599","total_energy_consumption_kwh":41.1718,"current_power_consumption_kw":2.126,"total_energy_production_kwh":0.1863,"on_time_h":120.929444,"timestamp":"1111-11-11T11:11:11Z"}
|Elen3;55995599;41.171800;2.126000;0.186300;120.929444;1111-11-11 11:11.11
|Elen3;55995599;41.171800;2.126000;0.186300;1111-11-11 11:11.11

2
src/meter_ehzp.cc
Wyświetl plik

@ -72,7 +72,7 @@ MeterEHZP::MeterEHZP(WMBus *bus, MeterInfo &mi) :
[&](Unit u){ assertQuantity(u, Quantity::Time);
return convert(on_time_h_, Unit::Hour, u); },
"Device on time.",
true, true);
false, true);
}
unique_ptr<ElectricityMeter> createEHZP(WMBus *bus, MeterInfo &mi)

6
src/meter_hydrus.cc
Wyświetl plik

@ -68,17 +68,17 @@ MeterHydrus::MeterHydrus(WMBus *bus, MeterInfo &mi) :
addPrint("flow_temperature", Quantity::Temperature,
[&](Unit u){ return flowTemperature(u); },
"The water temperature.",
true, true);
false, true);
addPrint("total_at_date", Quantity::Volume,
[&](Unit u){ return totalWaterConsumptionAtDate(u); },
"The total water consumption recorded at date.",
true, true);
false, true);
addPrint("at_date", Quantity::Text,
[&](){ return at_date_; },
"Date when total water consumption was recorded.",
true, true);
false, true);
}
unique_ptr<WaterMeter> createHydrus(WMBus *bus, MeterInfo &mi)

4
src/meter_q400.cc
Wyświetl plik

@ -66,12 +66,12 @@ MeterQ400::MeterQ400(WMBus *bus, MeterInfo &mi) :
addPrint("set_date", Quantity::Text,
[&](){ return setDate(); },
"The most recent billing period date.",
true, true);
false, true);
addPrint("consumption_at_set_date", Quantity::Volume,
[&](Unit u){ return consumptionAtSetDate(u); },
"The total water consumption at the most recent billing period date.",
true, true);
false, true);
}
void MeterQ400::processContent(Telegram *t)