From efd9aaa786cefdc041321c9fcba076ed36049253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= Date: Wed, 25 Nov 2020 11:01:27 +0100 Subject: [PATCH] Updates CHANGES and fix test. --- CHANGES | 3 +++ README.md | 2 +- simulations/simulation_t1.txt | 6 +++--- tests/test_listen_to_all.sh | 5 +++++ tests/test_t1_meters.sh | 1 + 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 99b3e0e..83bad0a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,7 @@ +Cinemarene added support for the Techem MK Radio 4 water meter. +Thanks Cinemarene! + Mira added support for Elster V200H water meter and the Elster Merlin 868 addon. Thanks Mira! diff --git a/README.md b/README.md index c064d52..3966090 100644 --- a/README.md +++ b/README.md @@ -275,7 +275,7 @@ Kamstrup flowIQ 2200 (flowiq2200) Kamstrup flowIQ 3100 (flowiq3100) Sontex Supercom 587 (supercom587) Sensus iPERL (iperl) -Techem MK Radio 3 (mkradio3) (non-standard protocol) +Techem MK Radio 3 and 4 (mkradio3,mkradio4) (non-standard protocols) Waterstar M (waterstarm) Currently not supported, please help! diff --git a/simulations/simulation_t1.txt b/simulations/simulation_t1.txt index 82ff913..e3853dc 100644 --- a/simulations/simulation_t1.txt +++ b/simulations/simulation_t1.txt @@ -41,8 +41,8 @@ telegram=|2F446850313233347462A2|069F255900B029310000000306060906030609070606050 # Test MKRadio4 T1 telegrams telegram=|2F446850200141029562A2|06702901006017030004000300000000000000000000000000000000000000000000000000| -{"media":"warm water","meter":"mkradio4","name":"Duschen","id":"02410120","total_m3":0.4,"target_m3":0.1,"timestamp":"1111-11-11T11:11:11Z"} -|Duschen;02410120;0.400000;0.100000;1111-11-11 11:11.11 +{"media":"warm water","meter":"mkradio4","name":"Duschagain","id":"02410120","total_m3":0.4,"target_m3":0.1,"timestamp":"1111-11-11T11:11:11Z"} +|Duschagain;02410120;0.400000;0.100000;1111-11-11 11:11.11 # Test vario451 T1 telegrams telegram=|374468506549235827C3A2|129F25383300A8622600008200800A2AF862115175552877A36F26C9AB1CB24400000004000000000004908002| @@ -51,7 +51,7 @@ telegram=|374468506549235827C3A2|129F25383300A8622600008200800A2AF86211517555287 # Test FHKV data II/III telegram=|31446850226677116980A0119F27020480048300C408F709143C003D341A2B0B2A0707000000000000062D114457563D71A1850000| -{"media":"Heat Cost Allocator","meter":"fhkvdataiii","name":"Room","id":"11776622","current_hca":131,"current_date":"2020-02-08T02:00:00Z","previous_hca":1026,"previous_date":"2019-12-31T02:00:00Z","temp_room_c":22.44,"temp_radiator_c":25.51,"timestamp":"1111-11-11T11:11:11Z"} +{"media":"heat cost allocator","meter":"fhkvdataiii","name":"Room","id":"11776622","current_hca":131,"current_date":"2020-02-08T02:00:00Z","previous_hca":1026,"previous_date":"2019-12-31T02:00:00Z","temp_room_c":22.44,"temp_radiator_c":25.51,"timestamp":"1111-11-11T11:11:11Z"} |Room;11776622;131.000000;2020-02-08T02:00:00Z;1026.000000;2019-12-31T02:00:00Z;22.440000;25.510000;1111-11-11 11:11.11 # Test EurisII T1 telegrams diff --git a/tests/test_listen_to_all.sh b/tests/test_listen_to_all.sh index 6812bcb..9ec88aa 100755 --- a/tests/test_listen_to_all.sh +++ b/tests/test_listen_to_all.sh @@ -55,6 +55,11 @@ Received telegram from: 34333231 type: Warm water (0x62) ver: 0x74 driver: mkradio3 +Received telegram from: 02410120 + manufacturer: (TCH) Techem Service (0x5068) + type: Warm water (0x62) + ver: 0x95 + driver: mkradio4 Received telegram from: 58234965 manufacturer: (TCH) Techem Service (0x5068) type: Heat meter (0xc3) diff --git a/tests/test_t1_meters.sh b/tests/test_t1_meters.sh index 307f5cf..0c68b6e 100755 --- a/tests/test_t1_meters.sh +++ b/tests/test_t1_meters.sh @@ -15,6 +15,7 @@ METERS="MyWarmWater supercom587 12345678 NOKEY WaterWater iperl 33225544 NOKEY MyElectricity1 amiplus 10101010 NOKEY Duschen mkradio3 34333231 NOKEY + Duschagain mkradio4 02410120 NOKEY HeatMeter vario451 58234965 NOKEY Room fhkvdataiii 11776622 NOKEY HeatMeter eurisii 88018801 NOKEY