diff --git a/Version.toml b/Version.toml index a01d904..e061811 100644 --- a/Version.toml +++ b/Version.toml @@ -1,8 +1,8 @@ [version] major = 1 minor = 5 -patch = 5 +patch = 6 [build] date = "2026-09-27" -time = "22:09:12" +time = "22:15:49" diff --git a/app/api.py b/app/api.py index e1e6b17..9643d08 100644 --- a/app/api.py +++ b/app/api.py @@ -362,33 +362,33 @@ def get_status() -> dict: auto_controller .manual_target_temperature ) - elif tion_status is not None: - schedule = schedule_service + elif tion_status is not None: + schedule = schedule_service + + if schedule is not None: + # Ручной override имеет приоритет над AUTO. + if ( + schedule.override_active + and schedule.override_settings.target_temp + is not None + ): + tion_status["target_temp"] = ( + schedule.override_settings.target_temp + ) + + else: + resolution = schedule.resolve() - if schedule is not None: - # Ручной override имеет приоритет над AUTO. if ( - schedule.override_active - and schedule.override_settings.target_temp + resolution.enabled + and resolution.auto_active + and resolution.auto_target_temp is not None ): tion_status["target_temp"] = ( - schedule.override_settings.target_temp + resolution.auto_target_temp ) - else: - resolution = schedule.resolve() - - if ( - resolution.enabled - and resolution.auto_active - and resolution.auto_target_temp - is not None - ): - tion_status["target_temp"] = ( - resolution.auto_target_temp - ) - return {