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(),
|
||||
|
||||
+201
-6
@@ -46,6 +46,20 @@ class AutoController:
|
||||
self._temperature: float | int | None = None
|
||||
self._temperature_source: str | None = None
|
||||
|
||||
# --------------------------------------------------
|
||||
# Ручное управление обогревом.
|
||||
#
|
||||
# Эти значения описывают желание пользователя,
|
||||
# а не текущее физическое состояние Tion.
|
||||
# --------------------------------------------------
|
||||
|
||||
self._manual_heater_enabled: bool | None = None
|
||||
self._manual_target_temperature: int | None = None
|
||||
|
||||
# Фактическое решение нашего внешнего
|
||||
# температурного регулятора.
|
||||
self._manual_heating: bool | None = None
|
||||
|
||||
self._last_error: str | None = None
|
||||
|
||||
|
||||
@@ -118,17 +132,16 @@ class AutoController:
|
||||
self._target_speed = None
|
||||
self._auto_speed = None
|
||||
|
||||
self._target_heater = None
|
||||
self._auto_heater = None
|
||||
|
||||
self._target_temperature = None
|
||||
|
||||
self._temperature = None
|
||||
self._temperature_source = None
|
||||
|
||||
await self._process_manual_heater()
|
||||
|
||||
self._last_error = None
|
||||
|
||||
self._release_elica_assist()
|
||||
await self._release_elica_assist()
|
||||
|
||||
return
|
||||
|
||||
@@ -156,7 +169,7 @@ class AutoController:
|
||||
|
||||
self._last_error = None
|
||||
|
||||
self._release_elica_assist()
|
||||
await self._release_elica_assist()
|
||||
|
||||
return
|
||||
|
||||
@@ -185,7 +198,7 @@ class AutoController:
|
||||
|
||||
self._last_error = None
|
||||
|
||||
self._release_elica_assist()
|
||||
await self._release_elica_assist()
|
||||
|
||||
return
|
||||
|
||||
@@ -386,6 +399,144 @@ class AutoController:
|
||||
|
||||
self._auto_heater = heater_required
|
||||
|
||||
async def _process_manual_heater(
|
||||
self,
|
||||
) -> None:
|
||||
"""
|
||||
Управление обогревом в полном ручном режиме.
|
||||
|
||||
Приоритет:
|
||||
1. Qingping -> внешний регулятор.
|
||||
2. Qingping недоступен -> штатный
|
||||
термостат Tion.
|
||||
"""
|
||||
|
||||
enabled = self._manual_heater_enabled
|
||||
target_temp = (
|
||||
self._manual_target_temperature
|
||||
)
|
||||
|
||||
# --------------------------------------------------
|
||||
# Пользователь явно выключил обогрев.
|
||||
# --------------------------------------------------
|
||||
|
||||
if enabled is False:
|
||||
await self._set_heater(False)
|
||||
|
||||
self._manual_heating = False
|
||||
|
||||
return
|
||||
|
||||
# Состояние ручного управления ещё
|
||||
# не инициализировано.
|
||||
if enabled is None:
|
||||
self._manual_heating = None
|
||||
return
|
||||
|
||||
# --------------------------------------------------
|
||||
# Heater разрешён, но нет пользовательской цели.
|
||||
#
|
||||
# Греть без уставки нельзя.
|
||||
# --------------------------------------------------
|
||||
|
||||
if target_temp is None:
|
||||
await self._set_heater(False)
|
||||
|
||||
self._manual_heating = False
|
||||
|
||||
return
|
||||
|
||||
qingping_state = self._qingping.state
|
||||
|
||||
qingping_temperature = getattr(
|
||||
qingping_state,
|
||||
"temperature",
|
||||
None,
|
||||
)
|
||||
|
||||
# --------------------------------------------------
|
||||
# Qingping недоступен.
|
||||
#
|
||||
# Возвращаем управление встроенному
|
||||
# термостату Tion:
|
||||
#
|
||||
# target = пользовательская температура
|
||||
# heater = ON
|
||||
#
|
||||
# Дальше Tion сам решает, когда реально греть.
|
||||
# --------------------------------------------------
|
||||
|
||||
if (
|
||||
not self._qingping.online
|
||||
or qingping_temperature is None
|
||||
or self._temperature_policy is None
|
||||
):
|
||||
await self._set_target_temperature(
|
||||
target_temp
|
||||
)
|
||||
|
||||
await self._set_heater(True)
|
||||
|
||||
self._manual_heating = None
|
||||
|
||||
# Это только диагностическое значение.
|
||||
# Решение по нему мы НЕ принимаем.
|
||||
tion_state = self._tion.state
|
||||
|
||||
if (
|
||||
self._tion.online
|
||||
and tion_state is not None
|
||||
and tion_state.in_temp is not None
|
||||
):
|
||||
self._temperature = (
|
||||
tion_state.in_temp
|
||||
)
|
||||
self._temperature_source = "tion"
|
||||
else:
|
||||
self._temperature = None
|
||||
self._temperature_source = None
|
||||
|
||||
return
|
||||
|
||||
# --------------------------------------------------
|
||||
# Qingping доступен.
|
||||
#
|
||||
# Именно его температура становится основной.
|
||||
# --------------------------------------------------
|
||||
|
||||
self._temperature = qingping_temperature
|
||||
self._temperature_source = "qingping"
|
||||
|
||||
heater_required = (
|
||||
self._temperature_policy
|
||||
.heater_required(
|
||||
temperature=qingping_temperature,
|
||||
target_temp=target_temp,
|
||||
heater_on=(
|
||||
self._manual_heating
|
||||
is True
|
||||
),
|
||||
)
|
||||
)
|
||||
|
||||
# --------------------------------------------------
|
||||
# Пока управляем по комнатному датчику,
|
||||
# внутренний термостат Tion не должен
|
||||
# выключить нагрев раньше нас.
|
||||
#
|
||||
# Поэтому физическая уставка всегда MAX.
|
||||
# --------------------------------------------------
|
||||
|
||||
await self._set_target_temperature(
|
||||
MAX_TARGET_TEMP
|
||||
)
|
||||
|
||||
await self._set_heater(
|
||||
heater_required
|
||||
)
|
||||
|
||||
self._manual_heating = heater_required
|
||||
|
||||
|
||||
def _get_temperature(self) -> tuple[float | int | None, str | None]:
|
||||
|
||||
@@ -787,6 +938,44 @@ class AutoController:
|
||||
|
||||
self._target_temperature = temperature
|
||||
|
||||
def set_manual_heater_enabled(self, enabled: bool) -> None:
|
||||
"""
|
||||
Запоминает, хочет ли пользователь использовать
|
||||
обогрев в ручном режиме.
|
||||
|
||||
Саму команду Tion этот метод пока не отправляет.
|
||||
"""
|
||||
self._manual_heater_enabled = enabled
|
||||
|
||||
self._target_heater = None
|
||||
|
||||
if not enabled:
|
||||
self._manual_heating = False
|
||||
|
||||
def set_manual_target_temperature(self, temperature: int) -> None:
|
||||
"""
|
||||
Запоминает желаемую температуру помещения
|
||||
для ручного режима.
|
||||
"""
|
||||
self._manual_target_temperature = temperature
|
||||
self._target_temperature = None
|
||||
|
||||
def clear_manual_heater_control(self) -> None:
|
||||
"""
|
||||
Забываем состояние ручного температурного
|
||||
регулятора при возврате к расписанию.
|
||||
"""
|
||||
self._manual_heater_enabled = None
|
||||
self._manual_target_temperature = None
|
||||
self._manual_heating = None
|
||||
|
||||
@property
|
||||
def manual_heater_enabled(self) -> bool | None:
|
||||
return self._manual_heater_enabled
|
||||
|
||||
@property
|
||||
def manual_target_temperature(self) -> int | None:
|
||||
return self._manual_target_temperature
|
||||
|
||||
def status(self) -> dict:
|
||||
return {
|
||||
@@ -808,6 +997,12 @@ class AutoController:
|
||||
else None
|
||||
),
|
||||
|
||||
"manual_heater": {
|
||||
"enabled": self._manual_heater_enabled,
|
||||
"target_temp": self._manual_target_temperature,
|
||||
"heating": self._manual_heating,
|
||||
},
|
||||
|
||||
"last_error": self._last_error,
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user