kopia lustrzana https://github.com/weetmuts/wmbusmeters
Added test case and updated README.
Fredrik Öhrström
rodzic
c295bf6fba
commit
ecce6a2c08
9
CHANGES
9
CHANGES
|
|
@ -1,3 +1,12 @@
|
|||
|
||||
Avandorp added support for the AquaMetro / Integra Topas Es Kr water meter.
|
||||
Thanks Avandorp!
|
||||
|
||||
IzeCube added the Techem Compact V heatmeter!
|
||||
Thanks IzeCube! Though we still need an example telegram for
|
||||
testing this meter to prevent regressions. So it is currently
|
||||
not as well supported as the other meters.
|
||||
|
||||
Version 0.9.35: 2020-08-23
|
||||
|
||||
Added support for alarms (shell command triggered)
|
||||
|
|
|
|||
22
README.md
22
README.md
|
|
@ -211,34 +211,36 @@ rtl_wmbus (rtlwmbus)
|
|||
rtl_433 (rtl433)
|
||||
|
||||
Supported water meters:
|
||||
Apator at-wmbus-08 (apator08) (non-standard protocol)
|
||||
Apator at-wmbus-16-2 (apator162) (non-standard protocol)
|
||||
Aquametro/Integra Topas Es Kr (topaseskr)
|
||||
Bmeters Hydrodigit (hydrodigit) (partly non-standard protocol)
|
||||
Diehl/Sappel IZAR RC 868 I R4 PL (izar) (non-standard protocol)
|
||||
Diehl HYDRUS (hydrus)
|
||||
Honeywell Q400 (q400)
|
||||
Kamstrup Multical 21 (multical21)
|
||||
Kamstrup flowIQ 3100 (flowiq3100)
|
||||
Sontex Supercom 587 (supercom587)
|
||||
Sensus iPERL (iperl)
|
||||
Apator at-wmbus-08 (apator08) (non-standard protocol)
|
||||
Apator at-wmbus-16-2 (apator162) (non-standard protocol)
|
||||
Techem MK Radio 3 (mkradio3) (non-standard protocol)
|
||||
Diehl/Sappel IZAR RC 868 I R4 PL (izar) (non-standard protocol)
|
||||
Diehl HYDRUS (hydrus)
|
||||
Bmeters Hydrodigit (hydrodigit) (partly non-standard protocol)
|
||||
Honeywell Q400 (q400)
|
||||
Waterstar M (waterstarm)
|
||||
|
||||
Supported heat cost allocators:
|
||||
Qundis Q caloric (qcaloric)
|
||||
Innotas EurisII (eurisii)
|
||||
Qundis Q caloric (qcaloric)
|
||||
Techem FHKV data II/III (fhkvdataiii)
|
||||
|
||||
Supported heat meter:
|
||||
Heat meter Techem Compact V (compact5) (non-standard protocol)
|
||||
(compact5 is unfortunately not quite supported since we lack a test telegram to prevent regressions)
|
||||
Heat meter Techem Vario 4 (vario451) (non-standard protocol)
|
||||
Heat meter Kamstrup Multical 302 (multical302) (in C1 mode, please open issue for T1 mode)
|
||||
Heat and Cooling meter Kamstrup Multical 403 (multical403) (in C1 mode)
|
||||
|
||||
Supported room sensors:
|
||||
Lansen Thermometer/Hygrometer (lansenth)
|
||||
Bmeters RFM-AMB Thermometer/Hygrometer (rfmamb)
|
||||
Elvaco CMa12w Thermometer (cma12w)
|
||||
Lansen Thermometer/Hygrometer (lansenth)
|
||||
|
||||
Supported smoke detectors:
|
||||
Lansen Smoke Detector (lansensm)
|
||||
|
|
@ -250,10 +252,10 @@ Supported pulse counter:
|
|||
Lansen Pulse Counter (lansenpu)
|
||||
|
||||
Supported electricity meters:
|
||||
Tauron Amiplus (amiplus) (includes vendor apator and echelon)
|
||||
EMH Metering (ehzp)
|
||||
Easy Meter ESYS-WM20 (esyswm)
|
||||
eBZ wMB-E01 (ebzwmbe)
|
||||
EMH Metering (ehzp)
|
||||
Tauron Amiplus (amiplus) (includes vendor apator and echelon)
|
||||
```
|
||||
|
||||
The wmbus dongles imst871a can listen to one type of wmbus telegrams
|
||||
|
|
|
|||
|
|
@ -153,3 +153,9 @@ telegram=|4644B4097172737405077AA5000610|1115F78184AB0F1D1E200000005904103103208
|
|||
telegram=|3944FA122162092002067A3600202567C94D48D00DC47B11213E23383DB51968A705AAFA60C60E263D50CD259D7C9A03FD0C08000002FD0B0011|
|
||||
{"media":"warm water","meter":"waterstarm","name":"Woter","id":"20096221","meter_timestamp":"2020-07-30 10:40","total_m3":0.106,"total_backwards_m3":0,"current_status":"OK","meter_version":"000008","parameter_set":"1100","timestamp":"1111-11-11T11:11:11Z"}
|
||||
|Woter;20096221;0.106000;0.000000;OK;1111-11-11 11:11.11
|
||||
|
||||
# Test topaseskr water meter
|
||||
|
||||
telegram=|4E44B40512345678F1077A310040052F2F|01FD08040C13991848004C1359423500CC101300000000CC201359423500426C7F2C0B3B00000002FD74DA10025AD300C4016D3B179F27CC011387124600|
|
||||
{"media":"water","meter":"topaseskr","name":"Witer","id":"78563412","total_m3":481.899,"temperature_c":21.1,"current_flow_m3h":0,"battery_life_days_remaining_remaining":"4314","volume_year_period_m3":354.259,"reverse_volume_year_period_m3":0,"meter_year_period_start_date":"2019-12-31","volume_month_period_m3":461.287,"meter_month_period_start_datetime":"2020-07-31 23:59","timestamp":"1111-11-11T11:11:11Z"}
|
||||
|Witer;78563412;481.899000;21.100000;0.000000;354.259000;0.000000;2019-12-31;461.287000;2020-07-31 23:59;1111-11-11 11:11.11
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
Copyright (C) 2017-2019 Fredrik Öhrström
|
||||
Copyright (C) 2017-2020 Fredrik Öhrström
|
||||
2020 Avandorp
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
|
|
|||
|
|
@ -105,6 +105,9 @@ Received telegram from: 74737271
|
|||
Received telegram from: 20096221
|
||||
manufacturer: (DWZ) Lorenz, Germany
|
||||
device type: Warm Water (30°C-90°C) meter
|
||||
Received telegram from: 78563412
|
||||
manufacturer: (AMT) INTEGRA METERING
|
||||
device type: Water meter
|
||||
EOF
|
||||
|
||||
RES=$($PROG --logfile=$LOGFILE --t1 simulations/simulation_t1.txt 2>&1)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,8 @@ METERS="MyWarmWater supercom587 12345678 NOKEY
|
|||
Elen3 ehzp 55995599 NOKEY
|
||||
Vatten apator08 004444dd NOKEY
|
||||
Wasser rfmtx1 74737271 NOKEY
|
||||
Woter waterstarm 20096221 BEDB81B52C29B5C143388CBB0D15A051"
|
||||
Woter waterstarm 20096221 BEDB81B52C29B5C143388CBB0D15A051
|
||||
Witer topaseskr 78563412 NOKEY"
|
||||
|
||||
cat simulations/simulation_t1.txt | grep '^{' > $TEST/test_expected.txt
|
||||
$PROG --format=json simulations/simulation_t1.txt $METERS > $TEST/test_output.txt
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue