From 9a2fd3b959dd22c1464c3b15ad4b34f652090204 Mon Sep 17 00:00:00 2001 From: Fedorov Dmitriy Date: Sun, 27 Sep 2026 21:38:39 +0300 Subject: [PATCH] =?UTF-8?q?work:=20=D0=B2=20=D1=80=D0=B5=D0=B6=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=20=D0=B0=D0=B2=D1=82=D0=BE=20=D1=82=D0=B5=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D1=8C=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=D1=81=D1=8F=20=D1=80=D0=B5=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=BD=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=B6=D0=B5=D0=BB=D0=B0=D0=B5=D0=BC=D0=B0=D1=8F=20=D1=82=D0=B5?= =?UTF-8?q?=D0=BC=D0=BF=D0=B5=D1=80=D0=B0=D1=82=D1=83=D1=80=D0=B0.=20?= =?UTF-8?q?=D0=A0=D0=B0=D0=BD=D1=8C=D1=88=D0=B5=20=D0=BE=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B0=D0=BB=D0=B0=D1=81=D1=8C=2030=20=D0=B3?= =?UTF-8?q?=D1=80=D0=B0=D0=B4=20=D1=82.=D0=BA.=20=D0=B2=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=BD=D0=B0=D0=B3=D1=80?= =?UTF-8?q?=D0=B5=D0=B2=D0=B0=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B5=20=D1=82=D0=B8=D0=BE=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Version.toml | 4 ++-- app/api.py | 16 ++++++++++++++++ config/{auto.yaml => auto_template.yaml} | 0 config/{schedule.yaml => schedule_template.yaml} | 5 ----- 4 files changed, 18 insertions(+), 7 deletions(-) rename config/{auto.yaml => auto_template.yaml} (100%) rename config/{schedule.yaml => schedule_template.yaml} (99%) diff --git a/Version.toml b/Version.toml index 0b19839..fbe88bb 100644 --- a/Version.toml +++ b/Version.toml @@ -1,8 +1,8 @@ [version] major = 1 minor = 5 -patch = 2 +patch = 3 [build] date = "2026-09-27" -time = "21:27:10" +time = "21:35:33" diff --git a/app/api.py b/app/api.py index b965af7..6636560 100644 --- a/app/api.py +++ b/app/api.py @@ -362,6 +362,22 @@ def get_status() -> dict: auto_controller .manual_target_temperature ) + elif ( + tion_status is not None + and schedule_service is not None + ): + resolution = schedule_service.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 { "online": service.online, diff --git a/config/auto.yaml b/config/auto_template.yaml similarity index 100% rename from config/auto.yaml rename to config/auto_template.yaml diff --git a/config/schedule.yaml b/config/schedule_template.yaml similarity index 99% rename from config/schedule.yaml rename to config/schedule_template.yaml index 4276d05..1977ced 100644 --- a/config/schedule.yaml +++ b/config/schedule_template.yaml @@ -36,7 +36,6 @@ templates: weekend: - - time: "10:00" action: power: on @@ -62,16 +61,12 @@ templates: speed: 1 - - days: - mon: workday tue: workday wed: workday thu: workday fri: workday - sat: weekend sun: weekend