From a79945dfb3c84793dc287d5f36399b6edd631c84 Mon Sep 17 00:00:00 2001 From: anders Date: Sat, 12 Nov 2022 15:01:31 +0100 Subject: [PATCH] Fixed input_sensor bug Added EVU functions Added heatpump communication supervision A couple of new indications in the lovelace view --- custom_components/thermiq_mqtt/manifest.json | 2 +- .../thermiq_mqtt/thermiq_regs.py | 94 +++++++++---------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/custom_components/thermiq_mqtt/manifest.json b/custom_components/thermiq_mqtt/manifest.json index 3713293..ebafba8 100644 --- a/custom_components/thermiq_mqtt/manifest.json +++ b/custom_components/thermiq_mqtt/manifest.json @@ -6,7 +6,7 @@ "dependencies": ["mqtt"], "config_flow": false, "codeowners": ["@ThermIQ"], - "version": "1.3.9", + "version": "1.4.0", "requirements":[], "iot_class": "local_push" } diff --git a/custom_components/thermiq_mqtt/thermiq_regs.py b/custom_components/thermiq_mqtt/thermiq_regs.py index a9b076f..04519e7 100644 --- a/custom_components/thermiq_mqtt/thermiq_regs.py +++ b/custom_components/thermiq_mqtt/thermiq_regs.py @@ -23,44 +23,44 @@ 'cooling_t' : ['r0a', 'temperature', 'ºC', '', '', 2, 10 ], 'supply_shunt_t' : ['r0b', 'temperature', 'ºC', '', '', 2, 9 ], 'current_consumed_a' : ['r0c', 'sensor', 'A', '', '', 0, 0 ], - 'boiler_3kw_on' : ['r0d', 'binary_sensor', '', 0x0001 -1, 0, 0 ], - 'boiler_6kw_on' : ['r0d', 'binary_sensor', '', 0x0002 -1, 0, 0 ], + 'boiler_3kw_on' : ['r0d', 'binary_sensor', '', 0x0001, -1, 0, 0 ], + 'boiler_6kw_on' : ['r0d', 'binary_sensor', '', 0x0002, -1, 0, 0 ], 'supplyline_target_t' : ['r0e', 'temperature', 'ºC', '', '', 0, 0 ], 'supplyline_shunt_target_t' : ['r0f', 'temperature', 'ºC', '', '', 0, 0 ], - 'brine_pump_on' : ['r10', 'binary_sensor', '', 0x0001 -1, 0, 0 ], - 'compressor_on' : ['r10', 'binary_sensor', '', 0x0002 -1, 0, 0 ], - 'supply_pump_on' : ['r10', 'binary_sensor', '', 0x0004 -1, 0, 0 ], - 'hotwaterproduction_on' : ['r10', 'binary_sensor', '', 0x0008 -1, 0, 0 ], - 'aux2_heating_on' : ['r10', 'binary_sensor', '', 0x0010 -1, 0, 0 ], - 'shunt1_n' : ['r10', 'binary_sensor', '', 0x0020 -1, 0, 0 ], - 'shunt1_p' : ['r10', 'binary_sensor', '', 0x0040 -1, 0, 0 ], - 'aux1_heating_on' : ['r10', 'binary_sensor', '', 0x0080 -1, 0, 0 ], - 'shunt2_n' : ['r11', 'binary_sensor', '', 0x0001 -1, 0, 0 ], - 'shunt2_p' : ['r11', 'binary_sensor', '', 0x0002 -1, 0, 0 ], - 'shunt_cooling_n' : ['r11', 'binary_sensor', '', 0x0004 -1, 0, 0 ], - 'shunt_cooling_p' : ['r11', 'binary_sensor', '', 0x0008 -1, 0, 0 ], - 'active_cooling_on' : ['r11', 'binary_sensor', '', 0x0010 -1, 0, 0 ], - 'passive_cooling_on' : ['r11', 'binary_sensor', '', 0x0020 -1, 0, 0 ], - 'alarm_indication_on' : ['r11', 'binary_sensor', '', 0x0040 -1, 0, 0 ], + 'brine_pump_on' : ['r10', 'binary_sensor', '', 0x0001, -1, 0, 0 ], + 'compressor_on' : ['r10', 'binary_sensor', '', 0x0002, -1, 0, 0 ], + 'supply_pump_on' : ['r10', 'binary_sensor', '', 0x0004, -1, 0, 0 ], + 'hotwaterproduction_on' : ['r10', 'binary_sensor', '', 0x0008, -1, 0, 0 ], + 'aux2_heating_on' : ['r10', 'binary_sensor', '', 0x0010, -1, 0, 0 ], + 'shunt1_n' : ['r10', 'binary_sensor', '', 0x0020, -1, 0, 0 ], + 'shunt1_p' : ['r10', 'binary_sensor', '', 0x0040, -1, 0, 0 ], + 'aux1_heating_on' : ['r10', 'binary_sensor', '', 0x0080, -1, 0, 0 ], + 'shunt2_n' : ['r11', 'binary_sensor', '', 0x0001, -1, 0, 0 ], + 'shunt2_p' : ['r11', 'binary_sensor', '', 0x0002, -1, 0, 0 ], + 'shunt_cooling_n' : ['r11', 'binary_sensor', '', 0x0004, -1, 0, 0 ], + 'shunt_cooling_p' : ['r11', 'binary_sensor', '', 0x0008, -1, 0, 0 ], + 'active_cooling_on' : ['r11', 'binary_sensor', '', 0x0010, -1, 0, 0 ], + 'passive_cooling_on' : ['r11', 'binary_sensor', '', 0x0020, -1, 0, 0 ], + 'alarm_indication_on' : ['r11', 'binary_sensor', '', 0x0040, -1, 0, 0 ], 'pwm_out_period' : ['r12', 'sensor', '%', '', '', 0, 0 ], - 'highpressure_alm' : ['r13', 'binary_sensor', '', 0x0001 -1, 0, 0 ], - 'lowpressure_alm' : ['r13', 'binary_sensor', '', 0x0002 -1, 0, 0 ], - 'motorbreaker_alm' : ['r13', 'binary_sensor', '', 0x0004 -1, 0, 0 ], - 'brine_flow_alm' : ['r13', 'binary_sensor', '', 0x0008 -1, 0, 0 ], - 'brine_temperature_alm' : ['r13', 'binary_sensor', '', 0x0010 -1, 0, 0 ], - 'outdoor_sensor_alm' : ['r14', 'binary_sensor', '', 0x0001 -1, 0, 0 ], - 'supplyline_sensor_alm' : ['r14', 'binary_sensor', '', 0x0002 -1, 0, 0 ], - 'returnline_sensor_alm' : ['r14', 'binary_sensor', '', 0x0004 -1, 0, 0 ], - 'boiler_sensor_alm' : ['r14', 'binary_sensor', '', 0x0008 -1, 0, 0 ], - 'indoor_sensor_alm' : ['r14', 'binary_sensor', '', 0x0010 -1, 0, 0 ], - 'phase_order_alm' : ['r14', 'binary_sensor', '', 0x0020 -1, 0, 0 ], - 'overheating_alm' : ['r14', 'binary_sensor', '', 0x0040 -1, 0, 0 ], + 'highpressure_alm' : ['r13', 'binary_sensor', '', 0x0001, -1, 0, 0 ], + 'lowpressure_alm' : ['r13', 'binary_sensor', '', 0x0002, -1, 0, 0 ], + 'motorbreaker_alm' : ['r13', 'binary_sensor', '', 0x0004, -1, 0, 0 ], + 'brine_flow_alm' : ['r13', 'binary_sensor', '', 0x0008, -1, 0, 0 ], + 'brine_temperature_alm' : ['r13', 'binary_sensor', '', 0x0010, -1, 0, 0 ], + 'outdoor_sensor_alm' : ['r14', 'binary_sensor', '', 0x0001, -1, 0, 0 ], + 'supplyline_sensor_alm' : ['r14', 'binary_sensor', '', 0x0002, -1, 0, 0 ], + 'returnline_sensor_alm' : ['r14', 'binary_sensor', '', 0x0004, -1, 0, 0 ], + 'boiler_sensor_alm' : ['r14', 'binary_sensor', '', 0x0008, -1, 0, 0 ], + 'indoor_sensor_alm' : ['r14', 'binary_sensor', '', 0x0010, -1, 0, 0 ], + 'phase_order_alm' : ['r14', 'binary_sensor', '', 0x0020, -1, 0, 0 ], + 'overheating_alm' : ['r14', 'binary_sensor', '', 0x0040, -1, 0, 0 ], 'demand1' : ['r15', 'sensor', '', '', '', 0, 0 ], 'demand2' : ['r16', 'sensor', '', '', '', 0, 0 ], 'pressurepipe_t' : ['r17', 'temperature', 'ºC', '', '', 0, 0 ], 'hgw_water_t' : ['r18', 'temperature', 'ºC', '', '', 0, 0 ], 'integral1' : ['r19', 'sensor', 'Cmin', '', '', 2, 6 ], - 'integral1_a_limit' : ['r1a', 'sensor', '', '', '', 0, 0 ], + 'integral1_a_step' : ['r1a', 'sensor', '', '', '', 0, 0 ], 'defrost_time_m' : ['r1b', 'time', '*10s', '', '', 0, 0 ], 'time_to_start_min_m' : ['r1c', 'time', 'min', '', '', 0, 0 ], 'sw_version' : ['r1d', 'sensor', '', '', '', 0, 0 ], @@ -115,14 +115,14 @@ 'brine_in_sensor_offset_t' : ['r5f', 'temperature_input', 'ºC', 0, 100, 10, 8 ], 'brine_out_sensor_offset_t' : ['r60', 'temperature_input', 'ºC', 0, 100, 10, 9 ], 'heatingsystem_type' : ['r61', 'sensor_input', 'type', -32768, 32767, 10, 10 ], - 'opt_phasemeassure_installed' : ['r62', 'binary_sensor', '', 0x0001 -1, 0, 0 ], - 'opt_2_installed' : ['r62', 'binary_sensor', '', 0x0002 -1, 0, 0 ], - 'opt_hgw_installed' : ['r62', 'binary_sensor', '', 0x0004 -1, 0, 0 ], - 'opt_4_installed' : ['r62', 'binary_sensor', '', 0x0008 -1, 0, 0 ], - 'opt_5_installed' : ['r62', 'binary_sensor', '', 0x0010 -1, 0, 0 ], - 'opt_6_installed' : ['r62', 'binary_sensor', '', 0x0020 -1, 0, 0 ], - 'opt_optimum_installed' : ['r62', 'binary_sensor', '', 0x0040 -1, 0, 0 ], - 'opt_flowguard_installed' : ['r62', 'binary_sensor', '', 0x0080 -1, 0, 0 ], + 'opt_phasemeassure_installed' : ['r62', 'binary_sensor', '', 0x0001, -1, 0, 0 ], + 'opt_2_installed' : ['r62', 'binary_sensor', '', 0x0002, -1, 0, 0 ], + 'opt_hgw_installed' : ['r62', 'binary_sensor', '', 0x0004, -1, 0, 0 ], + 'opt_4_installed' : ['r62', 'binary_sensor', '', 0x0008, -1, 0, 0 ], + 'opt_5_installed' : ['r62', 'binary_sensor', '', 0x0010, -1, 0, 0 ], + 'opt_6_installed' : ['r62', 'binary_sensor', '', 0x0020, -1, 0, 0 ], + 'opt_optimum_installed' : ['r62', 'binary_sensor', '', 0x0040, -1, 0, 0 ], + 'opt_flowguard_installed' : ['r62', 'binary_sensor', '', 0x0080, -1, 0, 0 ], 'internal_logging_t' : ['r63', 'time_input', 'min', 0, 32767, 10, 11 ], 'brine_runout_t' : ['r64', 'time_input', '*10s', 0, 32767, 10, 12 ], 'brine_run_in_t' : ['r65', 'time_input', '*10s', 0, 32767, 10, 13 ], @@ -131,15 +131,15 @@ 'compressor_runtime_h' : ['r68', 'time', 'h', '', '', 3, 0 ], 'msd1_dvp' : ['r69', 'sensor', '', '', '', 0, 0 ], 'boiler_3kw_runtime_h' : ['r6a', 'time', 'h', '', '', 3, 1 ], - 'msd1_dtp' : ['r6b', 'sensor', '', '', '', 0, 0 ], + 'msd1_dts' : ['r6b', 'sensor', '', '', '', 0, 0 ], 'hotwater_runtime_h' : ['r6c', 'time', 'h', '', '', 3, 3 ], 'msd1_dvv' : ['r6d', 'sensor', '', '', '', 0, 0 ], 'passive_cooling_runtime_h' : ['r6e', 'time', 'h', '', '', 3, 4 ], - 'msd1_d' : ['r6f', 'sensor', '', '', '', 0, 0 ], + 'msd1_dpas' : ['r6f', 'sensor', '', '', '', 0, 0 ], 'active_cooling_runtime_h' : ['r70', 'time', 'h', '', '', 3, 5 ], - 'msd1_d' : ['r71', 'sensor', '', '', '', 0, 0 ], + 'msd1_dact' : ['r71', 'sensor', '', '', '', 0, 0 ], 'boiler_6kw_on_runtime_h' : ['r72', 'time', 'h', '', '', 3, 2 ], - 'msd1_d' : ['r73', 'sensor', '', '', '', 0, 0 ], + 'msd1_dts2' : ['r73', 'sensor', '', '', '', 0, 0 ], 'graph_display_offset' : ['r74', 'sensor', '', '', '', 0, 0 ], 'room_sensor_set_t' : ['rf0', 'temperature_input', 'ºC', 0, 50, 0, 0 ], 'time' : ['rf1', 'time', 's', 0, 50, 0, 0 ], @@ -199,7 +199,7 @@ 'pressurepipe_t' : ['Pressurepipe temp.', 'Tryckrörtemp.', 'Paineputki lämpötila', 'Trykkrørstemp.', 'Druckrohrtemperatur'], 'hgw_water_t' : ['Hotw. supplyline temp.', 'Varmv.framledn.temp', 'Lämminvesi menolämpötila', 'Varmtv.Tur temp', 'Warmw.vorlauftemperatur'], 'integral1' : ['Integral (A1)', 'Integral (A1)', 'Integraali (A1)', 'Integral (A1)', 'Integral (A1)'], - 'integral1_a_limit' : ['Integral, reached A-limit', 'Integral, uppnådd A-gräns', 'Integraali, A-raja-arvo saavutettu', 'Integral, oppnådd A-grense', 'Integral, A-Grenzschritte'], + 'integral1_a_step' : ['Integral, reached A-limit', 'Integral, uppnådd A-gräns', 'Integraali, A-raja-arvo saavutettu', 'Integral, oppnådd A-grense', 'Integral, A-Grenzschritte'], 'defrost_time_m' : ['Defrost', 'Avfrostning', 'Defrost', 'Defrost', 'Defrost'], 'time_to_start_min_m' : ['Minimum time to start', 'Minimum tid till start', 'Pienin aika käynnistymiseen', 'Minimum tid til start', 'Mindestzeit bis Start'], 'sw_version' : ['Program version', 'Programversion', 'Ohjelmaversio', 'Programversjon', 'Programmversion'], @@ -270,15 +270,15 @@ 'compressor_runtime_h' : ['Runtime compressor', 'Drifttid kompressor', 'Kompressorin käyntiaika', 'Drifttid kompressor', 'Betriebszeit Kompressor'], 'msd1_dvp' : ['DVP_MSD1', 'DVP_MSD1', 'DVP_MSD1', 'DVP_MSD1', 'DVP_MSD1'], 'boiler_3kw_runtime_h' : ['Runtime 3 kW', 'Drifttid 3 kW', 'Käyttöaika 3 kW', 'Drifttid 3 kW', 'Betriebszeit 3 kW'], - 'msd1_dtp' : ['DTS_MSD1', 'DTS_MSD1', 'DTS_MSD1', 'DTS_MSD1', 'DTS_MSD1'], + 'msd1_dts' : ['DTS_MSD1', 'DTS_MSD1', 'DTS_MSD1', 'DTS_MSD1', 'DTS_MSD1'], 'hotwater_runtime_h' : ['Runtime hotwater production', 'Drifttid varmv.prod. med kompr.', 'Käyttöaika lämminvesi (kompressorilla)', 'Drifttid Varmtv.prod. med kompr.', 'Betriebszeit Warmwasser'], 'msd1_dvv' : ['DVV_MSD1', 'DVV_MSD1', 'DVV_MSD1', 'DVV_MSD1', 'DVV_MSD1'], 'passive_cooling_runtime_h' : ['Runtime passive cooling', 'Drifttid passiv kyla', 'Käyttöaika passiviseen viilennykseen', 'Drifttid passiv kjøling', 'Betriebszeit passive Kühlung'], - 'msd1_d' : ['DPAS_MSD1', 'DPAS_MSD1', 'DPAS_MSD1', 'DPAS_MSD1', 'DPAS_MSD1'], + 'msd1_dpas' : ['DPAS_MSD1', 'DPAS_MSD1', 'DPAS_MSD1', 'DPAS_MSD1', 'DPAS_MSD1'], 'active_cooling_runtime_h' : ['Runtime active cooling', 'Drifttid aktiv kyla', 'Käyttöaika aktiviseen viilennykseen', 'Drifttid aktiv kjøling', 'Betriebszeit aktive Kühlung'], - 'msd1_d' : ['DACT_MSD1', 'DACT_MSD1', 'DACT_MSD1', 'DACT_MSD1', 'DACT_MSD1'], + 'msd1_dact' : ['DACT_MSD1', 'DACT_MSD1', 'DACT_MSD1', 'DACT_MSD1', 'DACT_MSD1'], 'boiler_6kw_on_runtime_h' : ['Runtime 6 kW', 'Drifttid 6 kW', 'Käyttöaika 6 kW', 'Drifttid 6 kW', 'Betriebszeit 6 kW'], - 'msd1_d' : ['DTS2_MSD1', 'DTS2_MSD1', 'DTS2_MSD1', 'DTS2_MSD1', 'DTS2_MSD1'], + 'msd1_dts2' : ['DTS2_MSD1', 'DTS2_MSD1', 'DTS2_MSD1', 'DTS2_MSD1', 'DTS2_MSD1'], 'graph_display_offset' : ['GrafCounterOffSet   ', 'GrafCounterOffSet   ', 'GrafCounterOffSet   ', 'GrafCounterOffSet   ', 'GrafCounterOffSet   '], 'room_sensor_set_t' : ['Room sensor, Set target','Rums sensor, Styrvärde', 'Room sensor, Set target', 'Room sensor, Set target', 'Room sensor, Set target'], 'heatpump_evu_block' : ['EVU Function, Set state','EVU funktion, Läge','EVU Function, Set state','EVU Function, Set state','EVU Function, Set state' ]