diff --git a/simulations/simulation_t1.txt b/simulations/simulation_t1.txt index ca7b15c..abedd05 100644 --- a/simulations/simulation_t1.txt +++ b/simulations/simulation_t1.txt @@ -228,10 +228,15 @@ telegram=|294468506935639176F0A0|009F2782290060822900000401D6311AF93E1BF93E008DC |Smokey;91633569;OK;2019-12-31T02:00:00Z;1111-11-11 11:11.11 # Test Techem Compact V heat meter -telegram=|36446850626262624543A1|009F2777010060780000000A000000000000000000000000000000000000000000000000A0400000B4010000| +telegram=|36446850626262624543A1_009F2777010060780000000A000000000000000000000000000000000000000000000000A0400000B4010000| {"media":"heat","meter":"compact5","name":"Heating","id":"62626262","total_kwh":495,"current_kwh":120,"previous_kwh":375,"timestamp":"1111-11-11T11:11:11Z"} |Heating;62626262;495.000000;120.000000;375.000000;1111-11-11 11:11.11 +# Another Compact V heat meter +telegram=|37446850336633663943a2_10672c866100181c01000480794435d50000000000000000000000000000000000000000000000000000000000| +{"media":"heat","meter":"compact5","name":"Heating2","id":"66336633","total_kwh":25250,"current_kwh":284,"previous_kwh":24966,"timestamp":"1111-11-11T11:11:11Z"} +|Heating2;66336633;25250.000000;284.000000;24966.000000;1111-11-11 11:11.11 + # Test Maddalena EVO 868 wmbus module on water meter telegram=|aa4424347677787950077ac10000202f2f041306070000046d1e31b12104fd17000000000e787880048120004413c9040000426c9f2c840113c904000082016c9f2cd3013b9a0200c4016d0534a7218104fd280182046c9f2c840413c9040000c404131b00000084051300000000c405130000000084061300000000c406130000000084071300000000c407130000000084081300000000c408130000000084091300000000c4091300000000ffff| {"media":"water","meter":"evo868","name":"Votchka","id":"79787776","total_m3":1.798,"device_date_time":"2021-01-17 17:30","current_status":"OK","fabrication_no":"002081048078","consumption_at_set_date_m3":1.225,"set_date":"2020-12-31","consumption_at_set_date_2_m3":1.225,"set_date_2":"2020-12-31","max_flow_since_datetime_m3h":0.666,"max_flow_datetime":"2021-01-07 20:05","consumption_at_history_1_m3":1.225,"history_1_date":"2020-12-31","consumption_at_history_2_m3":0.027,"history_2_date":"2020-11-30","consumption_at_history_3_m3":0,"history_3_date":"2020-10-31","consumption_at_history_4_m3":0,"history_4_date":"2020-09-30","consumption_at_history_5_m3":0,"history_5_date":"2020-08-31","consumption_at_history_6_m3":0,"history_6_date":"2020-07-31","consumption_at_history_7_m3":0,"history_7_date":"2020-06-30","consumption_at_history_8_m3":0,"history_8_date":"2020-05-31","consumption_at_history_9_m3":0,"history_9_date":"2020-04-30","consumption_at_history_10_m3":0,"history_10_date":"2020-03-31","consumption_at_history_11_m3":0,"history_11_date":"2020-02-29","consumption_at_history_12_m3":0,"history_12_date":"2020-01-31","timestamp":"1111-11-11T11:11:11Z"} diff --git a/src/meter_detection.h b/src/meter_detection.h index ed0e648..0f61211 100644 --- a/src/meter_detection.h +++ b/src/meter_detection.h @@ -36,6 +36,7 @@ X(COMPACT5, MANUFACTURER_TCH, 0xc3, 0x45) \ X(COMPACT5, MANUFACTURER_TCH, 0x43, 0x22) \ X(COMPACT5, MANUFACTURER_TCH, 0x43, 0x45) \ + X(COMPACT5, MANUFACTURER_TCH, 0x43, 0x39) \ X(DME_07, MANUFACTURER_DME, 0x07, 0x7b) \ X(EBZWMBE, MANUFACTURER_EBZ, 0x37, 0x02) \ X(EURISII, MANUFACTURER_INE, 0x08, 0x55) \ diff --git a/tests/test_listen_to_all.sh b/tests/test_listen_to_all.sh index 556b299..0da0f71 100755 --- a/tests/test_listen_to_all.sh +++ b/tests/test_listen_to_all.sh @@ -250,6 +250,11 @@ Received telegram from: 62626262 type: Heat meter (0x43) ver: 0x45 driver: compact5 +Received telegram from: 66336633 + manufacturer: (TCH) Techem Service (0x5068) + type: Heat meter (0x43) + ver: 0x39 + driver: compact5 Received telegram from: 79787776 manufacturer: (MAD) Maddalena, Italy (0x3424) type: Water meter (0x07) diff --git a/tests/test_t1_meters.sh b/tests/test_t1_meters.sh index ae4d6d3..13b86ef 100755 --- a/tests/test_t1_meters.sh +++ b/tests/test_t1_meters.sh @@ -58,6 +58,7 @@ METERS="MyWarmWater supercom587 12345678 NOKEY Sharky774 sharky774 72615127 NOKEY Sharky775 sharky 68926025 NOKEY Heating compact5 62626262 NOKEY + Heating2 compact5 66336633 NOKEY Hetta elf 01885619 NOKEY DigiWasser dme_07 93929190 NOKEY Votten aventieswm 61070071 A004EB23329A477F1DD2D7820B56EB3D