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

Merge pull request #311 from BIBOLV/master 

Add version 0x06 for bmeter water meter.
pull/324/head
Fredrik Öhrström 2021-07-10 21:04:15 +02:00 zatwierdzone przez GitHub
rodzic db42776d2b a8dfb74720
commit a8fae5550c
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
3 zmienionych plików z 7 dodań i 0 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
simulations/simulation_t1.txt
Wyświetl plik

@ -129,6 +129,11 @@ telegram=|4E44B4098686868613077AF0004005|2F2F0C1366380000046D27287E2A0F150E00000
{"media":"water","meter":"hydrodigit","name":"HydrodigitWater","id":"86868686","total_m3":3.866,"meter_datetime":"2019-10-30 08:39","timestamp":"1111-11-11T11:11:11Z"}
|HydrodigitWater;86868686;3.866000;2019-10-30 08:39;1111-11-11 11:11.11
# Test another pair of BMeters HydroDigit water telegram
telegram=|3044B4090123456713067A190020052F2F|0C1315000000046D0136A7270F050B000000002F2F2F2F2F2F2F2F2F2F2F69E5|
{"media":"warm water","meter":"hydrodigit","name":"HydrodigitWater2","id":"67452301","total_m3":0.015,"meter_datetime":"2021-07-07 22:01","timestamp":"1111-11-11T11:11:11Z"}
|HydrodigitWater2;67452301;0.015000;2021-07-07 22:01;1111-11-11 11:11.11
# 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"}

1
src/meter_detection.h
Wyświetl plik

@ -56,6 +56,7 @@
X(HYDRUS, MANUFACTURER_DME, 0x06, 0x70) \
X(HYDRUS, MANUFACTURER_DME, 0x16, 0x70) \
X(HYDROCALM3,MANUFACTURER_BMT, 0x0d, 0x0b) \
X(HYDRODIGIT,MANUFACTURER_BMT, 0x06, 0x13) \
X(HYDRODIGIT,MANUFACTURER_BMT, 0x07, 0x13) \
X(EI6500, MANUFACTURER_EIE, 0x1a, 0x0c) \
X(IPERL, MANUFACTURER_SEN, 0x06, 0x68) \

1
tests/test_t1_meters.sh
Wyświetl plik

@ -36,6 +36,7 @@ METERS="MyWarmWater supercom587 12345678 NOKEY
HydrusVater hydrus 65656565 NOKEY
HydrusAES hydrus 64745666 NOKEY
HydrodigitWater hydrodigit 86868686 NOKEY
HydrodigitWater2 hydrodigit 67452301 NOKEY
Q400Water q400 72727272 AAA896100FED12DD614DD5D46369ACDD
Elen1 ebzwmbe 22992299 NOKEY
Elen2 esyswm 77997799 NOKEY