manual override reset plus minor fixes #3

Merged
pierre merged 31 commits from dev into main 2026-01-15 14:23:00 +01:00
Showing only changes of commit 69c65c844f - Show all commits

View File

@@ -229,7 +229,13 @@ variables:
{% endif %} {% endif %}
{{ ns.current_temperature }} {{ ns.current_temperature }}
target_temperature: > target_temperature: >
{{ scheduled_temperature if scheduled_temperature != none and not (alarm_control_panel and is_state(alarm_control_panel, 'armed_away')) else away_temperature }} {% if alarm_control_panel and is_state(alarm_control_panel, 'armed_away') %}
{{ away_temperature }}
{% elif scheduled_temperature != none %}
{{ scheduled_temperature }}
{% else %}
{{ away_temperature }}
{% endif %}
safe_temperature: > safe_temperature: >
{{ [min_temperature, [max_temperature, target_temperature | float(18)] | min] | max }} {{ [min_temperature, [max_temperature, target_temperature | float(18)] | min] | max }}
is_valid_temperature: > is_valid_temperature: >
@@ -240,15 +246,9 @@ variables:
{% set new_sensor_temp = states(temperature_sensor) | float(0) %} {% set new_sensor_temp = states(temperature_sensor) | float(0) %}
{% set target_temp = state_attr(trv, 'temperature') | float(0) %} {% set target_temp = state_attr(trv, 'temperature') | float(0) %}
{% set diff = (new_sensor_temp - current_remote_temperature) | abs %} {% set diff = (new_sensor_temp - current_remote_temperature) | abs %}
{% if diff >= sensor_sync_threshold %} {{ diff >= sensor_sync_threshold or
true (new_sensor_temp < target_temp and current_remote_temperature >= target_temp) or
{% elif new_sensor_temp < target_temp and current_remote_temperature >= target_temp %} (new_sensor_temp > target_temp and current_remote_temperature <= target_temp) }}
true
{% elif new_sensor_temp > target_temp and current_remote_temperature <= target_temp %}
true
{% else %}
false
{% endif %}
scheduler_mismatch: > scheduler_mismatch: >
{% set selected = states(active_scheduler_selector) %} {% set selected = states(active_scheduler_selector) %}
{% if selected not in ['unknown', '', none] %} {% if selected not in ['unknown', '', none] %}