work: изменил логику нагрева, теперь нагрев включается по датчику qingping а не тион. Если он недоступен то по тиону.
This commit is contained in:
+138
-23
@@ -327,6 +327,42 @@ def get_status() -> dict:
|
||||
|
||||
state = service.state
|
||||
|
||||
tion_status = (
|
||||
state.to_dict()
|
||||
if state is not None
|
||||
else None
|
||||
)
|
||||
|
||||
# --------------------------------------------------
|
||||
# В ручном режиме UI должен видеть желание
|
||||
# пользователя, а не техническое состояние
|
||||
# внешнего регулятора.
|
||||
# --------------------------------------------------
|
||||
|
||||
if (
|
||||
tion_status is not None
|
||||
and schedule_service is not None
|
||||
and schedule_service.paused
|
||||
and auto_controller is not None
|
||||
):
|
||||
if (
|
||||
auto_controller.manual_heater_enabled
|
||||
is not None
|
||||
):
|
||||
tion_status["heater"] = (
|
||||
auto_controller
|
||||
.manual_heater_enabled
|
||||
)
|
||||
|
||||
if (
|
||||
auto_controller.manual_target_temperature
|
||||
is not None
|
||||
):
|
||||
tion_status["target_temp"] = (
|
||||
auto_controller
|
||||
.manual_target_temperature
|
||||
)
|
||||
|
||||
return {
|
||||
"online": service.online,
|
||||
"running": service.running,
|
||||
@@ -339,11 +375,8 @@ def get_status() -> dict:
|
||||
|
||||
"last_error": service.last_error,
|
||||
|
||||
"tion": (
|
||||
state.to_dict()
|
||||
if state is not None
|
||||
else None
|
||||
),
|
||||
"tion": tion_status,
|
||||
|
||||
"auto": get_auto_status(),
|
||||
|
||||
"qingping": qingping_service.status(),
|
||||
@@ -396,6 +429,17 @@ def get_effective_speed() -> int:
|
||||
|
||||
def get_effective_temperature() -> int:
|
||||
|
||||
if (
|
||||
schedule_service is not None
|
||||
and schedule_service.paused
|
||||
and auto_controller is not None
|
||||
and auto_controller.manual_target_temperature is not None
|
||||
):
|
||||
return (
|
||||
auto_controller
|
||||
.manual_target_temperature
|
||||
)
|
||||
|
||||
if (
|
||||
schedule_service is not None
|
||||
and schedule_service.override_active
|
||||
@@ -756,10 +800,18 @@ async def set_heater(state: Literal["on", "off"]):
|
||||
operation = lambda tion: tion.heater_off()
|
||||
|
||||
|
||||
return await execute_command(
|
||||
operation,
|
||||
ScheduledSettings(heater=enabled),
|
||||
)
|
||||
await execute_command(operation, ScheduledSettings(heater=enabled))
|
||||
|
||||
if (
|
||||
schedule_service is not None
|
||||
and schedule_service.paused
|
||||
and auto_controller is not None
|
||||
):
|
||||
auto_controller.set_manual_heater_enabled(
|
||||
enabled
|
||||
)
|
||||
|
||||
return get_status()
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Target temperature increase / decrease
|
||||
@@ -775,39 +827,51 @@ async def increase_temperature():
|
||||
if new_temperature == current_temperature:
|
||||
return get_status()
|
||||
|
||||
return await execute_command(
|
||||
await execute_command(
|
||||
lambda tion:
|
||||
tion.set_target_temperature(
|
||||
new_temperature
|
||||
),
|
||||
|
||||
ScheduledSettings(
|
||||
target_temp=new_temperature,
|
||||
),
|
||||
)
|
||||
|
||||
if (
|
||||
schedule_service is not None
|
||||
and schedule_service.paused
|
||||
and auto_controller is not None
|
||||
):
|
||||
auto_controller.set_manual_target_temperature(new_temperature)
|
||||
|
||||
@app.post("/api/tion/temperature/decrease")
|
||||
async def decrease_temperature():
|
||||
return get_status()
|
||||
|
||||
current_temperature = get_effective_temperature()
|
||||
|
||||
new_temperature = max(current_temperature - 1, MIN_TARGET_TEMP)
|
||||
|
||||
if new_temperature == current_temperature:
|
||||
return get_status()
|
||||
|
||||
return await execute_command(
|
||||
@app.post("/api/tion/temperature/{temperature}")
|
||||
async def set_temperature(
|
||||
temperature: int,
|
||||
):
|
||||
await execute_command(
|
||||
lambda tion:
|
||||
tion.set_target_temperature(
|
||||
new_temperature
|
||||
temperature
|
||||
),
|
||||
|
||||
ScheduledSettings(
|
||||
target_temp=new_temperature,
|
||||
target_temp=temperature,
|
||||
),
|
||||
)
|
||||
|
||||
if (
|
||||
schedule_service is not None
|
||||
and schedule_service.paused
|
||||
and auto_controller is not None
|
||||
):
|
||||
auto_controller.set_manual_target_temperature(
|
||||
temperature
|
||||
)
|
||||
|
||||
return get_status()
|
||||
|
||||
# ----------------------------------------------------------------------
|
||||
# Target temperature
|
||||
# ----------------------------------------------------------------------
|
||||
@@ -1018,8 +1082,56 @@ async def pause_schedule():
|
||||
detail="Schedule service unavailable",
|
||||
)
|
||||
|
||||
state = service.state
|
||||
|
||||
manual_target = None
|
||||
|
||||
if state is not None:
|
||||
manual_target = state.target_temp
|
||||
|
||||
resolution = schedule_service.resolve()
|
||||
|
||||
# Если выходим в manual прямо из AUTO,
|
||||
# физическая уставка Tion могла быть 30°C.
|
||||
# Пользователю нужна настоящая AUTO-цель.
|
||||
if (
|
||||
resolution.auto_active
|
||||
and resolution.auto_target_temp
|
||||
is not None
|
||||
):
|
||||
manual_target = (
|
||||
resolution.auto_target_temp
|
||||
)
|
||||
|
||||
# Temporary override имеет ещё больший
|
||||
# приоритет.
|
||||
if (
|
||||
schedule_service.override_active
|
||||
and schedule_service
|
||||
.override_settings
|
||||
.target_temp is not None
|
||||
):
|
||||
manual_target = (
|
||||
schedule_service
|
||||
.override_settings
|
||||
.target_temp
|
||||
)
|
||||
|
||||
await schedule_service.pause()
|
||||
|
||||
if (
|
||||
auto_controller is not None
|
||||
and state is not None
|
||||
):
|
||||
auto_controller.set_manual_heater_enabled(
|
||||
state.heater
|
||||
)
|
||||
|
||||
if manual_target is not None:
|
||||
auto_controller.set_manual_target_temperature(
|
||||
manual_target
|
||||
)
|
||||
|
||||
return {
|
||||
"ok": True,
|
||||
"schedule": get_schedule_status(),
|
||||
@@ -1039,6 +1151,9 @@ async def resume_schedule():
|
||||
|
||||
await schedule_service.resume()
|
||||
|
||||
if auto_controller is not None:
|
||||
auto_controller.clear_manual_heater_control()
|
||||
|
||||
return {
|
||||
"ok": True,
|
||||
"schedule": get_schedule_status(),
|
||||
|
||||
Reference in New Issue
Block a user