Merge pull request #943 from wmbusmeters/BIBOLV-patch-1

Update driver_hydrocalm3.cc
pull/949/head
Fredrik Öhrström 2023-04-18 13:10:23 +02:00 zatwierdzone przez GitHub
commit abd72dcdf7
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 7 dodań i 1 usunięć

Wyświetl plik

@ -31,6 +31,7 @@ namespace
di.setMeterType(MeterType::HeatMeter);
di.addLinkMode(LinkMode::T1);
di.addDetection(MANUFACTURER_BMT, 0x0d, 0x0b);
di.addDetection(MANUFACTURER_BMT, 0x0d, 0x1a); // HYDROCAL-M4
di.setConstructor([](MeterInfo& mi, DriverInfo& di){ return shared_ptr<Meter>(new Driver(mi, di)); });
});
@ -158,7 +159,12 @@ namespace
}
}
// Test:HeatCool hydrocalm3 71727374 NOKEY
// Test: HeatCool hydrocalm3 71727374 NOKEY
// telegram=|8E44B409747372710B0D7A798080052F2F_0C0E59600100046D1D36B9290C13679947000C0E000000000C13590000000C13000000000C13000000000A5A18020A5E11020F823D06003D06003D06003D0600140600620500480400E402001601000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002F2F|
// {"media":"heat/cooling load","meter":"hydrocalm3","name":"HeatCool","id":"71727374","status": "SABOTAGE_ENCLOSURE","total_heating_kwh":4460.833333,"total_cooling_kwh":0,"device_datetime":"2021-09-25 22:29","total_heating_m3":479.967,"total_cooling_m3":0.059,"c1_volume_m3":0,"c2_volume_m3":0,"supply_temperature_c":21.8,"return_temperature_c":21.1,"timestamp":"1111-11-11T11:11:11Z"}
// |HeatCool;71727374;4460.833333;0;1111-11-11 11:11.11
//
// Test: testm4 hydrocalm3 38031627 NOKEY
// telegram=|2C44B409271603381A0D8C208A7ACE000020_046D0CB6ED240C03267300000C13130800000F6300000000000000|
// {"media":"heat/cooling load","meter":"hydrocalm3","name":"testm4","id":"38031627","status":"OK","total_heating_kwh":7.326,"device_datetime":"2023-04-13 22:12","total_cooling_kwh":null,"total_heating_m3":0.813,"total_cooling_m3":null,"c1_volume_m3":null,"c2_volume_m3":null,"supply_temperature_c":null,"return_temperature_c":null,"timestamp":"1111-11-11T11:11:11Z"}
// |testm4;38031627;7.326;0;1111-11-11 11:11.11