diff --git a/ha-configs/151/configuration.yaml b/ha-configs/151/configuration.yaml index 23eebe5..7942592 100644 --- a/ha-configs/151/configuration.yaml +++ b/ha-configs/151/configuration.yaml @@ -22,6 +22,13 @@ icon: mdi:heat-pump show_in_sidebar: true filename: dashboards/ibsystem_dashboard.yaml + lovelace-salon: + mode: yaml + title: Salon + icon: mdi:sofa + show_in_sidebar: true + filename: dashboards/salon_dashboard.yaml + lovelace-id35: mode: yaml title: ID35 @@ -62,7 +69,7 @@ - name: "Temperatura w salonie" unique_id: temperatura_salonu_ibsystem state: > - {% set raw = states('sensor.sterownik_4_rs0_id4_input_t_0_value') %} + {% set raw = states('sensor.ibsystem_rs0_id4_rs0_id4_input_t_0_value') %} {% if raw not in ['unknown', 'unavailable', ''] %} {{ (raw | float(0) / 10) | round(1) }} {% else %} @@ -87,8 +94,8 @@ - name: "Moc pompy aktualna" unique_id: moc_pompy_aktualna state: > - {% set current = states('sensor.sterownik_1_rs0_id1_outdoor_unit_current') | float(0) %} - {% set voltage = states('sensor.sterownik_1_rs0_id1_outdoor_unit_voltage') | float(230) %} + {% set current = states('sensor.ibsystem_rs0_id1_rs0_id1_outdoor_unit_current') | float(0) %} + {% set voltage = states('sensor.ibsystem_rs0_id1_rs0_id1_outdoor_unit_voltage') | float(230) %} {{ ((current * voltage) / 1000) | round(2) }} unit_of_measurement: "kW" device_class: power @@ -99,9 +106,9 @@ unique_id: cop_aktualny_pompy state: > {% set power_in = states('sensor.moc_pompy_aktualna') | float(0) %} - {% set freq = states('sensor.sterownik_1_rs0_id1_operating_frequency') | int(0) %} - {% set t1 = states('sensor.sterownik_1_rs0_id1_t1') | float(0) %} - {% set t4 = states('sensor.sterownik_1_rs0_id1_t4') | float(0) %} + {% set freq = states('sensor.ibsystem_rs0_id1_rs0_id1_operating_frequency') | int(0) %} + {% set t1 = states('sensor.ibsystem_rs0_id1_rs0_id1_t1') | float(0) %} + {% set t4 = states('sensor.ibsystem_rs0_id1_rs0_id1_t4') | float(0) %} {% if power_in > 0.1 and freq > 0 %} {# Przybliżona moc cieplna: power_in * estymowany COP #} {# COP zależy od różnicy temp: im większa różnica, tym niższy COP #} @@ -119,8 +126,8 @@ - name: "SCOP pompy" unique_id: scop_pompy_sezonowy state: > - {% set consumed = states('sensor.sterownik_1_rs0_id1_electricity_consumption_lo') | float(1) %} - {% set produced = states('sensor.sterownik_1_rs0_id1_power_output_lo') | float(0) %} + {% set consumed = states('sensor.ibsystem_rs0_id1_rs0_id1_electricity_consumption_lo') | float(1) %} + {% set produced = states('sensor.ibsystem_rs0_id1_rs0_id1_power_output_lo') | float(0) %} {% if consumed > 0 %} {{ (produced / consumed) | round(2) }} {% else %} @@ -132,7 +139,7 @@ - name: "Defrost aktywny" unique_id: defrost_status state: > - {% set load = states('sensor.sterownik_1_rs0_id1_load_output') | int(0) %} + {% set load = states('sensor.ibsystem_rs0_id1_rs0_id1_load_output') | int(0) %} {% set defrost_bit = (load // 32768) % 2 %} {{ 'ON' if defrost_bit == 1 else 'OFF' }} @@ -166,35 +173,41 @@ utility_meter: energia_pobrana_dzienna: - source: sensor.sterownik_1_rs0_id1_electricity_consumption_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_electricity_consumption_lo name: Energia pobrana (dzienna) cycle: daily energia_pobrana_tygodniowa: - source: sensor.sterownik_1_rs0_id1_electricity_consumption_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_electricity_consumption_lo name: Energia pobrana (tygodniowa) cycle: weekly energia_pobrana_miesieczna: - source: sensor.sterownik_1_rs0_id1_electricity_consumption_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_electricity_consumption_lo name: Energia pobrana (miesięczna) cycle: monthly energia_oddana_dzienna: - source: sensor.sterownik_1_rs0_id1_power_output_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_power_output_lo name: Energia oddana (dzienna) cycle: daily energia_oddana_tygodniowa: - source: sensor.sterownik_1_rs0_id1_power_output_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_power_output_lo name: Energia oddana (tygodniowa) cycle: weekly energia_oddana_miesieczna: - source: sensor.sterownik_1_rs0_id1_power_output_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_power_output_lo name: Energia oddana (miesięczna) cycle: monthly - set_heating_curve: > - sshpass -p 'QWer1234' ssh -o StrictHostKeyChecking=no wk@192.168.50.243 - "/ibsystem/ibls -a 127.0.0.1 -p 2001 -c 'set(rs.0.id.1.curve.selection={{ curve }};);' 2>/dev/null" +http: + use_x_forwarded_for: true + trusted_proxies: + - 127.0.0.1 + - ::1 + - 192.168.50.244 + - 172.16.0.0/12 + - 10.0.0.0/8 + - 192.168.0.0/16 diff --git a/ha-configs/151/configuration.yaml b/ha-configs/151/configuration.yaml index 23eebe5..7942592 100644 --- a/ha-configs/151/configuration.yaml +++ b/ha-configs/151/configuration.yaml @@ -22,6 +22,13 @@ icon: mdi:heat-pump show_in_sidebar: true filename: dashboards/ibsystem_dashboard.yaml + lovelace-salon: + mode: yaml + title: Salon + icon: mdi:sofa + show_in_sidebar: true + filename: dashboards/salon_dashboard.yaml + lovelace-id35: mode: yaml title: ID35 @@ -62,7 +69,7 @@ - name: "Temperatura w salonie" unique_id: temperatura_salonu_ibsystem state: > - {% set raw = states('sensor.sterownik_4_rs0_id4_input_t_0_value') %} + {% set raw = states('sensor.ibsystem_rs0_id4_rs0_id4_input_t_0_value') %} {% if raw not in ['unknown', 'unavailable', ''] %} {{ (raw | float(0) / 10) | round(1) }} {% else %} @@ -87,8 +94,8 @@ - name: "Moc pompy aktualna" unique_id: moc_pompy_aktualna state: > - {% set current = states('sensor.sterownik_1_rs0_id1_outdoor_unit_current') | float(0) %} - {% set voltage = states('sensor.sterownik_1_rs0_id1_outdoor_unit_voltage') | float(230) %} + {% set current = states('sensor.ibsystem_rs0_id1_rs0_id1_outdoor_unit_current') | float(0) %} + {% set voltage = states('sensor.ibsystem_rs0_id1_rs0_id1_outdoor_unit_voltage') | float(230) %} {{ ((current * voltage) / 1000) | round(2) }} unit_of_measurement: "kW" device_class: power @@ -99,9 +106,9 @@ unique_id: cop_aktualny_pompy state: > {% set power_in = states('sensor.moc_pompy_aktualna') | float(0) %} - {% set freq = states('sensor.sterownik_1_rs0_id1_operating_frequency') | int(0) %} - {% set t1 = states('sensor.sterownik_1_rs0_id1_t1') | float(0) %} - {% set t4 = states('sensor.sterownik_1_rs0_id1_t4') | float(0) %} + {% set freq = states('sensor.ibsystem_rs0_id1_rs0_id1_operating_frequency') | int(0) %} + {% set t1 = states('sensor.ibsystem_rs0_id1_rs0_id1_t1') | float(0) %} + {% set t4 = states('sensor.ibsystem_rs0_id1_rs0_id1_t4') | float(0) %} {% if power_in > 0.1 and freq > 0 %} {# Przybliżona moc cieplna: power_in * estymowany COP #} {# COP zależy od różnicy temp: im większa różnica, tym niższy COP #} @@ -119,8 +126,8 @@ - name: "SCOP pompy" unique_id: scop_pompy_sezonowy state: > - {% set consumed = states('sensor.sterownik_1_rs0_id1_electricity_consumption_lo') | float(1) %} - {% set produced = states('sensor.sterownik_1_rs0_id1_power_output_lo') | float(0) %} + {% set consumed = states('sensor.ibsystem_rs0_id1_rs0_id1_electricity_consumption_lo') | float(1) %} + {% set produced = states('sensor.ibsystem_rs0_id1_rs0_id1_power_output_lo') | float(0) %} {% if consumed > 0 %} {{ (produced / consumed) | round(2) }} {% else %} @@ -132,7 +139,7 @@ - name: "Defrost aktywny" unique_id: defrost_status state: > - {% set load = states('sensor.sterownik_1_rs0_id1_load_output') | int(0) %} + {% set load = states('sensor.ibsystem_rs0_id1_rs0_id1_load_output') | int(0) %} {% set defrost_bit = (load // 32768) % 2 %} {{ 'ON' if defrost_bit == 1 else 'OFF' }} @@ -166,35 +173,41 @@ utility_meter: energia_pobrana_dzienna: - source: sensor.sterownik_1_rs0_id1_electricity_consumption_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_electricity_consumption_lo name: Energia pobrana (dzienna) cycle: daily energia_pobrana_tygodniowa: - source: sensor.sterownik_1_rs0_id1_electricity_consumption_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_electricity_consumption_lo name: Energia pobrana (tygodniowa) cycle: weekly energia_pobrana_miesieczna: - source: sensor.sterownik_1_rs0_id1_electricity_consumption_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_electricity_consumption_lo name: Energia pobrana (miesięczna) cycle: monthly energia_oddana_dzienna: - source: sensor.sterownik_1_rs0_id1_power_output_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_power_output_lo name: Energia oddana (dzienna) cycle: daily energia_oddana_tygodniowa: - source: sensor.sterownik_1_rs0_id1_power_output_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_power_output_lo name: Energia oddana (tygodniowa) cycle: weekly energia_oddana_miesieczna: - source: sensor.sterownik_1_rs0_id1_power_output_lo + source: sensor.ibsystem_rs0_id1_rs0_id1_power_output_lo name: Energia oddana (miesięczna) cycle: monthly - set_heating_curve: > - sshpass -p 'QWer1234' ssh -o StrictHostKeyChecking=no wk@192.168.50.243 - "/ibsystem/ibls -a 127.0.0.1 -p 2001 -c 'set(rs.0.id.1.curve.selection={{ curve }};);' 2>/dev/null" +http: + use_x_forwarded_for: true + trusted_proxies: + - 127.0.0.1 + - ::1 + - 192.168.50.244 + - 172.16.0.0/12 + - 10.0.0.0/8 + - 192.168.0.0/16 diff --git a/ha-configs/151/dashboards/heating_dashboard.yaml b/ha-configs/151/dashboards/heating_dashboard.yaml index 8f42106..ea42f62 100644 --- a/ha-configs/151/dashboards/heating_dashboard.yaml +++ b/ha-configs/151/dashboards/heating_dashboard.yaml @@ -10,21 +10,21 @@ name: 🏠 Temperatura w salonie - entity: input_number.heating_target_temp name: 🎯 Temperatura docelowa - - entity: sensor.sterownik_1_rs0_id1_t4 + - entity: sensor.ibsystem_rs0_id1_rs0_id1_t4 name: ❄️ Temperatura zewnętrzna (T4) - - entity: sensor.sterownik_1_rs0_id1_t1 + - entity: sensor.ibsystem_rs0_id1_rs0_id1_t1 name: 🔥 Temperatura zasilania (T1) - - entity: sensor.sterownik_1_rs0_id1_t5 + - entity: sensor.ibsystem_rs0_id1_rs0_id1_t5 name: 🚿 Temperatura CWU (T5) - type: entities title: ⚙️ Parametry krzywej grzewczej entities: - - entity: sensor.sterownik_1_rs0_id1_setting_t1s + - entity: sensor.ibsystem_rs0_id1_rs0_id1_setting_t1s name: T1S (parametr) - - entity: sensor.sterownik_1_rs0_id1_climate_curve_t1s_calculated_value_1 + - entity: sensor.ibsystem_rs0_id1_rs0_id1_climate_curve_t1s_calculated_value_1 name: Temp obliczona krzywą - - entity: sensor.sterownik_1_rs0_id1_function_setting + - entity: sensor.ibsystem_rs0_id1_rs0_id1_function_setting name: Status (4096=ON) - type: entities @@ -36,11 +36,11 @@ name: COP chwilowy - entity: sensor.scop_pompy name: SCOP sezonowy - - entity: sensor.sterownik_1_rs0_id1_outdoor_unit_current + - entity: sensor.ibsystem_rs0_id1_rs0_id1_outdoor_unit_current name: Prąd (A) - - entity: sensor.sterownik_1_rs0_id1_outdoor_unit_voltage + - entity: sensor.ibsystem_rs0_id1_rs0_id1_outdoor_unit_voltage name: Napięcie (V) - - entity: sensor.sterownik_1_rs0_id1_operating_frequency + - entity: sensor.ibsystem_rs0_id1_rs0_id1_operating_frequency name: Częstotliwość (Hz) - type: entities @@ -51,9 +51,9 @@ - entity: sensor.energia_oddana_dzienna name: 🔥 Oddana dzisiaj - type: divider - - entity: sensor.sterownik_1_rs0_id1_electricity_consumption_lo + - entity: sensor.ibsystem_rs0_id1_rs0_id1_electricity_consumption_lo name: Pobrana TOTAL - - entity: sensor.sterownik_1_rs0_id1_power_output_lo + - entity: sensor.ibsystem_rs0_id1_rs0_id1_power_output_lo name: Oddana TOTAL - type: entities @@ -83,9 +83,9 @@ entities: - entity: sensor.temperatura_w_salonie name: Salon - - entity: sensor.sterownik_1_rs0_id1_t4 + - entity: sensor.ibsystem_rs0_id1_rs0_id1_t4 name: Zewnątrz - - entity: sensor.sterownik_1_rs0_id1_t1 + - entity: sensor.ibsystem_rs0_id1_rs0_id1_t1 name: Zasilanie - type: history-graph @@ -125,6 +125,6 @@ ### 📊 Stan: - Salon: {{ states('sensor.temperatura_w_salonie') }}°C - Cel: {{ states('input_number.heating_target_temp') }}°C - - T1: {{ states('sensor.sterownik_1_rs0_id1_t1') }}°C + - T1: {{ states('sensor.ibsystem_rs0_id1_rs0_id1_t1') }}°C - COP: {{ states('sensor.cop_aktualny') }} - Dziś pobrano: {{ states('sensor.energia_pobrana_dzienna') }} kWh