77 Commits
Author SHA1 Message Date
Dmitriy 0eae8b76a0 Merge branch 'release' into dev_fedorov 2026-09-27 22:10:56 +03:00
Dmitriy bc7b85df60 fix: v1.5.5 поправил баг, когда при режиме авто меняешь температуру, управление шло по джатчикам тион. теперь по quingping 2026-09-27 22:10:46 +03:00
Dmitriy d23ad89d67 work: поправил баг, когда при режиме авто меняешь температуру, управление шло по джатчикам тион. теперь по quingping 2026-09-27 22:10:06 +03:00
Dmitriy dc1481bc0d Merge branch 'release' into dev_fedorov 2026-09-27 21:57:20 +03:00
Dmitriy d21836bf76 fix: v1.5.4 поправил автоматический сброс температуры если руками изменить в режиме авто 2026-09-27 21:57:09 +03:00
Dmitriy 28ae6542fb work: поправил автоматический сброс температуры если руками изменить в режиме авто 2026-09-27 21:56:19 +03:00
Dmitriy 521e01bc92 Merge branch 'release' into dev_fedorov 2026-09-27 21:44:55 +03:00
Dmitriy 8f7564a55d fix: v1.5.3 в режиме авто теперь отображается реально заданная желаемая температура. Раньше отображалась 30 град т.к. включением нагрева управляет логика а не тион 2026-09-27 21:44:22 +03:00
Dmitriy 9a2fd3b959 work: в режиме авто теперь отображается реально заданная желаемая температура. Раньше отображалась 30 град т.к. включением нагрева управляет логика а не тион 2026-09-27 21:38:39 +03:00
Dmitriy f46ad0861d Merge branch 'release' into dev_fedorov 2026-09-27 21:28:44 +03:00
Dmitriy 328182e1b4 fix: v1.5.2 изменил логику нагрева, теперь нагрев включается по датчику qingping а не тион. Если он недоступен то по тиону. 2026-09-27 21:28:31 +03:00
Dmitriy b2030187c1 work: изменил логику нагрева, теперь нагрев включается по датчику qingping а не тион. Если он недоступен то по тиону. 2026-09-27 21:27:49 +03:00
Dmitriy 0fc519be14 Merge branch 'release' into dev_fedorov
# Conflicts:
#	Version.toml
#	app/auto/controller.py
2026-09-27 20:31:53 +03:00
Dmitriy cea2637ec8 fix: v1.5.1 добавил await в вызов await self._update_elica_assist(fallback_speed) 2026-09-27 20:06:36 +03:00
Dmitriy cb6ed3328d work: v1.5.0 добавил автоматику управления вытяжкой. Скорости сопоставляются в auto.yaml. Сейчас 4 тион 1 элика, 5 - 2; 6 -3. 2026-09-27 20:01:55 +03:00
Dmitriy 3298be6df7 work : изменил версию 2026-09-27 20:01:18 +03:00
Dmitriy f161d98746 work: добавил автоматику управления вытяжкой. Скорости сопоставляются в auto.yaml. Сейчас 4 тион 1 элика, 5 - 2; 6 -3. 2026-09-27 19:59:36 +03:00
Dmitriy e197e924ae Merge branch 'release' into dev_fedorov 2026-09-27 18:02:22 +03:00
Dmitriy 2846fb0fbb fix: v1.4.3 добавил защиту для случая если процесс bluetooth аварийно завершился, приложение считает его connected и не может подключиться 2026-09-27 17:13:42 +03:00
Dmitriy 0c0f6c5d0f work: добавил защиту для случая если процесс bluetooth аварийно завершился, приложение считает его connected и не может подключиться 2026-09-27 17:13:08 +03:00
Dmitriy 81f946fc24 Merge branch 'release' into dev_fedorov 2026-09-27 17:09:22 +03:00
Dmitriy 41a4d6cd1b fix : v1.4.22 исправил включение бризера. Теперь отправляется power on и speed 2026-09-27 09:22:31 +03:00
Dmitriy c61a6f8797 work : исправил включение бризера. Теперь отправляется power on и speed 2026-09-27 09:21:53 +03:00
Dmitriy 940f63ff94 Merge branch 'release' into dev_fedorov 2026-09-27 00:55:33 +03:00
Dmitriy cb9d0338a7 fix: 1.4.1 исправил адрес сервера mqtt на miniPC 2026-09-27 00:55:11 +03:00
Dmitriy 6a9613f40c work: исправил адрес сервера mqtt на miniPC 2026-09-27 00:54:32 +03:00
Dmitriy f06bafc72a Merge branch 'release' into dev_fedorov 2026-09-27 00:39:54 +03:00
Dmitriy 7da45b7fef fix: v1.4.1 исправлены css главных панелей тиона и элики. 2026-09-27 00:39:45 +03:00
Dmitriy cc339584a0 work: изменил patch 2026-09-27 00:38:55 +03:00
Dmitriy dfa3cafdf5 work: исправлены css главных панелей тиона и элики. 2026-09-27 00:38:05 +03:00
Dmitriy 536435aac2 Merge branch 'release' into dev_fedorov 2026-09-27 00:11:34 +03:00
Dmitriy 9fe85c3683 fix: 1.4.0 добавил фалйы форм в отслеживание 2026-09-27 00:11:18 +03:00
Dmitriy 869c826774 work: добавил фалйы форм в отслеживание 2026-09-27 00:10:43 +03:00
Dmitriy c6607a75ab Merge branch 'release' into dev_fedorov 2026-09-27 00:00:46 +03:00
Dmitriy 774d16f10a feat: v 1.4.0 Полный функционал для работы с вятяжкой
* Добавил полный функционал управления elica через esp32 по MQTT
    * Добавил в прошивку принудительную блокировку внешнего винтелятора при работающей вытяжке
    * Добавил веб-панели для управления вытяжкой
2026-09-27 00:00:26 +03:00
Dmitriy bf832ac86b work: функционал для работы с вятяжкой
* Добавил полный функционал управления elica через esp32 по MQTT
* Добавил в прошивку принудительную блокировку внешнего винтелятора при работающей вытяжке
* Добавил веб-панели для управления вытяжкой
2026-09-26 23:59:01 +03:00
Dmitriy 3b3c7a3f13 work: Добавил защиту от постоянного нажатия кнопки. В случае исключения всегда отправится команда на отжатие. Также добавил синхронизацию начального состояния вытяжки. 2026-09-22 23:07:40 +03:00
Dmitriy 75950a7eae work: Добавил высокоуровневый контроллер для работы с вытяжкой. 2026-09-22 22:45:33 +03:00
Dmitriy 4169b0c3e5 work: Низкий уровень работы с Элика завершен. Добавил логику для отслеживания состояния вытяжки. 2026-09-22 22:01:57 +03:00
Dmitriy 8ece9ba131 work: Добавил интерфейс для управления кнопками вытяжки. 2026-09-22 21:36:39 +03:00
Dmitriy f6e00842d8 work: Добавил функционал пульсирующего включения. Т.е. вкл\выкл. 2026-09-22 21:35:10 +03:00
Dmitriy 5e04013e2d work: Добавил функционал проверки состояний входов 2026-09-22 21:23:05 +03:00
Dmitriy 8d61712642 work: Изменил конфиг сервиса вытяжки для реальной платы. Добавил yaml конфигурацию платы. Сейчас доступны MQTT -прием статуса и управление реле. 2026-09-22 21:16:14 +03:00
Dmitriy 32f3fc754f work: добавил каркас под управление вытяжкой! 2026-09-20 18:24:17 +03:00
Dmitriy 9fd1b3976d Merge branch 'release' into dev_fedorov 2026-09-20 14:19:52 +03:00
Dmitriy e55d7a818e feat : v1.3.0 добавил экспорт метрик для Prometheus 2026-09-20 14:19:37 +03:00
Dmitriy 3754bbc380 work : добавил экспорт метрик для Prometheus 2026-09-20 14:18:40 +03:00
Dmitriy a000fb6c44 work : изменил расписание на реальное. 2026-09-20 13:42:34 +03:00
Dmitriy be4c2c403c work : переименовал проект 2026-09-20 12:55:06 +03:00
Fedorov Dmitriy e636bc53ca Merge branch 'release' into dev_fedorov 2026-09-20 11:29:58 +03:00
Fedorov Dmitriy 05539d91ed patch : v1.2.1 виджет стал более "горизонтальным" 2026-09-20 11:29:48 +03:00
Fedorov Dmitriy fdb798a430 work : виджет стал более "горизонтальным" 2026-09-20 11:28:48 +03:00
Fedorov Dmitriy 33cdb205b3 Merge branch 'release' into dev_fedorov 2026-09-20 02:02:34 +03:00
Fedorov Dmitriy 83d2eb619c work : v1.2.0 добавил web в отслеживание 2026-09-20 02:02:21 +03:00
Fedorov Dmitriy 8069ab65f2 work : добавил web в отслеживание 2026-09-20 02:01:44 +03:00
Fedorov Dmitriy 455d191ea1 Merge branch 'release' into dev_fedorov 2026-09-20 02:00:40 +03:00
Fedorov Dmitriy 8f749da14c feat: v.1.2.0 добавлин web интерфейс. 2026-09-20 02:00:28 +03:00
Fedorov Dmitriy 0172b6bcf2 work: добавлин web интерфейс. 2026-09-20 01:59:36 +03:00
Fedorov Dmitriy 65cf547c6c Merge branch 'release' into dev_fedorov 2026-09-19 23:05:03 +03:00
Fedorov Dmitriy 3cd71ba5ff patch: v1.1.1 исправил порядок объявления классов в app/auto/config TemperatureConfig объявлялся после AutoConfig в котором использовался. 2026-09-19 23:04:52 +03:00
Fedorov Dmitriy 741be479a6 work: исправил порядок объявления классов в app/auto/config TemperatureConfig объявлялся после AutoConfig в котором использовался. 2026-09-19 22:51:36 +03:00
Fedorov Dmitriy 958691a481 doc: поправил зависимости и расписание 2026-09-19 19:14:08 +03:00
Fedorov Dmitriy a5c9d07db5 feat: v.1.1.0 work: добавил режим ручного управления. Теперь можно отключать расписание!
POST api/schedule/pause
POST api/schedule/resume
2026-09-19 19:05:55 +03:00
Fedorov Dmitriy c22e8bc71d work: добавил режим ручного управления. Теперь можно отключать расписание! 2026-09-19 19:04:45 +03:00
Fedorov Dmitriy b02d18d283 v. 1.0.0 Реализовано ручное и автоматическое управление бризером. 2026-09-19 18:26:08 +03:00
Fedorov Dmitriy c6d92c10ee work: Добваил нагрев в автоматизацию 2026-09-19 18:09:03 +03:00
Fedorov Dmitriy bff8efb85b work: Добавил команду для перехода в автоматический режим после установления скорости вручную 2026-09-19 16:20:20 +03:00
Fedorov Dmitriy f98cc2d6a3 work: Автоматический режим управления скоростью
отлажен!
2026-09-19 15:48:44 +03:00
Fedorov Dmitriy cdec9b0996 work: добавил автоматический режим 2026-09-18 23:59:42 +03:00
Fedorov Dmitriy 7dbfd8b069 work: добавил api для увеличения уменьшения температуры. 2026-09-15 21:41:02 +03:00
Fedorov Dmitriy a3dafb4f59 work: Рефакторинг API с расписанием и ручным управлением. 2026-09-14 22:12:02 +03:00
Fedorov Dmitriy dec14b1d12 work: Протестировано расписание и ручная установка значений во время работающего расписания. 2026-09-14 21:24:22 +03:00
Fedorov Dmitriy 4c665d9108 work: Реализована работа расписания. Проведен первый тест. 2026-09-13 23:04:35 +03:00
Fedorov Dmitriy 419b8efe33 work: Реализован API 2026-09-13 22:05:31 +03:00
Fedorov Dmitriy fdae9dec72 work: Отладил переподключение к Tion. Раньше при разрыве соединения в библиотеке btle соединение зависало. Сейчас при сбросе устройства явно вызывается disconnect библиотеки, чтобы сессия Bluetooth освобождалась. 2026-09-13 21:35:37 +03:00
Fedorov Dmitriy 5cc125db3f work: Полностью реализовал логику управления бризером. 2026-09-13 19:39:07 +03:00
Fedorov Dmitriy 9241da63c3 work: проервил работу bluetooth. Все работает. 2026-09-13 19:12:35 +03:00
62 changed files with 13269 additions and 80 deletions
+2 -1
View File
@@ -3,9 +3,10 @@
<component name="NewModuleRootManager"> <component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/.venv" /> <excludeFolder url="file://$MODULE_DIR$/.venv" />
</content> </content>
<orderEntry type="jdk" jdkName="Python 3.14 (TionController)" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.14 (ClimatController)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>
+1 -1
View File
@@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/TionController.iml" filepath="$PROJECT_DIR$/.idea/TionController.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/ClimatController.iml" filepath="$PROJECT_DIR$/.idea/ClimatController.iml" />
</modules> </modules>
</component> </component>
</project> </project>
+8
View File
@@ -0,0 +1,8 @@
[version]
major = 1
minor = 5
patch = 5
[build]
date = "2026-09-27"
time = "22:09:12"
+433 -24
View File
@@ -1,17 +1,25 @@
import logging import logging
import shutil
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
from typing import Literal, Annotated from typing import Literal, Annotated
import yaml
from fastapi import FastAPI, Request, HTTPException, Path from fastapi import FastAPI, Request, HTTPException, Path
from fastapi.exceptions import RequestValidationError from fastapi.exceptions import RequestValidationError
from fastapi.responses import JSONResponse from fastapi.responses import FileResponse, JSONResponse, RedirectResponse
from fastapi.staticfiles import StaticFiles
from pathlib import Path as FilePath from pathlib import Path as FilePath
from app.qingping.service import QingpingService from app.qingping.service import QingpingService
from app.metrics import PrometheusMetricsService
from app.elica import ElicaConfig, ElicaController, ElicaService
from app.auto.elica_assist import ElicaAutoAssistState
from app.my_dataclasses import ( from app.my_dataclasses import (
TION_MAC, TION_MAC,
QINGPING_MAC, QINGPING_MAC,
QINGPING_MQTT_HOST, QINGPING_MQTT_HOST,
QINGPING_MQTT_PORT, QINGPING_MQTT_PORT,
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
MIN_FAN_SPEED, MIN_FAN_SPEED,
MAX_FAN_SPEED, MAX_FAN_SPEED,
MIN_TARGET_TEMP, MIN_TARGET_TEMP,
@@ -83,12 +91,22 @@ qingping_service = QingpingService(
mac=QINGPING_MAC, mac=QINGPING_MAC,
) )
elica_service = ElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
elica_controller = ElicaController(elica_service)
schedule_service: ScheduleService | None = None schedule_service: ScheduleService | None = None
schedule_load_error: str | None = None schedule_load_error: str | None = None
auto_controller: AutoController | None = None auto_controller: AutoController | None = None
auto_load_error: str | None = None auto_load_error: str | None = None
metrics_service: PrometheusMetricsService | None = None
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Application lifecycle # Application lifecycle
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@@ -99,9 +117,11 @@ async def lifespan(app: FastAPI):
global schedule_load_error global schedule_load_error
global auto_controller global auto_controller
global auto_load_error global auto_load_error
global metrics_service
await service.start() await service.start()
await qingping_service.start() await qingping_service.start()
await elica_service.start()
try: try:
try: try:
@@ -120,6 +140,8 @@ async def lifespan(app: FastAPI):
try: try:
auto_config = load_auto_config(AUTO_CONFIG_FILE) auto_config = load_auto_config(AUTO_CONFIG_FILE)
elica_assist = ElicaAutoAssistState(auto_config.elica_assist)
auto_policy = Co2SpeedPolicy( auto_policy = Co2SpeedPolicy(
base_speed=( base_speed=(
auto_config.co2.base_speed auto_config.co2.base_speed
@@ -142,6 +164,8 @@ async def lifespan(app: FastAPI):
auto_policy = None auto_policy = None
temperature_policy = None temperature_policy = None
elica_assist = None
# Безопасный встроенный интервал нужен, # Безопасный встроенный интервал нужен,
# потому что auto.yaml сейчас недоступен. # потому что auto.yaml сейчас недоступен.
auto_interval = 5.0 auto_interval = 5.0
@@ -154,8 +178,10 @@ async def lifespan(app: FastAPI):
schedule_service=schedule_service, schedule_service=schedule_service,
qingping_service=qingping_service, qingping_service=qingping_service,
tion_service=service, tion_service=service,
elica_controller=elica_controller,
policy=auto_policy, policy=auto_policy,
temperature_policy=temperature_policy, temperature_policy=temperature_policy,
elica_assist=elica_assist,
interval=auto_interval, interval=auto_interval,
) )
@@ -164,12 +190,36 @@ async def lifespan(app: FastAPI):
except Exception as exc: except Exception as exc:
schedule_service = None schedule_service = None
schedule_load_error = f"{type(exc).__name__}: {exc}" schedule_load_error = f"{type(exc).__name__}: {exc}"
try:
metrics_service = PrometheusMetricsService(
tion_service=service,
qingping_service=qingping_service,
schedule_service=schedule_service,
auto_controller=auto_controller,
output_path=(
"/var/lib/prometheus/"
"node-exporter/"
"climatcontroller.prom"
),
interval=5.0,
)
await metrics_service.start()
except Exception:
logging.getLogger(__name__).exception("Could not start Prometheus metrics service")
metrics_service = None
yield yield
finally: finally:
if metrics_service is not None:
await metrics_service.stop()
if schedule_service is not None: if schedule_service is not None:
await schedule_service.stop() await schedule_service.stop()
await elica_service.stop()
await qingping_service.stop() await qingping_service.stop()
await service.stop() await service.stop()
@@ -184,6 +234,71 @@ app = FastAPI(
lifespan=lifespan, lifespan=lifespan,
) )
WEB_ROOT = FilePath(__file__).resolve().parents[1] / "web"
app.mount(
"/ui/static",
StaticFiles(directory=WEB_ROOT),
name="ui-static",
)
@app.get("/", include_in_schema=False)
async def root():
return RedirectResponse(url="/ui/tion")
@app.get("/ui", include_in_schema=False)
async def ui_root():
return RedirectResponse(url="/ui/tion")
# Canonical UI routes. Device-specific names make room for additional
# controllers/widgets without overloading generic "panel"/"widget" names.
@app.get("/ui/tion", include_in_schema=False)
async def ui_tion():
return FileResponse(WEB_ROOT / "tion.html", headers={"Cache-Control": "no-store"})
@app.get("/ui/tion-widget", include_in_schema=False)
async def ui_tion_widget():
return FileResponse(WEB_ROOT / "tion-widget.html", headers={"Cache-Control": "no-store"})
@app.get("/ui/elica", include_in_schema=False)
async def ui_elica():
return FileResponse(WEB_ROOT / "elica.html", headers={"Cache-Control": "no-store"})
@app.get("/ui/elica-widget", include_in_schema=False)
async def ui_elica_widget():
return FileResponse(WEB_ROOT / "elica-widget.html", headers={"Cache-Control": "no-store"})
# Backward-compatible aliases for existing bookmarks/Homarr embeds.
@app.get("/ui/panel", include_in_schema=False)
async def ui_panel_legacy(request: Request):
suffix = f"?{request.url.query}" if request.url.query else ""
return RedirectResponse(url=f"/ui/tion{suffix}")
@app.get("/ui/widget", include_in_schema=False)
async def ui_widget_legacy(request: Request):
suffix = f"?{request.url.query}" if request.url.query else ""
return RedirectResponse(url=f"/ui/tion-widget{suffix}")
@app.get("/ui/exhaust", include_in_schema=False)
async def ui_exhaust_legacy(request: Request):
suffix = f"?{request.url.query}" if request.url.query else ""
return RedirectResponse(url=f"/ui/elica{suffix}")
@app.get("/ui/exhaust-widget", include_in_schema=False)
async def ui_exhaust_widget_legacy(request: Request):
suffix = f"?{request.url.query}" if request.url.query else ""
return RedirectResponse(url=f"/ui/elica-widget{suffix}")
@app.exception_handler(RequestValidationError) @app.exception_handler(RequestValidationError)
async def validation_exception_handler( async def validation_exception_handler(
@@ -212,6 +327,70 @@ def get_status() -> dict:
state = service.state 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
)
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 (
resolution.enabled
and resolution.auto_active
and resolution.auto_target_temp
is not None
):
tion_status["target_temp"] = (
resolution.auto_target_temp
)
return { return {
"online": service.online, "online": service.online,
"running": service.running, "running": service.running,
@@ -224,18 +403,37 @@ def get_status() -> dict:
"last_error": service.last_error, "last_error": service.last_error,
"tion": ( "tion": tion_status,
state.to_dict()
if state is not None
else None
),
"auto": get_auto_status(), "auto": get_auto_status(),
"qingping": qingping_service.status(), "qingping": qingping_service.status(),
"elica": get_elica_status(),
"schedule": get_schedule_status(), "schedule": get_schedule_status(),
} }
def get_elica_status() -> dict:
"""Текущее состояние ESP32, вытяжки Elica и внешнего вентилятора."""
return elica_service.status()
async def execute_elica_command(operation):
try:
await operation()
except Exception as exc:
raise HTTPException(
status_code=503,
detail={
"message": "Elica unavailable",
"error": f"{type(exc).__name__}: {exc}",
},
) from exc
return get_elica_status()
def get_effective_speed() -> int: def get_effective_speed() -> int:
if ( if (
@@ -259,6 +457,17 @@ def get_effective_speed() -> int:
def get_effective_temperature() -> 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 ( if (
schedule_service is not None schedule_service is not None
and schedule_service.override_active and schedule_service.override_active
@@ -473,6 +682,55 @@ async def status():
return get_status() return get_status()
# ----------------------------------------------------------------------
# Elica / exhaust
# ----------------------------------------------------------------------
@app.get("/api/elica/status")
async def elica_status():
return get_elica_status()
@app.post("/api/elica/power/{state}")
async def set_elica_power(state: Literal["on", "off"]):
operation = (
elica_controller.power_on
if state == "on"
else elica_controller.power_off
)
return await execute_elica_command(operation)
@app.post("/api/elica/speed/{speed}")
async def set_elica_speed(
speed: Annotated[int, Path(ge=1, le=4)],
):
return await execute_elica_command(
lambda: elica_controller.set_speed(speed)
)
@app.post("/api/elica/timer/{state}")
async def set_elica_timer(state: Literal["on", "off"]):
enabled = state == "on"
return await execute_elica_command(
lambda: elica_controller.set_timer(enabled)
)
@app.post("/api/elica/light/toggle")
async def toggle_elica_light():
return await execute_elica_command(elica_controller.toggle_light)
@app.post("/api/elica/external-fan/{state}")
async def set_external_fan(state: Literal["on", "off"]):
enabled = state == "on"
return await execute_elica_command(
lambda: elica_controller.set_external_fan(enabled)
)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Power # Power
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@@ -570,10 +828,18 @@ async def set_heater(state: Literal["on", "off"]):
operation = lambda tion: tion.heater_off() operation = lambda tion: tion.heater_off()
return await execute_command( await execute_command(operation, ScheduledSettings(heater=enabled))
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 # Target temperature increase / decrease
@@ -589,39 +855,51 @@ async def increase_temperature():
if new_temperature == current_temperature: if new_temperature == current_temperature:
return get_status() return get_status()
return await execute_command( await execute_command(
lambda tion: lambda tion:
tion.set_target_temperature( tion.set_target_temperature(
new_temperature new_temperature
), ),
ScheduledSettings( ScheduledSettings(
target_temp=new_temperature, 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") return get_status()
async def decrease_temperature():
current_temperature = get_effective_temperature()
new_temperature = max(current_temperature - 1, MIN_TARGET_TEMP) @app.post("/api/tion/temperature/{temperature}")
async def set_temperature(
if new_temperature == current_temperature: temperature: int,
return get_status() ):
await execute_command(
return await execute_command(
lambda tion: lambda tion:
tion.set_target_temperature( tion.set_target_temperature(
new_temperature temperature
), ),
ScheduledSettings( 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 # Target temperature
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@@ -724,6 +1002,86 @@ async def set_light(
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Переход в auto # Переход в auto
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@app.get("/api/schedule/config")
async def get_schedule_config():
try:
raw = yaml.safe_load(
FilePath(SCHEDULE_FILE).read_text(encoding="utf-8")
)
except (OSError, yaml.YAMLError) as exc:
raise HTTPException(
status_code=500,
detail={
"message": "Could not read schedule config",
"error": f"{type(exc).__name__}: {exc}",
},
) from exc
if not isinstance(raw, dict):
raise HTTPException(
status_code=500,
detail="Schedule config root must be an object",
)
return raw
@app.put("/api/schedule/config")
async def update_schedule_config(payload: dict):
global schedule_load_error
schedule_path = FilePath(SCHEDULE_FILE)
temp_path = schedule_path.with_name(schedule_path.name + ".tmp")
backup_path = schedule_path.with_name(schedule_path.name + ".bak")
try:
serialized = yaml.safe_dump(
payload,
allow_unicode=True,
sort_keys=False,
default_flow_style=False,
)
temp_path.write_text(serialized, encoding="utf-8")
config = load_schedule(temp_path)
except (OSError, ValueError, yaml.YAMLError) as exc:
temp_path.unlink(missing_ok=True)
raise HTTPException(
status_code=400,
detail={
"message": "Invalid schedule config",
"error": str(exc),
},
) from exc
try:
if schedule_path.exists():
shutil.copy2(schedule_path, backup_path)
temp_path.replace(schedule_path)
except OSError as exc:
temp_path.unlink(missing_ok=True)
raise HTTPException(
status_code=500,
detail={
"message": "Could not save schedule config",
"error": f"{type(exc).__name__}: {exc}",
},
) from exc
schedule_load_error = None
restart_required = schedule_service is None
if schedule_service is not None:
await schedule_service.replace_config(config)
return {
"ok": True,
"restart_required": restart_required,
"config": payload,
"schedule": get_schedule_status(),
}
@app.post("/api/schedule/override/clear") @app.post("/api/schedule/override/clear")
async def clear_schedule_override(): async def clear_schedule_override():
if schedule_service is None: if schedule_service is None:
@@ -752,8 +1110,56 @@ async def pause_schedule():
detail="Schedule service unavailable", 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() 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 { return {
"ok": True, "ok": True,
"schedule": get_schedule_status(), "schedule": get_schedule_status(),
@@ -773,6 +1179,9 @@ async def resume_schedule():
await schedule_service.resume() await schedule_service.resume()
if auto_controller is not None:
auto_controller.clear_manual_heater_control()
return { return {
"ok": True, "ok": True,
"schedule": get_schedule_status(), "schedule": get_schedule_status(),
+118 -10
View File
@@ -23,6 +23,27 @@ class Co2Config:
... ...
] ]
@dataclass(
frozen=True,
slots=True,
)
class TemperatureConfig:
hysteresis: float
@dataclass(
frozen=True,
slots=True,
)
class ElicaAssistConfig:
enabled: bool
# (скорость Tion, скорость Elica)
speed_map: tuple[
tuple[int, int],
...
]
@dataclass( @dataclass(
frozen=True, frozen=True,
@@ -33,13 +54,7 @@ class AutoConfig:
check_interval: float check_interval: float
co2: Co2Config co2: Co2Config
temperature: TemperatureConfig temperature: TemperatureConfig
elica_assist: ElicaAssistConfig
@dataclass(
frozen=True,
slots=True,
)
class TemperatureConfig:
hysteresis: float
def _require_dict(name: str, value: Any) -> dict: def _require_dict(name: str, value: Any) -> dict:
@@ -268,6 +283,7 @@ def load_auto_config(path: str | Path) -> AutoConfig:
"check_interval", "check_interval",
"co2", "co2",
"temperature", "temperature",
"elica_assist",
} }
if unknown: if unknown:
@@ -375,16 +391,108 @@ def load_auto_config(path: str | Path) -> AutoConfig:
hysteresis=temperature_hysteresis, hysteresis=temperature_hysteresis,
) )
# --------------------------------------------------
# Elica Auto Assist
# --------------------------------------------------
if "elica_assist" not in data:
raise ValueError("elica_assist config is required")
elica_data = _require_dict(
"elica_assist",
data["elica_assist"],
)
unknown_elica = (
set(elica_data)
- {
"enabled",
"speed_map",
}
)
if unknown_elica:
raise ValueError(f"Unknown elica_assist config fields: {sorted(unknown_elica)}")
enabled = elica_data.get("enabled")
if type(enabled) is not bool:
raise ValueError(
"elica_assist.enabled "
"must be a boolean"
)
speed_map_data = elica_data.get("speed_map")
if not isinstance(
speed_map_data,
dict,
):
raise ValueError("elica_assist.speed_map must be an object")
speed_map = []
for tion_speed, elica_speed in (
speed_map_data.items()
):
if type(tion_speed) is not int:
raise ValueError(
"elica_assist.speed_map keys "
"must be integers"
)
if not (
MIN_FAN_SPEED
<= tion_speed
<= MAX_FAN_SPEED
):
raise ValueError(
"Tion speed in "
"elica_assist.speed_map "
f"must be between "
f"{MIN_FAN_SPEED} and "
f"{MAX_FAN_SPEED}"
)
if type(elica_speed) is not int:
raise ValueError(
"Elica speed in "
"elica_assist.speed_map "
"must be an integer"
)
if not 1 <= elica_speed <= 4:
raise ValueError(
"Elica speed in "
"elica_assist.speed_map "
"must be between 1 and 4"
)
speed_map.append(
(
tion_speed,
elica_speed,
)
)
speed_map.sort()
elica_assist = ElicaAssistConfig(
enabled=enabled,
speed_map=tuple(speed_map),
)
# -------------------------------------------------- # --------------------------------------------------
# Result # Result
# -------------------------------------------------- # --------------------------------------------------
return AutoConfig( return AutoConfig(
version=version, version=version,
check_interval=float( check_interval=float(check_interval),
check_interval
),
co2=co2, co2=co2,
temperature=temperature, temperature=temperature,
elica_assist=elica_assist,
) )
+583 -14
View File
@@ -3,6 +3,10 @@ from datetime import datetime
from app.auto.co2_policy import Co2SpeedPolicy from app.auto.co2_policy import Co2SpeedPolicy
from app.auto.temperature_policy import TemperaturePolicy from app.auto.temperature_policy import TemperaturePolicy
from app.my_dataclasses import MAX_TARGET_TEMP from app.my_dataclasses import MAX_TARGET_TEMP
from app.auto.elica_assist import (
ElicaAssistMode,
ElicaAutoAssistState,
)
class AutoController: class AutoController:
@@ -11,15 +15,19 @@ class AutoController:
schedule_service, schedule_service,
qingping_service, qingping_service,
tion_service, tion_service,
elica_controller=None,
policy: Co2SpeedPolicy | None = None, policy: Co2SpeedPolicy | None = None,
temperature_policy: TemperaturePolicy | None = None, temperature_policy: TemperaturePolicy | None = None,
elica_assist: ElicaAutoAssistState | None = None,
interval: float = 5.0, interval: float = 5.0,
): ):
self._schedule = schedule_service self._schedule = schedule_service
self._qingping = qingping_service self._qingping = qingping_service
self._tion = tion_service self._tion = tion_service
self._elica = elica_controller
self._policy = policy self._policy = policy
self._temperature_policy = temperature_policy self._temperature_policy = temperature_policy
self._elica_assist = elica_assist
self._interval = interval self._interval = interval
@@ -38,6 +46,20 @@ class AutoController:
self._temperature: float | int | None = None self._temperature: float | int | None = None
self._temperature_source: str | 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 self._last_error: str | None = None
@@ -110,16 +132,17 @@ class AutoController:
self._target_speed = None self._target_speed = None
self._auto_speed = None self._auto_speed = None
self._target_heater = None
self._auto_heater = None self._auto_heater = None
self._target_temperature = None
self._temperature = None self._temperature = None
self._temperature_source = None self._temperature_source = None
await self._process_manual_heater()
self._last_error = None self._last_error = None
await self._release_elica_assist()
return return
# ---------------------------------------------- # ----------------------------------------------
@@ -131,27 +154,80 @@ class AutoController:
if self._schedule.override_active: if self._schedule.override_active:
self._state = "suspended" self._state = "suspended"
self._reason = "manual_override" self._reason = "manual_override"
# AUTO больше не может считать,
# что знает реальное состояние speed/heater: # AUTO скоростью больше не управляет.
# пользователь мог изменить их вручную.
self._target_speed = None self._target_speed = None
self._auto_speed = None self._auto_speed = None
self._target_heater = None # AUTO-регулятор температуры также
# больше не используется.
self._auto_heater = None self._auto_heater = None
self._target_temperature = None
self._temperature = None override = self._schedule.override_settings
self._temperature_source = None
# --------------------------------------------------
# Температура, установленная пользователем,
# становится целью ручного регулятора.
# --------------------------------------------------
if override.target_temp is not None:
self.set_manual_target_temperature(
override.target_temp
)
# Если пользователь меняет температуру,
# считаем, что термостат ему нужен.
#
# Явный heater=off ниже имеет приоритет.
if override.heater is None:
self.set_manual_heater_enabled(
True
)
# --------------------------------------------------
# Явная команда heater ON/OFF имеет
# максимальный приоритет.
# --------------------------------------------------
if override.heater is not None:
self.set_manual_heater_enabled(
override.heater
)
# --------------------------------------------------
# Если override касается температуры/heater,
# применяем тот же регулятор, что и в PAUSE:
#
# Qingping -> основной
# Tion thermostat -> fallback
# --------------------------------------------------
if (
self._manual_heater_enabled is not None
or self._manual_target_temperature is not None
):
await self._process_manual_heater()
self._last_error = None self._last_error = None
await self._release_elica_assist()
return return
# --------------------------------------------------
# Override закончился.
# Его ручную температурную сессию забываем.
# --------------------------------------------------
if (
self._manual_heater_enabled is not None
or self._manual_target_temperature is not None
):
self.clear_manual_heater_control()
# ---------------------------------------------- # ----------------------------------------------
# AUTO сейчас не активен # AUTO сейчас не активен
# ---------------------------------------------- # ----------------------------------------------
if ( if (
not resolution.enabled not resolution.enabled
or not resolution.auto_active or not resolution.auto_active
@@ -173,6 +249,8 @@ class AutoController:
self._last_error = None self._last_error = None
await self._release_elica_assist()
return return
fallback_speed = resolution.auto_fallback_speed fallback_speed = resolution.auto_fallback_speed
@@ -195,6 +273,8 @@ class AutoController:
await self._set_speed(fallback_speed) await self._set_speed(fallback_speed)
await self._update_elica_assist(fallback_speed)
if self._temperature_policy is not None: if self._temperature_policy is not None:
await self._process_heater(resolution) await self._process_heater(resolution)
@@ -222,9 +302,9 @@ class AutoController:
self._state = "active" self._state = "active"
self._reason = None self._reason = None
await self._set_speed( await self._set_speed(target_speed)
target_speed
) await self._update_elica_assist(target_speed)
self._auto_speed = target_speed self._auto_speed = target_speed
@@ -253,6 +333,8 @@ class AutoController:
await self._set_speed(fallback_speed) await self._set_speed(fallback_speed)
await self._update_elica_assist(fallback_speed)
if self._temperature_policy is not None: if self._temperature_policy is not None:
await self._process_heater( await self._process_heater(
resolution resolution
@@ -368,6 +450,144 @@ class AutoController:
self._auto_heater = heater_required 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]: def _get_temperature(self) -> tuple[float | int | None, str | None]:
@@ -417,6 +637,305 @@ class AutoController:
return None, None return None, None
async def _update_elica_assist(
self,
speed: int,
) -> None:
if self._elica_assist is None:
return
target_speed = (
self._elica_assist.set_tion_speed(
speed
)
)
if self._elica is None:
return
service = self._elica.service
# Без достоверной обратной связи
# никаких действий с Elica.
if (
not service.running
or not service.state.mqtt_connected
or not service.state.device_online
or not service.feedback_ready
):
return
state = self._elica.state
# Сначала проверяем фактическое состояние.
#
# Если Elica уже была включена пользователем
# или пользователь вмешался в OWNED-сессию,
# state machine сама перейдёт в SUPPRESSED.
self._elica_assist.observe_elica(
power=state.power,
speed=state.speed,
timer=state.timer,
)
mode = self._elica_assist.mode
# --------------------------------------------------
# SUPPRESSED
#
# Пользовательская Elica.
# Ничего не делаем.
# --------------------------------------------------
if mode == ElicaAssistMode.SUPPRESSED:
return
# --------------------------------------------------
# IDLE
#
# Elica свободна.
# Пока здесь только первый захват.
# --------------------------------------------------
if mode == ElicaAssistMode.IDLE:
if target_speed is None:
return
# Дополнительная страховка.
# После observe_elica() включённая Elica
# уже должна была стать SUPPRESSED.
if state.power:
return
result = await self._elica.set_speed(
target_speed
)
# Владение получаем только после
# подтверждённого результата.
self._elica_assist.mark_owned(
result.speed
)
self._elica_assist.observe_elica(
power=result.power,
speed=result.speed,
timer=result.timer,
)
return
# --------------------------------------------------
# OWNED
#
# Эту Elica включила автоматика.
# Теперь ей разрешено менять скорость.
# --------------------------------------------------
if mode == ElicaAssistMode.OWNED:
expected_speed = (
self._elica_assist.expected_speed
)
# --------------------------------------------------
# Tion вышел из диапазона, где нужна Elica.
#
# Выключать её можно ТОЛЬКО если фактическое
# состояние всё ещё полностью совпадает с тем,
# которым владеет автоматика.
# --------------------------------------------------
if target_speed is None:
current = self._elica.state
# Пользователь уже выключил Elica сам.
#
# Ничего дополнительно не нажимаем.
if not current.power:
self._elica_assist.reset()
return
# Состояние изменилось относительно нашего.
#
# Значит пользователь вмешался:
# Elica больше не наша и выключать её нельзя.
if (
current.speed != expected_speed
or current.timer
):
self._elica_assist.suppress(
"manual_intervention"
)
return
# --------------------------------------------------
# Elica всё ещё находится ровно в том состоянии,
# которое установила автоматика.
#
# Значит её безопасно выключить.
# --------------------------------------------------
result = await self._elica.power_off()
# Владение заканчивается только после
# подтверждённого выключения.
if not result.power:
self._elica_assist.reset()
return
# --------------------------------------------------
# Elica по-прежнему нужна.
# --------------------------------------------------
# Уже нужная скорость.
if target_speed == expected_speed:
return
# --------------------------------------------------
# Автоматическое изменение скорости.
#
# set_speed() выполняет всю последовательность
# целиком, например:
#
# 2 -> 3 -> 4 -> 1
#
# Промежуточные состояния здесь не передаются
# в observe_elica().
# --------------------------------------------------
result = await self._elica.set_speed(
target_speed
)
# Обновляем владение только после
# подтверждённой конечной скорости.
self._elica_assist.mark_owned(
result.speed
)
self._elica_assist.observe_elica(
power=result.power,
speed=result.speed,
timer=result.timer,
)
async def _release_elica_assist(self) -> None:
"""
Завершает текущую сессию Elica Auto Assist.
Если Elica принадлежит автоматике, безопасно
выключает её.
Если Elica пользовательская (SUPPRESSED),
устройство не трогаем.
Если обратная связь недоступна, OWNED не
забываем: попробуем освободить Elica позже.
"""
if self._elica_assist is None:
return
mode = self._elica_assist.mode
# --------------------------------------------------
# IDLE
# Ничего не захвачено.
# --------------------------------------------------
if mode == ElicaAssistMode.IDLE:
self._elica_assist.reset()
return
# --------------------------------------------------
# SUPPRESSED
#
# Elica принадлежит пользователю.
# Просто забываем текущий AUTO-цикл.
# Саму Elica не трогаем.
# --------------------------------------------------
if mode == ElicaAssistMode.SUPPRESSED:
self._elica_assist.reset()
return
# --------------------------------------------------
# OWNED
#
# Elica была включена автоматикой.
# --------------------------------------------------
if self._elica is None:
# Не забываем владение.
return
service = self._elica.service
# Без достоверной обратной связи нельзя решать,
# можно ли выключать Elica.
#
# OWNED сохраняем, чтобы попробовать позже.
if (
not service.running
or not service.state.mqtt_connected
or not service.state.device_online
or not service.feedback_ready
):
return
current = self._elica.state
# --------------------------------------------------
# Если Elica уже выключена, работа закончена.
# --------------------------------------------------
if not current.power:
self._elica_assist.reset()
return
# --------------------------------------------------
# Проверяем, что пользователь не вмешался.
# --------------------------------------------------
self._elica_assist.observe_elica(
power=current.power,
speed=current.speed,
timer=current.timer,
)
# Если observe_elica() обнаружил ручное
# вмешательство, Elica больше не наша.
if (
self._elica_assist.mode
== ElicaAssistMode.SUPPRESSED
):
self._elica_assist.reset()
return
expected_speed = (
self._elica_assist.expected_speed
)
# Дополнительная страховка.
if (
current.speed != expected_speed
or current.timer
):
self._elica_assist.reset()
return
# --------------------------------------------------
# Elica всё ещё находится ровно в нашем
# состоянии. Можно выключать.
# --------------------------------------------------
result = await self._elica.power_off()
# Владение заканчиваем только после
# подтверждённого выключения.
if not result.power:
self._elica_assist.reset()
async def _set_speed(self, speed: int) -> None: async def _set_speed(self, speed: int) -> None:
@@ -470,6 +989,44 @@ class AutoController:
self._target_temperature = temperature 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: def status(self) -> dict:
return { return {
@@ -485,6 +1042,18 @@ class AutoController:
"temperature": self._temperature, "temperature": self._temperature,
"temperature_source": self._temperature_source, "temperature_source": self._temperature_source,
"elica_assist": (
self._elica_assist.status()
if self._elica_assist is not None
else None
),
"manual_heater": {
"enabled": self._manual_heater_enabled,
"target_temp": self._manual_target_temperature,
"heating": self._manual_heating,
},
"last_error": self._last_error, "last_error": self._last_error,
} }
+181
View File
@@ -0,0 +1,181 @@
from dataclasses import dataclass
from enum import Enum
from .config import ElicaAssistConfig
class ElicaAssistMode(str, Enum):
IDLE = "idle"
OWNED = "owned"
SUPPRESSED = "suppressed"
@dataclass(slots=True)
class ElicaAssistRuntime:
mode: ElicaAssistMode = ElicaAssistMode.IDLE
reason: str | None = None
tion_speed: int | None = None
target_speed: int | None = None
# Скорость, которую автоматика считает
# установленной ею самой.
expected_speed: int | None = None
class ElicaAutoAssistState:
def __init__(
self,
config: ElicaAssistConfig,
):
self._config = config
self._speed_map = dict(
config.speed_map
)
self._runtime = ElicaAssistRuntime()
@property
def mode(self) -> ElicaAssistMode:
return self._runtime.mode
@property
def target_speed(self) -> int | None:
return self._runtime.target_speed
@property
def expected_speed(self) -> int | None:
return self._runtime.expected_speed
def set_tion_speed(self, tion_speed: int) -> int | None:
"""
Обновляет текущую AUTO-скорость Tion
и вычисляет требуемую скорость Elica.
Никаких команд Elica здесь нет.
"""
self._runtime.tion_speed = tion_speed
if not self._config.enabled:
target = None
else:
target = self._speed_map.get(tion_speed)
self._runtime.target_speed = target
# Если потребность в Elica закончилась,
# SUPPRESSED можно сбросить:
# следующий подъём Tion будет уже
# новым циклом.
if (
target is None
and self._runtime.mode
== ElicaAssistMode.SUPPRESSED
):
self._runtime.mode = (
ElicaAssistMode.IDLE
)
self._runtime.reason = None
self._runtime.expected_speed = None
return target
def mark_owned(self, speed: int) -> None:
"""
Будем вызывать позже только после того,
как автоматика действительно успешно
включила Elica.
"""
self._runtime.mode = ElicaAssistMode.OWNED
self._runtime.reason = None
self._runtime.expected_speed = speed
def suppress(self, reason: str) -> None:
"""
Elica принадлежит пользователю.
До конца текущего AUTO-цикла
автоматика её не трогает.
"""
self._runtime.mode = ElicaAssistMode.SUPPRESSED
self._runtime.reason = reason
self._runtime.expected_speed = None
def reset(self) -> None:
self._runtime = ElicaAssistRuntime()
def status(self) -> dict:
return {
"mode": self._runtime.mode.value,
"reason": self._runtime.reason,
"tion_speed": self._runtime.tion_speed,
"target_speed": self._runtime.target_speed,
"expected_speed": self._runtime.expected_speed,
}
def observe_elica(
self,
power: bool,
speed: int,
timer: bool = False,
) -> None:
"""
Передаёт state machine фактическое состояние Elica.
Пока никаких команд вытяжке не отправляет.
"""
target = self._runtime.target_speed
# Сейчас Elica для AUTO вообще не требуется.
if target is None:
return
# --------------------------------------------------
# IDLE
#
# Tion уже требует помощи Elica, но вытяжка
# оказалась включена ещё до того, как автоматика
# получила над ней управление.
#
# Значит считаем её пользовательской и не трогаем
# до конца текущего цикла.
# --------------------------------------------------
if self._runtime.mode == ElicaAssistMode.IDLE:
if power:
self.suppress(
"elica_already_on"
)
return
# --------------------------------------------------
# OWNED
#
# Позже в это состояние будем переходить после
# успешной автоматической команды.
#
# Если фактическое состояние перестало совпадать
# с тем, которое установила автоматика,
# считаем это ручным вмешательством.
# --------------------------------------------------
if self._runtime.mode == ElicaAssistMode.OWNED:
expected = (
self._runtime.expected_speed
)
if (
not power
or speed != expected
or timer
):
self.suppress(
"manual_intervention"
)
+14
View File
@@ -0,0 +1,14 @@
from .config import ElicaConfig
from .controller import ElicaController
from .models import ElicaLogicalState, ElicaPanelState, ElicaState, ExternalFanState
from .service import ElicaService
__all__ = [
"ElicaConfig",
"ElicaController",
"ElicaLogicalState",
"ElicaPanelState",
"ElicaService",
"ElicaState",
"ExternalFanState",
]
+88
View File
@@ -0,0 +1,88 @@
from dataclasses import dataclass
@dataclass(frozen=True, slots=True)
class ElicaConfig:
mqtt_host: str
mqtt_port: int = 1883
# Корневой MQTT topic ESPHome-контроллера Elica
topic: str = "elica"
# Длительность виртуального нажатия кнопки
pulse_ms: int = 300
# Физические реле платы ESP32 Relay X8 Modbus.
# OUT1-OUT4 используются для кнопок Elica.
power_relay: int = 1
speed_relay: int = 2
light_relay: int = 3
timer_relay: int = 4
# Внешний вытяжной вентилятор подключён к OUT5.
# Нагрузка заведена через NC-контакт реле, поэтому логическое
# состояние вентилятора инвертировано относительно катушки реле:
# relay OFF -> NC замкнут -> fan ON; relay ON -> fan OFF.
external_fan_relay: int = 5
external_fan_normally_closed: bool = True
# Индикаторы Elica -> IN
speed_1_input: int = 1
speed_2_input: int = 2
speed_3_input: int = 3
speed_4_input: int = 4
power_input: int = 5
# Определение мигания индикатора скорости.
blink_max_off_s: float = 1.5
blink_hold_s: float = 2.5
@property
def status_topic(self) -> str:
"""
Доступность ESP32.
Payload:
online
offline
"""
return f"{self.topic}/status"
def relay_command_topic(self, relay: int) -> str:
"""
Команда конкретному реле.
Payload:
ON
OFF
"""
return f"{self.topic}/relay/{relay}/set"
def relay_state_topic(self, relay: int) -> str:
"""
Состояние конкретного реле.
Payload:
ON
OFF
"""
return f"{self.topic}/relay/{relay}/state"
def input_state_topic(self, input_number: int) -> str:
"""
Состояние физического входа IN1-IN8.
Payload:
ON
OFF
"""
return f"{self.topic}/input/{input_number}/state"
@property
def relay_state_wildcard(self) -> str:
return f"{self.topic}/relay/+/state"
@property
def input_state_wildcard(self) -> str:
return f"{self.topic}/input/+/state"
+335
View File
@@ -0,0 +1,335 @@
import asyncio
from collections.abc import Callable
from .models import ElicaLogicalState
from .service import ElicaService
class ElicaController:
"""
Высокоуровневый контроллер вытяжки Elica.
ElicaService отвечает за ESP32, MQTT, реле и входы.
ElicaController работает уже с понятиями самой вытяжки:
питание, скорость, таймер и свет.
"""
def __init__(
self,
service: ElicaService,
state_timeout: float = 3.0,
poll_interval: float = 0.05,
speed_inter_press_delay: float = 0.4,
):
self._service = service
self._state_timeout = state_timeout
self._poll_interval = poll_interval
self._speed_inter_press_delay = max(0.0, speed_inter_press_delay)
self._last_speed_press_finished_at: float | None = None
# Не допускаем одновременное выполнение нескольких
# последовательностей нажатий кнопок.
self._lock = asyncio.Lock()
self._external_fan_lock = asyncio.Lock()
@property
def service(self) -> ElicaService:
return self._service
@property
def state(self) -> ElicaLogicalState:
return self._service.logical_state
# ------------------------------------------------------------------
# Internal helpers
# ------------------------------------------------------------------
def _ensure_available(self) -> None:
if not self._service.running:
raise RuntimeError("Elica service is not running")
if not self._service.state.mqtt_connected:
raise RuntimeError("Elica MQTT is not connected")
if not self._service.state.device_online:
raise RuntimeError("ESP32 Elica controller is offline")
async def _wait_state(
self,
predicate: Callable[[ElicaLogicalState], bool],
description: str,
timeout: float | None = None,
) -> ElicaLogicalState:
"""Ждёт подтверждения требуемого состояния по обратной связи."""
timeout = self._state_timeout if timeout is None else timeout
deadline = asyncio.get_running_loop().time() + timeout
while True:
self._ensure_available()
self._ensure_feedback_ready()
state = self.state
if predicate(state):
return state
if asyncio.get_running_loop().time() >= deadline:
raise TimeoutError(
f"Elica did not reach expected state: {description}; "
f"current state: {state}"
)
await asyncio.sleep(self._poll_interval)
async def _power_on_locked(self) -> ElicaLogicalState:
"""Включает вытяжку. Вызывается только под self._lock."""
await self._ensure_ready()
state = self.state
if state.power:
return state
await self._service.press_power()
return await self._wait_state(
lambda value: value.power,
"power on",
)
async def _power_off_locked(self) -> ElicaLogicalState:
"""Выключает вытяжку. Вызывается только под self._lock."""
await self._ensure_ready()
state = self.state
if not state.power:
return state
await self._service.press_power()
return await self._wait_state(
lambda value: not value.power,
"power off",
)
# ------------------------------------------------------------------
# Power
# ------------------------------------------------------------------
async def power_on(self) -> ElicaLogicalState:
async with self._lock:
return await self._power_on_locked()
async def power_off(self) -> ElicaLogicalState:
async with self._lock:
return await self._power_off_locked()
async def _press_speed_locked(self) -> None:
"""
Нажимает Speed с гарантированным минимальным
интервалом после предыдущего нажатия.
Интервал соблюдается и между разными
вызовами set_speed().
"""
loop = asyncio.get_running_loop()
if (
self._last_speed_press_finished_at is not None
and self._speed_inter_press_delay > 0
):
elapsed = (
loop.time()
- self._last_speed_press_finished_at
)
remaining = (
self._speed_inter_press_delay
- elapsed
)
if remaining > 0:
await asyncio.sleep(
remaining
)
await self._service.press_speed()
self._last_speed_press_finished_at = (
loop.time()
)
# ------------------------------------------------------------------
# Speed
# ------------------------------------------------------------------
async def set_speed(self, speed: int) -> ElicaLogicalState:
"""Устанавливает скорость 1-4 последовательными нажатиями Speed.
У Elica одна кнопка скорости и фиксированный цикл:
1 -> 2 -> 3 -> 4 -> 1
Поэтому сначала определяем текущую скорость по индикаторам,
вычисляем точное число нажатий и после каждого нажатия ждём
подтверждения следующей скорости.
"""
if not 1 <= speed <= 4:
raise ValueError("Elica speed must be between 1 and 4")
async with self._lock:
await self._ensure_ready()
state = self.state
if not state.power:
# У Elica кнопка Speed сама включает вытяжку. Первое
# нажатие из состояния OFF запускает её на скорости 1.
# Поэтому при выборе скорости Power здесь не нажимаем.
await self._press_speed_locked()
state = await self._wait_state(
lambda value: value.power and value.speed == 1,
"speed 1",
)
# Если питание уже было включено, но индикатор скорости ещё
# не успел синхронизироваться, ждём корректное значение 1-4.
if not 1 <= state.speed <= 4:
state = await self._wait_state(
lambda value: value.power and 1 <= value.speed <= 4,
"initial speed",
)
current_speed = state.speed
presses = (speed - current_speed) % 4
for _ in range(presses):
expected_speed = current_speed % 4 + 1
await self._press_speed_locked()
state = await self._wait_state(
lambda value, expected=expected_speed: (
value.power and value.speed == expected
),
f"speed {expected_speed}",
)
current_speed = expected_speed
return state
# ------------------------------------------------------------------
# Timer
# ------------------------------------------------------------------
async def set_timer(self, enabled: bool) -> ElicaLogicalState:
"""
Включает или выключает таймер.
Состояние подтверждается по миганию индикатора скорости.
"""
async with self._lock:
await self._ensure_ready()
state = self.state
if not enabled and not state.power:
return state
if enabled and not state.power:
state = await self._power_on_locked()
if state.timer == enabled:
return state
await self._service.press_timer()
# При выключении таймера logical_state.timer остаётся True,
# пока не истечёт blink_hold_s после последнего мигания.
timeout = max(
self._state_timeout,
self._service.config.blink_hold_s + 1.5,
)
return await self._wait_state(
lambda value: value.timer == enabled,
f"timer {'on' if enabled else 'off'}",
timeout=timeout,
)
async def timer_on(self) -> ElicaLogicalState:
return await self.set_timer(True)
async def timer_off(self) -> ElicaLogicalState:
return await self.set_timer(False)
# ------------------------------------------------------------------
# Light
# ------------------------------------------------------------------
async def toggle_light(self) -> None:
"""
Переключает свет.
Обратной связи о состоянии света сейчас нет,
поэтому light_on/light_off реализовать достоверно нельзя.
"""
async with self._lock:
await self._ensure_ready()
await self._service.press_light()
# ------------------------------------------------------------------
# External fan (OUT5 / NC contact)
# ------------------------------------------------------------------
async def set_external_fan(self, enabled: bool) -> bool:
"""
Управляет внешним вентилятором через OUT5.
Вентилятор подключён к NC-контакту, поэтому для включения
вентилятора катушка реле должна быть выключена, а для выключения
— включена. Физическая инверсия скрыта внутри этого метода.
"""
async with self._external_fan_lock:
self._ensure_available()
relay = self._service.config.external_fan_relay
await self._service.wait_relay_feedback_ready(
relay,
timeout=self._state_timeout,
)
relay_enabled = (
not enabled
if self._service.config.external_fan_normally_closed
else enabled
)
if self._service.relay_state(relay) != relay_enabled:
self._service.set_relay(relay, relay_enabled)
await self._service.wait_relay_state(
relay,
relay_enabled,
timeout=self._state_timeout,
)
state = self._service.external_fan_state
if state.on is None:
raise RuntimeError("External fan state is unavailable")
return state.on
async def external_fan_on(self) -> bool:
return await self.set_external_fan(True)
async def external_fan_off(self) -> bool:
return await self.set_external_fan(False)
# ------------------------------------------------------------------
# Синхронизация начального состояния
# ------------------------------------------------------------------
async def _ensure_ready(self) -> None:
"""Проверяет доступность и ждёт исходной синхронизации feedback."""
self._ensure_available()
await self._service.wait_feedback_ready(timeout=self._state_timeout)
self._ensure_available()
def _ensure_feedback_ready(self) -> None:
if not self._service.feedback_ready:
raise RuntimeError("Elica feedback is not synchronized")
+70
View File
@@ -0,0 +1,70 @@
from dataclasses import asdict, dataclass
from datetime import datetime
@dataclass(frozen=True, slots=True)
class ElicaState:
mqtt_connected: bool = False
device_online: bool = False
last_message_at: datetime | None = None
firmware: str | None = None
uptime_seconds: int | None = None
wifi_rssi: int | None = None
# Фактические состояния OUT1-OUT8,
# полученные от ESPHome через MQTT.
relay_states: tuple[bool, ...] = (
False, False, False, False,
False, False, False, False,
)
# Состояния оптовходов IN1-IN8, полученные от ESPHome через MQTT.
# True означает электрически активный вход платы. Для линий
# индикаторов Elica это НЕ равно "LED включён": Elica активна LOW.
input_states: tuple[bool, ...] = (
False, False, False, False,
False, False, False, False,
)
def to_dict(self) -> dict:
result = asdict(self)
if result["last_message_at"] is not None:
result["last_message_at"] = (
result["last_message_at"].isoformat()
)
return result
@dataclass(frozen=True, slots=True)
class ElicaPanelState:
speed_leds: tuple[bool, bool, bool, bool] = (
False, False, False, False
)
power_led: bool = False
def to_dict(self) -> dict:
return asdict(self)
@dataclass(frozen=True, slots=True)
class ElicaLogicalState:
power: bool = False
speed: int = 0
timer: bool = False
def to_dict(self) -> dict:
return asdict(self)
@dataclass(frozen=True, slots=True)
class ExternalFanState:
available: bool = False
on: bool | None = None
relay: int = 5
relay_on: bool | None = None
normally_closed: bool = True
def to_dict(self) -> dict:
return asdict(self)
+733
View File
@@ -0,0 +1,733 @@
import time
import asyncio
import logging
import paho.mqtt.client as mqtt
from dataclasses import replace
from datetime import datetime, timezone
from .config import ElicaConfig
from .models import ElicaState, ElicaPanelState, ElicaLogicalState, ExternalFanState
logger = logging.getLogger(__name__)
class ElicaService:
"""
Низкоуровневый сервис связи с ESP32-контроллером Elica.
На данном этапе умеет:
- подключаться к MQTT;
- отслеживать online/offline ESP32;
- получать состояния OUT1-OUT8;
- включать и выключать любое реле.
Логика самой вытяжки здесь пока отсутствует.
"""
def __init__(self, config: ElicaConfig):
self._config = config
self._state = ElicaState()
self._running = False
self._client: mqtt.Client | None = None
self._last_speed = 0
self._speed_led_off_at: float | None = None
self._last_blink_at: float | None = None
self._received_input_mask = 0
self._received_relay_mask = 0
@property
def config(self) -> ElicaConfig:
return self._config
@property
def state(self) -> ElicaState:
return self._state
@property
def running(self) -> bool:
return self._running
async def start(self) -> None:
if self._running:
return
client = mqtt.Client(
callback_api_version=mqtt.CallbackAPIVersion.VERSION2,
client_id="climatcontroller-elica",
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def stop(self) -> None:
if not self._running:
return
self._running = False
if self._client is not None:
self._client.disconnect()
self._client.loop_stop()
self._client = None
self._state = replace(
self._state,
mqtt_connected=False,
device_online=False,
)
# ------------------------------------------------------------------
# MQTT callbacks
# ------------------------------------------------------------------
def _on_connect(
self,
_client,
_userdata,
_flags,
reason_code,
_properties=None,
) -> None:
if reason_code != 0:
logger.error("ESP32 elica MQTT connection failed: %s",reason_code)
return
logger.info("ESP32 elica MQTT connected")
self._received_input_mask = 0
self._received_relay_mask = 0
# ------------------------------------------------------------------
# Подписки сервиса
# ------------------------------------------------------------------
#Статус
_client.subscribe(self._config.status_topic)
#широковещательная подписка статусов реле
_client.subscribe(self._config.relay_state_wildcard)
# широковещательная подписка статусов входов
_client.subscribe(self._config.input_state_wildcard)
self._state = replace(self._state, mqtt_connected=True)
def _on_disconnect(
self,
_client,
_userdata,
_disconnect_flags,
reason_code,
_properties=None,
) -> None:
if self._running:
logger.warning("ESP32 Elica MQTT disconnected unexpectedly: %s",reason_code)
else:
logger.info("ESP32 Elica MQTT disconnected: %s",reason_code)
self._received_input_mask = 0
self._received_relay_mask = 0
self._state = replace(
self._state,
mqtt_connected=False,
device_online=False,
)
def _on_message(
self,
_client,
_userdata,
message,
) -> None:
if message.topic == self._config.status_topic:
self._handle_status(message)
return
relay_prefix = f"{self._config.topic}/relay/"
if message.topic.startswith(relay_prefix) and message.topic.endswith("/state"):
self._handle_relay_state(message)
return
input_prefix = f"{self._config.topic}/input/"
if message.topic.startswith(input_prefix) and message.topic.endswith("/state"):
self._handle_input_state(message)
return
# ------------------------------------------------------------------
# Device status
# ------------------------------------------------------------------
def _handle_status(self, message) -> None:
payload = message.payload.decode("utf-8").strip()
now = datetime.now(timezone.utc)
if payload.lower() == "online":
device_online = True
elif payload.lower() == "offline":
device_online = False
else:
logger.warning("Unknown Exhaust LWT payload: %r",payload)
return
self._state = replace(
self._state,
device_online=device_online,
last_message_at=now,
)
# ------------------------------------------------------------------
# Relay state
# ------------------------------------------------------------------
def _handle_relay_state(self, message) -> None:
"""
Обрабатывает сообщения:
elica/relay/1/state
...
elica/relay/8/state
Payload:
ON
OFF
"""
prefix = f"{self._config.topic}/relay/"
suffix = "/state"
relay_text = message.topic[
len(prefix):-len(suffix)
]
try:
relay = int(relay_text)
except ValueError:
logger.warning("Invalid ESP32 Elica relay topic: %s",message.topic)
return
if not 1 <= relay <= 8:
logger.warning("ESP32 Elica relay number out of range: %s",relay)
return
try:
payload = message.payload.decode("utf-8").strip().upper()
except UnicodeDecodeError:
logger.warning("Invalid ESP32 Elica relay payload")
return
if payload == "ON":
enabled = True
elif payload == "OFF":
enabled = False
else:
logger.warning("Unknown ESP32 Elica relay payload: %r",payload,)
return
relay_states = list(self._state.relay_states)
relay_states[relay - 1] = enabled
self._state = replace(
self._state,
relay_states=tuple(relay_states),
last_message_at=datetime.now(timezone.utc),
)
self._received_relay_mask |= 1 << (relay - 1)
# ------------------------------------------------------------------
# Input state
# ------------------------------------------------------------------
def _handle_input_state(self, message) -> None:
"""
Обрабатывает elica/input/1/state ... elica/input/8/state.
Payload: ON / OFF.
"""
prefix = f"{self._config.topic}/input/"
suffix = "/state"
input_text = message.topic[len(prefix):-len(suffix)]
try:
input_number = int(input_text)
except ValueError:
logger.warning("Invalid ESP32 Elica input topic: %s", message.topic)
return
if not 1 <= input_number <= 8:
logger.warning("ESP32 Elica input number out of range: %s", input_number)
return
try:
payload = message.payload.decode("utf-8").strip().upper()
except UnicodeDecodeError:
logger.warning("Invalid ESP32 Elica input payload")
return
if payload == "ON":
enabled = True
elif payload == "OFF":
enabled = False
else:
logger.warning("Unknown ESP32 Elica input payload: %r", payload)
return
input_states = list(self._state.input_states)
input_states[input_number - 1] = enabled
self._state = replace(
self._state,
input_states=tuple(input_states),
last_message_at=datetime.now(timezone.utc),
)
self._received_input_mask |= 1 << (input_number - 1)
self._update_panel_tracker()
def input_state(self, input_number: int) -> bool:
"""Возвращает последнее известное состояние IN1-IN8."""
if not 1 <= input_number <= 8:
raise ValueError("Input number must be between 1 and 8")
return self._state.input_states[input_number - 1]
# ------------------------------------------------------------------
# Elica state tracking
# ------------------------------------------------------------------
def _update_panel_tracker(self) -> None:
"""Отслеживает скорость и мигание индикатора таймера."""
# Пока не получили все пять входов панели, не пытаемся
# интерпретировать их начальные значения. После инверсии Elica
# значение False по умолчанию выглядело бы как включённый LED.
if not self.feedback_ready:
return
panel = self.panel_state
now = time.monotonic()
if not panel.power_led:
self._last_speed = 0
self._speed_led_off_at = None
self._last_blink_at = None
return
active_speeds = [
index + 1
for index, enabled in enumerate(panel.speed_leds)
if enabled
]
if active_speeds:
speed = active_speeds[0]
if speed != self._last_speed:
self._last_speed = speed
self._speed_led_off_at = None
self._last_blink_at = None
return
if self._speed_led_off_at is not None:
off_time = now - self._speed_led_off_at
if off_time <= self._config.blink_max_off_s:
self._last_blink_at = now
self._speed_led_off_at = None
return
if self._last_speed > 0 and self._speed_led_off_at is None:
self._speed_led_off_at = now
@property
def logical_state(self) -> ElicaLogicalState:
"""Возвращает интерпретированное состояние вытяжки Elica."""
if not self.feedback_ready:
return ElicaLogicalState()
panel = self.panel_state
now = time.monotonic()
if not panel.power_led:
return ElicaLogicalState()
active_speeds = [
index + 1
for index, enabled in enumerate(panel.speed_leds)
if enabled
]
if active_speeds:
speed = active_speeds[0]
elif (
self._last_speed > 0
and self._speed_led_off_at is not None
and now - self._speed_led_off_at <= self._config.blink_max_off_s
):
speed = self._last_speed
else:
speed = 0
timer = (
speed > 0
and self._last_blink_at is not None
and now - self._last_blink_at <= self._config.blink_hold_s
)
return ElicaLogicalState(
power=True,
speed=speed,
timer=timer,
)
# ------------------------------------------------------------------
# MQTT publish
# ------------------------------------------------------------------
def _publish(
self,
topic: str,
payload: str,
) -> None:
if not self._running:
raise RuntimeError("Elica service is not running")
if self._client is None or not self._state.mqtt_connected:
raise RuntimeError("ESP32 Elica MQTT is not connected")
result = self._client.publish(
topic,
payload,
retain=False,
)
if result.rc != mqtt.MQTT_ERR_SUCCESS:
raise RuntimeError(f"MQTT publish failed: {result.rc}")
# ------------------------------------------------------------------
# Relay control
# ------------------------------------------------------------------
def set_relay(
self,
relay: int,
enabled: bool,
) -> None:
"""
Устанавливает состояние физического реле OUT1-OUT8.
Это низкоуровневая функция.
Например:
set_relay(1, True)
отправит:
elica/relay/1/set -> ON
"""
if not 1 <= relay <= 8:
raise ValueError("Relay number must be between 1 and 8")
topic = self._config.relay_command_topic(relay)
payload = "ON" if enabled else "OFF"
self._publish(topic, payload)
def relay_state(
self,
relay: int,
) -> bool:
"""
Возвращает последнее известное состояние реле.
"""
if not 1 <= relay <= 8:
raise ValueError("Relay number must be between 1 and 8")
return self._state.relay_states[relay - 1]
def relay_feedback_ready(self, relay: int) -> bool:
"""True, если после подключения уже получено состояние реле."""
if not 1 <= relay <= 8:
raise ValueError("Relay number must be between 1 and 8")
return bool(self._received_relay_mask & (1 << (relay - 1)))
@property
def external_fan_state(self) -> ExternalFanState:
"""Логическое состояние внешнего вентилятора на OUT5."""
relay = self._config.external_fan_relay
ready = self.relay_feedback_ready(relay)
if not ready:
return ExternalFanState(
available=False,
on=None,
relay=relay,
relay_on=None,
normally_closed=self._config.external_fan_normally_closed,
)
relay_on = self.relay_state(relay)
fan_on = (
not relay_on
if self._config.external_fan_normally_closed
else relay_on
)
return ExternalFanState(
available=True,
on=fan_on,
relay=relay,
relay_on=relay_on,
normally_closed=self._config.external_fan_normally_closed,
)
# ------------------------------------------------------------------
# Public status
# ------------------------------------------------------------------
def status(self) -> dict:
return {
"running": self._running,
"topic": self._config.topic,
"pulse_ms": self._config.pulse_ms,
"panel": self.panel_state.to_dict(),
"elica": self.logical_state.to_dict(),
"external_fan": self.external_fan_state.to_dict(),
"feedback_ready": self.feedback_ready,
"missing_feedback_inputs": self.missing_feedback_inputs,
**self._state.to_dict(),
}
async def pulse_relay(self, relay: int, pulse_ms: int | None = None) -> None:
"""
Кратковременно включает реле и затем выключает его.
Перед первой командой обязательно ждём
синхронизации MQTT-feedback этого реле.
"""
if not 1 <= relay <= 8:
raise ValueError(
"Relay number must be between 1 and 8"
)
duration_ms = (
pulse_ms
if pulse_ms is not None
else self._config.pulse_ms
)
# --------------------------------------------------
# ВАЖНО:
# после MQTT connect состояния входов панели
# и состояний реле приходят независимо.
#
# Нельзя начинать импульс, пока мы не получили
# хотя бы первое достоверное состояние именно
# этого OUT.
# --------------------------------------------------
await self.wait_relay_feedback_ready(relay)
# --------------------------------------------------
# Перед новым импульсом реле обязано быть OFF.
#
# Это дополнительно восстанавливает состояние,
# если предыдущая операция была аварийно
# прервана на включённом реле.
# --------------------------------------------------
if self.relay_state(relay):
self.set_relay(relay,False)
await self.wait_relay_state(relay,False)
# --------------------------------------------------
# Нажатие
# --------------------------------------------------
self.set_relay(relay,True)
try:
await self.wait_relay_state(relay,True)
await asyncio.sleep(duration_ms / 1000)
finally:
# Relay обязательно пытаемся отпустить,
# даже если подтверждение ON не пришло.
try:
self.set_relay(relay,False)
except Exception:
logger.exception("Failed to release Elica relay %s",relay)
# И ждём подтверждённого отпускания.
await self.wait_relay_state(relay,False)
async def wait_relay_feedback_ready(
self,
relay: int,
timeout: float = 3.0,
poll_interval: float = 0.02,
) -> None:
"""Ждёт первого MQTT-состояния указанного реле после connect."""
if not 1 <= relay <= 8:
raise ValueError("Relay number must be between 1 and 8")
deadline = asyncio.get_running_loop().time() + timeout
while not self.relay_feedback_ready(relay):
if not self._running:
raise RuntimeError("Elica service is not running")
if not self._state.mqtt_connected:
raise RuntimeError("Elica MQTT is not connected")
if not self._state.device_online:
raise RuntimeError("ESP32 Elica controller is offline")
if asyncio.get_running_loop().time() >= deadline:
raise TimeoutError(
f"Relay {relay} feedback synchronization timeout"
)
await asyncio.sleep(poll_interval)
async def wait_relay_state(
self,
relay: int,
expected: bool,
timeout: float = 2.0,
) -> None:
"""
Ждёт подтверждения состояния реле через MQTT.
"""
if not 1 <= relay <= 8:
raise ValueError("Relay number must be between 1 and 8")
deadline = asyncio.get_running_loop().time() + timeout
while self.relay_state(relay) != expected:
if asyncio.get_running_loop().time() >= deadline:
state = self.relay_state(relay)
raise TimeoutError(
f"Relay {relay} did not reach state {expected}; current state: {state}"
)
await asyncio.sleep(0.02)
# ------------------------------------------------------------------
# Elica buttons
# ------------------------------------------------------------------
async def press_power(self) -> None:
"""Эмулирует нажатие кнопки Power."""
await self.pulse_relay(self._config.power_relay)
async def press_speed(self) -> None:
"""Эмулирует нажатие кнопки Speed."""
await self.pulse_relay(self._config.speed_relay)
async def press_light(self) -> None:
"""Эмулирует нажатие кнопки Light."""
await self.pulse_relay(self._config.light_relay)
async def press_timer(self) -> None:
"""Эмулирует нажатие кнопки Timer."""
await self.pulse_relay(self._config.timer_relay)
# ------------------------------------------------------------------
# Elica panel feedback
# ------------------------------------------------------------------
@property
def panel_state(self) -> ElicaPanelState:
"""Возвращает фактическое состояние светодиодов панели Elica.
Входы обратной связи имеют обратную полярность относительно LED:
высокий уровень на IN означает, что соответствующий индикатор
Elica погашен, низкий уровень — что индикатор горит.
MQTT-состояние входа поэтому инвертируем именно здесь, на границе
между электрическим состоянием IN и логическим состоянием панели.
"""
return ElicaPanelState(
speed_leds=(
not self.input_state(self._config.speed_1_input),
not self.input_state(self._config.speed_2_input),
not self.input_state(self._config.speed_3_input),
not self.input_state(self._config.speed_4_input),
),
power_led=not self.input_state(self._config.power_input),
)
@property
def feedback_ready(self) -> bool:
"""True, когда получены состояния всех входов, необходимых для Elica."""
return not self.missing_feedback_inputs
@property
def missing_feedback_inputs(self) -> tuple[int, ...]:
"""Возвращает номера входов Elica, состояние которых ещё не получено."""
required = (
self._config.speed_1_input,
self._config.speed_2_input,
self._config.speed_3_input,
self._config.speed_4_input,
self._config.power_input,
)
return tuple(
input_number
for input_number in required
if not self._received_input_mask & (1 << (input_number - 1))
)
async def wait_feedback_ready(
self,
timeout: float = 3.0,
poll_interval: float = 0.05,
) -> None:
"""Ждёт получения исходного состояния всех входов панели Elica."""
deadline = asyncio.get_running_loop().time() + timeout
while not self.feedback_ready:
if not self._running:
raise RuntimeError("Elica service is not running")
if not self._state.mqtt_connected:
raise RuntimeError("Elica MQTT is not connected")
if not self._state.device_online:
raise RuntimeError("ESP32 Elica controller is offline")
if asyncio.get_running_loop().time() >= deadline:
raise TimeoutError(
f"Elica feedback synchronization timeout; "
f"missing inputs: {self.missing_feedback_inputs}"
)
await asyncio.sleep(poll_interval)
+1
View File
@@ -0,0 +1 @@
from .service import PrometheusMetricsService
+309
View File
@@ -0,0 +1,309 @@
import asyncio
import logging
import time
from pathlib import Path
logger = logging.getLogger(__name__)
class PrometheusMetricsService:
def __init__(
self,
tion_service,
qingping_service,
schedule_service=None,
auto_controller=None,
output_path: str | Path = (
"/var/lib/prometheus/node-exporter/"
"climatcontroller.prom"
),
interval: float = 5.0,
):
self._tion = tion_service
self._qingping = qingping_service
self._schedule = schedule_service
self._auto = auto_controller
self._output_path = Path(output_path)
self._interval = interval
self._running = False
self._task = None
self._last_error: str | None = None
@property
def running(self) -> bool:
return self._running
@property
def last_error(self) -> str | None:
return self._last_error
async def start(self) -> None:
if self._running:
return
self._running = True
await self._write_metrics()
self._task = asyncio.create_task(
self._loop()
)
async def stop(self) -> None:
if not self._running:
return
self._running = False
if self._task is not None:
self._task.cancel()
try:
await self._task
except asyncio.CancelledError:
pass
self._task = None
async def _loop(self) -> None:
while self._running:
await asyncio.sleep(
self._interval
)
try:
await self._write_metrics()
except Exception as exc:
self._last_error = f"{type(exc).__name__}: {exc}"
logger.exception("Prometheus metrics update failed")
async def _write_metrics(self) -> None:
lines: list[str] = []
# --------------------------------------------------
# Время последнего успешного обновления файла.
# Позволяет определить протухшие метрики.
# --------------------------------------------------
self._add_gauge(
lines,
"climat_metrics_timestamp_seconds",
time.time(),
"Unix timestamp of the last "
"ClimatController metrics update",
)
# --------------------------------------------------
# Tion
# --------------------------------------------------
self._add_gauge(
lines,
"climat_tion_online",
self._tion.online,
"Tion connection state",
)
tion_state = self._tion.state
if tion_state is not None:
self._add_gauge(
lines,
"climat_tion_power",
tion_state.power,
"Tion power state",
)
self._add_gauge(
lines,
"climat_tion_heater",
tion_state.heater,
"Tion heater enabled state",
)
self._add_gauge(
lines,
"climat_tion_heating",
tion_state.heating,
"Tion active heating state",
)
self._add_gauge(
lines,
"climat_tion_fan_speed",
tion_state.fan_speed,
"Tion fan speed",
)
self._add_gauge(
lines,
"climat_tion_in_temperature_celsius",
tion_state.in_temp,
"Tion inlet temperature",
)
self._add_gauge(
lines,
"climat_tion_out_temperature_celsius",
tion_state.out_temp,
"Tion outside temperature",
)
self._add_gauge(
lines,
"climat_tion_target_temperature_celsius",
tion_state.target_temp,
"Tion target temperature",
)
# --------------------------------------------------
# Qingping
# --------------------------------------------------
self._add_gauge(
lines,
"climat_qingping_online",
self._qingping.online,
"Qingping online state",
)
qingping_state = self._qingping.state
if qingping_state is not None:
self._add_gauge(
lines,
"climat_qingping_mqtt_connected",
qingping_state.mqtt_connected,
"Qingping MQTT connection state",
)
self._add_gauge(
lines,
"climat_qingping_temperature_celsius",
qingping_state.temperature,
"Qingping temperature",
)
self._add_gauge(
lines,
"climat_qingping_humidity_percent",
qingping_state.humidity,
"Qingping relative humidity",
)
self._add_gauge(
lines,
"climat_qingping_co2_ppm",
qingping_state.co2,
"Qingping CO2 concentration",
)
self._add_gauge(
lines,
"climat_qingping_pm25_ug_m3",
qingping_state.pm25,
"Qingping PM2.5 concentration",
)
self._add_gauge(
lines,
"climat_qingping_pm10_ug_m3",
qingping_state.pm10,
"Qingping PM10 concentration",
)
self._add_gauge(
lines,
"climat_qingping_battery_percent",
qingping_state.battery,
"Qingping battery level",
)
# --------------------------------------------------
# Schedule / AUTO
# --------------------------------------------------
if self._schedule is not None:
self._add_gauge(
lines,
"climat_schedule_paused",
self._schedule.paused,
"Schedule manual pause state",
)
try:
resolution = (
self._schedule.resolve()
)
self._add_gauge(
lines,
"climat_auto_active",
resolution.auto_active,
"AUTO schedule state",
)
except Exception:
logger.exception(
"Schedule metrics resolve failed"
)
# --------------------------------------------------
# Atomic write
# --------------------------------------------------
self._output_path.parent.mkdir(
parents=True,
exist_ok=True,
)
temp_path = (
self._output_path.with_suffix(
self._output_path.suffix
+ ".tmp"
)
)
temp_path.write_text(
"\n".join(lines) + "\n",
encoding="utf-8",
)
temp_path.replace(
self._output_path
)
self._last_error = None
@staticmethod
def _add_gauge(
lines: list[str],
name: str,
value,
help_text: str,
) -> None:
if value is None:
return
if isinstance(value, bool):
value = 1 if value else 0
lines.append(f"# HELP {name} {help_text}")
lines.append(f"# TYPE {name} gauge")
lines.append(f"{name} {value}")
+5 -1
View File
@@ -10,9 +10,13 @@ from typing import Any, Mapping
TION_MAC = "d1:74:9b:eb:ee:a6" TION_MAC = "d1:74:9b:eb:ee:a6"
QINGPING_MAC = "CCB5D131BA93" QINGPING_MAC = "CCB5D131BA93"
QINGPING_MQTT_HOST = "192.168.7.3" QINGPING_MQTT_HOST = "192.168.7.100"
QINGPING_MQTT_PORT = 1883 QINGPING_MQTT_PORT = 1883
# ESP32-контроллер вытяжки Elica подключён к Mosquitto на mini-PC/NAS.
ELICA_MQTT_HOST = "192.168.7.100"
ELICA_MQTT_PORT = 1883
MIN_FAN_SPEED = 1 MIN_FAN_SPEED = 1
MAX_FAN_SPEED = 6 MAX_FAN_SPEED = 6
+90 -2
View File
@@ -1,4 +1,7 @@
import asyncio import asyncio
import logging
import shutil
import sys
from typing import Any from typing import Any
from bleak import BleakScanner from bleak import BleakScanner
from tion_btle import TionS4 from tion_btle import TionS4
@@ -7,6 +10,7 @@ from .models import TionState
from app.my_dataclasses import * from app.my_dataclasses import *
logger = logging.getLogger(__name__)
class TionController: class TionController:
""" """
@@ -88,12 +92,23 @@ class TionController:
# от предыдущего соединения. # от предыдущего соединения.
await self._reset_device() await self._reset_device()
# Получаем свежий BLEDevice. # Сначала обычный поиск.
ble_device = await BleakScanner.find_device_by_address( ble_device = await BleakScanner.find_device_by_address(
self._mac, self._mac,
timeout=5.0, timeout=5.0,
) )
if ble_device is None:
# Возможно, предыдущий процесс умер через SIGKILL,
# а ОС всё ещё удерживает старое BLE-соединение.
await self._recover_stale_system_connection()
# После recovery пробуем найти Tion ещё раз.
ble_device = await BleakScanner.find_device_by_address(
self._mac,
timeout=5.0,
)
if ble_device is None: if ble_device is None:
raise ConnectionError( raise ConnectionError(
f"Tion {self._mac} not found" f"Tion {self._mac} not found"
@@ -150,8 +165,18 @@ class TionController:
""" """
async def power_on(self) -> TionState: async def power_on(self) -> TionState:
# Tion 4S reliably wakes up when the power command also carries
# a valid fan speed. The device keeps the last speed even while
# powered off, so preserve it instead of forcing a new value.
speed = (
self._state.fan_speed
if self._state is not None
else MIN_FAN_SPEED
)
return await self._set({ return await self._set({
"state": "on" "state": "on",
"fan_speed": speed,
}) })
async def power_off(self) -> TionState: async def power_off(self) -> TionState:
@@ -273,3 +298,66 @@ class TionController:
async def __aexit__(self, exc_type, exc_value, traceback) -> None: async def __aexit__(self, exc_type, exc_value, traceback) -> None:
await self.disconnect() await self.disconnect()
async def _recover_stale_system_connection(self) -> None:
"""
Попытаться освободить зависшее BLE-соединение,
оставшееся после аварийного завершения предыдущего процесса.
На Linux BlueZ может продолжать показывать Connected=yes,
хотя процесс-владелец уже умер. В таком состоянии Tion может
не advertising'иться, поэтому BleakScanner его не находит.
На других ОС ничего не делаем: основной код остаётся
платформенно-независимым.
"""
if not sys.platform.startswith("linux"):
return
bluetoothctl = shutil.which("bluetoothctl")
if bluetoothctl is None:
logger.warning(
"Tion stale-connection recovery skipped: "
"bluetoothctl not found"
)
return
logger.warning(
"Tion %s not found by scan; "
"trying to clear stale BlueZ connection",
self._mac,
)
process = await asyncio.create_subprocess_exec(
bluetoothctl,
"disconnect",
self._mac,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE,
)
try:
stdout, stderr = await asyncio.wait_for(
process.communicate(),
timeout=5.0,
)
except asyncio.TimeoutError:
process.kill()
await process.communicate()
logger.warning(
"Timed out while clearing stale Tion BLE connection"
)
return
logger.warning(
"Tion BlueZ recovery finished: rc=%s stdout=%s stderr=%s",
process.returncode,
stdout.decode(errors="replace").strip(),
stderr.decode(errors="replace").strip(),
)
# Даём BlueZ и самому Tion время освободить старое соединение
# и снова начать advertising.
await asyncio.sleep(1.0)
@@ -24,3 +24,12 @@ co2:
temperature: temperature:
hysteresis: 0.5 hysteresis: 0.5
elica_assist:
enabled: true
speed_map:
4: 1
5: 2
6: 3
@@ -36,7 +36,6 @@ templates:
weekend: weekend:
- time: "10:00" - time: "10:00"
action: action:
power: on power: on
@@ -62,15 +61,12 @@ templates:
speed: 1 speed: 1
days: days:
mon: workday mon: workday
tue: workday tue: workday
wed: workday wed: workday
thu: workday thu: workday
fri: workday fri: workday
sat: weekend sat: weekend
sun: weekend sun: weekend
@@ -0,0 +1,348 @@
esphome:
name: elica-relay
friendly_name: Elica Relay Controller
on_boot:
# First disable 74HC595 outputs so relays cannot chatter during boot.
- priority: 900
then:
- lambda: |-
pinMode(13, OUTPUT);
digitalWrite(13, HIGH);
# Initialise shared bus, force all relays OFF, then enable outputs.
- priority: 600
then:
- delay: 500ms
- lambda: |-
pinMode(25, OUTPUT); // shared LATCH
pinMode(26, OUTPUT); // shared CLOCK
pinMode(33, OUTPUT); // data to 74HC595
pinMode(27, INPUT); // data from 74HC165
digitalWrite(25, LOW);
shiftOut(33, 26, MSBFIRST, 0xFF); // active-low relays: all OFF
digitalWrite(25, HIGH);
id(relay_state) = 0x00;
digitalWrite(13, LOW); // enable 74HC595 outputs
esp32:
board: esp32dev
framework:
type: arduino
logger:
wifi:
ssid: !secret wifi_ssid
password: !secret wifi_password
ap:
ssid: "Elica-Relay-Fallback"
password: !secret fallback_password
captive_portal:
# We use MQTT as the main connection to the controller.
# Home Assistant / native ESPHome API is deliberately not enabled.
mqtt:
broker: !secret mqtt_broker
username: !secret mqtt_username
password: !secret mqtt_password
discovery: false
birth_message:
topic: elica/status
payload: online
retain: true
will_message:
topic: elica/status
payload: offline
retain: true
ota:
- platform: esphome
password: !secret ota_password
# Handy while commissioning the board.
web_server:
port: 80
globals:
- id: relay_state
type: uint8_t
restore_value: no
initial_value: '0x00'
- id: input_state
type: uint8_t
restore_value: no
initial_value: '0xFF'
# Tracks the real Elica Power LED so OUT5 can be used as a hard
# interlock for the external fan. The LED line is active LOW.
- id: elica_power_initialized
type: bool
restore_value: no
initial_value: 'false'
- id: elica_power_was_on
type: bool
restore_value: no
initial_value: 'false'
script:
- id: write_relays
mode: restart
then:
- lambda: |-
// Relay drivers are active LOW.
digitalWrite(25, LOW);
shiftOut(33, 26, MSBFIRST, ~id(relay_state));
digitalWrite(25, HIGH);
# 74HC595 and 74HC165 share CLOCK/LATCH on this board.
# Read inputs, then immediately restore the relay register.
interval:
- interval: 100ms
then:
- lambda: |-
// Parallel-load current input state into 74HC165.
digitalWrite(25, LOW);
delayMicroseconds(10);
digitalWrite(25, HIGH);
uint8_t v = 0;
for (int i = 0; i < 8; i++) {
v <<= 1;
if (digitalRead(27)) v |= 1;
digitalWrite(26, HIGH);
delayMicroseconds(2);
digitalWrite(26, LOW);
delayMicroseconds(2);
}
id(input_state) = v;
// Elica Power LED is connected to IN5 (74HC165 mask 0x40).
// IMPORTANT: on this board the 74HC165 raw state is inverted
// relative to the MQTT binary_sensor state. Empirically:
// raw bit 1 -> Elica Power LED ON, raw bit 0 -> LED OFF.
const bool elica_power_on = (v & 0x40) != 0;
bool relay5_changed = false;
if (!id(elica_power_initialized)) {
id(elica_power_initialized) = true;
// If ESP32 boots while Elica is already running, enforce
// the interlock immediately. If Elica is OFF, boot defaults
// already leave Relay 5 OFF -> NC closed -> fan ON.
if (elica_power_on && !(id(relay_state) & 0x10)) {
id(relay_state) |= 0x10;
relay5_changed = true;
}
} else if (elica_power_on) {
// Hard interlock: while Elica is ON, Relay 5 must stay ON.
// Relay 5 ON opens the NC contact and stops the external fan.
if (!(id(relay_state) & 0x10)) {
id(relay_state) |= 0x10;
relay5_changed = true;
}
} else if (id(elica_power_was_on)) {
// Elica has just switched OFF: automatically restore the
// external fan. Relay 5 OFF closes NC and starts the fan.
if (id(relay_state) & 0x10) {
id(relay_state) &= ~0x10;
relay5_changed = true;
}
}
id(elica_power_was_on) = elica_power_on;
// Shared bus changed while reading 74HC165:
// restore the requested relay state in 74HC595.
digitalWrite(25, LOW);
shiftOut(33, 26, MSBFIRST, ~id(relay_state));
digitalWrite(25, HIGH);
// Keep MQTT/web-server state in sync when the interlock itself
// changes Relay 5 rather than an external command doing it.
if (relay5_changed) {
id(relay5).publish_state((id(relay_state) & 0x10) != 0);
}
switch:
- platform: template
name: "Relay 1"
id: relay1
restore_mode: ALWAYS_OFF
lambda: return (id(relay_state) & 0x01) != 0;
turn_on_action:
- lambda: id(relay_state) |= 0x01;
- script.execute: write_relays
turn_off_action:
- lambda: id(relay_state) &= ~0x01;
- script.execute: write_relays
command_topic: "elica/relay/1/set"
state_topic: "elica/relay/1/state"
- platform: template
name: "Relay 2"
id: relay2
restore_mode: ALWAYS_OFF
lambda: return (id(relay_state) & 0x02) != 0;
turn_on_action:
- lambda: id(relay_state) |= 0x02;
- script.execute: write_relays
turn_off_action:
- lambda: id(relay_state) &= ~0x02;
- script.execute: write_relays
command_topic: "elica/relay/2/set"
state_topic: "elica/relay/2/state"
- platform: template
name: "Relay 3"
id: relay3
restore_mode: ALWAYS_OFF
lambda: return (id(relay_state) & 0x04) != 0;
turn_on_action:
- lambda: id(relay_state) |= 0x04;
- script.execute: write_relays
turn_off_action:
- lambda: id(relay_state) &= ~0x04;
- script.execute: write_relays
command_topic: "elica/relay/3/set"
state_topic: "elica/relay/3/state"
- platform: template
name: "Relay 4"
id: relay4
restore_mode: ALWAYS_OFF
lambda: return (id(relay_state) & 0x08) != 0;
turn_on_action:
- lambda: id(relay_state) |= 0x08;
- script.execute: write_relays
turn_off_action:
- lambda: id(relay_state) &= ~0x08;
- script.execute: write_relays
command_topic: "elica/relay/4/set"
state_topic: "elica/relay/4/state"
# OUT5 управляет внешним вентилятором через NC-контакт.
# relay5=OFF -> NC замкнут -> внешний вентилятор ВКЛ.
# relay5=ON -> NC разомкнут -> внешний вентилятор ВЫКЛ.
#
# HARD INTERLOCK по фактическому Power LED Elica (IN5):
# Elica ON -> Relay 5 принудительно ON -> внешний вентилятор OFF.
# Elica OFF -> при переходе автоматически Relay 5 OFF -> вентилятор ON.
# Пока Elica включена, MQTT-команда Relay 5 OFF игнорируется, чтобы
# внешний вентилятор нельзя было случайно включить одновременно с Elica.
- platform: template
name: "Relay 5"
id: relay5
restore_mode: ALWAYS_OFF
lambda: return (id(relay_state) & 0x10) != 0;
turn_on_action:
- lambda: id(relay_state) |= 0x10;
- script.execute: write_relays
turn_off_action:
- lambda: |-
// Use the same raw IN5 polarity as the interlock above:
// raw bit 1 means the Elica Power LED is ON.
const bool elica_power_on = (id(input_state) & 0x40) != 0;
if (elica_power_on) {
id(relay_state) |= 0x10;
} else {
id(relay_state) &= ~0x10;
}
- script.execute: write_relays
command_topic: "elica/relay/5/set"
state_topic: "elica/relay/5/state"
- platform: template
name: "Relay 6"
id: relay6
restore_mode: ALWAYS_OFF
lambda: return (id(relay_state) & 0x20) != 0;
turn_on_action:
- lambda: id(relay_state) |= 0x20;
- script.execute: write_relays
turn_off_action:
- lambda: id(relay_state) &= ~0x20;
- script.execute: write_relays
command_topic: "elica/relay/6/set"
state_topic: "elica/relay/6/state"
- platform: template
name: "Relay 7"
id: relay7
restore_mode: ALWAYS_OFF
lambda: return (id(relay_state) & 0x40) != 0;
turn_on_action:
- lambda: id(relay_state) |= 0x40;
- script.execute: write_relays
turn_off_action:
- lambda: id(relay_state) &= ~0x40;
- script.execute: write_relays
command_topic: "elica/relay/7/set"
state_topic: "elica/relay/7/state"
- platform: template
name: "Relay 8"
id: relay8
restore_mode: ALWAYS_OFF
lambda: return (id(relay_state) & 0x80) != 0;
turn_on_action:
- lambda: id(relay_state) |= 0x80;
- script.execute: write_relays
turn_off_action:
- lambda: id(relay_state) &= ~0x80;
- script.execute: write_relays
command_topic: "elica/relay/8/set"
state_topic: "elica/relay/8/state"
binary_sensor:
- platform: template
name: "Input 1"
lambda: return !(id(input_state) & 0x10);
state_topic: "elica/input/1/state"
- platform: template
name: "Input 2"
lambda: return !(id(input_state) & 0x08);
state_topic: "elica/input/2/state"
- platform: template
name: "Input 3"
lambda: return !(id(input_state) & 0x20);
state_topic: "elica/input/3/state"
- platform: template
name: "Input 4"
lambda: return !(id(input_state) & 0x04);
state_topic: "elica/input/4/state"
- platform: template
name: "Input 5"
lambda: return !(id(input_state) & 0x40);
state_topic: "elica/input/5/state"
- platform: template
name: "Input 6"
lambda: return !(id(input_state) & 0x02);
state_topic: "elica/input/6/state"
- platform: template
name: "Input 7"
lambda: return !(id(input_state) & 0x80);
state_topic: "elica/input/7/state"
- platform: template
name: "Input 8"
lambda: return !(id(input_state) & 0x01);
state_topic: "elica/input/8/state"
- platform: status
name: "Controller Status"
+28
View File
@@ -0,0 +1,28 @@
ELICA ESP32 RELAY X8 - INITIAL COMMISSIONING
Files:
elica-relay.yaml Main ESPHome configuration
secrets.yaml.template Copy/rename this to secrets.yaml and enter your values
Target hardware:
LCTech ESP32 Relay Board X8 Modbus / 303e32dc812
ESP32-WROOM-32E
74HC595 relay outputs + 74HC165 optocoupled inputs on shared bus
First commissioning:
1. Install ESPHome Device Builder.
2. Put elica-relay.yaml and secrets.yaml in its config folder/project.
3. Connect the board by USB-C.
4. Compile and install via USB.
5. After boot, supply the board from a suitable 9-24 V DC power supply for relay/input tests.
6. Test all relays before connecting anything to Elica.
MQTT topics:
elica/status
elica/relay/1/set ... elica/relay/8/set
elica/relay/1/state ... elica/relay/8/state
elica/input/1/state ... elica/input/8/state
Relay commands use ON / OFF.
All relays are forced OFF during boot.
Inputs do not control relays.
@@ -0,0 +1,15 @@
# Fill these values before compiling.
wifi_ssid: "YOUR_WIFI_SSID"
wifi_password: "YOUR_WIFI_PASSWORD"
# IP address or DNS name of the existing Mosquitto broker.
mqtt_broker: "192.168.1.10"
mqtt_username: "YOUR_MQTT_USERNAME"
mqtt_password: "YOUR_MQTT_PASSWORD"
# Used only if normal Wi-Fi cannot be reached.
fallback_password: "ChangeMe123!"
# Password for future wireless firmware updates.
ota_password: "ChangeThisOTAPassword"
+20 -11
View File
@@ -1,16 +1,25 @@
# Это пример Python скрипта. import argparse
# Нажмите Shift+F10 для выполнения или замените его своим кодом. import uvicorn
# Нажмите Двойное нажатие Shift для поиска везде: классы, файлы, окна инструментов, действия и настройки.
def print_hi(name): def parse_args() -> argparse.Namespace:
# Используйте точку останова в строке кода ниже для отладки скрипта. parser = argparse.ArgumentParser(description="Tion Controller web server")
print(f'Hi, {name}') # Нажмите Ctrl+F8 для переключения точки останова. parser.add_argument("--host", default="0.0.0.0")
parser.add_argument("--port", default=8000, type=int)
parser.add_argument(
"--reload",
action="store_true",
help="Reload the server after source file changes",
)
return parser.parse_args()
# Нажмите зеленую кнопку на полях для запуска скрипта. if __name__ == "__main__":
if __name__ == '__main__': args = parse_args()
print_hi('PyCharm') uvicorn.run(
"app.api:app",
# Справка PyCharm доступна на https://www.jetbrains.com/help/pycharm/ host=args.host,
port=args.port,
reload=args.reload,
)
-1
View File
@@ -3,4 +3,3 @@ fastapi
uvicorn[standard] uvicorn[standard]
PyYAML PyYAML
paho-mqtt>=2.1,<3 paho-mqtt>=2.1,<3
paho-mqtt
+21
View File
@@ -105,6 +105,27 @@ class ScheduleService:
def config(self) -> ScheduleConfig: def config(self) -> ScheduleConfig:
return self._config return self._config
async def replace_config(
self,
config: ScheduleConfig,
) -> None:
"""Заменить расписание без перезапуска приложения."""
if not isinstance(config, ScheduleConfig):
raise TypeError("config must be ScheduleConfig")
self._config = config
self._last_applied_when = None
self._clear_override()
self._last_error = None
# Сохранение расписания не должно завершаться ошибкой только из-за
# временно недоступного Bluetooth. Фоновый цикл повторит применение.
if self._running and not self._paused:
try:
await self._process()
except Exception as exc:
self._last_error = f"{type(exc).__name__}: {exc}"
def _load_runtime_state(self) -> None: def _load_runtime_state(self) -> None:
if self._state_path is None: if self._state_path is None:
@@ -0,0 +1,425 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.controller import AutoController
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaController,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
ELICA_READY_TIMEOUT = 15.0
class TestElicaService(ElicaService):
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-auto-elica-already-on-test-"
f"{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready.\n"
f"mqtt_connected="
f"{state.mqtt_connected}\n"
f"device_online="
f"{state.device_online}\n"
f"feedback_ready="
f"{service.feedback_ready}\n"
f"missing_feedback_inputs="
f"{service.missing_feedback_inputs}"
)
await asyncio.sleep(0.1)
async def main() -> None:
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
elica_controller = ElicaController(
service
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
initial = elica_controller.state
print()
print(
"Initial Elica:",
{
"power": initial.power,
"speed": initial.speed,
"timer": initial.timer,
},
)
# --------------------------------------------------
# Для этого теста Elica должна быть заранее
# включена пользователем.
# --------------------------------------------------
if not initial.power:
raise RuntimeError(
"Before starting this test, "
"manually turn Elica ON "
"at any speed."
)
initial_power = initial.power
initial_speed = initial.speed
initial_timer = initial.timer
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
auto_controller = AutoController(
schedule_service=object(),
qingping_service=object(),
tion_service=object(),
elica_controller=elica_controller,
policy=None,
temperature_policy=None,
elica_assist=assist,
interval=1.0,
)
# ==================================================
# ЭТАП 1
#
# Пользовательская Elica уже включена.
#
# Tion AUTO поднимается до 4.
#
# AutoController должен:
#
# увидеть Elica ON
# -> SUPPRESSED
# -> reason = elica_already_on
# -> ничего не переключать
# ==================================================
print()
print(
"STEP 1:"
)
print(
"Tion AUTO speed 4 while "
"Elica is already user-controlled."
)
await auto_controller._update_elica_assist(
4
)
after_speed_4 = elica_controller.state
print()
print(
"Elica after Tion speed 4:",
{
"power": after_speed_4.power,
"speed": after_speed_4.speed,
"timer": after_speed_4.timer,
},
)
print(
"Assist:",
assist.status(),
)
if assist.mode.value != "suppressed":
raise RuntimeError(
"Assist did not enter SUPPRESSED"
)
if (
assist.status()["reason"]
!= "elica_already_on"
):
raise RuntimeError(
"Expected reason elica_already_on"
)
# --------------------------------------------------
# Elica обязана остаться полностью неизменной.
# --------------------------------------------------
if (
after_speed_4.power != initial_power
or after_speed_4.speed != initial_speed
or after_speed_4.timer != initial_timer
):
raise RuntimeError(
"AutoController modified "
"already-running user Elica"
)
print()
print(
"SUPPRESSION PASSED"
)
# ==================================================
# ЭТАП 2
#
# Пока Tion остаётся в диапазоне,
# например поднимается 4 -> 5.
#
# Elica всё равно трогать нельзя.
# ==================================================
print()
print(
"STEP 2:"
)
print(
"Tion AUTO speed changes 4 -> 5."
)
print(
"Elica must remain untouched."
)
await auto_controller._update_elica_assist(
5
)
after_speed_5 = elica_controller.state
print()
print(
"Elica after Tion speed 5:",
{
"power": after_speed_5.power,
"speed": after_speed_5.speed,
"timer": after_speed_5.timer,
},
)
print(
"Assist:",
assist.status(),
)
if assist.mode.value != "suppressed":
raise RuntimeError(
"Assist left SUPPRESSED "
"during the same cycle"
)
if (
after_speed_5.power != initial_power
or after_speed_5.speed != initial_speed
or after_speed_5.timer != initial_timer
):
raise RuntimeError(
"AutoController modified Elica "
"while SUPPRESSED"
)
print()
print(
"SUPPRESSED HOLD PASSED"
)
# ==================================================
# ЭТАП 3
#
# Tion падает до 3.
#
# Текущий повышенный AUTO-цикл закончен.
#
# Elica должна остаться пользовательской,
# но Assist может вернуться в IDLE.
# ==================================================
print()
print("STEP 3:")
print("Tion AUTO speed drops to 3.")
print(
"Elica must remain ON and unchanged."
)
await auto_controller._update_elica_assist(
3
)
final_elica = elica_controller.state
print()
print(
"Final Elica:",
{
"power": final_elica.power,
"speed": final_elica.speed,
"timer": final_elica.timer,
},
)
print(
"Final Assist:",
assist.status(),
)
if (
final_elica.power != initial_power
or final_elica.speed != initial_speed
or final_elica.timer != initial_timer
):
raise RuntimeError(
"AutoController changed user Elica "
"when the Tion cycle ended"
)
if assist.mode.value != "idle":
raise RuntimeError(
"Assist did not return to IDLE "
"after Tion dropped below threshold"
)
print()
print(
"CYCLE END PASSED"
)
print()
print(
"TEST PASSED"
)
print()
print("Verified sequence:")
print(
"User Elica already ON"
" -> Tion 4"
" -> SUPPRESSED"
)
print(
"Tion 5"
" -> Elica untouched"
" -> still SUPPRESSED"
)
print(
"Tion 3"
" -> Elica untouched"
" -> IDLE"
)
finally:
print()
print("Stopping Elica service...")
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
@@ -0,0 +1,355 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.controller import AutoController
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaController,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
ELICA_READY_TIMEOUT = 15.0
class TestElicaService(ElicaService):
"""
Используем отдельный MQTT client_id,
чтобы тест не конфликтовал с обычным
ClimatController.
"""
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-auto-elica-test-{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready.\n"
f"mqtt_connected="
f"{state.mqtt_connected}\n"
f"device_online="
f"{state.device_online}\n"
f"feedback_ready="
f"{service.feedback_ready}\n"
f"missing_feedback_inputs="
f"{service.missing_feedback_inputs}"
)
await asyncio.sleep(0.1)
async def main() -> None:
# --------------------------------------------------
# Реальный ElicaService + ElicaController.
# --------------------------------------------------
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
elica_controller = ElicaController(
service
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
initial = elica_controller.state
print()
print(
"Initial Elica:",
{
"power": initial.power,
"speed": initial.speed,
"timer": initial.timer,
},
)
# Для чистого теста начинаем с выключенной Elica.
if initial.power:
raise RuntimeError(
"Elica must be OFF before this test. "
"Turn it off manually and run again."
)
# --------------------------------------------------
# Создаём настоящий Elica Auto Assist.
# --------------------------------------------------
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
# --------------------------------------------------
# Создаём настоящий AutoController.
#
# Schedule / Qingping / Tion здесь не нужны,
# потому что мы НЕ запускаем его основной цикл,
# а вызываем только _update_elica_assist().
# --------------------------------------------------
auto_controller = AutoController(
schedule_service=object(),
qingping_service=object(),
tion_service=object(),
elica_controller=elica_controller,
policy=None,
temperature_policy=None,
elica_assist=assist,
interval=1.0,
)
# ==================================================
# ЭТАП 1
#
# Имитируем:
#
# Tion AUTO выбрал скорость 4.
#
# Именно реальный метод AutoController должен:
#
# target = 1
# Elica OFF -> speed 1
# mode -> OWNED
# ==================================================
print()
print(
"Calling AutoController "
"_update_elica_assist(4)..."
)
await auto_controller._update_elica_assist(
4
)
acquired = elica_controller.state
print()
print(
"Elica after Tion speed 4:",
{
"power": acquired.power,
"speed": acquired.speed,
"timer": acquired.timer,
},
)
print(
"Assist:",
assist.status(),
)
if not acquired.power:
raise RuntimeError(
"AutoController did not turn Elica on"
)
if acquired.speed != 1:
raise RuntimeError(
f"Expected Elica speed 1, "
f"got {acquired.speed}"
)
if assist.mode.value != "owned":
raise RuntimeError(
"Auto Assist did not enter OWNED"
)
if assist.expected_speed != 1:
raise RuntimeError(
"expected_speed is not 1"
)
print()
print(
"ACQUIRE PASSED"
)
# ==================================================
# ЭТАП 2
#
# Имитируем:
#
# Tion AUTO упал до скорости 3.
#
# Теперь реальный AutoController должен:
#
# target = None
# проверить OWNED
# выключить Elica
# reset -> IDLE
# ==================================================
print()
print(
"Calling AutoController "
"_update_elica_assist(3)..."
)
await auto_controller._update_elica_assist(
3
)
released = elica_controller.state
print()
print(
"Elica after Tion speed 3:",
{
"power": released.power,
"speed": released.speed,
"timer": released.timer,
},
)
print(
"Assist:",
assist.status(),
)
if released.power:
raise RuntimeError(
"AutoController did not turn Elica off"
)
if assist.mode.value != "idle":
raise RuntimeError(
"Auto Assist did not return to IDLE"
)
if assist.expected_speed is not None:
raise RuntimeError(
"expected_speed was not cleared"
)
print()
print(
"RELEASE PASSED"
)
print()
print(
"TEST PASSED"
)
print(
"Real AutoController successfully performed:"
)
print(
"Tion 4 -> Elica speed 1 -> OWNED"
)
print(
"Tion 3 -> Elica OFF -> IDLE"
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
@@ -0,0 +1,422 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.controller import AutoController
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaController,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
ELICA_READY_TIMEOUT = 15.0
MANUAL_CHANGE_TIMEOUT = 60.0
class TestElicaService(ElicaService):
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-auto-exit-manual-test-"
f"{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready"
)
await asyncio.sleep(0.1)
async def wait_for_manual_change(
service: ElicaService,
*,
power: bool,
speed: int,
timer: bool,
):
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ MANUAL_CHANGE_TIMEOUT
)
while True:
state = service.state
ready = (
state.mqtt_connected
and state.device_online
and service.feedback_ready
)
if ready:
logical = service.logical_state
if (
logical.power != power
or logical.speed != speed
or logical.timer != timer
):
return logical
if loop.time() >= deadline:
raise RuntimeError(
"No manual Elica change detected "
f"within {MANUAL_CHANGE_TIMEOUT} seconds"
)
await asyncio.sleep(0.1)
async def main() -> None:
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
elica_controller = ElicaController(
service
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
initial = elica_controller.state
print()
print(
"Initial Elica:",
{
"power": initial.power,
"speed": initial.speed,
"timer": initial.timer,
},
)
if initial.power:
raise RuntimeError(
"Elica must be OFF before this test"
)
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
auto_controller = AutoController(
schedule_service=object(),
qingping_service=object(),
tion_service=object(),
elica_controller=elica_controller,
policy=None,
temperature_policy=None,
elica_assist=assist,
interval=1.0,
)
# ==================================================
# STEP 1
#
# AUTO активен:
# Tion 4 -> Elica 1 -> OWNED
# ==================================================
print()
print("STEP 1:")
print(
"Tion AUTO speed 4 "
"-> Auto Assist acquires Elica"
)
await auto_controller._update_elica_assist(
4
)
owned = elica_controller.state
print()
print(
"Elica:",
{
"power": owned.power,
"speed": owned.speed,
"timer": owned.timer,
},
)
print(
"Assist:",
assist.status(),
)
if (
not owned.power
or owned.speed != 1
):
raise RuntimeError(
"Auto Assist did not acquire "
"Elica at speed 1"
)
if assist.mode.value != "owned":
raise RuntimeError(
"Assist did not enter OWNED"
)
print()
print(
"ACQUIRE PASSED"
)
# ==================================================
# STEP 2
#
# Пользователь вручную меняет Elica.
# Например 1 -> 2.
# ==================================================
print()
print("STEP 2:")
print(
"Now MANUALLY change Elica."
)
print(
"For example change speed 1 -> 2."
)
print(
"The test is waiting..."
)
changed = await wait_for_manual_change(
service,
power=owned.power,
speed=owned.speed,
timer=owned.timer,
)
print()
print(
"Manual Elica state:",
{
"power": changed.power,
"speed": changed.speed,
"timer": changed.timer,
},
)
# ==================================================
# STEP 3
#
# ВАЖНО:
# AutoController ещё не успел сделать обычный
# проход _update_elica_assist().
#
# Сразу имитируем выход из AUTO.
#
# _release_elica_assist() сам обязан заметить,
# что actual != expected, и НЕ выключить Elica.
# ==================================================
print()
print("STEP 3:")
print(
"Simulating immediate exit from AUTO..."
)
print(
"Elica must NOT be switched off."
)
await auto_controller._release_elica_assist()
final_elica = elica_controller.state
print()
print(
"Final Elica:",
{
"power": final_elica.power,
"speed": final_elica.speed,
"timer": final_elica.timer,
},
)
print(
"Final Assist:",
assist.status(),
)
# --------------------------------------------------
# Elica должна остаться точно такой,
# какой её сделал пользователь.
# --------------------------------------------------
if (
final_elica.power != changed.power
or final_elica.speed != changed.speed
or final_elica.timer != changed.timer
):
raise RuntimeError(
"AutoController modified user's Elica "
"during AUTO exit"
)
# --------------------------------------------------
# Сессия Auto Assist должна закончиться.
# --------------------------------------------------
if assist.mode.value != "idle":
raise RuntimeError(
"Assist did not return to IDLE "
"after AUTO exit"
)
if assist.expected_speed is not None:
raise RuntimeError(
"expected_speed was not cleared"
)
print()
print(
"MANUAL TAKEOVER ON AUTO EXIT PASSED"
)
print()
print(
"TEST PASSED"
)
print()
print(
"Verified sequence:"
)
print(
"AUTO -> Tion 4 "
"-> Elica 1 "
"-> OWNED"
)
print(
"User changes Elica"
)
print(
"AUTO exit "
"-> Elica untouched "
"-> IDLE"
)
print()
print(
"Turn Elica off manually "
"after the test."
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
@@ -0,0 +1,555 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.controller import AutoController
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaController,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
ELICA_READY_TIMEOUT = 15.0
MANUAL_CHANGE_TIMEOUT = 60.0
class TestElicaService(ElicaService):
"""
Отдельный MQTT client_id для live-теста.
"""
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-auto-elica-manual-test-"
f"{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready.\n"
f"mqtt_connected="
f"{state.mqtt_connected}\n"
f"device_online="
f"{state.device_online}\n"
f"feedback_ready="
f"{service.feedback_ready}\n"
f"missing_feedback_inputs="
f"{service.missing_feedback_inputs}"
)
await asyncio.sleep(0.1)
async def wait_for_manual_change(
service: ElicaService,
*,
power: bool,
speed: int,
timer: bool,
):
"""
Ждём реального изменения Elica пользователем.
Потеря MQTT/feedback изменением
не считается.
"""
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ MANUAL_CHANGE_TIMEOUT
)
while True:
state = service.state
ready = (
state.mqtt_connected
and state.device_online
and service.feedback_ready
)
if ready:
logical = service.logical_state
if (
logical.power != power
or logical.speed != speed
or logical.timer != timer
):
return logical
if loop.time() >= deadline:
raise RuntimeError(
"No manual Elica change detected "
f"within {MANUAL_CHANGE_TIMEOUT} seconds"
)
await asyncio.sleep(0.1)
async def main() -> None:
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
elica_controller = ElicaController(
service
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
initial = elica_controller.state
print()
print(
"Initial Elica:",
{
"power": initial.power,
"speed": initial.speed,
"timer": initial.timer,
},
)
if initial.power:
raise RuntimeError(
"Elica must be OFF before this test. "
"Turn it off manually and run again."
)
# --------------------------------------------------
# Создаём настоящий Auto Assist.
# --------------------------------------------------
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
# --------------------------------------------------
# Настоящий AutoController.
#
# Основной цикл мы не запускаем.
# Вызываем только _update_elica_assist().
# --------------------------------------------------
auto_controller = AutoController(
schedule_service=object(),
qingping_service=object(),
tion_service=object(),
elica_controller=elica_controller,
policy=None,
temperature_policy=None,
elica_assist=assist,
interval=1.0,
)
# ==================================================
# ЭТАП 1
#
# Tion 4
# -> AutoController включает Elica 1
# -> OWNED
# ==================================================
print()
print(
"STEP 1:"
)
print(
"Tion AUTO speed 4 "
"-> Auto Assist should acquire Elica"
)
await auto_controller._update_elica_assist(
4
)
owned = elica_controller.state
print()
print(
"Elica:",
{
"power": owned.power,
"speed": owned.speed,
"timer": owned.timer,
},
)
print(
"Assist:",
assist.status(),
)
if (
not owned.power
or owned.speed != 1
):
raise RuntimeError(
"AutoController did not acquire "
"Elica at speed 1"
)
if assist.mode.value != "owned":
raise RuntimeError(
"Assist did not enter OWNED"
)
print()
print(
"ACQUIRE PASSED"
)
# ==================================================
# ЭТАП 2
#
# Теперь пользователь физически меняет Elica.
#
# Например:
#
# speed 1 -> 2
#
# AutoController пока ничего не делает.
# Просто ждём реальный MQTT feedback.
# ==================================================
print()
print(
"STEP 2:"
)
print(
"Now MANUALLY change Elica."
)
print(
"For example change speed 1 -> 2."
)
print(
"The test is waiting..."
)
changed = await wait_for_manual_change(
service,
power=owned.power,
speed=owned.speed,
timer=owned.timer,
)
print()
print(
"Manual Elica state:",
{
"power": changed.power,
"speed": changed.speed,
"timer": changed.timer,
},
)
# ==================================================
# ЭТАП 3
#
# Tion всё ещё 4.
#
# Следующий проход AutoController должен увидеть:
#
# expected_speed = 1
# actual speed = 2
#
# -> manual_intervention
# -> SUPPRESSED
#
# И НИКАКИХ команд Elica.
# ==================================================
print()
print(
"STEP 3:"
)
print(
"Tion is still speed 4."
)
print(
"AutoController should detect "
"manual intervention..."
)
await auto_controller._update_elica_assist(
4
)
after_takeover = elica_controller.state
print()
print(
"Elica after detection:",
{
"power": after_takeover.power,
"speed": after_takeover.speed,
"timer": after_takeover.timer,
},
)
print(
"Assist:",
assist.status(),
)
if assist.mode.value != "suppressed":
raise RuntimeError(
"Assist did not enter SUPPRESSED"
)
if (
assist.status()["reason"]
!= "manual_intervention"
):
raise RuntimeError(
"Expected reason manual_intervention"
)
# Elica должна остаться ровно такой,
# какой её сделал пользователь.
if (
after_takeover.power
!= changed.power
or after_takeover.speed
!= changed.speed
or after_takeover.timer
!= changed.timer
):
raise RuntimeError(
"AutoController changed Elica "
"after manual intervention"
)
print()
print(
"MANUAL TAKEOVER PASSED"
)
# ==================================================
# ЭТАП 4
#
# Теперь Tion падает ниже порога:
#
# 4 -> 3
#
# Текущий автоматический цикл заканчивается.
#
# Но Elica уже пользовательская,
# поэтому выключать её ЗАПРЕЩЕНО.
#
# SUPPRESSED -> IDLE
# Elica остаётся включена.
# ==================================================
print()
print(
"STEP 4:"
)
print(
"Tion AUTO speed drops to 3."
)
print(
"Elica must NOT be switched off."
)
await auto_controller._update_elica_assist(
3
)
final_elica = elica_controller.state
print()
print(
"Final Elica:",
{
"power": final_elica.power,
"speed": final_elica.speed,
"timer": final_elica.timer,
},
)
print(
"Final Assist:",
assist.status(),
)
# --------------------------------------------------
# Проверяем, что пользовательское состояние
# вообще не изменилось.
# --------------------------------------------------
if (
final_elica.power
!= changed.power
or final_elica.speed
!= changed.speed
or final_elica.timer
!= changed.timer
):
raise RuntimeError(
"AutoController modified user's "
"Elica when Tion dropped to speed 3"
)
# Новый цикл должен быть готов начаться
# в будущем.
if assist.mode.value != "idle":
raise RuntimeError(
"Assist did not return to IDLE "
"after the automatic cycle ended"
)
print()
print(
"RELEASE AFTER TAKEOVER PASSED"
)
print()
print(
"TEST PASSED"
)
print()
print(
"Verified sequence:"
)
print(
"Tion 4"
" -> Auto Elica 1"
" -> OWNED"
)
print(
"User changes Elica"
" -> SUPPRESSED"
)
print(
"Tion 3"
" -> Elica untouched"
" -> IDLE"
)
print()
print(
"Turn Elica off manually "
"after the test."
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
@@ -0,0 +1,314 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.controller import AutoController
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaController,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
ELICA_READY_TIMEOUT = 15.0
class TestElicaService(ElicaService):
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-auto-exit-test-"
f"{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready"
)
await asyncio.sleep(0.1)
async def main() -> None:
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
elica_controller = ElicaController(
service
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
initial = elica_controller.state
print()
print(
"Initial Elica:",
{
"power": initial.power,
"speed": initial.speed,
"timer": initial.timer,
},
)
if initial.power:
raise RuntimeError(
"Elica must be OFF before this test"
)
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
auto_controller = AutoController(
schedule_service=object(),
qingping_service=object(),
tion_service=object(),
elica_controller=elica_controller,
policy=None,
temperature_policy=None,
elica_assist=assist,
interval=1.0,
)
# --------------------------------------------------
# ЭТАП 1
#
# Имитируем рабочий AUTO:
# Tion speed 4 -> Elica speed 1 -> OWNED
# --------------------------------------------------
print()
print("STEP 1:")
print(
"Tion AUTO speed 4 "
"-> Auto Assist acquires Elica"
)
await auto_controller._update_elica_assist(
4
)
owned = elica_controller.state
print()
print(
"Elica:",
{
"power": owned.power,
"speed": owned.speed,
"timer": owned.timer,
},
)
print(
"Assist:",
assist.status(),
)
if (
not owned.power
or owned.speed != 1
):
raise RuntimeError(
"Auto Assist did not acquire "
"Elica at speed 1"
)
if assist.mode.value != "owned":
raise RuntimeError(
"Assist did not enter OWNED"
)
print()
print(
"ACQUIRE PASSED"
)
# --------------------------------------------------
# ЭТАП 2
#
# Теперь имитируем не Tion speed 3,
# а полный ВЫХОД ИЗ AUTO.
#
# Именно _release_elica_assist()
# должен выключить принадлежащую нам Elica.
# --------------------------------------------------
print()
print("STEP 2:")
print(
"Simulating exit from Tion AUTO..."
)
await auto_controller._release_elica_assist()
released = elica_controller.state
print()
print(
"Elica after AUTO exit:",
{
"power": released.power,
"speed": released.speed,
"timer": released.timer,
},
)
print(
"Assist after AUTO exit:",
assist.status(),
)
# --------------------------------------------------
# ПРОВЕРКИ
# --------------------------------------------------
if released.power:
raise RuntimeError(
"Elica remained ON after AUTO exit"
)
if assist.mode.value != "idle":
raise RuntimeError(
"Assist did not return to IDLE"
)
if assist.expected_speed is not None:
raise RuntimeError(
"expected_speed was not cleared"
)
print()
print(
"AUTO EXIT RELEASE PASSED"
)
print()
print(
"TEST PASSED"
)
print()
print(
"Verified sequence:"
)
print(
"AUTO active"
" -> Tion 4"
" -> Elica 1"
" -> OWNED"
)
print(
"AUTO exit"
" -> Elica OFF"
" -> IDLE"
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
@@ -0,0 +1,341 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaController,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
# По нашей текущей таблице:
# Tion 4 -> Elica 1
TION_SPEED = 4
ELICA_READY_TIMEOUT = 15.0
class TestElicaService(ElicaService):
"""
Отдельный MQTT client_id для live-теста,
чтобы не конфликтовать с запущенным
ClimatController.
"""
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-elica-acquire-test-{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
"""
Ждём подключения к MQTT, ESP32
и полной обратной связи панели Elica.
"""
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready.\n"
f"mqtt_connected="
f"{state.mqtt_connected}\n"
f"device_online="
f"{state.device_online}\n"
f"feedback_ready="
f"{service.feedback_ready}\n"
f"missing_feedback_inputs="
f"{service.missing_feedback_inputs}"
)
await asyncio.sleep(0.1)
async def main() -> None:
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
controller = ElicaController(
service
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
# --------------------------------------------------
# Перед началом теста Elica обязана быть OFF.
# --------------------------------------------------
state = controller.state
print()
print(
"Initial Elica:",
{
"power": state.power,
"speed": state.speed,
"timer": state.timer,
},
)
if state.power:
raise RuntimeError(
"Elica must be OFF before this test. "
"Turn it off manually and run the test again."
)
# --------------------------------------------------
# Создаём Auto Assist.
# --------------------------------------------------
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
# --------------------------------------------------
# Имитируем решение AUTO Tion.
# --------------------------------------------------
target_speed = (
assist.set_tion_speed(
TION_SPEED
)
)
print()
print(
"Tion AUTO speed:",
TION_SPEED,
)
print(
"Elica target:",
target_speed,
)
print(
"Assist before observe:",
assist.status(),
)
# --------------------------------------------------
# Проверяем исходное состояние Elica.
#
# Она OFF, поэтому ассистент должен
# остаться IDLE и разрешить захват.
# --------------------------------------------------
assist.observe_elica(
power=state.power,
speed=state.speed,
timer=state.timer,
)
print(
"Assist after observe:",
assist.status(),
)
if assist.mode.value != "idle":
raise RuntimeError(
"Auto Assist did not remain IDLE "
"with Elica switched off"
)
if target_speed is None:
raise RuntimeError(
"No Elica target speed "
"for current Tion speed"
)
print()
print(
"AUTO ASSIST IS NOW GOING TO "
f"SET ELICA SPEED {target_speed}"
)
# --------------------------------------------------
# ПЕРВАЯ РЕАЛЬНАЯ КОМАНДА.
#
# Из OFF вызов set_speed(1) нажмёт Speed
# и дождётся подтверждения:
#
# power=True
# speed=1
# --------------------------------------------------
result = await controller.set_speed(
target_speed
)
print()
print(
"Confirmed Elica:",
{
"power": result.power,
"speed": result.speed,
"timer": result.timer,
},
)
# --------------------------------------------------
# Только после подтверждённой команды
# объявляем Elica принадлежащей автоматике.
# --------------------------------------------------
assist.mark_owned(
result.speed
)
print(
"Assist after mark_owned:",
assist.status(),
)
# --------------------------------------------------
# Передаём подтверждённое фактическое
# состояние ещё раз.
#
# Оно совпадает с expected_speed,
# поэтому OWNED должен сохраниться.
# --------------------------------------------------
assist.observe_elica(
power=result.power,
speed=result.speed,
timer=result.timer,
)
print()
print(
"Assist after confirmed feedback:",
assist.status(),
)
if assist.mode.value != "owned":
raise RuntimeError(
"Auto Assist did not enter OWNED state"
)
if result.speed != target_speed:
raise RuntimeError(
"Elica reached unexpected speed"
)
print()
print(
"TEST PASSED"
)
print(
"Elica was acquired by Auto Assist "
f"at speed {result.speed}."
)
print(
"Turn Elica off manually after the test."
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
+368
View File
@@ -0,0 +1,368 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
# Имитируем ситуацию:
# AUTO-контроллер Tion выбрал скорость 4.
TION_SPEED = 4
ELICA_READY_TIMEOUT = 15.0
ELICA_CHANGE_TIMEOUT = 60.0
class TestElicaService(ElicaService):
"""
Тестовая версия ElicaService.
Отличие только одно:
используется отдельный MQTT client_id,
чтобы не конфликтовать с запущенным
ClimatController.
"""
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-elica-test-{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
"""
Ждём полноценного подключения Elica:
MQTT + ESP32 online + обратная связь.
"""
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready.\n"
f"mqtt_connected="
f"{state.mqtt_connected}\n"
f"device_online="
f"{state.device_online}\n"
f"feedback_ready="
f"{service.feedback_ready}\n"
f"missing_feedback_inputs="
f"{service.missing_feedback_inputs}"
)
await asyncio.sleep(0.1)
async def wait_for_elica_change(
service: ElicaService,
*,
power: bool,
speed: int,
timer: bool,
):
"""
Ждём реального ручного изменения Elica.
ВАЖНО:
потеря MQTT, offline ESP32 или потеря
feedback НЕ считаются ручным изменением.
"""
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_CHANGE_TIMEOUT
)
while True:
state = service.state
# ----------------------------------------------
# Если связь временно потеряна,
# состояние logical_state использовать нельзя.
#
# Иначе OFF/0 после disconnect можно ошибочно
# принять за ручное выключение Elica.
# ----------------------------------------------
ready = (
state.mqtt_connected
and state.device_online
and service.feedback_ready
)
if ready:
logical = service.logical_state
changed = (
logical.power != power
or logical.speed != speed
or logical.timer != timer
)
if changed:
return logical
if loop.time() >= deadline:
raise RuntimeError(
"No real Elica change detected "
f"within "
f"{ELICA_CHANGE_TIMEOUT} seconds"
)
await asyncio.sleep(0.1)
async def main() -> None:
# --------------------------------------------------
# Запускаем только тестовый ElicaService.
#
# Tion, Qingping, FastAPI и Schedule
# здесь не участвуют.
# --------------------------------------------------
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
# --------------------------------------------------
# Ждём реальную ESP32 Elica.
# --------------------------------------------------
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
# --------------------------------------------------
# Читаем текущее состояние.
# --------------------------------------------------
elica = service.logical_state
print()
print(
"Real Elica:",
{
"power": elica.power,
"speed": elica.speed,
"timer": elica.timer,
},
)
# --------------------------------------------------
# Загружаем Auto Assist.
# --------------------------------------------------
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
# --------------------------------------------------
# Имитируем:
#
# Tion AUTO выбрал скорость 4.
#
# По текущей таблице:
# Tion 4 -> Elica 1.
# --------------------------------------------------
target = assist.set_tion_speed(
TION_SPEED
)
print()
print(
"Tion AUTO speed:",
TION_SPEED,
)
print(
"Elica target:",
target,
)
print()
print(
"Before observe:",
assist.status(),
)
# --------------------------------------------------
# Передаём исходное реальное состояние Elica.
# --------------------------------------------------
assist.observe_elica(
power=elica.power,
speed=elica.speed,
timer=elica.timer,
)
print(
"After observe:",
assist.status(),
)
# --------------------------------------------------
# Запоминаем именно подтверждённое состояние.
# --------------------------------------------------
initial_power = elica.power
initial_speed = elica.speed
initial_timer = elica.timer
print()
print(
"Now change Elica manually."
)
print(
"Change speed, turn it on/off "
"or enable Timer."
)
print(
"The test is waiting for "
"REAL MQTT feedback..."
)
# --------------------------------------------------
# Здесь тест ждёт физического изменения Elica.
# Disconnect теперь изменение не имитирует.
# --------------------------------------------------
changed = await wait_for_elica_change(
service,
power=initial_power,
speed=initial_speed,
timer=initial_timer,
)
print()
print(
"Elica changed:",
{
"power": changed.power,
"speed": changed.speed,
"timer": changed.timer,
},
)
# --------------------------------------------------
# Передаём ручное изменение Auto Assist.
# --------------------------------------------------
assist.observe_elica(
power=changed.power,
speed=changed.speed,
timer=changed.timer,
)
print()
print(
"After manual change:",
assist.status(),
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
+335
View File
@@ -0,0 +1,335 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
ELICA_READY_TIMEOUT = 15.0
ELICA_CHANGE_TIMEOUT = 60.0
class TestElicaService(ElicaService):
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-elica-owned-test-{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready"
)
await asyncio.sleep(0.1)
async def wait_for_elica_change(
service: ElicaService,
*,
power: bool,
speed: int,
timer: bool,
):
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_CHANGE_TIMEOUT
)
while True:
state = service.state
ready = (
state.mqtt_connected
and state.device_online
and service.feedback_ready
)
if ready:
logical = service.logical_state
if (
logical.power != power
or logical.speed != speed
or logical.timer != timer
):
return logical
if loop.time() >= deadline:
raise RuntimeError(
"No real Elica change detected "
f"within {ELICA_CHANGE_TIMEOUT} seconds"
)
await asyncio.sleep(0.1)
async def main() -> None:
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
elica = service.logical_state
print()
print(
"Current Elica:",
{
"power": elica.power,
"speed": elica.speed,
"timer": elica.timer,
},
)
# Для этого теста Elica должна быть
# уже включена на скорости 1, 2 или 3.
if (
not elica.power
or elica.speed not in (1, 2, 3)
):
raise RuntimeError(
"Before starting this test, "
"manually turn Elica on "
"at speed 1, 2 or 3"
)
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
# Находим скорость Tion, которой
# соответствует текущая скорость Elica.
tion_speed = None
for (
candidate_tion_speed,
candidate_elica_speed,
) in config.elica_assist.speed_map:
if (
candidate_elica_speed
== elica.speed
):
tion_speed = (
candidate_tion_speed
)
break
if tion_speed is None:
raise RuntimeError(
"Current Elica speed is not "
"present in elica_assist.speed_map"
)
# --------------------------------------------------
# Имитируем:
#
# Tion AUTO потребовал такую скорость Elica,
# и автоматика якобы успешно её установила.
# --------------------------------------------------
target = assist.set_tion_speed(
tion_speed
)
assist.mark_owned(
elica.speed
)
print()
print(
"Tion AUTO speed:",
tion_speed,
)
print(
"Elica target:",
target,
)
print(
"Assist after mark_owned:",
assist.status(),
)
# --------------------------------------------------
# Передаём совпадающую обратную связь.
#
# OWNED должен сохраниться.
# --------------------------------------------------
assist.observe_elica(
power=elica.power,
speed=elica.speed,
timer=elica.timer,
)
print()
print(
"After matching feedback:",
assist.status(),
)
initial_power = elica.power
initial_speed = elica.speed
initial_timer = elica.timer
print()
print(
"Now change Elica manually."
)
print(
"For example, change its speed."
)
print(
"The test is waiting for "
"REAL MQTT feedback..."
)
changed = await wait_for_elica_change(
service,
power=initial_power,
speed=initial_speed,
timer=initial_timer,
)
print()
print(
"Elica changed:",
{
"power": changed.power,
"speed": changed.speed,
"timer": changed.timer,
},
)
# --------------------------------------------------
# Теперь Auto Assist должен увидеть,
# что фактическое состояние больше
# не совпадает с expected_speed.
# --------------------------------------------------
assist.observe_elica(
power=changed.power,
speed=changed.speed,
timer=changed.timer,
)
print()
print(
"After manual intervention:",
assist.status(),
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
@@ -0,0 +1,375 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaController,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
ELICA_READY_TIMEOUT = 15.0
class TestElicaService(ElicaService):
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-elica-release-test-{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready"
)
await asyncio.sleep(0.1)
async def main() -> None:
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
controller = ElicaController(
service
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
state = controller.state
print()
print(
"Initial Elica:",
{
"power": state.power,
"speed": state.speed,
"timer": state.timer,
},
)
if state.power:
raise RuntimeError(
"Elica must be OFF before this test"
)
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
# --------------------------------------------------
# ЭТАП 1
#
# Tion AUTO = 4
# Elica target = 1
# Получаем OWNED.
# --------------------------------------------------
target = assist.set_tion_speed(
4
)
print()
print(
"Tion AUTO speed:",
4,
)
print(
"Elica target:",
target,
)
if target != 1:
raise RuntimeError(
f"Expected target 1, got {target}"
)
assist.observe_elica(
power=state.power,
speed=state.speed,
timer=state.timer,
)
result = await controller.set_speed(
target
)
assist.mark_owned(
result.speed
)
assist.observe_elica(
power=result.power,
speed=result.speed,
timer=result.timer,
)
print()
print(
"Elica acquired:",
{
"power": result.power,
"speed": result.speed,
"timer": result.timer,
},
)
print(
"Assist:",
assist.status(),
)
if assist.mode.value != "owned":
raise RuntimeError(
"Assist did not enter OWNED"
)
# --------------------------------------------------
# ЭТАП 2
#
# Tion AUTO падает до 3.
#
# target_speed должен стать None.
# --------------------------------------------------
target = assist.set_tion_speed(
3
)
print()
print(
"Tion AUTO speed:",
3,
)
print(
"Elica target:",
target,
)
if target is not None:
raise RuntimeError(
"Expected no Elica target "
"at Tion speed 3"
)
# --------------------------------------------------
# Перед выключением обязательно ещё раз
# проверяем фактическое состояние.
#
# Если оно уже не совпадает с expected_speed,
# значит пользователь вмешался.
# --------------------------------------------------
current = controller.state
print()
print(
"Elica before release:",
{
"power": current.power,
"speed": current.speed,
"timer": current.timer,
},
)
print(
"Assist before release:",
assist.status(),
)
assist.observe_elica(
power=current.power,
speed=current.speed,
timer=current.timer,
)
# После проверки мы всё ещё должны
# владеть Elica.
if assist.mode.value != "owned":
raise RuntimeError(
"Auto Assist lost ownership "
"before release. "
"Elica will NOT be switched off."
)
expected = assist.expected_speed
if (
not current.power
or current.speed != expected
or current.timer
):
raise RuntimeError(
"Actual Elica state does not match "
"the state owned by Auto Assist"
)
# --------------------------------------------------
# ПЕРВОЕ АВТОМАТИЧЕСКОЕ ВЫКЛЮЧЕНИЕ.
# --------------------------------------------------
print()
print(
"AUTO ASSIST IS NOW GOING TO "
"TURN ELICA OFF"
)
result_off = await controller.power_off()
print()
print(
"Confirmed Elica:",
{
"power": result_off.power,
"speed": result_off.speed,
"timer": result_off.timer,
},
)
# После успешного выключения
# текущий автоматический цикл завершён.
assist.reset()
print(
"Assist after release:",
assist.status(),
)
# --------------------------------------------------
# ПРОВЕРКИ
# --------------------------------------------------
if result_off.power:
raise RuntimeError(
"Elica did not switch off"
)
if assist.mode.value != "idle":
raise RuntimeError(
"Assist did not return to IDLE"
)
if assist.expected_speed is not None:
raise RuntimeError(
"expected_speed was not cleared"
)
print()
print(
"TEST PASSED"
)
print(
"Auto Assist acquired Elica, "
"then released and switched it off "
"when Tion dropped to speed 3."
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
@@ -0,0 +1,316 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaController,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
ELICA_READY_TIMEOUT = 15.0
class TestElicaService(ElicaService):
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-elica-speed-test-{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready"
)
await asyncio.sleep(0.1)
async def main() -> None:
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
controller = ElicaController(
service
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
state = controller.state
print()
print(
"Initial Elica:",
{
"power": state.power,
"speed": state.speed,
"timer": state.timer,
},
)
# Для этого теста Elica должна быть выключена.
if state.power:
raise RuntimeError(
"Elica must be OFF before this test"
)
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
# --------------------------------------------------
# Этап 1:
# Tion AUTO = 4 -> Elica должна стать 1
# --------------------------------------------------
target_1 = assist.set_tion_speed(4)
print()
print(
"Tion AUTO speed:",
4,
)
print(
"Elica target:",
target_1,
)
if target_1 != 1:
raise RuntimeError(
f"Expected Elica target 1, got {target_1}"
)
assist.observe_elica(
power=state.power,
speed=state.speed,
timer=state.timer,
)
result_1 = await controller.set_speed(
target_1
)
assist.mark_owned(
result_1.speed
)
assist.observe_elica(
power=result_1.power,
speed=result_1.speed,
timer=result_1.timer,
)
print()
print(
"After first acquire:",
{
"power": result_1.power,
"speed": result_1.speed,
"timer": result_1.timer,
},
)
print(
"Assist:",
assist.status(),
)
if assist.mode.value != "owned":
raise RuntimeError(
"Assist did not enter OWNED"
)
# --------------------------------------------------
# Этап 2:
# Tion AUTO меняется 4 -> 5
# Значит Elica 1 -> 2
# --------------------------------------------------
target_2 = assist.set_tion_speed(5)
print()
print(
"Tion AUTO speed:",
5,
)
print(
"New Elica target:",
target_2,
)
if target_2 != 2:
raise RuntimeError(
f"Expected Elica target 2, got {target_2}"
)
# --------------------------------------------------
# Пока владельцем остаётся автоматика,
# поэтому ей разрешено изменить скорость.
# --------------------------------------------------
result_2 = await controller.set_speed(
target_2
)
print()
print(
"Confirmed Elica after speed change:",
{
"power": result_2.power,
"speed": result_2.speed,
"timer": result_2.timer,
},
)
# Обновляем expected_speed только после
# подтверждённой команды.
assist.mark_owned(
result_2.speed
)
assist.observe_elica(
power=result_2.power,
speed=result_2.speed,
timer=result_2.timer,
)
print()
print(
"Assist after speed change:",
assist.status(),
)
if assist.mode.value != "owned":
raise RuntimeError(
"Assist lost OWNED after "
"automatic speed change"
)
if result_2.speed != 2:
raise RuntimeError(
"Elica did not reach speed 2"
)
print()
print(
"TEST PASSED"
)
print(
"Auto Assist changed Elica "
"from speed 1 to speed 2 "
"and kept OWNED."
)
print(
"Turn Elica off manually after the test."
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
@@ -0,0 +1,448 @@
import asyncio
import os
import paho.mqtt.client as mqtt
from app.auto.config import load_auto_config
from app.auto.elica_assist import ElicaAutoAssistState
from app.elica import (
ElicaConfig,
ElicaController,
ElicaService,
)
from app.my_dataclasses import (
ELICA_MQTT_HOST,
ELICA_MQTT_PORT,
)
AUTO_CONFIG = "config/auto.yaml"
ELICA_READY_TIMEOUT = 15.0
class TestElicaService(ElicaService):
async def start(self) -> None:
if self._running:
return
client_id = (
f"climatcontroller-elica-down-test-{os.getpid()}"
)
print(
"Test MQTT client_id:",
client_id,
)
client = mqtt.Client(
callback_api_version=(
mqtt.CallbackAPIVersion.VERSION2
),
client_id=client_id,
)
client.on_connect = self._on_connect
client.on_disconnect = self._on_disconnect
client.on_message = self._on_message
client.reconnect_delay_set(
min_delay=1,
max_delay=30,
)
self._client = client
self._running = True
client.connect_async(
self._config.mqtt_host,
self._config.mqtt_port,
keepalive=60,
)
client.loop_start()
async def wait_for_elica(
service: ElicaService,
) -> None:
loop = asyncio.get_running_loop()
deadline = (
loop.time()
+ ELICA_READY_TIMEOUT
)
while True:
state = service.state
if (
state.mqtt_connected
and state.device_online
and service.feedback_ready
):
return
if loop.time() >= deadline:
raise RuntimeError(
"Elica did not become ready"
)
await asyncio.sleep(0.1)
async def set_speed_with_trace(
controller: ElicaController,
service: ElicaService,
target_speed: int,
):
"""
Выполняет обычный controller.set_speed(),
параллельно записывая фактические скорости Elica.
Это позволяет увидеть реальный цикл:
2 -> 3 -> 4 -> 1
"""
path: list[int] = []
initial = service.logical_state
if (
initial.power
and 1 <= initial.speed <= 4
):
path.append(initial.speed)
task = asyncio.create_task(
controller.set_speed(
target_speed
)
)
while not task.done():
state = service.logical_state
if (
state.power
and 1 <= state.speed <= 4
):
if (
not path
or path[-1] != state.speed
):
path.append(
state.speed
)
await asyncio.sleep(0.02)
result = await task
# На всякий случай фиксируем конечное
# подтверждённое состояние.
if (
result.power
and 1 <= result.speed <= 4
and (
not path
or path[-1] != result.speed
)
):
path.append(
result.speed
)
return result, path
async def main() -> None:
service = TestElicaService(
ElicaConfig(
mqtt_host=ELICA_MQTT_HOST,
mqtt_port=ELICA_MQTT_PORT,
)
)
controller = ElicaController(
service
)
print(
"Starting Elica service..."
)
await service.start()
try:
print(
f"Connecting to MQTT "
f"{ELICA_MQTT_HOST}:"
f"{ELICA_MQTT_PORT}..."
)
await wait_for_elica(
service
)
print(
"Elica connected and "
"feedback ready"
)
state = controller.state
print()
print(
"Initial Elica:",
{
"power": state.power,
"speed": state.speed,
"timer": state.timer,
},
)
# Для чистоты начинаем с OFF.
if state.power:
raise RuntimeError(
"Elica must be OFF before this test"
)
config = load_auto_config(
AUTO_CONFIG
)
assist = ElicaAutoAssistState(
config.elica_assist
)
# ==================================================
# ЭТАП 1
#
# Tion AUTO = 5
# Elica target = 2
#
# Получаем OWNED на скорости 2.
# ==================================================
target_2 = assist.set_tion_speed(
5
)
print()
print(
"Tion AUTO speed:",
5,
)
print(
"Elica target:",
target_2,
)
if target_2 != 2:
raise RuntimeError(
f"Expected Elica target 2, "
f"got {target_2}"
)
assist.observe_elica(
power=state.power,
speed=state.speed,
timer=state.timer,
)
result_2 = await controller.set_speed(
target_2
)
assist.mark_owned(
result_2.speed
)
assist.observe_elica(
power=result_2.power,
speed=result_2.speed,
timer=result_2.timer,
)
print()
print(
"Elica acquired:",
{
"power": result_2.power,
"speed": result_2.speed,
"timer": result_2.timer,
},
)
print(
"Assist:",
assist.status(),
)
if (
assist.mode.value != "owned"
or result_2.speed != 2
):
raise RuntimeError(
"Failed to acquire Elica "
"at speed 2"
)
# ==================================================
# ЭТАП 2
#
# Tion AUTO падает:
#
# 5 -> 4
#
# Новая цель Elica:
#
# 2 -> 1
#
# Но физически Elica должна пройти:
#
# 2 -> 3 -> 4 -> 1
# ==================================================
target_1 = assist.set_tion_speed(
4
)
print()
print(
"Tion AUTO speed:",
4,
)
print(
"New Elica target:",
target_1,
)
print(
"Assist before speed change:",
assist.status(),
)
if target_1 != 1:
raise RuntimeError(
f"Expected Elica target 1, "
f"got {target_1}"
)
# ВАЖНО:
#
# Здесь НЕ вызываем observe_elica()
# во время промежуточных скоростей.
#
# 3 и 4 являются частью нашей
# собственной команды set_speed(1),
# а не действиями пользователя.
result_1, speed_path = (
await set_speed_with_trace(
controller,
service,
target_1,
)
)
print()
print(
"Observed speed path:",
speed_path,
)
print(
"Confirmed Elica:",
{
"power": result_1.power,
"speed": result_1.speed,
"timer": result_1.timer,
},
)
# Только ПОСЛЕ завершения всей нашей
# последовательности обновляем владение.
assist.mark_owned(
result_1.speed
)
assist.observe_elica(
power=result_1.power,
speed=result_1.speed,
timer=result_1.timer,
)
print()
print(
"Assist after speed change:",
assist.status(),
)
# ==================================================
# ПРОВЕРКИ
# ==================================================
if speed_path != [2, 3, 4, 1]:
raise RuntimeError(
"Unexpected Elica speed path: "
f"{speed_path}; "
"expected [2, 3, 4, 1]"
)
if result_1.speed != 1:
raise RuntimeError(
"Elica did not reach speed 1"
)
if assist.mode.value != "owned":
raise RuntimeError(
"Auto Assist lost OWNED "
"during automatic speed change"
)
if assist.expected_speed != 1:
raise RuntimeError(
"Auto Assist expected_speed "
"was not updated to 1"
)
print()
print(
"TEST PASSED"
)
print(
"Automatic Elica transition:"
)
print(
"2 -> 3 -> 4 -> 1"
)
print(
"Auto Assist kept OWNED."
)
print()
print(
"Turn Elica off manually "
"after the test."
)
finally:
print()
print(
"Stopping Elica service..."
)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
+112
View File
@@ -0,0 +1,112 @@
import asyncio
import json
from app.elica.config import ElicaConfig
from app.elica.service import ElicaService
async def main() -> None:
config = ElicaConfig(
mqtt_host="192.168.7.100", # IP Mosquitto
mqtt_port=1883,
)
service = ElicaService(config)
print("Starting ElicaService...")
await service.start( )
try:
# Даём MQTT время подключиться и получить retained elica/status.
await asyncio.sleep(2)
print(
json.dumps(
service.status(),
indent=2,
ensure_ascii=False,
)
)
assert service.state.mqtt_connected
assert service.state.device_online
print("\nMQTT: OK")
print("ESP32: ONLINE")
# --------------------------------------------------------------
# Проверяем все 8 реле по очереди
# --------------------------------------------------------------
for relay in range(1, 9):
# print(f"\nTesting Relay {relay}...")
#
# # ON
# service.set_relay(relay,True,)
#
# await asyncio.sleep(0.5)
#
# state = service.relay_state(relay)
#
# print(f"Relay {relay} after ON: {state}")
#
# assert state is True, (f"Relay {relay} did not report ON")
#
# # OFF
# service.set_relay(relay,False)
#
# await asyncio.sleep(0.5)
#
# state = service.relay_state(relay)
#
# print(f"Relay {relay} after OFF: {state}")
#
# assert state is False, (f"Relay {relay} did not report OFF")
print(f"Pulse Relay {relay}")
await service.pulse_relay(relay)
await asyncio.sleep(0.5)
print(f"Relay {relay} state:", service.relay_state(relay))
assert service.relay_state(relay) is False
print("\nAll 8 relays passed MQTT test.")
print("\nFinal state:")
print(
json.dumps(
service.status(),
indent=2,
ensure_ascii=False,
)
)
# print("\nInitial inputs:")
# print(service.state.input_states)
#
# print("\nToggle ESP32 inputs now...")
# for _ in range(15):
# await asyncio.sleep(1)
# print(service.state.input_states)
finally:
# На всякий случай гарантированно выключаем все реле.
if service.state.mqtt_connected:
for relay in range(1, 9):
service.set_relay(
relay,
False,
)
await asyncio.sleep(0.5)
await service.stop()
if __name__ == "__main__":
asyncio.run(main())
+248
View File
@@ -0,0 +1,248 @@
from app.auto.controller import AutoController
def print_state(
title: str,
controller: AutoController,
) -> None:
print()
print(title)
print(
{
"enabled": (
controller.manual_heater_enabled
),
"target_temp": (
controller.manual_target_temperature
),
"heating": (
controller._manual_heating
),
}
)
def main() -> None:
controller = object.__new__(
AutoController
)
controller._manual_heater_enabled = None
controller._manual_target_temperature = None
controller._manual_heating = None
# ==================================================
# 1. Исходное состояние.
# ==================================================
print_state(
"1. Initial:",
controller,
)
assert (
controller.manual_heater_enabled
is None
)
assert (
controller.manual_target_temperature
is None
)
assert controller._manual_heating is None
# ==================================================
# 2. Пользователь входит в ручной режим.
#
# Представим, что на момент перехода:
# heater был выключен,
# пользовательская температура = 23.
# ==================================================
controller.set_manual_heater_enabled(
False
)
controller.set_manual_target_temperature(
23
)
print_state(
"2. Enter manual mode:",
controller,
)
assert (
controller.manual_heater_enabled
is False
)
assert (
controller.manual_target_temperature
== 23
)
# ==================================================
# 3. Пользователь включает обогрев.
# ==================================================
controller.set_manual_heater_enabled(
True
)
print_state(
"3. Heater ON:",
controller,
)
assert (
controller.manual_heater_enabled
is True
)
assert (
controller.manual_target_temperature
== 23
)
# Пока реальный регулятор Qingping ещё
# не реализован, heating остаётся None.
assert controller._manual_heating is False
# ==================================================
# 4. Пользователь увеличивает температуру.
#
# 23 -> 24.
# ==================================================
controller.set_manual_target_temperature(
24
)
print_state(
"4. Temperature 23 -> 24:",
controller,
)
assert (
controller.manual_target_temperature
== 24
)
assert (
controller.manual_heater_enabled
is True
)
# ==================================================
# 5. Пользователь уменьшает температуру.
#
# 24 -> 23.
# ==================================================
controller.set_manual_target_temperature(
23
)
print_state(
"5. Temperature 24 -> 23:",
controller,
)
assert (
controller.manual_target_temperature
== 23
)
assert (
controller.manual_heater_enabled
is True
)
# ==================================================
# 6. Пользователь выключает обогрев.
# ==================================================
controller.set_manual_heater_enabled(
False
)
print_state(
"6. Heater OFF:",
controller,
)
assert (
controller.manual_heater_enabled
is False
)
# Уставка пользователя должна сохраниться.
assert (
controller.manual_target_temperature
== 23
)
# При явном выключении heater мы уже
# установили manual_heating=False.
assert controller._manual_heating is False
# ==================================================
# 7. Пользователь снова включает heater.
#
# Проверяем, что сохранённая температура 23
# не потерялась.
# ==================================================
controller.set_manual_heater_enabled(
True
)
print_state(
"7. Heater ON again:",
controller,
)
assert (
controller.manual_heater_enabled
is True
)
assert (
controller.manual_target_temperature
== 23
)
# ==================================================
# 8. Resume расписания.
#
# API при resume вызывает
# clear_manual_heater_control().
# ==================================================
controller.clear_manual_heater_control()
print_state(
"8. Resume schedule:",
controller,
)
assert (
controller.manual_heater_enabled
is None
)
assert (
controller.manual_target_temperature
is None
)
assert controller._manual_heating is None
print()
print("TEST PASSED")
if __name__ == "__main__":
main()
+366
View File
@@ -0,0 +1,366 @@
import asyncio
import inspect
from app.auto.controller import AutoController
from app.my_dataclasses import MAX_TARGET_TEMP
class FakeTionController:
def __init__(self) -> None:
self.heater = False
self.target_temp = 23
def heater_on(self) -> None:
self.heater = True
def heater_off(self) -> None:
self.heater = False
def set_target_temperature(
self,
temperature: int,
) -> None:
self.target_temp = temperature
class FakeTionState:
def __init__(self) -> None:
self.in_temp = 22
class FakeTionService:
def __init__(self) -> None:
self.online = True
self.state = FakeTionState()
self.controller = FakeTionController()
self.commands: list[str] = []
async def execute(self, operation):
result = operation(self.controller)
if inspect.isawaitable(result):
await result
self.commands.append(
(
f"heater={self.controller.heater}, "
f"target={self.controller.target_temp}"
)
)
class FakeQingpingState:
def __init__(self) -> None:
self.temperature = 21.0
class FakeQingpingService:
def __init__(self) -> None:
self.online = True
self.state = FakeQingpingState()
class FakeTemperaturePolicy:
"""
Для этого теста нас интересует именно
интеграция Manual Heater с источниками
температуры и Tion.
Поэтому policy делаем простой и
детерминированной.
"""
def heater_required(
self,
temperature,
target_temp,
heater_on,
) -> bool:
return temperature < target_temp
def print_state(
title: str,
controller: AutoController,
tion: FakeTionService,
) -> None:
print()
print(title)
print(
{
"manual_enabled": (
controller.manual_heater_enabled
),
"user_target": (
controller.manual_target_temperature
),
"manual_heating": (
controller._manual_heating
),
"temperature": (
controller._temperature
),
"temperature_source": (
controller._temperature_source
),
"tion_heater": (
tion.controller.heater
),
"tion_target": (
tion.controller.target_temp
),
}
)
async def main() -> None:
tion = FakeTionService()
qingping = FakeQingpingService()
controller = AutoController(
schedule_service=object(),
qingping_service=qingping,
tion_service=tion,
temperature_policy=(
FakeTemperaturePolicy()
),
)
controller.set_manual_heater_enabled(
True
)
controller.set_manual_target_temperature(
23
)
# ==================================================
# 1. Qingping доступен.
# Комната холоднее цели.
#
# 21 < 23
#
# Ожидаем:
# - управление по Qingping;
# - heater ON;
# - физическая уставка Tion = MAX;
# - manual_heating=True.
# ==================================================
qingping.online = True
qingping.state.temperature = 21.0
await controller._process_manual_heater()
print_state(
"1. Qingping OK, room 21°C:",
controller,
tion,
)
assert (
controller._temperature_source
== "qingping"
)
assert controller._temperature == 21.0
assert controller._manual_heating is True
assert tion.controller.heater is True
assert (
tion.controller.target_temp
== MAX_TARGET_TEMP
)
assert (
controller.manual_target_temperature
== 23
)
# ==================================================
# 2. Температура достигла цели.
#
# 23 >= 23
#
# Ожидаем:
# - heater OFF;
# - внешний регулятор остаётся активным;
# - физическая уставка Tion остаётся MAX.
# ==================================================
qingping.state.temperature = 23.0
await controller._process_manual_heater()
print_state(
"2. Room reached 23°C:",
controller,
tion,
)
assert (
controller._temperature_source
== "qingping"
)
assert controller._temperature == 23.0
assert controller._manual_heating is False
assert tion.controller.heater is False
assert (
tion.controller.target_temp
== MAX_TARGET_TEMP
)
# ==================================================
# 3. Qingping пропал.
#
# Ожидаем:
# - внешний регулятор отключается;
# - manual_heating=None;
# - Tion получает пользовательские 23°C;
# - heater разрешается;
# - дальше решение принимает встроенный
# термостат Tion.
# ==================================================
qingping.online = False
tion.state.in_temp = 22
await controller._process_manual_heater()
print_state(
"3. Qingping OFFLINE:",
controller,
tion,
)
assert controller._manual_heating is None
assert tion.controller.heater is True
assert tion.controller.target_temp == 23
assert controller._temperature == 22
assert (
controller._temperature_source
== "tion"
)
# ==================================================
# 4. Qingping снова появился.
#
# Комната 22°C при цели 23°C.
#
# Ожидаем автоматический возврат
# внешнего регулирования.
# ==================================================
qingping.online = True
qingping.state.temperature = 22.0
await controller._process_manual_heater()
print_state(
"4. Qingping recovered, room 22°C:",
controller,
tion,
)
assert (
controller._temperature_source
== "qingping"
)
assert controller._temperature == 22.0
assert controller._manual_heating is True
assert tion.controller.heater is True
assert (
tion.controller.target_temp
== MAX_TARGET_TEMP
)
# ==================================================
# 5. После восстановления снова достигаем цели.
# ==================================================
qingping.state.temperature = 23.0
await controller._process_manual_heater()
print_state(
"5. Target reached after recovery:",
controller,
tion,
)
assert controller._manual_heating is False
assert tion.controller.heater is False
assert (
tion.controller.target_temp
== MAX_TARGET_TEMP
)
# ==================================================
# 6. Пользователь выключает heater.
#
# Даже при холодной комнате нагрев должен
# остаться выключенным.
# ==================================================
qingping.state.temperature = 18.0
controller.set_manual_heater_enabled(
False
)
await controller._process_manual_heater()
print_state(
"6. User heater OFF:",
controller,
tion,
)
assert (
controller.manual_heater_enabled
is False
)
assert controller._manual_heating is False
assert tion.controller.heater is False
# Пользовательская температура при этом
# должна сохраниться.
assert (
controller.manual_target_temperature
== 23
)
print()
print("Commands sent to fake Tion:")
for command in tion.commands:
print(" ", command)
print()
print("TEST PASSED")
if __name__ == "__main__":
asyncio.run(main())
@@ -0,0 +1,279 @@
class FakeTion:
"""
Модель Tion.
target_temp:
реальная температура, отправленная в Tion.
heater:
разрешён ли нагреватель физически.
"""
def __init__(self) -> None:
self.heater = False
self.target_temp = 23
def set_heater(
self,
enabled: bool,
) -> None:
self.heater = enabled
def set_target_temperature(
self,
temperature: int,
) -> None:
self.target_temp = temperature
class ManualHeaterModel:
"""
Эталонная модель будущего ручного
температурного регулятора.
user_target:
температура, которую задал пользователь.
heating:
решение внешнего регулятора:
True -> сейчас хотим греть;
False -> сейчас не хотим греть;
None -> внешний регулятор не работает,
управление отдано Tion.
"""
def __init__(
self,
tion: FakeTion,
user_target: int,
) -> None:
self.tion = tion
self.user_target = user_target
self.heating: bool | None = None
def update(
self,
qingping_available: bool,
room_temperature: float | None,
) -> None:
# ----------------------------------------------
# Qingping недоступен.
#
# Возвращаем штатное управление Tion:
#
# heater = ON
# target = пользовательская температура.
#
# Дальше встроенный термостат Tion сам
# решает, когда реально нагревать.
# ----------------------------------------------
if (
not qingping_available
or room_temperature is None
):
self.heating = None
self.tion.set_target_temperature(
self.user_target
)
self.tion.set_heater(
True
)
return
# ----------------------------------------------
# Qingping доступен.
#
# Чтобы внутренний термостат Tion
# не выключил нагрев раньше комнатного
# датчика, ставим техническую уставку 30°C.
# ----------------------------------------------
self.tion.set_target_temperature(
30
)
# Комната холоднее цели.
if room_temperature < self.user_target:
self.heating = True
self.tion.set_heater(
True
)
return
# Температура достигнута.
self.heating = False
self.tion.set_heater(
False
)
def print_state(
title: str,
model: ManualHeaterModel,
) -> None:
print()
print(title)
print(
{
"user_target": model.user_target,
"manual_heating": model.heating,
"tion_heater": model.tion.heater,
"tion_target": model.tion.target_temp,
}
)
def main() -> None:
tion = FakeTion()
model = ManualHeaterModel(
tion=tion,
user_target=23,
)
# ==================================================
# 1. Qingping доступен.
# В комнате холодно: 21°C при цели 23°C.
#
# Ожидаем:
# - внешний регулятор активен;
# - heater ON;
# - техническая уставка Tion = 30°C.
# ==================================================
model.update(
qingping_available=True,
room_temperature=21.0,
)
print_state(
"1. Qingping available, room 21°C:",
model,
)
assert model.heating is True
assert tion.heater is True
assert tion.target_temp == 30
# Пользовательская цель не должна
# измениться.
assert model.user_target == 23
# ==================================================
# 2. Температура комнаты достигла цели.
#
# 23°C при цели 23°C.
#
# Ожидаем:
# - нагрев выключается;
# - Tion остаётся с технической уставкой 30,
# потому что управление всё ещё внешнее.
# ==================================================
model.update(
qingping_available=True,
room_temperature=23.0,
)
print_state(
"2. Room reached target 23°C:",
model,
)
assert model.heating is False
assert tion.heater is False
assert tion.target_temp == 30
assert model.user_target == 23
# ==================================================
# 3. Qingping пропал.
#
# Ожидаем немедленный fallback:
#
# - внешний регулятор прекращает принимать
# решения;
# - heater разрешаем;
# - возвращаем физическую уставку Tion = 23;
# - дальше работает встроенный термостат Tion.
# ==================================================
model.update(
qingping_available=False,
room_temperature=None,
)
print_state(
"3. Qingping unavailable:",
model,
)
assert model.heating is None
assert tion.heater is True
assert (
tion.target_temp
== model.user_target
== 23
)
# ==================================================
# 4. Qingping снова появился.
#
# В комнате снова холоднее цели.
#
# Ожидаем возврат внешнего управления:
#
# target Tion 23 -> 30
# heater ON
# heating True
# ==================================================
model.update(
qingping_available=True,
room_temperature=22.0,
)
print_state(
"4. Qingping recovered, room 22°C:",
model,
)
assert model.heating is True
assert tion.heater is True
assert tion.target_temp == 30
assert model.user_target == 23
# ==================================================
# 5. После восстановления снова достигаем цели.
# ==================================================
model.update(
qingping_available=True,
room_temperature=23.0,
)
print_state(
"5. Target reached after recovery:",
model,
)
assert model.heating is False
assert tion.heater is False
assert tion.target_temp == 30
assert model.user_target == 23
print()
print("TEST PASSED")
if __name__ == "__main__":
main()
+107
View File
@@ -0,0 +1,107 @@
from app.auto.controller import AutoController
def main() -> None:
controller = object.__new__(
AutoController
)
controller._manual_heater_enabled = None
controller._manual_target_temperature = None
controller._manual_heating = None
print("Initial:")
print(
{
"enabled": controller._manual_heater_enabled,
"target_temp": controller._manual_target_temperature,
"heating": controller._manual_heating,
}
)
controller.set_manual_heater_enabled(
True
)
controller.set_manual_target_temperature(
23
)
print("After enable + target 23:")
print(
{
"enabled": controller.manual_heater_enabled,
"target_temp": controller.manual_target_temperature,
"heating": controller._manual_heating,
}
)
assert (
controller.manual_heater_enabled
is True
)
assert (
controller.manual_target_temperature
== 23
)
assert (
controller._manual_heating
is None
)
controller.set_manual_heater_enabled(
False
)
print("After heater OFF:")
print(
{
"enabled": controller.manual_heater_enabled,
"target_temp": controller.manual_target_temperature,
"heating": controller._manual_heating,
}
)
assert (
controller.manual_heater_enabled
is False
)
assert (
controller._manual_heating
is False
)
controller.clear_manual_heater_control()
print("After clear:")
print(
{
"enabled": controller.manual_heater_enabled,
"target_temp": controller.manual_target_temperature,
"heating": controller._manual_heating,
}
)
assert (
controller.manual_heater_enabled
is None
)
assert (
controller.manual_target_temperature
is None
)
assert (
controller._manual_heating
is None
)
print("TEST PASSED")
if __name__ == "__main__":
main()
+326
View File
@@ -0,0 +1,326 @@
import asyncio
import inspect
from types import SimpleNamespace
from app.auto.controller import AutoController
from app.my_dataclasses import MAX_TARGET_TEMP
class FakeTionController:
def __init__(self) -> None:
# Имитируем состояние до ручного изменения:
# AUTO ранее разрешил нагрев.
self.heater = True
self.target_temp = MAX_TARGET_TEMP
def heater_on(self) -> None:
self.heater = True
def heater_off(self) -> None:
self.heater = False
def set_target_temperature(
self,
temperature: int,
) -> None:
self.target_temp = temperature
class FakeTionState:
def __init__(self) -> None:
self.heater = True
self.in_temp = 18
class FakeTionService:
def __init__(self) -> None:
self.online = True
self.state = FakeTionState()
self.controller = FakeTionController()
async def execute(self, operation):
result = operation(self.controller)
if inspect.isawaitable(result):
await result
class FakeQingpingState:
def __init__(self) -> None:
self.temperature = 25.8
self.co2 = 900
class FakeQingpingService:
def __init__(self) -> None:
self.online = True
self.state = FakeQingpingState()
class FakeTemperaturePolicy:
def heater_required(
self,
temperature,
target_temp,
heater_on,
) -> bool:
return temperature < target_temp
class FakeSchedule:
def __init__(self) -> None:
self.paused = False
self.override_active = True
# Пользователь во время AUTO
# изменил только температуру:
#
# AUTO target = 25
# manual override target = 23
self.override_settings = SimpleNamespace(
target_temp=23,
heater=None,
)
def resolve(self, now=None):
# _process() вызывает resolve() ещё до
# проверки override_active.
#
# Для самого override содержимое resolution
# использоваться не должно.
return SimpleNamespace(
enabled=True,
auto_active=True,
auto_fallback_speed=2,
auto_target_temp=25,
)
def print_state(
title: str,
controller: AutoController,
tion: FakeTionService,
qingping: FakeQingpingService,
) -> None:
print()
print(title)
print(
{
"controller_state": controller._state,
"reason": controller._reason,
"qingping_online": qingping.online,
"qingping_temp": (
qingping.state.temperature
),
"manual_enabled": (
controller.manual_heater_enabled
),
"manual_target": (
controller.manual_target_temperature
),
"manual_heating": (
controller._manual_heating
),
"temperature": controller._temperature,
"temperature_source": (
controller._temperature_source
),
"tion_in_temp": tion.state.in_temp,
"tion_heater": tion.controller.heater,
"tion_target": (
tion.controller.target_temp
),
}
)
async def main() -> None:
schedule = FakeSchedule()
tion = FakeTionService()
qingping = FakeQingpingService()
controller = AutoController(
schedule_service=schedule,
qingping_service=qingping,
tion_service=tion,
temperature_policy=FakeTemperaturePolicy(),
)
# ==================================================
# 1. Регрессионный тест найденного бага.
#
# Было:
#
# AUTO target = 25
# Qingping = 25.8
# Tion heater = ON
#
# Пользователь вручную ставит 23.
#
# Несмотря на то, что встроенный датчик Tion
# показывает только 18°C, главным должен остаться
# Qingping:
#
# 25.8 > 23
# -> heater OFF.
# ==================================================
await controller._process()
print_state(
"1. Override target 23, Qingping 25.8:",
controller,
tion,
qingping,
)
assert controller._state == "suspended"
assert controller._reason == "manual_override"
assert (
controller.manual_target_temperature
== 23
)
assert (
controller.manual_heater_enabled
is True
)
assert (
controller._temperature_source
== "qingping"
)
assert controller._temperature == 25.8
assert controller._manual_heating is False
# КЛЮЧЕВАЯ ПРОВЕРКА БАГА:
assert tion.controller.heater is False
# Внешний регулятор активен,
# поэтому физическая уставка Tion остаётся MAX.
assert (
tion.controller.target_temp
== MAX_TARGET_TEMP
)
# ==================================================
# 2. Qingping пропадает во время того же override.
#
# Должны:
#
# target Tion -> 23
# heater -> ON
#
# И дальше встроенный термостат Tion решает,
# нужен ли фактический нагрев.
# ==================================================
qingping.online = False
qingping.state.temperature = None
await controller._process()
print_state(
"2. Same override, Qingping OFFLINE:",
controller,
tion,
qingping,
)
assert (
controller.manual_target_temperature
== 23
)
assert controller._manual_heating is None
assert tion.controller.target_temp == 23
assert tion.controller.heater is True
assert (
controller._temperature_source
== "tion"
)
assert controller._temperature == 18
# ==================================================
# 3. Qingping восстанавливается.
#
# Комната = 22°C, цель override = 23°C.
#
# Внешний регулятор автоматически должен
# снова забрать управление:
#
# target Tion -> MAX
# heater -> ON
# source -> Qingping
# ==================================================
qingping.online = True
qingping.state.temperature = 22.0
await controller._process()
print_state(
"3. Qingping recovered, room 22:",
controller,
tion,
qingping,
)
assert (
controller._temperature_source
== "qingping"
)
assert controller._temperature == 22.0
assert controller._manual_heating is True
assert tion.controller.heater is True
assert (
tion.controller.target_temp
== MAX_TARGET_TEMP
)
# ==================================================
# 4. Температура снова выше ручной цели.
#
# Проверяем, что heater снова отключается.
# ==================================================
qingping.state.temperature = 24.0
await controller._process()
print_state(
"4. Qingping 24, override target 23:",
controller,
tion,
qingping,
)
assert controller._manual_heating is False
assert tion.controller.heater is False
assert (
tion.controller.target_temp
== MAX_TARGET_TEMP
)
print()
print("TEST PASSED")
if __name__ == "__main__":
asyncio.run(main())
+128
View File
@@ -0,0 +1,128 @@
from unittest.mock import MagicMock, patch
import app.api as api
class FakeTionState:
def __init__(
self,
heater: bool,
target_temp: int,
):
self.heater = heater
self.target_temp = target_temp
def to_dict(self) -> dict:
return {
"power": True,
"heater": self.heater,
"heating": True,
"mode": "outside",
"out_temp": 10,
"in_temp": 21,
"target_temp": self.target_temp,
"fan_speed": 3,
}
def main() -> None:
# --------------------------------------------------
# Физическое состояние Tion:
# heater ON
# target = 30°C
#
# Но пользователь в ручном режиме хочет 23°C.
# --------------------------------------------------
tion_state = FakeTionState(
heater=True,
target_temp=30,
)
fake_service = MagicMock()
fake_service.state = tion_state
fake_service.online = True
fake_service.running = True
fake_service.last_seen = None
fake_service.last_error = None
fake_schedule = MagicMock()
fake_schedule.paused = True
fake_schedule.override_active = False
fake_auto = MagicMock()
fake_auto.manual_heater_enabled = True
fake_auto.manual_target_temperature = 23
fake_auto.status.return_value = {
"manual_heater": {
"enabled": True,
"target_temp": 23,
"heating": None,
}
}
print("Physical Tion:")
print(tion_state.to_dict())
with (
patch.object(
api,
"service",
fake_service,
),
patch.object(
api,
"schedule_service",
fake_schedule,
),
patch.object(
api,
"auto_controller",
fake_auto,
),
):
status = api.get_status()
print()
print("Public API Tion:")
print(status["tion"])
print()
print("Auto:")
print(status["auto"])
# --------------------------------------------------
# Главная проверка.
# --------------------------------------------------
assert tion_state.target_temp == 30
assert (
status["tion"]["target_temp"]
== 23
)
assert (
status["tion"]["heater"]
is True
)
print()
print(
"Physical target:",
tion_state.target_temp,
)
print(
"Public target:",
status["tion"]["target_temp"],
)
print()
print("TEST PASSED")
if __name__ == "__main__":
main()
+64
View File
@@ -0,0 +1,64 @@
from datetime import datetime
from pathlib import Path
import subprocess
import tomllib
PROJECT_DIR = Path(__file__).resolve().parent.parent
VERSION_FILE = PROJECT_DIR / "version.toml"
def get_git_commit() -> str:
"""Возвращает short hash текущего HEAD."""
try:
result = subprocess.run(
["git", "rev-parse", "--short", "HEAD"],
cwd=PROJECT_DIR,
capture_output=True,
text=True,
check=True,
)
return result.stdout.strip()
except (subprocess.CalledProcessError, FileNotFoundError):
return "unknown"
def main() -> None:
# Сначала читаем текущий version.toml.
# Нам нужны значения, которые разработчик поменял вручную.
with VERSION_FILE.open("rb") as file:
data = tomllib.load(file)
major = data["version"]["major"]
minor = data["version"]["minor"]
patch = data["version"]["patch"]
now = datetime.now()
content = f"""\
[version]
major = {major}
minor = {minor}
patch = {patch}
[build]
date = "{now:%Y-%m-%d}"
time = "{now:%H:%M:%S}"
"""
VERSION_FILE.write_text(
content,
encoding="utf-8",
)
print(
f"Version updated: "
f"{major}.{minor}.{patch} "
f"({now:%Y-%m-%d %H:%M:%S})"
)
if __name__ == "__main__":
main()
Binary file not shown.

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

+47
View File
@@ -0,0 +1,47 @@
<svg xmlns="http://www.w3.org/2000/svg">
<symbol id="fan" viewBox="0 0 24 24">
<circle cx="12" cy="12" r="2.1" fill="currentColor" stroke="none"/>
<path d="M12 9.9c-1.3-1.6-2.1-3.1-1.3-5.1.6-1.5 2.5-2.2 3.8-1.2 1.7 1.3 1.2 3.5-.5 5.1-.6.6-1.3 1-2 1.2ZM14.1 12c1.6-1.3 3.1-2.1 5.1-1.3 1.5.6 2.2 2.5 1.2 3.8-1.3 1.7-3.5 1.2-5.1-.5-.6-.6-1-1.3-1.2-2ZM12 14.1c1.3 1.6 2.1 3.1 1.3 5.1-.6 1.5-2.5 2.2-3.8 1.2-1.7-1.3-1.2-3.5.5-5.1.6-.6 1.3-1 2-1.2ZM9.9 12c-1.6 1.3-3.1 2.1-5.1 1.3-1.5-.6-2.2-2.5-1.2-3.8 1.3-1.7 3.5-1.2 5.1.5.6.6 1 1.3 1.2 2Z" fill="currentColor" stroke="none"/>
</symbol>
<symbol id="thermometer" viewBox="0 0 24 24">
<path d="M9 14.4V5a3 3 0 0 1 6 0v9.4a5 5 0 1 1-6 0Z"/>
<path d="M12 7v9"/><circle cx="12" cy="18" r="1.7" fill="currentColor" stroke="none"/>
</symbol>
<symbol id="power" viewBox="0 0 24 24">
<path d="M12 2.8v8.4"/><path d="M7.2 6.1a8 8 0 1 0 9.6 0"/>
</symbol>
<symbol id="heat" viewBox="0 0 24 24">
<path d="M7 21c-2.7-3.1 2.5-5.5 0-8.6C4.7 9.6 8.8 7.1 7.2 3M12 21c-2.7-3.1 2.5-5.5 0-8.6C9.7 9.6 13.8 7.1 12.2 3M17 21c-2.7-3.1 2.5-5.5 0-8.6-2.3-2.8 1.8-5.3.2-9.4"/>
</symbol>
<symbol id="leaf" viewBox="0 0 24 24">
<path d="M20.5 3.5C12 3.3 5.5 6.4 5.2 13.1c-.2 3.5 2.5 6.1 5.8 5.7 6.3-.8 8.6-7.5 9.5-15.3Z"/>
<path d="M3 21c3.1-5 7-8.4 12.1-11"/>
</symbol>
<symbol id="drop" viewBox="0 0 24 24">
<path d="M12 2.7S5.7 9.6 5.7 14.8a6.3 6.3 0 0 0 12.6 0C18.3 9.6 12 2.7 12 2.7Z"/><path d="M9 16.2a3.3 3.3 0 0 0 3 2"/>
</symbol>
<symbol id="particles" viewBox="0 0 24 24">
<g fill="currentColor" stroke="none"><circle cx="7" cy="5" r="1.3"/><circle cx="13" cy="4" r="1"/><circle cx="18" cy="7" r="1.5"/><circle cx="5" cy="11" r="1"/><circle cx="11" cy="10" r="1.5"/><circle cx="17" cy="13" r="1"/><circle cx="7" cy="17" r="1.5"/><circle cx="13" cy="19" r="1"/><circle cx="19" cy="19" r="1.3"/></g>
</symbol>
<symbol id="filter" viewBox="0 0 24 24">
<rect x="5" y="3" width="14" height="18" rx="2"/><path d="M9 7v10M12 7v10M15 7v10"/>
</symbol>
<symbol id="clock" viewBox="0 0 24 24">
<circle cx="12" cy="12" r="9"/><path d="M12 7v5l3.5 2"/>
</symbol>
<symbol id="auto" viewBox="0 0 24 24">
<path d="M20 8V3.5L18.2 5A9 9 0 1 0 21 12M4 16v4.5L5.8 19"/><path d="m8.6 16 3.4-8 3.4 8M9.8 13h4.4"/>
</symbol>
<symbol id="pause" viewBox="0 0 24 24">
<circle cx="12" cy="12" r="9"/><path d="M9.5 8v8M14.5 8v8"/>
</symbol>
<symbol id="settings" viewBox="0 0 24 24">
<circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.7 1.7 0 0 0 .3 1.9l.1.1-2.8 2.8-.1-.1a1.7 1.7 0 0 0-1.9-.3 1.7 1.7 0 0 0-1 1.6v.2h-4V21a1.7 1.7 0 0 0-1-1.6 1.7 1.7 0 0 0-1.9.3l-.1.1L4.2 17l.1-.1a1.7 1.7 0 0 0 .3-1.9A1.7 1.7 0 0 0 3 14H2.8v-4H3a1.7 1.7 0 0 0 1.6-1 1.7 1.7 0 0 0-.3-1.9L4.2 7 7 4.2l.1.1A1.7 1.7 0 0 0 9 4.6 1.7 1.7 0 0 0 10 3v-.2h4V3a1.7 1.7 0 0 0 1 1.6 1.7 1.7 0 0 0 1.9-.3l.1-.1L19.8 7l-.1.1a1.7 1.7 0 0 0-.3 1.9 1.7 1.7 0 0 0 1.6 1h.2v4H21a1.7 1.7 0 0 0-1.6 1Z"/>
</symbol>
<symbol id="home" viewBox="0 0 24 24">
<path d="m3 11 9-8 9 8"/><path d="M5.5 9.5V21h13V9.5M9.5 21v-7h5v7"/>
</symbol>
<symbol id="wind" viewBox="0 0 24 24">
<path d="M3 7h9a3 3 0 1 0-2.6-4.5M3 12h15a3 3 0 1 1-2.7 4.3M3 17h7"/>
</symbol>
</svg>

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 388 KiB

+872
View File
@@ -0,0 +1,872 @@
:root {
--panel-ink: #08265d;
--panel-muted: #315d91;
--tile: rgba(219, 241, 253, 0.22);
--tile-strong: rgba(244, 251, 255, 0.4);
--tile-line: rgba(255, 255, 255, 0.9);
--tile-line-soft: rgba(193, 226, 244, 0.5);
--tile-shadow: 0 14px 32px rgba(23, 75, 111, 0.16), inset 0 1px 0 rgba(255,255,255,0.92), inset 1px 0 0 rgba(255,255,255,0.36);
--panel-glass: rgba(211, 235, 248, 0.35);
--panel-edge: rgba(255, 255, 255, 0.92);
--blue-halo: rgba(25, 139, 255, 0.34);
--green-halo: rgba(30, 205, 120, 0.34);
--orange-halo: rgba(255, 126, 46, 0.3);
}
:root[data-theme="dark"] {
--panel-ink: #edf8ff;
--panel-muted: #9fc5df;
--tile: rgba(28, 48, 65, 0.46);
--tile-strong: rgba(45, 71, 89, 0.54);
--tile-line: rgba(194, 229, 247, 0.3);
--tile-line-soft: rgba(114, 176, 207, 0.22);
--tile-shadow: 0 16px 38px rgba(0, 0, 0, 0.34), inset 0 1px 0 rgba(235,249,255,0.14), inset 1px 0 0 rgba(190,228,247,0.08);
--panel-glass: rgba(13, 29, 41, 0.58);
--panel-edge: rgba(187, 225, 244, 0.32);
--blue-halo: rgba(30, 161, 255, 0.42);
--green-halo: rgba(25, 225, 129, 0.35);
--orange-halo: rgba(255, 126, 39, 0.34);
}
html { min-width: 320px; }
body {
min-height: 100vh;
padding: clamp(0.7rem, 2vw, 2rem);
color: var(--panel-ink);
background:
radial-gradient(ellipse at 8% 10%, rgba(244,253,255,.95) 0 7%, transparent 24%),
radial-gradient(ellipse at 73% -8%, rgba(255,249,239,.85) 0 10%, transparent 29%),
radial-gradient(ellipse at 93% 32%, rgba(90,152,125,.52) 0 10%, transparent 28%),
radial-gradient(ellipse at 12% 80%, rgba(65,132,170,.46) 0 12%, transparent 31%),
linear-gradient(115deg, rgba(184,222,239,.94), rgba(213,236,247,.82) 37%, rgba(239,232,217,.82) 66%, rgba(129,181,183,.88));
background-attachment: fixed;
overflow-x: hidden;
isolation: isolate;
}
:root[data-theme="dark"] body {
background:
radial-gradient(ellipse at 6% 2%, rgba(54,112,145,.44) 0 8%, transparent 28%),
radial-gradient(ellipse at 78% -5%, rgba(138,103,60,.31) 0 9%, transparent 28%),
radial-gradient(ellipse at 94% 36%, rgba(28,91,78,.44) 0 12%, transparent 31%),
radial-gradient(ellipse at 15% 87%, rgba(17,84,122,.42) 0 13%, transparent 33%),
linear-gradient(118deg, #081723, #122d3d 40%, #292c30 68%, #0c262c);
}
body::before {
content: "";
position: fixed;
inset: -7rem;
z-index: -3;
background:
linear-gradient(90deg, transparent 0 13%, rgba(255,255,255,.55) 13% 16%, transparent 16% 34%, rgba(255,255,255,.35) 34% 37%, transparent 37% 68%, rgba(255,255,255,.42) 68% 71%, transparent 71%),
linear-gradient(0deg, transparent 0 58%, rgba(228,244,251,.48) 58% 61%, transparent 61%),
radial-gradient(ellipse at 50% 114%, rgba(36,111,68,.48) 0 17%, transparent 47%);
filter: blur(26px);
transform: scale(1.05);
}
body::after {
content: "";
position: fixed;
inset: 0;
z-index: -2;
pointer-events: none;
background:
radial-gradient(circle at 4% 22%, rgba(255,255,255,.88) 0 .8%, transparent 5%),
radial-gradient(circle at 19% 74%, rgba(246,253,255,.68) 0 1.2%, transparent 7%),
radial-gradient(circle at 62% 34%, rgba(255,241,210,.63) 0 1.3%, transparent 8%),
radial-gradient(circle at 89% 13%, rgba(244,253,255,.66) 0 1%, transparent 6%),
radial-gradient(circle at 82% 82%, rgba(209,238,228,.48) 0 1.5%, transparent 8%);
filter: blur(8px);
opacity: .86;
}
.ambient::before { width: 42rem; height: 42rem; left: -14rem; top: -18rem; background: #c9f2ff; opacity: .58; filter: blur(54px); }
.ambient::after { width: 46rem; height: 46rem; right: -14rem; bottom: -21rem; background: #ebd5a7; opacity: .38; filter: blur(64px); }
:root[data-theme="dark"] .ambient::before { background: #147db5; opacity: .24; }
:root[data-theme="dark"] .ambient::after { background: #846630; opacity: .2; }
.climate-panel {
position: relative;
isolation: isolate;
overflow: hidden;
width: min(100%, 104rem);
min-height: calc(100vh - clamp(1.4rem, 4vw, 4rem));
margin: 0 auto;
padding: clamp(0.65rem, 1.25vw, 1.25rem);
border: 1px solid var(--panel-edge);
outline: 1px solid rgba(255,255,255,.5);
outline-offset: -5px;
border-radius: 1.5rem;
background:
linear-gradient(125deg, rgba(255,255,255,.34), transparent 29%, rgba(255,255,255,.11) 67%, rgba(214,235,247,.2)),
var(--panel-glass);
box-shadow: 0 32px 90px rgba(20,60,89,.3), 0 2px 10px rgba(255,255,255,.35), inset 0 1px 0 rgba(255,255,255,.95), inset 0 -1px 0 rgba(114,162,192,.23);
backdrop-filter: blur(34px) saturate(148%);
-webkit-backdrop-filter: blur(34px) saturate(148%);
}
:root[data-theme="dark"] .climate-panel { outline-color: rgba(203,235,250,.12); box-shadow: 0 38px 100px rgba(0,0,0,.48), 0 0 42px rgba(21,120,171,.1), inset 0 1px 0 rgba(224,246,255,.2), inset 0 -1px 0 rgba(0,0,0,.35); }
.climate-panel::before {
content: "";
position: absolute;
inset: 0;
z-index: 0;
pointer-events: none;
border-radius: inherit;
background:
linear-gradient(112deg, rgba(255,255,255,.44) 0, rgba(255,255,255,.08) 17%, transparent 38%),
radial-gradient(ellipse at 52% -16%, rgba(255,255,255,.54), transparent 48%),
radial-gradient(ellipse at 100% 100%, rgba(102,178,219,.13), transparent 42%);
}
.climate-panel::after {
content: "";
position: absolute;
inset: 0;
z-index: 0;
pointer-events: none;
opacity: .2;
background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 180 180' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='.9' numOctaves='3' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)' opacity='.16'/%3E%3C/svg%3E");
mix-blend-mode: soft-light;
}
.climate-panel > * { position: relative; z-index: 1; }
.glass-tile, .glass-section {
position: relative;
isolation: isolate;
overflow: hidden;
border: 1px solid var(--tile-line);
outline: 1px solid var(--tile-line-soft);
outline-offset: -3px;
background:
linear-gradient(132deg, rgba(255,255,255,.38), rgba(255,255,255,.06) 35%, transparent 63%),
linear-gradient(145deg, var(--tile-strong), var(--tile));
box-shadow: var(--tile-shadow);
backdrop-filter: blur(23px) saturate(145%);
-webkit-backdrop-filter: blur(23px) saturate(145%);
}
.glass-tile::before, .glass-section::before {
content: "";
position: absolute;
inset: 0;
z-index: 0;
pointer-events: none;
border-radius: inherit;
background: linear-gradient(115deg, rgba(255,255,255,.35), transparent 25%, transparent 72%, rgba(255,255,255,.08));
}
.glass-tile > *, .glass-section > * { position: relative; z-index: 1; }
.speed-card::after, .temperature-card::after, .power-card::after, .heater-card::after {
content: "";
position: absolute;
z-index: 0;
width: 13rem;
height: 13rem;
right: -5rem;
bottom: -7rem;
border-radius: 50%;
pointer-events: none;
filter: blur(17px);
}
.speed-card::after { background: var(--blue-halo); }
.temperature-card::after { width: 18rem; background: linear-gradient(90deg, var(--blue-halo), var(--orange-halo)); }
.power-card::after { background: var(--green-halo); opacity: .64; }
.heater-card::after { background: var(--orange-halo); opacity: .58; }
.panel-header { display: flex; align-items: center; justify-content: space-between; gap: 1rem; padding: 0 0.65rem 0.7rem; }
.identity, .header-tools { display: flex; align-items: center; gap: 0.65rem; }
.identity h1 { margin: 0 0.35rem 0 0; font-size: clamp(1.8rem, 3.1vw, 3rem); line-height: 1; letter-spacing: -0.045em; }
.climate-panel .pill { min-height: 2.05rem; padding: .38rem .82rem; border-color: rgba(255,255,255,.62); box-shadow: inset 0 1px 0 rgba(255,255,255,.72), 0 6px 18px rgba(26,75,108,.1); backdrop-filter: blur(14px); }
.climate-panel .pill.good { box-shadow: 0 0 21px rgba(28,204,117,.18), inset 0 1px 0 rgba(255,255,255,.74); }
.climate-panel .pill.warn { box-shadow: 0 0 21px rgba(242,145,56,.17), inset 0 1px 0 rgba(255,255,255,.74); }
.climate-panel .pill.info { box-shadow: 0 0 21px rgba(31,145,236,.16), inset 0 1px 0 rgba(255,255,255,.74); }
.climate-panel .icon-button { border-color: var(--tile-line); background: linear-gradient(145deg, var(--tile-strong), var(--tile)); box-shadow: var(--tile-shadow); backdrop-filter: blur(16px); }
.header-tools { justify-content: flex-end; }
.ventilation-badge { display: flex; align-items: center; gap: 0.7rem; min-width: 22rem; padding: 0.55rem 1rem; border-radius: 1rem; }
.ventilation-badge svg { width: 2.5rem; color: #1977d2; filter: drop-shadow(0 0 9px rgba(26,128,226,.34)); }
.ventilation-badge strong, .ventilation-badge small { display: block; }
.ventilation-badge strong { font-size: 0.9rem; }
.ventilation-badge small { margin-top: 0.1rem; color: var(--panel-muted); font-size: 0.68rem; }
.primary-controls { display: grid; grid-template-columns: 2.05fr 2.05fr .95fr .95fr; gap: 0.75rem; }
.control-card, .switch-card { min-height: 17.6rem; border-radius: 1.15rem; padding: 1rem; }
.control-card { display: flex; flex-direction: column; }
.card-title { display: flex; align-items: flex-start; gap: 0.72rem; }
.card-title.compact { align-items: center; }
.card-title h2 { margin: 0; font-size: clamp(1rem, 1.55vw, 1.28rem); letter-spacing: -0.02em; }
.card-title p { margin: 0.18rem 0 0; color: var(--panel-muted); font-size: 0.72rem; }
.feature-icon { display: grid; place-items: center; flex: 0 0 auto; width: 2.1rem; height: 2.1rem; color: #1389f4; font-size: 1.75rem; font-weight: 800; line-height: 1; text-shadow: 0 0 16px rgba(20,139,244,.46); }
.feature-icon.green { color: #08a95a; text-shadow: 0 0 20px rgba(20,210,112,.62); }
.feature-icon.orange { color: #f06419; text-shadow: 0 0 18px rgba(255,105,29,.46); }
.fan-icon { font-size: 2.2rem; }
.hero-control { display: grid; grid-template-columns: 4.3rem 1fr 4.3rem; align-items: center; gap: 1rem; margin: auto 0 0.75rem; }
.hero-value { text-align: center; font-size: clamp(3.2rem, 5vw, 4.35rem); line-height: 1; letter-spacing: -0.06em; font-variant-numeric: tabular-nums; }
.hero-step {
display: grid;
place-items: center;
width: 4.3rem;
height: 4.3rem;
border: 1.5px solid rgba(255,255,255,.85);
border-radius: 1rem;
color: #176dbb;
background: linear-gradient(145deg, rgba(245,252,255,.42), rgba(191,224,244,.2));
box-shadow: 0 10px 24px rgba(35,92,132,.15), inset 0 1px 0 rgba(255,255,255,.9), 0 0 0 1px rgba(185,226,248,.24);
cursor: pointer;
font-size: 2.3rem;
font-weight: 500;
transition: transform .15s ease, filter .15s ease;
}
.hero-step.primary { color: white; background: linear-gradient(145deg, #57b5ff, #1376e4 76%); box-shadow: 0 12px 28px rgba(16,103,220,.35), 0 0 26px var(--blue-halo), inset 0 1px 0 rgba(255,255,255,.8), inset 0 -2px 5px rgba(0,67,156,.24); }
.hero-step:hover { transform: translateY(-2px); filter: brightness(1.08); box-shadow: 0 14px 32px rgba(25,112,219,.35), 0 0 32px var(--blue-halo), inset 0 1px 0 rgba(255,255,255,.78); }
.hero-step:active { transform: scale(.98); }
.speed-range { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); clip-path: inset(50%); white-space: nowrap; }
.speed-segments { display: grid; grid-template-columns: repeat(6, 1fr); gap: 0.16rem; }
.speed-segments button { height: 1.12rem; padding: 0; border: 1px solid rgba(255,255,255,.88); border-radius: .55rem; background: linear-gradient(180deg, rgba(173,207,229,.32), rgba(98,151,190,.2)); box-shadow: inset 0 1px 2px rgba(27,70,105,.08), 0 2px 5px rgba(32,86,126,.08); cursor: pointer; transition: background .12s ease, box-shadow .12s ease, transform .12s ease; }
.speed-segments button:hover { transform: translateY(-1px); }
.speed-segments button.active { background: linear-gradient(90deg, #0e82ed, #37b8ff); box-shadow: 0 0 17px rgba(25,143,247,.56), inset 0 1px 0 rgba(255,255,255,.74), inset 0 -2px 4px rgba(0,84,182,.22); }
.speed-labels, .temperature-labels { display: flex; justify-content: space-between; margin-top: 0.45rem; padding: 0 .55rem; color: var(--panel-muted); font-size: 0.68rem; }
.temperature-range { height: 1.45rem; }
.temperature-range::-webkit-slider-runnable-track { height: .78rem; background: linear-gradient(90deg, #0878ed, #53c7f5 38%, #f3c26e 72%, #ff6b31); border: 1px solid rgba(255,255,255,.92); box-shadow: 0 0 16px rgba(37,153,239,.24), 0 0 14px rgba(255,114,41,.14), inset 0 1px 2px rgba(255,255,255,.5); }
.temperature-range::-webkit-slider-thumb { width: 1.9rem; height: 1.9rem; margin-top: -.58rem; border-width: .28rem; box-shadow: 0 0 0 2px rgba(255,255,255,.55), 0 0 22px rgba(29,139,241,.58), 0 5px 13px rgba(17,79,143,.3); }
.temperature-range::-moz-range-track { height: .78rem; background: linear-gradient(90deg, #0878ed, #53c7f5 38%, #f3c26e 72%, #ff6b31); }
.temperature-range::-moz-range-progress { background: transparent; }
.switch-card { display: flex; flex-direction: column; justify-content: space-between; }
.glass-switch {
width: 100%; min-height: 6rem; border: 1.5px solid rgba(255,255,255,.9); border-radius: 1rem; color: var(--panel-ink); background: rgba(199,222,235,.28); box-shadow: var(--tile-shadow); cursor: pointer; font-size: 1.75rem; font-weight: 850;
text-shadow: 0 1px 0 rgba(255,255,255,.35);
transition: transform .15s ease, background .2s ease, box-shadow .2s ease, filter .2s ease;
}
.glass-switch:hover { transform: translateY(-2px); filter: brightness(1.06); }
.glass-switch[aria-pressed="true"].green { background: linear-gradient(145deg, rgba(145,255,198,.9), rgba(38,194,113,.62)); border-color: rgba(213,255,232,.96); box-shadow: 0 14px 32px rgba(11,153,81,.3), 0 0 32px var(--green-halo), inset 0 1px 0 rgba(255,255,255,.9), inset 0 -4px 10px rgba(0,125,62,.18); }
.glass-switch[aria-pressed="true"].orange { background: linear-gradient(145deg, rgba(255,202,130,.88), rgba(245,112,40,.58)); border-color: rgba(255,236,213,.95); box-shadow: 0 14px 32px rgba(210,91,25,.3), 0 0 30px var(--orange-halo), inset 0 1px 0 rgba(255,255,255,.88), inset 0 -4px 10px rgba(168,54,0,.17); }
.content-section { margin-top: 0.75rem; padding: 0.7rem; border-radius: 1.15rem; }
.section-title { display: flex; align-items: center; gap: 0.65rem; min-height: 2.35rem; padding: 0 0.35rem 0.5rem; }
.section-title > div { display: flex; align-items: center; gap: 0.55rem; }
.section-title h2 { margin: 0; font-size: clamp(1rem, 1.55vw, 1.28rem); }
.section-icon { display: grid; place-items: center; width: 1.8rem; height: 1.8rem; color: #207bcc; font-size: 1.55rem; text-shadow: 0 0 14px rgba(26,124,210,.38); }
.section-icon.leaf { color: #069c51; transform: rotate(-18deg); text-shadow: 0 0 15px rgba(8,173,88,.42); }
.section-title .updated { margin-left: auto; color: var(--panel-muted); font-size: 0.7rem; }
.air-grid { display: grid; grid-template-columns: 1.55fr 1fr .9fr 1fr 1fr 1.28fr; gap: 0.55rem; }
.metric-card { min-width: 0; min-height: 9.4rem; padding: 0.85rem; border-radius: 1rem; }
.metric-head, .metric-heading { display: flex; align-items: center; gap: 0.55rem; color: var(--panel-muted); font-size: 0.76rem; }
.metric-head { justify-content: space-between; }
.metric-icon { color: #137edc; font-size: 1.7rem; line-height: 1; text-shadow: 0 0 14px rgba(20,124,221,.34); }
.metric-icon.dots { letter-spacing: -.2rem; }
.metric-card > strong { display: block; margin-top: 0.75rem; font-size: clamp(1.55rem, 2.4vw, 2.2rem); line-height: 1; font-variant-numeric: tabular-nums; white-space: nowrap; }
.metric-card strong small { color: var(--panel-muted); font-size: .63rem; font-weight: 600; }
.quality-chip { display: inline-flex; justify-content: center; padding: .35rem .72rem; border: 1px solid rgba(109,237,167,.82); border-radius: 999px; color: #076d3d; background: linear-gradient(145deg, rgba(179,255,214,.7), rgba(92,218,151,.48)); box-shadow: 0 0 17px rgba(33,203,116,.24), inset 0 1px 0 rgba(255,255,255,.88); font-size: .66rem; font-weight: 750; }
:root[data-theme="dark"] .quality-chip { color: #b9ffda; }
.quality-chip.small { margin-top: .8rem; min-width: 5.5rem; }
.co2-card > p { height: 1rem; margin: .2rem 0 .55rem; color: var(--panel-muted); font-size: .58rem; overflow: hidden; }
.meter { height: .82rem; border: 1px solid rgba(255,255,255,.8); border-radius: 999px; background: rgba(91,145,181,.18); overflow: hidden; }
.meter i { display: block; height: 100%; width: 0; border-radius: inherit; background: linear-gradient(90deg, #08a350, #36dc83); box-shadow: 0 0 18px rgba(18,199,104,.58), inset 0 1px 0 rgba(255,255,255,.64); transition: width .35s ease; }
.meter-labels { display: flex; justify-content: space-between; margin-top: .27rem; color: rgba(22,69,108,.78); font-size: .6rem; font-weight: 650; text-shadow: 0 1px 0 rgba(255,255,255,.48); }
:root[data-theme="dark"] .meter-labels { color: rgba(211,235,248,.76); text-shadow: 0 1px 2px rgba(0,0,0,.58); }
.filter-line { display: flex; align-items: center; gap: .45rem; margin-top: 1rem; }
.filter-meter { flex: 1; }
.filter-meter i { background: linear-gradient(90deg, #176dec, #36c1ff); box-shadow: 0 0 18px rgba(31,144,247,.55), inset 0 1px 0 rgba(255,255,255,.58); }
.filter-line > span { font-size: .65rem; font-weight: 750; }
.bottom-grid { display: grid; grid-template-columns: 1.4fr 1fr; gap: 0.75rem; }
.schedule-layout { display: grid; grid-template-columns: 1.35fr 1fr; gap: 0.7rem; }
.schedule-times { display: grid; grid-template-columns: 1fr 1px 1fr; gap: 1rem; align-items: center; min-height: 8.2rem; padding: 1rem 1.3rem; border-radius: 1rem; }
.schedule-times > i { width: 1px; height: 80%; background: rgba(49,93,145,.25); }
.schedule-times div { display: grid; gap: .22rem; }
.schedule-times span, .schedule-times small { color: var(--panel-muted); font-size: .68rem; }
.schedule-times strong { font-size: clamp(1.65rem, 2.8vw, 2.3rem); font-variant-numeric: tabular-nums; }
.schedule-buttons { display: grid; gap: .55rem; }
.schedule-button { display: grid; grid-template-columns: 2.4rem 1fr; align-items: center; gap: .65rem; min-height: 3.8rem; padding: .55rem .8rem; border: 1.5px solid; border-radius: .9rem; text-align: left; cursor: pointer; }
.schedule-button strong, .schedule-button small { display: block; }
.schedule-button strong { font-size: .84rem; }
.schedule-button small { margin-top: .12rem; font-size: .62rem; }
.schedule-button.auto { color: #096bda; border-color: rgba(83,176,255,.9); background: linear-gradient(145deg, rgba(224,244,255,.67), rgba(133,201,250,.26)); box-shadow: 0 9px 24px rgba(23,113,212,.19), 0 0 20px rgba(42,153,243,.13), inset 0 1px 0 rgba(255,255,255,.92); }
.schedule-button.pause { color: #a73512; border-color: rgba(250,174,102,.9); background: linear-gradient(145deg, rgba(255,240,217,.72), rgba(246,177,107,.28)); box-shadow: 0 9px 24px rgba(202,104,44,.17), 0 0 20px rgba(244,131,50,.12), inset 0 1px 0 rgba(255,255,255,.92); }
.schedule-button:hover { filter: brightness(1.06); transform: translateY(-1px); }
.action-symbol { font-size: 2rem; font-weight: 800; text-align: center; }
.mode-banner { display: flex; gap: .4rem; align-items: center; margin-top: .5rem; padding: .45rem .7rem; border-radius: .65rem; color: var(--panel-muted); background: rgba(255,255,255,.14); font-size: .62rem; }
.mode-banner small::before { content: "· "; }
.extras-grid { display: grid; grid-template-columns: .9fr 1.3fr; gap: .55rem; }
.extra-card { display: flex; align-items: center; gap: .8rem; min-height: 8.2rem; padding: 1rem; border-radius: 1rem; }
.extra-icon { color: #267fd3; font-size: 3.4rem; line-height: 1; text-shadow: 0 0 19px rgba(33,126,211,.32); }
.extra-icon.wind { font-size: 3.8rem; transform: rotate(90deg); }
.extra-card small, .extra-card strong, .extra-card em { display: block; }
.extra-card small { color: var(--panel-muted); font-size: .7rem; }
.extra-card strong { margin-top: .18rem; font-size: clamp(1.3rem, 2.2vw, 2rem); font-style: normal; }
.extra-card em { margin-top: .18rem; color: var(--panel-muted); font-size: .62rem; font-style: normal; }
.mode-card { display: grid; grid-template-columns: auto 1fr; }
.mode-card strong { font-size: .85rem; }
.segments { grid-column: 1 / -1; display: flex; gap: .3rem; }
.segment { flex: 1; padding: .42rem; border: 1px solid rgba(255,255,255,.55); border-radius: .55rem; color: var(--panel-muted); background: rgba(255,255,255,.14); cursor: pointer; font-size: .58rem; }
.segment.active { color: white; background: linear-gradient(145deg, #45a7f4, #1976d2); }
.micro-settings { display: flex; align-items: center; gap: .65rem; margin-top: .55rem; padding: 0 .25rem; color: var(--panel-muted); font-size: .58rem; }
.micro-settings > span:nth-child(2) { margin-right: auto; }
.micro-toggle { padding: .32rem .55rem; border: 1px solid var(--tile-line); border-radius: 999px; color: var(--panel-muted); background: var(--tile); cursor: pointer; font-size: .56rem; }
.micro-toggle[aria-pressed="true"] { color: #087848; background: rgba(105,222,160,.38); }
.demo-note { display: block; margin-top: .55rem; color: var(--panel-muted); text-align: center; font-size: .62rem; }
/* Dark aeroglass keeps the same optical depth, with colder edges and
brighter local halos so active controls do not disappear into the glass. */
:root[data-theme="dark"] body::after { opacity: .42; mix-blend-mode: screen; }
:root[data-theme="dark"] .climate-panel::before {
background:
linear-gradient(112deg, rgba(205,239,255,.14), rgba(255,255,255,.025) 21%, transparent 42%),
radial-gradient(ellipse at 52% -16%, rgba(112,202,244,.13), transparent 50%),
radial-gradient(ellipse at 100% 100%, rgba(23,139,186,.12), transparent 44%);
}
:root[data-theme="dark"] .glass-tile,
:root[data-theme="dark"] .glass-section {
background:
linear-gradient(132deg, rgba(211,240,253,.105), rgba(255,255,255,.018) 38%, transparent 65%),
linear-gradient(145deg, var(--tile-strong), var(--tile));
}
:root[data-theme="dark"] .glass-tile::before,
:root[data-theme="dark"] .glass-section::before {
background: linear-gradient(115deg, rgba(218,243,255,.12), transparent 26%, transparent 74%, rgba(80,181,222,.045));
}
:root[data-theme="dark"] .hero-step {
color: #8ed3ff;
border-color: rgba(184,226,247,.28);
background: linear-gradient(145deg, rgba(89,137,166,.2), rgba(20,48,67,.23));
box-shadow: 0 12px 28px rgba(0,0,0,.28), inset 0 1px 0 rgba(224,246,255,.14), 0 0 0 1px rgba(60,157,205,.08);
}
:root[data-theme="dark"] .hero-step.primary {
color: white;
background: linear-gradient(145deg, #42b8ff, #096bd3 78%);
box-shadow: 0 13px 32px rgba(0,65,139,.5), 0 0 30px var(--blue-halo), inset 0 1px 0 rgba(220,248,255,.52), inset 0 -3px 7px rgba(0,27,91,.38);
}
:root[data-theme="dark"] .speed-segments button { border-color: rgba(192,226,244,.25); background: linear-gradient(180deg, rgba(91,136,162,.23), rgba(24,55,74,.28)); }
:root[data-theme="dark"] .speed-segments button.active { border-color: rgba(117,207,255,.55); background: linear-gradient(90deg, #0877df, #20b7ff); box-shadow: 0 0 20px rgba(24,156,255,.66), inset 0 1px 0 rgba(223,248,255,.42); }
:root[data-theme="dark"] .glass-switch { color: #ddecf4; border-color: rgba(193,228,245,.25); background: linear-gradient(145deg, rgba(77,112,133,.23), rgba(20,44,59,.28)); text-shadow: 0 1px 2px rgba(0,0,0,.4); }
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].green { color: #eafff4; border-color: rgba(118,255,185,.54); background: linear-gradient(145deg, rgba(56,221,137,.76), rgba(8,120,69,.67)); box-shadow: 0 15px 36px rgba(0,0,0,.3), 0 0 38px var(--green-halo), inset 0 1px 0 rgba(218,255,236,.48); }
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].orange { color: #fff5e9; border-color: rgba(255,185,118,.53); background: linear-gradient(145deg, rgba(244,145,61,.76), rgba(143,58,14,.68)); box-shadow: 0 15px 36px rgba(0,0,0,.3), 0 0 36px var(--orange-halo), inset 0 1px 0 rgba(255,237,216,.48); }
:root[data-theme="dark"] .quality-chip { color: #caffdf; border-color: rgba(89,232,158,.42); background: linear-gradient(145deg, rgba(45,186,113,.35), rgba(11,101,60,.3)); box-shadow: 0 0 20px rgba(20,218,118,.18), inset 0 1px 0 rgba(210,255,232,.16); }
:root[data-theme="dark"] .schedule-button.auto { color: #a8ddff; border-color: rgba(76,176,241,.48); background: linear-gradient(145deg, rgba(38,125,187,.29), rgba(15,61,91,.28)); box-shadow: 0 10px 27px rgba(0,0,0,.23), 0 0 24px rgba(27,150,237,.13), inset 0 1px 0 rgba(211,241,255,.13); }
:root[data-theme="dark"] .schedule-button.pause { color: #ffc18c; border-color: rgba(242,147,70,.48); background: linear-gradient(145deg, rgba(167,82,27,.3), rgba(73,40,25,.27)); box-shadow: 0 10px 27px rgba(0,0,0,.23), 0 0 24px rgba(244,117,35,.12), inset 0 1px 0 rgba(255,230,207,.12); }
:root[data-theme="dark"] .meter { border-color: rgba(200,232,247,.24); background: rgba(3,22,34,.34); box-shadow: inset 0 2px 5px rgba(0,0,0,.2); }
:root[data-theme="dark"] .micro-toggle { border-color: rgba(190,226,244,.2); background: rgba(76,117,141,.15); }
:root[data-theme="dark"] .micro-toggle[aria-pressed="true"] { color: #b8ffda; border-color: rgba(67,213,139,.35); background: rgba(21,149,85,.26); box-shadow: 0 0 15px rgba(20,208,114,.12); }
/* Photographic aeroglass refinement. The backdrop already contains optical
blur, so the UI only adds a restrained haze instead of whitening the scene. */
:root {
--tile: rgba(214, 238, 251, 0.14);
--tile-strong: rgba(247, 252, 255, 0.27);
--tile-line: rgba(255, 255, 255, 0.82);
--tile-line-soft: rgba(206, 235, 249, 0.43);
--panel-glass: rgba(200, 228, 244, 0.2);
--blue-halo: rgba(23, 137, 248, 0.16);
--green-halo: rgba(28, 196, 113, 0.16);
--orange-halo: rgba(246, 126, 50, 0.14);
}
:root[data-theme="dark"] {
--tile: rgba(16, 37, 51, 0.28);
--tile-strong: rgba(52, 78, 96, 0.31);
--tile-line: rgba(203, 234, 248, 0.25);
--tile-line-soft: rgba(114, 176, 207, 0.16);
--panel-glass: rgba(7, 22, 33, 0.48);
--blue-halo: rgba(29, 153, 245, 0.22);
--green-halo: rgba(27, 210, 121, 0.19);
--orange-halo: rgba(246, 125, 46, 0.18);
}
body {
background-color: #b7d5e3;
background-image: none;
}
:root[data-theme="dark"] body {
background-color: #091722;
background-image: none;
}
body::before {
inset: -1.25rem;
background-image:
linear-gradient(118deg, rgba(180,220,239,.15), rgba(238,247,251,.025) 45%, rgba(247,226,204,.09)),
url("../assets/mountain-lake-light.jpg");
background-position: center;
background-size: cover;
background-repeat: no-repeat;
filter: blur(6px) saturate(108%);
transform: scale(1.025);
opacity: 1;
pointer-events: none;
}
:root[data-theme="dark"] body::before {
background-image:
linear-gradient(118deg, rgba(2,15,25,.66), rgba(8,27,40,.57) 48%, rgba(20,25,29,.64)),
url("../assets/mountain-lake-dark.jpg");
background-position: center;
background-size: cover;
filter: blur(7px) saturate(106%);
opacity: 1;
}
body::after {
background:
radial-gradient(circle at 11% 18%, rgba(255,255,255,.33) 0 .5%, transparent 5%),
radial-gradient(circle at 64% 23%, rgba(255,244,218,.28) 0 .6%, transparent 6%),
radial-gradient(circle at 91% 79%, rgba(225,250,237,.22) 0 .8%, transparent 7%);
filter: blur(11px);
opacity: .5;
}
:root[data-theme="dark"] body::after { opacity: .26; }
.ambient::before { opacity: .14; filter: blur(76px); }
.ambient::after { opacity: .11; filter: blur(82px); }
:root[data-theme="dark"] .ambient::before { opacity: .12; }
:root[data-theme="dark"] .ambient::after { opacity: .08; }
.climate-panel {
background:
linear-gradient(125deg, rgba(255,255,255,.22), transparent 31%, rgba(255,255,255,.055) 69%, rgba(196,224,240,.1)),
var(--panel-glass);
box-shadow: 0 27px 68px rgba(22,66,95,.24), 0 2px 8px rgba(255,255,255,.28), inset 0 1px 0 rgba(255,255,255,.88), inset 0 -1px 0 rgba(113,163,192,.17);
backdrop-filter: blur(13px) saturate(124%);
-webkit-backdrop-filter: blur(13px) saturate(124%);
}
.climate-panel::before {
background:
linear-gradient(112deg, rgba(255,255,255,.25), rgba(255,255,255,.035) 18%, transparent 39%),
radial-gradient(ellipse at 50% -20%, rgba(255,255,255,.25), transparent 47%);
}
.climate-panel::after { opacity: .1; }
:root[data-theme="dark"] .climate-panel { box-shadow: 0 33px 78px rgba(0,0,0,.43), 0 0 28px rgba(19,112,158,.06), inset 0 1px 0 rgba(221,243,252,.17), inset 0 -1px 0 rgba(0,0,0,.28); }
:root[data-theme="dark"] .climate-panel::before { background: linear-gradient(112deg, rgba(203,238,253,.1), transparent 24%, transparent 72%, rgba(71,163,202,.035)); }
.glass-tile, .glass-section {
background:
linear-gradient(132deg, rgba(255,255,255,.25), rgba(255,255,255,.035) 35%, transparent 64%),
linear-gradient(145deg, var(--tile-strong), var(--tile));
box-shadow: 0 10px 25px rgba(24,72,105,.12), inset 0 1px 0 rgba(255,255,255,.78), inset 1px 0 0 rgba(255,255,255,.24);
backdrop-filter: blur(16px) saturate(127%);
-webkit-backdrop-filter: blur(16px) saturate(127%);
}
.glass-tile::before, .glass-section::before { opacity: .62; }
:root[data-theme="dark"] .glass-tile,
:root[data-theme="dark"] .glass-section {
background:
linear-gradient(132deg, rgba(213,240,252,.075), rgba(255,255,255,.012) 38%, transparent 65%),
linear-gradient(145deg, var(--tile-strong), var(--tile));
box-shadow: 0 13px 29px rgba(0,0,0,.26), inset 0 1px 0 rgba(226,246,255,.11), inset 1px 0 0 rgba(186,226,245,.055);
}
.speed-card::after, .temperature-card::after, .power-card::after, .heater-card::after { filter: blur(32px); opacity: .48; }
.power-card::after { opacity: .38; }
.heater-card::after { opacity: .34; }
.hero-step.primary { box-shadow: 0 10px 23px rgba(16,103,220,.25), 0 0 15px var(--blue-halo), inset 0 1px 0 rgba(255,255,255,.76), inset 0 -2px 5px rgba(0,67,156,.2); }
.hero-step:hover { box-shadow: 0 12px 27px rgba(25,112,219,.27), 0 0 19px var(--blue-halo), inset 0 1px 0 rgba(255,255,255,.75); }
.speed-segments button.active { box-shadow: 0 0 9px rgba(25,143,247,.34), inset 0 1px 0 rgba(255,255,255,.66), inset 0 -2px 4px rgba(0,84,182,.18); }
.temperature-range::-webkit-slider-runnable-track { box-shadow: 0 0 8px rgba(37,153,239,.15), 0 0 7px rgba(255,114,41,.09), inset 0 1px 2px rgba(255,255,255,.46); }
.temperature-range::-webkit-slider-thumb { box-shadow: 0 0 0 2px rgba(255,255,255,.48), 0 0 12px rgba(29,139,241,.34), 0 4px 10px rgba(17,79,143,.24); }
.glass-switch[aria-pressed="true"].green { box-shadow: 0 12px 27px rgba(11,153,81,.22), 0 0 19px var(--green-halo), inset 0 1px 0 rgba(255,255,255,.84), inset 0 -4px 10px rgba(0,125,62,.14); }
.glass-switch[aria-pressed="true"].orange { box-shadow: 0 12px 27px rgba(210,91,25,.2), 0 0 18px var(--orange-halo), inset 0 1px 0 rgba(255,255,255,.83), inset 0 -4px 10px rgba(168,54,0,.13); }
.quality-chip { box-shadow: 0 0 10px rgba(33,203,116,.13), inset 0 1px 0 rgba(255,255,255,.83); }
.meter i { box-shadow: 0 0 10px rgba(18,199,104,.35), inset 0 1px 0 rgba(255,255,255,.58); }
.filter-meter i { box-shadow: 0 0 10px rgba(31,144,247,.32), inset 0 1px 0 rgba(255,255,255,.54); }
.schedule-button.auto, .schedule-button.pause { box-shadow: 0 7px 18px rgba(31,83,119,.12), inset 0 1px 0 rgba(255,255,255,.82); }
:root[data-theme="dark"] .hero-step.primary { box-shadow: 0 11px 27px rgba(0,65,139,.4), 0 0 18px var(--blue-halo), inset 0 1px 0 rgba(220,248,255,.42), inset 0 -3px 7px rgba(0,27,91,.3); }
:root[data-theme="dark"] .speed-segments button.active { box-shadow: 0 0 12px rgba(24,156,255,.4), inset 0 1px 0 rgba(223,248,255,.36); }
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].green { box-shadow: 0 12px 28px rgba(0,0,0,.28), 0 0 20px var(--green-halo), inset 0 1px 0 rgba(218,255,236,.4); }
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].orange { box-shadow: 0 12px 28px rgba(0,0,0,.28), 0 0 20px var(--orange-halo), inset 0 1px 0 rgba(255,237,216,.4); }
/* Natural highlights: state colors tint the glass, but do not paint opaque
neon blocks over the photographic background. Heater ON is a healthy green
state too; its orange icon still communicates heat. */
.speed-card::after, .temperature-card::after { opacity: .18; filter: blur(42px); }
.power-card::after, .heater-card::after { background: var(--green-halo); opacity: .16; filter: blur(44px); }
.hero-step.primary { box-shadow: 0 9px 20px rgba(15,92,183,.22), 0 0 9px rgba(48,151,239,.14), inset 0 1px 0 rgba(255,255,255,.78), inset 0 -2px 5px rgba(0,67,156,.18); }
.hero-step:hover { box-shadow: 0 11px 23px rgba(20,101,190,.24), 0 0 12px rgba(48,151,239,.16), inset 0 1px 0 rgba(255,255,255,.76); }
.speed-segments button.active { box-shadow: 0 0 6px rgba(25,143,247,.24), inset 0 1px 0 rgba(255,255,255,.68), inset 0 -2px 4px rgba(0,84,182,.16); }
.glass-switch[aria-pressed="true"].green,
.glass-switch[aria-pressed="true"].orange {
background: linear-gradient(145deg, rgba(139,244,190,.72), rgba(55,194,122,.48));
border-color: rgba(218,255,235,.84);
box-shadow: 0 10px 23px rgba(18,143,80,.18), 0 0 11px rgba(38,199,116,.13), inset 0 1px 0 rgba(255,255,255,.82), inset 0 -3px 8px rgba(0,114,57,.1);
}
:root[data-theme="dark"] .speed-card::after,
:root[data-theme="dark"] .temperature-card::after { opacity: .2; }
:root[data-theme="dark"] .power-card::after,
:root[data-theme="dark"] .heater-card::after { opacity: .18; }
:root[data-theme="dark"] .hero-step.primary { box-shadow: 0 10px 24px rgba(0,53,119,.38), 0 0 11px rgba(41,162,244,.19), inset 0 1px 0 rgba(220,248,255,.4), inset 0 -3px 7px rgba(0,27,91,.27); }
:root[data-theme="dark"] .speed-segments button.active { box-shadow: 0 0 7px rgba(24,156,255,.27), inset 0 1px 0 rgba(223,248,255,.34); }
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].green,
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].orange {
color: #effff6;
border-color: rgba(127,242,182,.4);
background: linear-gradient(145deg, rgba(51,190,119,.58), rgba(9,102,59,.55));
box-shadow: 0 11px 25px rgba(0,0,0,.25), 0 0 12px rgba(37,207,121,.15), inset 0 1px 0 rgba(218,255,236,.34);
}
/* Final material and icon polish. */
.ui-icon {
display: block;
fill: none;
stroke: currentColor;
stroke-width: 1.8;
stroke-linecap: round;
stroke-linejoin: round;
}
.feature-icon { padding: .08rem; filter: drop-shadow(0 0 6px rgba(20,139,244,.2)); text-shadow: none; }
.feature-icon.green { filter: drop-shadow(0 0 6px rgba(20,190,104,.24)); }
.feature-icon.orange { filter: drop-shadow(0 0 6px rgba(244,105,31,.22)); }
.fan-icon { font-size: inherit; }
.section-icon { padding: .06rem; filter: drop-shadow(0 0 5px rgba(26,124,210,.17)); text-shadow: none; }
.section-icon.leaf { filter: drop-shadow(0 0 5px rgba(8,160,81,.2)); }
.metric-icon { width: 1.7rem; height: 1.7rem; flex: 0 0 auto; filter: drop-shadow(0 0 4px rgba(20,124,221,.15)); text-shadow: none; }
.metric-icon.particles { padding: .05rem; }
.action-symbol { width: 2rem; height: 2rem; font-size: inherit; }
.extra-icon { width: 3.4rem; height: 3.4rem; flex: 0 0 auto; filter: drop-shadow(0 0 7px rgba(33,126,211,.17)); text-shadow: none; }
.extra-icon.wind { width: 3.8rem; height: 3.8rem; font-size: inherit; transform: none; }
:root[data-theme="light"] {
--tile: rgba(104, 126, 139, 0.16);
--tile-strong: rgba(214, 226, 232, 0.2);
--tile-line-soft: rgba(189, 211, 221, 0.38);
}
:root[data-theme="light"] .glass-tile,
:root[data-theme="light"] .glass-section {
background:
linear-gradient(132deg, rgba(244,248,250,.22), rgba(159,178,188,.055) 38%, transparent 66%),
linear-gradient(145deg, var(--tile-strong), var(--tile));
backdrop-filter: blur(14px) saturate(116%);
-webkit-backdrop-filter: blur(14px) saturate(116%);
}
.metric-card:not(.co2-card) {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
text-align: center;
}
.metric-card:not(.co2-card) .metric-heading { width: 100%; justify-content: center; text-align: left; }
.metric-card:not(.co2-card) > strong { margin-top: .7rem; }
.metric-card:not(.co2-card) .quality-chip { align-self: center; }
.filter-card .filter-line { width: 100%; }
.hero-step.primary {
background:
radial-gradient(circle at 24% 5%, rgba(255,255,255,.55), transparent 38%),
linear-gradient(135deg, rgba(255,255,255,.16), transparent 42%, rgba(0,73,170,.1)),
linear-gradient(145deg, #55b4ff, #1479e8 72%);
box-shadow: 0 8px 18px rgba(15,92,183,.18), 0 0 7px rgba(48,151,239,.1), inset 0 1px 0 rgba(255,255,255,.86), inset 0 -3px 7px rgba(0,67,156,.16);
}
.hero-step.primary:hover { box-shadow: 0 10px 21px rgba(20,101,190,.21), 0 0 9px rgba(48,151,239,.12), inset 0 1px 0 rgba(255,255,255,.88); }
.speed-segments button.active {
background:
linear-gradient(180deg, rgba(255,255,255,.32), transparent 48%),
linear-gradient(90deg, #1685ec, #35afff);
box-shadow: 0 0 5px rgba(25,143,247,.19), inset 0 1px 0 rgba(255,255,255,.75), inset 0 -2px 4px rgba(0,84,182,.13);
}
.glass-switch { overflow: hidden; }
.glass-switch[aria-pressed="true"].green,
.glass-switch[aria-pressed="true"].orange {
background:
radial-gradient(circle at 25% -8%, rgba(255,255,255,.67), transparent 42%),
linear-gradient(132deg, rgba(255,255,255,.15), transparent 40%, rgba(0,125,62,.06)),
linear-gradient(145deg, rgba(139,244,190,.67), rgba(55,194,122,.43));
box-shadow: 0 8px 19px rgba(18,143,80,.14), 0 0 8px rgba(38,199,116,.09), inset 0 1px 0 rgba(255,255,255,.9), inset 0 -4px 9px rgba(0,114,57,.08);
}
.schedule-button.auto {
background:
radial-gradient(circle at 19% -30%, rgba(255,255,255,.55), transparent 44%),
linear-gradient(135deg, rgba(255,255,255,.13), transparent 43%),
linear-gradient(145deg, rgba(211,239,255,.52), rgba(100,179,235,.18));
}
.schedule-button.pause {
background:
radial-gradient(circle at 19% -30%, rgba(255,255,255,.58), transparent 44%),
linear-gradient(135deg, rgba(255,255,255,.13), transparent 43%),
linear-gradient(145deg, rgba(255,231,199,.55), rgba(235,151,76,.18));
}
:root[data-theme="dark"] .hero-step.primary {
background:
radial-gradient(circle at 24% 5%, rgba(214,246,255,.32), transparent 38%),
linear-gradient(135deg, rgba(255,255,255,.08), transparent 42%, rgba(0,32,95,.17)),
linear-gradient(145deg, #33aaf4, #0869d0 74%);
}
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].green,
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].orange {
background:
radial-gradient(circle at 25% -8%, rgba(218,255,236,.3), transparent 42%),
linear-gradient(132deg, rgba(255,255,255,.07), transparent 40%, rgba(0,45,23,.12)),
linear-gradient(145deg, rgba(51,190,119,.52), rgba(9,102,59,.49));
box-shadow: 0 9px 21px rgba(0,0,0,.22), 0 0 9px rgba(37,207,121,.1), inset 0 1px 0 rgba(218,255,236,.32), inset 0 -3px 8px rgba(0,31,16,.16);
}
:root[data-theme="dark"] .schedule-button.auto {
background:
radial-gradient(circle at 19% -30%, rgba(208,243,255,.17), transparent 45%),
linear-gradient(145deg, rgba(38,125,187,.26), rgba(15,61,91,.25));
}
:root[data-theme="dark"] .schedule-button.pause {
background:
radial-gradient(circle at 19% -30%, rgba(255,226,199,.16), transparent 45%),
linear-gradient(145deg, rgba(167,82,27,.27), rgba(73,40,25,.25));
}
@media (min-width: 1300px) and (min-height: 760px) {
.climate-panel {
width: 100%;
max-width: none;
display: grid;
grid-template-rows: auto minmax(18rem, 1.4fr) minmax(11rem, .78fr) minmax(13rem, .9fr) auto;
gap: .75rem;
}
.panel-header { padding-bottom: 0; }
.primary-controls, .bottom-grid { min-height: 0; height: 100%; }
.control-card, .switch-card { min-height: 0; height: 100%; }
.content-section { min-height: 0; height: 100%; margin-top: 0; display: flex; flex-direction: column; }
.air-grid { min-height: 0; flex: 1; }
.metric-card { min-height: 0; height: 100%; }
.schedule-layout, .extras-grid { min-height: 0; flex: 1; }
.schedule-times, .extra-card { min-height: 0; height: 100%; }
}
@media (min-width: 1700px) {
html { font-size: 18px; }
.climate-panel { padding: 1.2rem; }
}
@media (max-width: 1120px) {
.primary-controls { grid-template-columns: 1fr 1fr; }
.switch-card { min-height: 9rem; }
.glass-switch { min-height: 3.8rem; }
.air-grid { grid-template-columns: repeat(3, 1fr); }
.bottom-grid { grid-template-columns: 1fr; }
}
@media (max-width: 760px) {
body { padding: .5rem; }
.climate-panel { border-radius: 1.1rem; }
.panel-header, .identity, .header-tools { flex-wrap: wrap; }
.panel-header { align-items: flex-start; }
.header-tools { width: 100%; justify-content: flex-start; }
.ventilation-badge { min-width: 0; flex: 1; }
.primary-controls { grid-template-columns: 1fr; }
.control-card, .switch-card { min-height: auto; }
.hero-control { margin: 1.4rem 0 .75rem; }
.air-grid { grid-template-columns: 1fr 1fr; }
.co2-card, .filter-card { grid-column: 1 / -1; }
.schedule-layout { grid-template-columns: 1fr; }
}
@media (max-width: 480px) {
.identity h1 { width: 100%; }
.ventilation-badge small { display: none; }
.air-grid, .extras-grid { grid-template-columns: 1fr; }
.co2-card, .filter-card { grid-column: auto; }
.schedule-times { grid-template-columns: 1fr; }
.schedule-times > i { width: 100%; height: 1px; }
.micro-settings { flex-wrap: wrap; }
}
@media (prefers-reduced-motion: reduce) { .hero-step:hover { transform: none; } }
/* Schedule controls and editor. */
.schedule-title-tools { margin-left: auto; }
.schedule-edit-button {
display: inline-flex;
align-items: center;
gap: .4rem;
min-height: 2.05rem;
padding: .36rem .68rem;
border: 1px solid var(--tile-line);
border-radius: .7rem;
color: #126fc4;
background:
radial-gradient(circle at 20% -35%, rgba(255,255,255,.48), transparent 48%),
linear-gradient(145deg, rgba(220,241,253,.42), rgba(100,173,220,.13));
box-shadow: 0 6px 15px rgba(27,91,135,.1), inset 0 1px 0 rgba(255,255,255,.76);
cursor: pointer;
font-size: .65rem;
font-weight: 750;
transition: transform .15s ease, filter .15s ease;
}
.schedule-edit-button svg { width: 1rem; height: 1rem; }
.schedule-edit-button:hover { transform: translateY(-1px); filter: brightness(1.06); }
.schedule-button:disabled { cursor: not-allowed; opacity: .5; filter: saturate(.38); box-shadow: none; }
.schedule-button:disabled:hover { transform: none; filter: saturate(.38); }
.schedule-button[aria-busy="true"] { cursor: wait; }
#schedule-state.warn {
color: #8d3b00;
border-color: rgba(247,162,73,.78);
background: linear-gradient(145deg, rgba(255,232,190,.82), rgba(240,157,69,.42));
box-shadow: 0 0 12px rgba(237,130,39,.13), inset 0 1px 0 rgba(255,255,255,.86);
font-size: .66rem;
letter-spacing: .07em;
}
:root[data-theme="dark"] #schedule-state.warn {
color: #ffe2b8;
border-color: rgba(255,166,83,.57);
background: linear-gradient(145deg, rgba(177,87,24,.52), rgba(95,45,17,.48));
box-shadow: 0 0 13px rgba(242,129,38,.15), inset 0 1px 0 rgba(255,228,198,.18);
}
.schedule-dialog {
width: min(72rem, calc(100vw - 2rem));
max-width: none;
max-height: calc(100vh - 2rem);
padding: 0;
border: 1px solid var(--panel-edge);
border-radius: 1.35rem;
color: var(--panel-ink);
background:
linear-gradient(125deg, rgba(255,255,255,.28), transparent 32%, rgba(255,255,255,.06) 72%),
rgba(201,229,244,.72);
box-shadow: 0 28px 90px rgba(8,45,70,.42), inset 0 1px 0 rgba(255,255,255,.9);
backdrop-filter: blur(28px) saturate(135%);
-webkit-backdrop-filter: blur(28px) saturate(135%);
overflow: hidden;
}
.schedule-dialog::backdrop { background: rgba(5,20,31,.46); backdrop-filter: blur(9px); -webkit-backdrop-filter: blur(9px); }
:root[data-theme="dark"] .schedule-dialog { background: linear-gradient(125deg, rgba(205,239,255,.1), transparent 34%), rgba(7,24,36,.88); box-shadow: 0 30px 100px rgba(0,0,0,.64), inset 0 1px 0 rgba(221,243,252,.15); }
.schedule-editor { display: grid; grid-template-rows: auto minmax(0, 1fr) auto; max-height: calc(100vh - 2rem); }
.editor-header, .editor-footer { display: flex; align-items: center; gap: .7rem; padding: .8rem 1rem; }
.editor-header { justify-content: space-between; border-bottom: 1px solid var(--tile-line-soft); }
.editor-heading { display: flex; align-items: center; gap: .65rem; }
.editor-heading > svg { width: 2rem; height: 2rem; color: #1883df; filter: drop-shadow(0 0 5px rgba(24,131,223,.2)); }
.editor-heading h2 { margin: 0; font-size: 1.15rem; }
.editor-heading small { display: block; margin-top: .15rem; color: var(--panel-muted); font-size: .63rem; }
.editor-close { width: 2.2rem; height: 2.2rem; padding: 0; border: 1px solid var(--tile-line); border-radius: .75rem; color: var(--panel-muted); background: var(--tile); cursor: pointer; font-size: 1.45rem; line-height: 1; }
.editor-scroll { display: grid; gap: .7rem; padding: .85rem 1rem 1rem; overflow: auto; }
.schedule-enabled { display: flex; align-items: center; gap: .7rem; padding: .72rem .82rem; border: 1px solid var(--tile-line); border-radius: .9rem; background: linear-gradient(145deg, rgba(255,255,255,.22), rgba(120,169,195,.08)); cursor: pointer; }
.schedule-enabled input { width: 1.1rem; height: 1.1rem; accent-color: var(--blue); }
.schedule-enabled span { display: grid; gap: .12rem; }
.schedule-enabled strong { font-size: .76rem; }
.schedule-enabled small { color: var(--panel-muted); font-size: .61rem; }
.editor-section { padding: .8rem; border: 1px solid var(--tile-line); border-radius: 1rem; background: linear-gradient(145deg, rgba(255,255,255,.19), rgba(94,148,179,.075)); box-shadow: inset 0 1px 0 rgba(255,255,255,.48); }
:root[data-theme="dark"] .editor-section, :root[data-theme="dark"] .schedule-enabled { background: linear-gradient(145deg, rgba(205,236,249,.055), rgba(2,19,30,.12)); box-shadow: inset 0 1px 0 rgba(224,246,255,.07); }
.editor-section-title { display: flex; align-items: end; justify-content: space-between; gap: .75rem; margin-bottom: .65rem; }
.editor-section-title h3 { margin: 0; font-size: .86rem; }
.editor-section-title small { display: block; margin-top: .13rem; color: var(--panel-muted); font-size: .6rem; }
.day-assignments { display: grid; grid-template-columns: repeat(7, minmax(0, 1fr)); gap: .42rem; }
.day-assignment { display: grid; gap: .3rem; color: var(--panel-muted); font-size: .58rem; font-weight: 700; }
.day-assignment select, .template-toolbar select, .point-editor input, .point-editor select {
min-width: 0;
height: 2.25rem;
padding: .38rem .48rem;
border: 1px solid var(--tile-line);
border-radius: .62rem;
color: var(--panel-ink);
background: rgba(245,251,253,.48);
outline: none;
font-size: .66rem;
}
:root[data-theme="dark"] .day-assignment select,
:root[data-theme="dark"] .template-toolbar select,
:root[data-theme="dark"] .point-editor input,
:root[data-theme="dark"] .point-editor select { background: rgba(16,38,52,.72); }
.day-assignment select:focus, .template-toolbar select:focus, .point-editor input:focus, .point-editor select:focus { border-color: rgba(45,151,230,.7); box-shadow: 0 0 0 3px rgba(34,145,226,.11); }
.template-toolbar > label { display: grid; gap: .25rem; min-width: 10rem; color: var(--panel-muted); font-size: .57rem; font-weight: 700; }
.template-actions { display: flex; align-items: end; gap: .35rem; }
.template-actions button { min-height: 2.25rem; padding: .4rem .65rem; border: 1px solid var(--tile-line); border-radius: .62rem; color: #126fc4; background: rgba(52,150,220,.08); cursor: pointer; font-size: .61rem; font-weight: 700; }
.template-actions #delete-template { color: var(--red); border-color: rgba(223,91,105,.28); background: var(--red-soft); }
.template-actions button:disabled { cursor: not-allowed; opacity: .45; }
.schedule-points { display: grid; gap: .55rem; }
.point-editor { padding: .68rem; border: 1px solid var(--tile-line); border-radius: .85rem; background: linear-gradient(145deg, rgba(255,255,255,.22), rgba(116,160,183,.065)); box-shadow: inset 0 1px 0 rgba(255,255,255,.45); }
:root[data-theme="dark"] .point-editor { background: linear-gradient(145deg, rgba(197,231,247,.055), rgba(2,18,29,.13)); box-shadow: inset 0 1px 0 rgba(224,246,255,.06); }
.point-header { display: grid; grid-template-columns: auto minmax(7rem, .7fr) minmax(9rem, 1fr) auto; align-items: end; gap: .55rem; }
.point-number { align-self: center; display: grid; place-items: center; width: 1.85rem; height: 1.85rem; border-radius: 50%; color: #1478cc; background: var(--blue-soft); font-size: .62rem; font-weight: 800; }
.point-header label, .point-setting { display: grid; gap: .25rem; color: var(--panel-muted); font-size: .56rem; font-weight: 700; }
.remove-point { width: 2.25rem; height: 2.25rem; padding: 0; border: 1px solid rgba(223,91,105,.32); border-radius: .62rem; color: var(--red); background: var(--red-soft); cursor: pointer; font-size: 1.1rem; }
.point-settings { display: grid; grid-template-columns: repeat(7, minmax(0, 1fr)); gap: .48rem; margin-top: .55rem; }
.point-editor.auto [data-set-only] { display: none; }
.point-editor.auto .point-settings { grid-template-columns: repeat(2, minmax(0, 1fr)); }
.empty-points { padding: 1.4rem; border: 1px dashed var(--tile-line); border-radius: .8rem; color: var(--panel-muted); text-align: center; font-size: .68rem; }
.add-schedule-point { width: 100%; min-height: 2.55rem; margin-top: .6rem; border: 1px dashed rgba(37,131,205,.55); border-radius: .75rem; color: #126fc4; background: rgba(52,150,220,.08); cursor: pointer; font-size: .68rem; font-weight: 750; }
.editor-footer { border-top: 1px solid var(--tile-line-soft); justify-content: flex-end; }
.editor-status { margin-right: auto; color: var(--panel-muted); font-size: .63rem; }
.editor-status.error { color: var(--red); }
.editor-button { min-height: 2.5rem; padding: .58rem .9rem; border-radius: .75rem; cursor: pointer; font-size: .69rem; font-weight: 750; }
.editor-button.secondary { border: 1px solid var(--tile-line); color: var(--panel-ink); background: var(--tile); }
.editor-button.primary { border: 1px solid rgba(182,226,255,.76); color: white; background: radial-gradient(circle at 20% -30%, rgba(255,255,255,.5), transparent 48%), linear-gradient(145deg, #3aa9eb, #1476c9); box-shadow: 0 7px 17px rgba(18,102,170,.2), inset 0 1px 0 rgba(255,255,255,.75); }
@media (max-width: 900px) {
.day-assignments { grid-template-columns: repeat(4, minmax(0, 1fr)); }
.point-settings { grid-template-columns: repeat(3, minmax(0, 1fr)); }
}
@media (max-width: 600px) {
.schedule-dialog { width: calc(100vw - .7rem); max-height: calc(100vh - .7rem); border-radius: 1rem; }
.schedule-editor { max-height: calc(100vh - .7rem); }
.editor-header, .editor-footer { padding: .7rem; }
.editor-scroll { padding: .7rem; }
.day-assignments { grid-template-columns: repeat(2, minmax(0, 1fr)); }
.editor-section-title { align-items: stretch; flex-direction: column; }
.template-toolbar > label { min-width: 0; }
.template-actions { align-items: stretch; }
.template-actions button { flex: 1; }
.point-header { grid-template-columns: auto 1fr auto; }
.point-header .point-action { grid-column: 2 / -1; }
.point-settings, .point-editor.auto .point-settings { grid-template-columns: repeat(2, minmax(0, 1fr)); }
.editor-footer { flex-wrap: wrap; }
.editor-status { width: 100%; }
.schedule-edit-button span { display: none; }
}
/* CO2 state drives both the label and the meter, so the visual state cannot
disagree with the air-quality text returned by airQuality(). */
.co2-card {
--air-color: #7896ac;
--air-glow: rgba(93, 140, 171, .22);
--air-track: rgba(181, 203, 200, .28);
}
.co2-card[data-air-tone="good"] {
--air-color: #1fbd69;
--air-glow: rgba(18, 199, 104, .34);
}
.co2-card[data-air-tone="warn"] {
--air-color: #efa12b;
--air-glow: rgba(244, 161, 42, .35);
}
.co2-card[data-air-tone="bad"] {
--air-color: #e8495c;
--air-glow: rgba(235, 74, 83, .36);
}
.co2-card .co2-meter {
height: .84rem;
border-color: rgba(255,255,255,.82);
background-color: var(--air-track);
background-image: linear-gradient(180deg, rgba(255,255,255,.15), transparent 52%, rgba(0,20,36,.045));
box-shadow: inset 0 1px 3px rgba(20,61,78,.14), 0 1px 4px rgba(8,43,72,.07);
transition: background-color .65s ease;
}
.co2-card .co2-meter i {
background-color: var(--air-color);
background-image: linear-gradient(180deg, rgba(255,255,255,.28), rgba(255,255,255,.045) 48%, rgba(0,35,20,.1));
box-shadow: 0 0 8px var(--air-glow), inset 0 1px 0 rgba(255,255,255,.58), inset 0 -1px 2px rgba(0,34,19,.1);
transition: width .35s ease, background-color .65s ease, box-shadow .65s ease;
}
:root[data-theme="dark"] .co2-card .co2-meter { border-color: rgba(205,235,248,.3); box-shadow: inset 0 1px 4px rgba(0,0,0,.27), 0 1px 5px rgba(0,0,0,.12); }
.co2-card .quality-chip.muted {
color: var(--panel-muted);
border-color: var(--tile-line-soft);
background: rgba(199,222,235,.2);
box-shadow: inset 0 1px 0 rgba(255,255,255,.55);
}
.co2-card .quality-chip.good {
color: #076d3d;
border-color: rgba(109,237,167,.65);
background: linear-gradient(145deg, rgba(179,255,214,.58), rgba(92,218,151,.39));
box-shadow: 0 0 9px rgba(33,203,116,.12), inset 0 1px 0 rgba(255,255,255,.82);
}
.co2-card .quality-chip.warn {
color: #9c5513;
border-color: rgba(244,183,106,.67);
background: linear-gradient(145deg, rgba(255,232,188,.56), rgba(239,168,80,.34));
box-shadow: 0 0 9px rgba(235,153,53,.11), inset 0 1px 0 rgba(255,255,255,.8);
}
.co2-card .quality-chip.bad {
color: #a62f3d;
border-color: rgba(242,135,147,.62);
background: linear-gradient(145deg, rgba(255,209,216,.53), rgba(225,105,120,.3));
box-shadow: 0 0 9px rgba(224,83,101,.12), inset 0 1px 0 rgba(255,255,255,.78);
}
:root[data-theme="dark"] .co2-card { --air-track: rgba(8,28,39,.38); }
:root[data-theme="dark"] .co2-card[data-air-tone="good"] { --air-glow: rgba(30,224,128,.3); }
:root[data-theme="dark"] .co2-card[data-air-tone="warn"] { --air-glow: rgba(255,176,49,.3); }
:root[data-theme="dark"] .co2-card[data-air-tone="bad"] { --air-glow: rgba(255,82,102,.32); }
:root[data-theme="dark"] .co2-card .quality-chip.good { color: #b9ffda; background: linear-gradient(145deg, rgba(45,186,113,.35), rgba(11,101,60,.3)); }
:root[data-theme="dark"] .co2-card .quality-chip.warn { color: #ffd59e; background: linear-gradient(145deg, rgba(176,115,30,.34), rgba(91,58,15,.3)); }
:root[data-theme="dark"] .co2-card .quality-chip.bad { color: #ffc0c8; background: linear-gradient(145deg, rgba(174,58,75,.34), rgba(91,25,37,.31)); }
:root[data-theme="dark"] .co2-card .quality-chip.muted { color: var(--panel-muted); background: rgba(42,70,88,.25); }
+601
View File
@@ -0,0 +1,601 @@
:root {
--widget-ink: #08265d;
--widget-muted: #315d91;
--widget-glass: rgba(200, 228, 244, 0.21);
--widget-edge: rgba(255, 255, 255, 0.9);
--tile: rgba(104, 126, 139, 0.16);
--tile-strong: rgba(214, 226, 232, 0.2);
--tile-edge: rgba(255, 255, 255, 0.82);
--tile-edge-soft: rgba(189, 211, 221, 0.38);
--tile-shadow: 0 10px 25px rgba(24, 72, 105, 0.12), inset 0 1px 0 rgba(255,255,255,.78), inset 1px 0 0 rgba(255,255,255,.24);
--blue-halo: rgba(23, 137, 248, 0.16);
--green-halo: rgba(28, 196, 113, 0.16);
--orange-halo: rgba(246, 126, 50, 0.14);
}
:root[data-theme="dark"] {
--widget-ink: #edf8ff;
--widget-muted: #9fc5df;
--widget-glass: rgba(7, 22, 33, 0.49);
--widget-edge: rgba(187, 225, 244, 0.3);
--tile: rgba(16, 37, 51, 0.3);
--tile-strong: rgba(52, 78, 96, 0.33);
--tile-edge: rgba(203, 234, 248, 0.25);
--tile-edge-soft: rgba(114, 176, 207, 0.16);
--tile-shadow: 0 13px 29px rgba(0,0,0,.26), inset 0 1px 0 rgba(226,246,255,.11), inset 1px 0 0 rgba(186,226,245,.055);
--blue-halo: rgba(29, 153, 245, 0.22);
--green-halo: rgba(27, 210, 121, 0.19);
--orange-halo: rgba(246, 125, 46, 0.18);
}
html { min-width: 280px; }
body {
min-height: 100vh;
margin: 0;
padding: clamp(.5rem, 2.2vw, 1rem);
display: flex;
align-items: flex-start;
justify-content: center;
color: var(--widget-ink);
background-color: #b7d5e3;
overflow-x: hidden;
isolation: isolate;
}
:root[data-theme="dark"] body {
background-color: #091722;
}
body::before,
body::after {
content: "";
position: fixed;
pointer-events: none;
}
body::before {
inset: -1.25rem;
z-index: -2;
background-image:
linear-gradient(118deg, rgba(180,220,239,.15), rgba(238,247,251,.025) 45%, rgba(247,226,204,.09)),
url("../assets/mountain-lake-light.jpg");
background-position: center;
background-size: cover;
background-repeat: no-repeat;
filter: blur(6px) saturate(108%);
transform: scale(1.025);
}
body::after {
inset: 0;
z-index: -1;
background:
radial-gradient(circle at 11% 18%, rgba(255,255,255,.32) 0 .5%, transparent 5%),
radial-gradient(circle at 64% 23%, rgba(255,244,218,.27) 0 .6%, transparent 6%),
radial-gradient(circle at 91% 79%, rgba(225,250,237,.21) 0 .8%, transparent 7%);
filter: blur(11px);
opacity: .5;
}
:root[data-theme="dark"] body::before {
background-image:
linear-gradient(118deg, rgba(2,15,25,.66), rgba(8,27,40,.57) 48%, rgba(20,25,29,.64)),
url("../assets/mountain-lake-dark.jpg");
filter: blur(7px) saturate(106%);
}
:root[data-theme="dark"] body::after { opacity: .25; }
.ambient::before { width: 32rem; height: 32rem; left: -13rem; top: -14rem; background: #c9f2ff; opacity: .14; filter: blur(76px); }
.ambient::after { width: 34rem; height: 34rem; right: -14rem; bottom: -16rem; background: #ebd5a7; opacity: .11; filter: blur(82px); }
:root[data-theme="dark"] .ambient::before { background: #147db5; opacity: .12; }
:root[data-theme="dark"] .ambient::after { background: #846630; opacity: .08; }
.widget {
position: relative;
isolation: isolate;
width: min(100%, 31.5rem);
display: grid;
gap: .65rem;
padding: clamp(.65rem, 2.2vw, .9rem);
overflow: hidden;
border: 1px solid var(--widget-edge);
outline: 1px solid rgba(255,255,255,.48);
outline-offset: -5px;
border-radius: 1.55rem;
background:
linear-gradient(125deg, rgba(255,255,255,.22), transparent 31%, rgba(255,255,255,.055) 69%, rgba(196,224,240,.1)),
var(--widget-glass);
box-shadow: 0 27px 68px rgba(22,66,95,.24), 0 2px 8px rgba(255,255,255,.28), inset 0 1px 0 rgba(255,255,255,.88), inset 0 -1px 0 rgba(113,163,192,.17);
backdrop-filter: blur(13px) saturate(124%);
-webkit-backdrop-filter: blur(13px) saturate(124%);
}
.widget::before,
.widget::after {
content: "";
position: absolute;
inset: 0;
z-index: 0;
border-radius: inherit;
pointer-events: none;
}
.widget::before {
background:
linear-gradient(112deg, rgba(255,255,255,.25), rgba(255,255,255,.035) 18%, transparent 39%),
radial-gradient(ellipse at 50% -20%, rgba(255,255,255,.25), transparent 47%);
}
.widget::after {
opacity: .1;
background-image: url("data:image/svg+xml,%3Csvg viewBox='0 0 180 180' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='.9' numOctaves='3' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)' opacity='.16'/%3E%3C/svg%3E");
mix-blend-mode: soft-light;
}
.widget > * { position: relative; z-index: 1; }
:root[data-theme="dark"] .widget { outline-color: rgba(203,235,250,.11); box-shadow: 0 33px 78px rgba(0,0,0,.43), 0 0 28px rgba(19,112,158,.06), inset 0 1px 0 rgba(221,243,252,.17), inset 0 -1px 0 rgba(0,0,0,.28); }
:root[data-theme="dark"] .widget::before { background: linear-gradient(112deg, rgba(203,238,253,.1), transparent 24%, transparent 72%, rgba(71,163,202,.035)); }
.widget-header {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
align-items: center;
gap: .55rem .7rem;
padding: .15rem .25rem .05rem;
}
.identity { min-width: 0; display: flex; align-items: center; gap: .7rem; }
.brand-icon {
display: grid;
place-items: center;
width: 2.9rem;
height: 2.9rem;
flex: 0 0 auto;
border: 1px solid rgba(255,255,255,.82);
border-radius: 1rem;
color: #147bd5;
background:
radial-gradient(circle at 25% 2%, rgba(255,255,255,.62), transparent 43%),
linear-gradient(145deg, rgba(217,242,255,.58), rgba(73,159,222,.2));
box-shadow: 0 8px 19px rgba(19,101,160,.13), inset 0 1px 0 rgba(255,255,255,.88);
}
.brand-icon svg { width: 1.75rem; height: 1.75rem; filter: drop-shadow(0 0 5px rgba(20,123,213,.18)); }
.identity-copy { min-width: 0; display: block; }
.title-row { display: flex; align-items: center; gap: .55rem; min-width: 0; }
.identity h1 { margin: 0; font-size: 1.62rem; line-height: 1; letter-spacing: -.045em; white-space: nowrap; }
.identity-copy > small { display: block; margin-top: .28rem; color: var(--widget-muted); font-size: .7rem; }
.widget .pill { min-height: 1.75rem; padding: .27rem .58rem; border-color: rgba(255,255,255,.56); font-size: .59rem; box-shadow: inset 0 1px 0 rgba(255,255,255,.62), 0 5px 14px rgba(26,75,108,.08); backdrop-filter: blur(12px); }
.widget .pill::before { width: .36rem; height: .36rem; box-shadow: 0 0 7px currentColor; }
.theme-button,
.open-section {
display: grid;
place-items: center;
border: 1px solid var(--tile-edge);
color: var(--widget-ink);
background: linear-gradient(145deg, var(--tile-strong), var(--tile));
box-shadow: var(--tile-shadow);
cursor: pointer;
backdrop-filter: blur(14px);
-webkit-backdrop-filter: blur(14px);
transition: transform .15s ease, filter .15s ease;
}
.theme-button { width: 2.55rem; height: 2.55rem; border-radius: .9rem; }
.theme-button svg { width: 1.18rem; height: 1.18rem; }
.theme-button:hover, .open-section:hover { transform: translateY(-1px); filter: brightness(1.07); }
.theme-button:active, .open-section:active { transform: scale(.97); }
.status-row { grid-column: 1 / -1; display: flex; align-items: center; gap: .55rem; min-width: 0; }
.mode-detail { min-width: 0; color: var(--widget-muted); font-size: .66rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.widget-tile {
position: relative;
isolation: isolate;
overflow: hidden;
border: 1px solid var(--tile-edge);
outline: 1px solid var(--tile-edge-soft);
outline-offset: -3px;
border-radius: 1.15rem;
background:
linear-gradient(132deg, rgba(244,248,250,.22), rgba(159,178,188,.055) 38%, transparent 66%),
linear-gradient(145deg, var(--tile-strong), var(--tile));
box-shadow: var(--tile-shadow);
backdrop-filter: blur(14px) saturate(116%);
-webkit-backdrop-filter: blur(14px) saturate(116%);
}
.widget-tile::before {
content: "";
position: absolute;
inset: 0;
z-index: 0;
border-radius: inherit;
pointer-events: none;
opacity: .62;
background: linear-gradient(115deg, rgba(255,255,255,.35), transparent 25%, transparent 72%, rgba(255,255,255,.08));
}
.widget-tile > * { position: relative; z-index: 1; }
:root[data-theme="dark"] .widget-tile { background: linear-gradient(132deg, rgba(213,240,252,.075), rgba(255,255,255,.012) 38%, transparent 65%), linear-gradient(145deg, var(--tile-strong), var(--tile)); backdrop-filter: blur(16px) saturate(127%); -webkit-backdrop-filter: blur(16px) saturate(127%); }
.control-card { min-height: 11.4rem; padding: .9rem 1rem .85rem; display: flex; flex-direction: column; }
.control-card::after,
.switch-card::after {
content: "";
position: absolute;
z-index: 0;
width: 12rem;
height: 12rem;
right: -5rem;
bottom: -7rem;
border-radius: 50%;
pointer-events: none;
filter: blur(42px);
opacity: .18;
}
.speed-card::after { background: var(--blue-halo); }
.temperature-card::after { width: 17rem; background: linear-gradient(90deg, var(--blue-halo), var(--orange-halo)); }
.power-card::after, .heater-card::after { background: var(--green-halo); opacity: .16; }
.card-title { display: flex; align-items: flex-start; gap: .65rem; }
.card-title h2, .switch-title h2, .section-title h2 { margin: 0; font-size: .96rem; line-height: 1.2; letter-spacing: -.015em; }
.card-title p { margin: .16rem 0 0; color: var(--widget-muted); font-size: .66rem; }
.ui-icon { display: block; fill: none; stroke: currentColor; stroke-width: 1.8; stroke-linecap: round; stroke-linejoin: round; }
.feature-icon { width: 1.95rem; height: 1.95rem; flex: 0 0 auto; padding: .06rem; color: #1389f4; filter: drop-shadow(0 0 5px rgba(20,139,244,.2)); }
.hero-control { display: grid; grid-template-columns: 3.45rem 1fr 3.45rem; align-items: center; gap: .8rem; margin: 1rem 0 .72rem; }
.hero-value { text-align: center; font-size: 3rem; line-height: 1; letter-spacing: -.065em; font-variant-numeric: tabular-nums; }
.hero-step {
display: grid;
place-items: center;
width: 3.45rem;
height: 3.45rem;
padding: 0;
border: 1.5px solid rgba(255,255,255,.84);
border-radius: .95rem;
color: #176dbb;
background:
radial-gradient(circle at 24% 5%, rgba(255,255,255,.48), transparent 40%),
linear-gradient(145deg, rgba(245,252,255,.4), rgba(191,224,244,.18));
box-shadow: 0 8px 19px rgba(35,92,132,.13), inset 0 1px 0 rgba(255,255,255,.88), 0 0 0 1px rgba(185,226,248,.2);
cursor: pointer;
font-size: 1.8rem;
line-height: 1;
transition: transform .15s ease, filter .15s ease, box-shadow .15s ease;
}
.hero-step.primary {
color: white;
background:
radial-gradient(circle at 24% 5%, rgba(255,255,255,.55), transparent 38%),
linear-gradient(135deg, rgba(255,255,255,.16), transparent 42%, rgba(0,73,170,.1)),
linear-gradient(145deg, #55b4ff, #1479e8 72%);
box-shadow: 0 8px 18px rgba(15,92,183,.18), 0 0 7px rgba(48,151,239,.1), inset 0 1px 0 rgba(255,255,255,.86), inset 0 -3px 7px rgba(0,67,156,.16);
}
.hero-step:hover { transform: translateY(-1px); filter: brightness(1.07); box-shadow: 0 10px 21px rgba(20,101,190,.2), 0 0 9px rgba(48,151,239,.12), inset 0 1px 0 rgba(255,255,255,.88); }
.hero-step:active { transform: scale(.97); }
.speed-segments { display: grid; grid-template-columns: repeat(6, 1fr); gap: .18rem; }
.speed-segments button {
height: .9rem;
padding: 0;
border: 1px solid rgba(255,255,255,.82);
border-radius: .5rem;
background: linear-gradient(180deg, rgba(173,207,229,.3), rgba(98,151,190,.18));
box-shadow: inset 0 1px 2px rgba(27,70,105,.07), 0 2px 5px rgba(32,86,126,.07);
cursor: pointer;
transition: background .12s ease, box-shadow .12s ease, transform .12s ease;
}
.speed-segments button:hover { transform: translateY(-1px); }
.speed-segments button.active {
background: linear-gradient(180deg, rgba(255,255,255,.32), transparent 48%), linear-gradient(90deg, #1685ec, #35afff);
box-shadow: 0 0 5px rgba(25,143,247,.19), inset 0 1px 0 rgba(255,255,255,.75), inset 0 -2px 4px rgba(0,84,182,.13);
}
.scale-labels, .temperature-labels { display: flex; justify-content: space-between; margin-top: .34rem; padding: 0 .3rem; color: var(--widget-muted); font-size: .62rem; }
.temperature-range { width: 100%; height: 1.45rem; margin: 0; appearance: none; background: transparent; cursor: pointer; }
.temperature-range::-webkit-slider-runnable-track { height: .68rem; border: 1px solid rgba(255,255,255,.88); border-radius: 999px; background: linear-gradient(90deg, #0878ed, #53c7f5 38%, #f3c26e 72%, #ff6b31); box-shadow: 0 0 8px rgba(37,153,239,.15), 0 0 7px rgba(255,114,41,.09), inset 0 1px 2px rgba(255,255,255,.46); }
.temperature-range::-moz-range-track { height: .68rem; border: 1px solid rgba(255,255,255,.88); border-radius: 999px; background: linear-gradient(90deg, #0878ed, #53c7f5 38%, #f3c26e 72%, #ff6b31); }
.temperature-range::-moz-range-progress { background: transparent; }
.temperature-range::-webkit-slider-thumb { width: 1.6rem; height: 1.6rem; margin-top: -.49rem; appearance: none; border: .25rem solid rgba(244,252,255,.9); border-radius: 50%; background: #238feb; box-shadow: 0 0 0 2px rgba(255,255,255,.45), 0 0 11px rgba(29,139,241,.31), 0 4px 9px rgba(17,79,143,.22); }
.temperature-range::-moz-range-thumb { width: 1.08rem; height: 1.08rem; border: .25rem solid rgba(244,252,255,.9); border-radius: 50%; background: #238feb; box-shadow: 0 0 0 2px rgba(255,255,255,.45), 0 0 11px rgba(29,139,241,.31), 0 4px 9px rgba(17,79,143,.22); }
.switch-grid { display: grid; grid-template-columns: 1fr 1fr; gap: .65rem; }
.switch-card { min-width: 0; min-height: 8.15rem; padding: .82rem; display: flex; flex-direction: column; gap: .72rem; }
.switch-title { display: flex; align-items: center; gap: .5rem; min-width: 0; }
.switch-title > span { min-width: 0; }
.switch-title small { display: block; margin-top: .12rem; color: var(--widget-muted); font-size: .58rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
.switch-icon { width: 1.75rem; height: 1.75rem; flex: 0 0 auto; }
.switch-icon.green { color: #08a95a; filter: drop-shadow(0 0 5px rgba(20,190,104,.23)); }
.switch-icon.orange { color: #f06419; filter: drop-shadow(0 0 5px rgba(244,105,31,.2)); }
.glass-switch {
position: relative;
overflow: hidden;
width: 100%;
min-height: 3.35rem;
margin-top: auto;
border: 1.5px solid rgba(255,255,255,.86);
border-radius: .95rem;
color: var(--widget-ink);
background: rgba(199,222,235,.24);
box-shadow: var(--tile-shadow);
cursor: pointer;
font-size: 1.25rem;
font-weight: 850;
text-shadow: 0 1px 0 rgba(255,255,255,.3);
transition: transform .15s ease, background .2s ease, box-shadow .2s ease, filter .2s ease;
}
.glass-switch:hover { transform: translateY(-1px); filter: brightness(1.06); }
.glass-switch:active { transform: scale(.98); }
.glass-switch[aria-pressed="true"].green,
.glass-switch[aria-pressed="true"].orange {
background:
radial-gradient(circle at 25% -8%, rgba(255,255,255,.67), transparent 42%),
linear-gradient(132deg, rgba(255,255,255,.15), transparent 40%, rgba(0,125,62,.06)),
linear-gradient(145deg, rgba(139,244,190,.67), rgba(55,194,122,.43));
border-color: rgba(218,255,235,.84);
box-shadow: 0 8px 19px rgba(18,143,80,.14), 0 0 8px rgba(38,199,116,.09), inset 0 1px 0 rgba(255,255,255,.9), inset 0 -4px 9px rgba(0,114,57,.08);
}
.info-card { padding: .82rem; }
.section-title { display: flex; align-items: center; justify-content: space-between; gap: .65rem; }
.section-title > span { display: flex; align-items: center; gap: .5rem; }
.section-icon { width: 1.75rem; height: 1.75rem; color: #207bcc; filter: drop-shadow(0 0 5px rgba(26,124,210,.17)); }
.section-icon.leaf { color: #069c51; transform: rotate(-18deg); filter: drop-shadow(0 0 5px rgba(8,160,81,.2)); }
.open-section { width: 2rem; height: 2rem; padding: 0; border-radius: .7rem; color: #147bd5; font-size: .96rem; }
.co2-summary { display: grid; grid-template-columns: auto 1fr auto; align-items: center; gap: .6rem; margin: .8rem .1rem .52rem; }
.co2-label { color: var(--widget-muted); font-size: .74rem; font-weight: 750; }
.co2-summary strong { text-align: center; font-size: 2rem; line-height: 1; letter-spacing: -.045em; }
.co2-summary strong small { color: var(--widget-muted); font-size: .62rem; font-weight: 650; letter-spacing: 0; }
.quality-chip { display: inline-flex; justify-content: center; padding: .32rem .62rem; border: 1px solid var(--tile-edge-soft); border-radius: 999px; background: rgba(199,222,235,.2); color: var(--widget-muted); font-size: .6rem; font-weight: 750; white-space: nowrap; }
.quality-chip.good { color: #076d3d; border-color: rgba(109,237,167,.65); background: linear-gradient(145deg, rgba(179,255,214,.58), rgba(92,218,151,.39)); box-shadow: 0 0 9px rgba(33,203,116,.12), inset 0 1px 0 rgba(255,255,255,.82); }
.quality-chip.warn { color: #9c5513; border-color: rgba(244,183,106,.67); background: linear-gradient(145deg, rgba(255,232,188,.56), rgba(239,168,80,.34)); }
.quality-chip.bad { color: #a62f3d; border-color: rgba(242,135,147,.62); background: linear-gradient(145deg, rgba(255,209,216,.53), rgba(225,105,120,.3)); }
:root[data-theme="dark"] .quality-chip.good { color: #b9ffda; }
:root[data-theme="dark"] .quality-chip.warn { color: #ffd59e; }
:root[data-theme="dark"] .quality-chip.bad { color: #ffc0c8; }
.air-card {
--air-color: #7896ac;
--air-glow: rgba(93, 140, 171, .2);
--air-track: rgba(181, 203, 200, .28);
}
.air-card[data-air-tone="good"] {
--air-color: #1fbd69;
--air-glow: rgba(18, 199, 104, .34);
}
.air-card[data-air-tone="warn"] {
--air-color: #efa12b;
--air-glow: rgba(244, 161, 42, .35);
}
.air-card[data-air-tone="bad"] {
--air-color: #e8495c;
--air-glow: rgba(235, 74, 83, .36);
}
.co2-meter { height: .72rem; border: 1px solid rgba(255,255,255,.82); border-radius: 999px; background-color: var(--air-track); background-image: linear-gradient(180deg, rgba(255,255,255,.15), transparent 52%, rgba(0,20,36,.045)); box-shadow: inset 0 1px 3px rgba(20,61,78,.14), 0 1px 4px rgba(8,43,72,.07); overflow: hidden; transition: background-color .65s ease; }
.co2-meter i { display: block; width: 0; height: 100%; border-radius: inherit; background-color: var(--air-color); background-image: linear-gradient(180deg, rgba(255,255,255,.28), rgba(255,255,255,.045) 48%, rgba(0,35,20,.1)); box-shadow: 0 0 8px var(--air-glow), inset 0 1px 0 rgba(255,255,255,.58), inset 0 -1px 2px rgba(0,34,19,.1); transition: width .35s ease, background-color .65s ease, box-shadow .65s ease; }
.meter-labels { display: flex; justify-content: space-between; margin-top: .27rem; padding: 0 .2rem; color: rgba(22,69,108,.78); font-size: .58rem; font-weight: 650; text-shadow: 0 1px 0 rgba(255,255,255,.48); }
:root[data-theme="dark"] .meter-labels { color: rgba(211,235,248,.76); text-shadow: 0 1px 2px rgba(0,0,0,.58); }
.mini-metrics { display: grid; grid-template-columns: 1fr 1fr; gap: .52rem; margin-top: .68rem; }
.mini-metric { min-width: 0; min-height: 4.35rem; display: flex; align-items: center; justify-content: center; gap: .5rem; padding: .62rem .5rem; border: 1px solid var(--tile-edge-soft); border-radius: .9rem; background: linear-gradient(145deg, rgba(255,255,255,.13), rgba(107,151,177,.055)); box-shadow: inset 0 1px 0 rgba(255,255,255,.33); text-align: center; }
.metric-icon { width: 1.55rem; height: 1.55rem; flex: 0 0 auto; color: #137edc; filter: drop-shadow(0 0 4px rgba(20,124,221,.15)); }
.mini-metric span { min-width: 0; }
.mini-metric small { display: block; color: var(--widget-muted); font-size: .58rem; }
.mini-metric strong { display: block; margin-top: .2rem; font-size: 1.35rem; line-height: 1; letter-spacing: -.035em; }
.schedule-times { display: grid; grid-template-columns: 1fr 1px 1fr; align-items: center; gap: .7rem; margin-top: .75rem; padding: .15rem .25rem .25rem; }
.schedule-times > span { display: grid; justify-items: center; gap: .18rem; text-align: center; }
.schedule-times small { color: var(--widget-muted); font-size: .6rem; }
.schedule-times strong { font-size: 1.35rem; letter-spacing: -.035em; }
.schedule-times > i { width: 1px; height: 2.75rem; background: var(--tile-edge-soft); }
.open-panel {
min-height: 3.25rem;
display: grid;
grid-template-columns: auto 1fr auto;
align-items: center;
gap: .65rem;
padding: .65rem .9rem;
border: 1px solid rgba(194,232,255,.84);
border-radius: 1rem;
color: white;
background:
radial-gradient(circle at 18% -35%, rgba(255,255,255,.52), transparent 47%),
linear-gradient(135deg, rgba(255,255,255,.13), transparent 43%),
linear-gradient(145deg, rgba(60,174,239,.92), rgba(17,113,194,.88));
box-shadow: 0 9px 20px rgba(15,92,183,.2), 0 0 9px rgba(48,151,239,.11), inset 0 1px 0 rgba(255,255,255,.84), inset 0 -3px 7px rgba(0,67,156,.15);
cursor: pointer;
font-size: .78rem;
font-weight: 760;
transition: transform .15s ease, filter .15s ease, box-shadow .15s ease;
}
.open-panel svg { width: 1.45rem; height: 1.45rem; }
.open-panel b { font-size: 1rem; }
.open-panel:hover { transform: translateY(-1px); filter: brightness(1.05); box-shadow: 0 11px 23px rgba(20,101,190,.23), 0 0 11px rgba(48,151,239,.13), inset 0 1px 0 rgba(255,255,255,.86); }
.open-panel:active { transform: scale(.99); }
.demo-note { color: var(--widget-muted); text-align: center; font-size: .58rem; }
:root[data-theme="dark"] .brand-icon { border-color: rgba(193,228,245,.25); background: radial-gradient(circle at 25% 2%, rgba(208,243,255,.16), transparent 43%), linear-gradient(145deg, rgba(38,125,187,.27), rgba(15,61,91,.26)); }
:root[data-theme="dark"] .hero-step { color: #76c7fa; border-color: rgba(192,226,244,.25); background: radial-gradient(circle at 24% 5%, rgba(213,240,252,.11), transparent 40%), linear-gradient(145deg, rgba(77,112,133,.23), rgba(20,44,59,.28)); box-shadow: 0 9px 21px rgba(0,0,0,.23), inset 0 1px 0 rgba(226,246,255,.12); }
:root[data-theme="dark"] .hero-step.primary { color: white; background: radial-gradient(circle at 24% 5%, rgba(214,246,255,.32), transparent 38%), linear-gradient(135deg, rgba(255,255,255,.08), transparent 42%, rgba(0,32,95,.17)), linear-gradient(145deg, #33aaf4, #0869d0 74%); box-shadow: 0 10px 24px rgba(0,53,119,.38), 0 0 11px rgba(41,162,244,.19), inset 0 1px 0 rgba(220,248,255,.4), inset 0 -3px 7px rgba(0,27,91,.27); }
:root[data-theme="dark"] .speed-segments button { border-color: rgba(192,226,244,.25); background: linear-gradient(180deg, rgba(91,136,162,.23), rgba(24,55,74,.28)); }
:root[data-theme="dark"] .speed-segments button.active { border-color: rgba(117,207,255,.48); background: linear-gradient(180deg, rgba(216,246,255,.19), transparent 48%), linear-gradient(90deg, #0877df, #20b7ff); box-shadow: 0 0 7px rgba(24,156,255,.27), inset 0 1px 0 rgba(223,248,255,.34); }
:root[data-theme="dark"] .glass-switch { color: #ddecf4; border-color: rgba(193,228,245,.25); background: linear-gradient(145deg, rgba(77,112,133,.23), rgba(20,44,59,.28)); text-shadow: 0 1px 2px rgba(0,0,0,.4); }
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].green,
:root[data-theme="dark"] .glass-switch[aria-pressed="true"].orange { color: #effff6; border-color: rgba(127,242,182,.4); background: radial-gradient(circle at 25% -8%, rgba(218,255,236,.3), transparent 42%), linear-gradient(132deg, rgba(255,255,255,.07), transparent 40%, rgba(0,45,23,.12)), linear-gradient(145deg, rgba(51,190,119,.52), rgba(9,102,59,.49)); box-shadow: 0 9px 21px rgba(0,0,0,.22), 0 0 9px rgba(37,207,121,.1), inset 0 1px 0 rgba(218,255,236,.32), inset 0 -3px 8px rgba(0,31,16,.16); }
:root[data-theme="dark"] .air-card { --air-track: rgba(8,28,39,.38); }
:root[data-theme="dark"] .air-card[data-air-tone="good"] { --air-glow: rgba(30, 224, 128, .3); }
:root[data-theme="dark"] .air-card[data-air-tone="warn"] { --air-glow: rgba(255, 176, 49, .3); }
:root[data-theme="dark"] .air-card[data-air-tone="bad"] { --air-glow: rgba(255, 82, 102, .32); }
:root[data-theme="dark"] .co2-meter { border-color: rgba(205,235,248,.3); box-shadow: inset 0 1px 4px rgba(0,0,0,.27), 0 1px 5px rgba(0,0,0,.12); }
:root[data-theme="dark"] .mini-metric { background: linear-gradient(145deg, rgba(196,231,247,.055), rgba(3,24,37,.08)); box-shadow: inset 0 1px 0 rgba(224,246,255,.07); }
/* Wide monitor layout. The same markup stays vertical on narrow screens, so
controls and API behaviour cannot drift between two widget versions. */
:root[data-widget-layout="horizontal"] body {
padding: .36rem;
}
:root[data-widget-layout="horizontal"] .widget {
width: min(100%, 76rem);
max-width: none;
gap: .48rem;
padding: .58rem;
border-radius: 1.35rem;
grid-template-columns: minmax(0, 1.4fr) minmax(0, 1.4fr) minmax(0, .8fr) minmax(0, .8fr);
grid-template-areas:
"header header header header"
"speed temperature power heater"
"air air schedule schedule"
"open open open open"
"demo demo demo demo";
align-items: stretch;
}
:root[data-widget-layout="horizontal"] .widget-header {
grid-area: header;
min-height: 2.6rem;
grid-template-columns: minmax(0, 1fr) auto auto;
gap: .35rem .55rem;
padding: 0 .12rem;
}
:root[data-widget-layout="horizontal"] .widget-header .identity { grid-column: 1; grid-row: 1; }
:root[data-widget-layout="horizontal"] .widget-header .status-row { grid-column: 2; grid-row: 1; }
:root[data-widget-layout="horizontal"] .widget-header .theme-button { grid-column: 3; grid-row: 1; }
:root[data-widget-layout="horizontal"] .identity { gap: .55rem; }
:root[data-widget-layout="horizontal"] .brand-icon { width: 2.45rem; height: 2.45rem; border-radius: .82rem; }
:root[data-widget-layout="horizontal"] .brand-icon svg { width: 1.48rem; height: 1.48rem; }
:root[data-widget-layout="horizontal"] .identity h1 { font-size: 1.42rem; }
:root[data-widget-layout="horizontal"] .identity-copy > small { margin-top: .18rem; font-size: .61rem; }
:root[data-widget-layout="horizontal"] .title-row { gap: .42rem; }
:root[data-widget-layout="horizontal"] .widget .pill { min-height: 1.52rem; padding: .2rem .5rem; font-size: .54rem; }
:root[data-widget-layout="horizontal"] .mode-detail { font-size: .59rem; }
:root[data-widget-layout="horizontal"] .theme-button { width: 2.2rem; height: 2.2rem; border-radius: .75rem; }
:root[data-widget-layout="horizontal"] .speed-card { grid-area: speed; }
:root[data-widget-layout="horizontal"] .temperature-card { grid-area: temperature; }
:root[data-widget-layout="horizontal"] .control-card {
min-height: 8.75rem;
padding: .66rem .78rem .58rem;
}
:root[data-widget-layout="horizontal"] .card-title { gap: .5rem; }
:root[data-widget-layout="horizontal"] .card-title h2,
:root[data-widget-layout="horizontal"] .switch-title h2,
:root[data-widget-layout="horizontal"] .section-title h2 { font-size: .86rem; }
:root[data-widget-layout="horizontal"] .card-title p { margin-top: .1rem; font-size: .58rem; }
:root[data-widget-layout="horizontal"] .feature-icon { width: 1.65rem; height: 1.65rem; }
:root[data-widget-layout="horizontal"] .hero-control {
grid-template-columns: 2.75rem 1fr 2.75rem;
gap: .55rem;
margin: .46rem 0 .34rem;
}
:root[data-widget-layout="horizontal"] .hero-step { width: 2.75rem; height: 2.75rem; border-radius: .78rem; font-size: 1.5rem; }
:root[data-widget-layout="horizontal"] .hero-value { font-size: 2.4rem; }
:root[data-widget-layout="horizontal"] .speed-segments button { height: .68rem; }
:root[data-widget-layout="horizontal"] .scale-labels,
:root[data-widget-layout="horizontal"] .temperature-labels { margin-top: .2rem; font-size: .52rem; }
:root[data-widget-layout="horizontal"] .temperature-range { height: 1.05rem; }
:root[data-widget-layout="horizontal"] .temperature-range::-webkit-slider-runnable-track { height: .55rem; }
:root[data-widget-layout="horizontal"] .temperature-range::-moz-range-track { height: .55rem; }
:root[data-widget-layout="horizontal"] .temperature-range::-webkit-slider-thumb { width: 1.32rem; height: 1.32rem; margin-top: -.4rem; border-width: .21rem; }
:root[data-widget-layout="horizontal"] .temperature-range::-moz-range-thumb { width: .9rem; height: .9rem; border-width: .21rem; }
:root[data-widget-layout="horizontal"] .switch-grid { display: contents; }
:root[data-widget-layout="horizontal"] .switch-grid > * { z-index: 1; }
:root[data-widget-layout="horizontal"] .power-card { grid-area: power; }
:root[data-widget-layout="horizontal"] .heater-card { grid-area: heater; }
:root[data-widget-layout="horizontal"] .switch-card {
min-height: 8.75rem;
gap: .45rem;
padding: .66rem .68rem .58rem;
}
:root[data-widget-layout="horizontal"] .switch-title { gap: .4rem; }
:root[data-widget-layout="horizontal"] .switch-title small { font-size: .52rem; }
:root[data-widget-layout="horizontal"] .switch-icon { width: 1.5rem; height: 1.5rem; }
:root[data-widget-layout="horizontal"] .glass-switch { min-height: 2.7rem; border-radius: .78rem; font-size: 1.05rem; }
:root[data-widget-layout="horizontal"] .info-card { padding: .62rem .68rem; }
:root[data-widget-layout="horizontal"] .section-icon { width: 1.5rem; height: 1.5rem; }
:root[data-widget-layout="horizontal"] .open-section { width: 1.75rem; height: 1.75rem; border-radius: .58rem; font-size: .82rem; }
:root[data-widget-layout="horizontal"] .air-card {
grid-area: air;
display: grid;
grid-template-columns: minmax(0, 1.55fr) minmax(10.8rem, .82fr);
grid-template-rows: auto auto auto auto;
column-gap: .72rem;
align-content: start;
}
:root[data-widget-layout="horizontal"] .air-card .section-title { grid-column: 1 / -1; grid-row: 1; }
:root[data-widget-layout="horizontal"] .air-card .co2-summary {
grid-column: 1;
grid-row: 2;
margin: .42rem .05rem .3rem;
}
:root[data-widget-layout="horizontal"] .air-card .co2-meter { grid-column: 1; grid-row: 3; }
:root[data-widget-layout="horizontal"] .air-card .meter-labels { grid-column: 1; grid-row: 4; }
:root[data-widget-layout="horizontal"] .air-card .mini-metrics {
grid-column: 2;
grid-row: 2 / 5;
align-self: stretch;
gap: .38rem;
margin-top: .4rem;
}
:root[data-widget-layout="horizontal"] .air-card .mini-metric {
min-height: 0;
flex-direction: column;
gap: .14rem;
padding: .35rem .25rem;
border-radius: .72rem;
}
:root[data-widget-layout="horizontal"] .air-card .metric-icon { width: 1.25rem; height: 1.25rem; }
:root[data-widget-layout="horizontal"] .air-card .mini-metric small { font-size: .51rem; }
:root[data-widget-layout="horizontal"] .air-card .mini-metric strong { margin-top: .1rem; font-size: 1.08rem; }
:root[data-widget-layout="horizontal"] .air-card .co2-summary strong { font-size: 1.65rem; }
:root[data-widget-layout="horizontal"] .air-card .quality-chip { padding: .25rem .48rem; font-size: .54rem; }
:root[data-widget-layout="horizontal"] .co2-meter { height: .62rem; }
:root[data-widget-layout="horizontal"] .schedule-card { grid-area: schedule; }
:root[data-widget-layout="horizontal"] .air-card,
:root[data-widget-layout="horizontal"] .schedule-card { min-height: 6.9rem; }
:root[data-widget-layout="horizontal"] .schedule-times {
gap: .5rem;
margin-top: .42rem;
padding: .08rem .18rem .12rem;
}
:root[data-widget-layout="horizontal"] .schedule-times small { font-size: .53rem; }
:root[data-widget-layout="horizontal"] .schedule-times strong { font-size: 1.18rem; }
:root[data-widget-layout="horizontal"] .schedule-times > i { height: 2.2rem; }
:root[data-widget-layout="horizontal"] .open-panel {
grid-area: open;
min-height: 2.45rem;
gap: .5rem;
padding: .38rem .75rem;
border-radius: .82rem;
font-size: .68rem;
}
:root[data-widget-layout="horizontal"] .open-panel svg { width: 1.15rem; height: 1.15rem; }
:root[data-widget-layout="horizontal"] .open-panel b { font-size: .85rem; }
:root[data-widget-layout="horizontal"] .demo-note { grid-area: demo; }
button:disabled { opacity: .58; cursor: default; transform: none !important; }
@media (min-width: 560px) and (min-height: 900px) {
html { font-size: 17px; }
:root[data-widget-layout="vertical"] .widget { width: min(100%, 33rem); }
}
@media (max-width: 380px) {
body { padding: .36rem; }
.widget { padding: .55rem; gap: .52rem; border-radius: 1.2rem; }
.brand-icon { width: 2.55rem; height: 2.55rem; }
.identity h1 { font-size: 1.38rem; }
.title-row { gap: .38rem; }
.widget .pill { padding-inline: .46rem; font-size: .54rem; }
.hero-control { grid-template-columns: 3.15rem 1fr 3.15rem; gap: .55rem; }
.hero-step { width: 3.15rem; height: 3.15rem; }
.hero-value { font-size: 2.65rem; }
.switch-grid { gap: .5rem; }
.switch-card { padding: .7rem; }
.switch-title { align-items: flex-start; }
.switch-title small { display: none; }
.co2-summary { grid-template-columns: auto 1fr; }
.co2-summary .quality-chip { grid-column: 1 / -1; justify-self: center; }
}
@media (prefers-reduced-motion: reduce) {
.hero-step:hover, .theme-button:hover, .open-section:hover, .glass-switch:hover, .open-panel:hover { transform: none; }
}
+293
View File
@@ -0,0 +1,293 @@
:root {
color-scheme: light;
--page: #dcecf2;
--page-deep: #b7d4df;
--glass: rgba(244, 251, 253, 0.58);
--glass-strong: rgba(248, 253, 255, 0.76);
--glass-soft: rgba(255, 255, 255, 0.34);
--line: rgba(255, 255, 255, 0.72);
--line-soft: rgba(63, 104, 121, 0.14);
--text: #17313e;
--muted: #617b87;
--faint: #8ca0a9;
--blue: #198ed1;
--blue-deep: #096ca7;
--blue-soft: rgba(25, 142, 209, 0.14);
--green: #20a66a;
--green-soft: rgba(32, 166, 106, 0.14);
--orange: #e98a2c;
--orange-soft: rgba(233, 138, 44, 0.16);
--red: #d95665;
--red-soft: rgba(217, 86, 101, 0.14);
--yellow: #d7a823;
--shadow: 0 24px 70px rgba(42, 86, 105, 0.2), 0 2px 10px rgba(43, 82, 98, 0.08);
--shadow-soft: 0 10px 32px rgba(39, 80, 96, 0.12);
--radius-xl: 28px;
--radius-lg: 21px;
--radius-md: 16px;
--blur: 26px;
font-family: Inter, ui-sans-serif, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
}
:root[data-theme="dark"] {
color-scheme: dark;
--page: #0d161d;
--page-deep: #172b39;
--glass: rgba(24, 38, 49, 0.68);
--glass-strong: rgba(28, 44, 56, 0.86);
--glass-soft: rgba(255, 255, 255, 0.045);
--line: rgba(193, 226, 240, 0.16);
--line-soft: rgba(188, 220, 234, 0.1);
--text: #eff8fb;
--muted: #9cb4bf;
--faint: #6e8793;
--blue: #56b9f0;
--blue-deep: #178ccf;
--blue-soft: rgba(69, 168, 225, 0.14);
--green: #52d394;
--green-soft: rgba(48, 193, 119, 0.14);
--orange: #f2a24c;
--orange-soft: rgba(242, 162, 76, 0.15);
--red: #ff7280;
--red-soft: rgba(255, 99, 116, 0.14);
--yellow: #f2c84b;
--shadow: 0 28px 80px rgba(0, 0, 0, 0.36), 0 2px 12px rgba(0, 0, 0, 0.28);
--shadow-soft: 0 12px 34px rgba(0, 0, 0, 0.22);
}
* { box-sizing: border-box; }
html, body { min-height: 100%; }
body {
margin: 0;
color: var(--text);
background:
radial-gradient(circle at 10% 5%, rgba(64, 176, 219, 0.32), transparent 32rem),
radial-gradient(circle at 88% 16%, rgba(73, 144, 225, 0.23), transparent 29rem),
radial-gradient(circle at 58% 92%, rgba(75, 191, 171, 0.2), transparent 32rem),
linear-gradient(145deg, var(--page), var(--page-deep));
background-attachment: fixed;
-webkit-font-smoothing: antialiased;
}
button, input { font: inherit; }
button { color: inherit; }
.ambient {
position: fixed;
inset: 0;
z-index: -1;
overflow: hidden;
pointer-events: none;
}
.ambient::before,
.ambient::after {
content: "";
position: absolute;
width: 28rem;
height: 28rem;
border-radius: 50%;
filter: blur(34px);
opacity: 0.34;
}
.ambient::before { left: -10rem; top: -12rem; background: #62d7e3; }
.ambient::after { right: -12rem; bottom: -15rem; background: #58a0ef; }
.glass {
background: linear-gradient(145deg, var(--glass-strong), var(--glass));
border: 1px solid var(--line);
box-shadow: var(--shadow);
backdrop-filter: blur(var(--blur)) saturate(135%);
-webkit-backdrop-filter: blur(var(--blur)) saturate(135%);
}
.glass-inner {
background: linear-gradient(145deg, var(--glass-soft), rgba(255,255,255,0.015));
border: 1px solid var(--line-soft);
box-shadow: inset 0 1px 0 rgba(255,255,255,0.08), var(--shadow-soft);
}
.eyebrow {
color: var(--muted);
font-size: 0.69rem;
font-weight: 750;
letter-spacing: 0.12em;
text-transform: uppercase;
}
.brand { display: flex; align-items: center; gap: 0.78rem; min-width: 0; }
.brand-mark {
display: grid;
place-items: center;
width: 2.65rem;
height: 2.65rem;
flex: 0 0 auto;
border-radius: 0.9rem;
color: white;
background: linear-gradient(145deg, #45b9ed, #147cba);
box-shadow: 0 8px 20px rgba(18, 126, 184, 0.26), inset 0 1px 0 rgba(255,255,255,0.35);
}
.brand-mark svg { width: 1.42rem; height: 1.42rem; }
.brand-copy { min-width: 0; }
.brand-title { margin: 0; font-size: 1.05rem; line-height: 1.15; letter-spacing: -0.015em; }
.brand-subtitle { margin: 0.18rem 0 0; color: var(--muted); font-size: 0.72rem; }
.pill {
display: inline-flex;
align-items: center;
justify-content: center;
gap: 0.43rem;
min-height: 1.75rem;
padding: 0.3rem 0.66rem;
border: 1px solid transparent;
border-radius: 999px;
font-size: 0.68rem;
font-weight: 800;
letter-spacing: 0.055em;
white-space: nowrap;
text-transform: uppercase;
}
.pill::before { content: ""; width: 0.43rem; height: 0.43rem; border-radius: 50%; background: currentColor; box-shadow: 0 0 0 4px currentColor; opacity: 0.9; }
.pill.good { color: var(--green); background: var(--green-soft); border-color: color-mix(in srgb, var(--green) 24%, transparent); }
.pill.info { color: var(--blue); background: var(--blue-soft); border-color: color-mix(in srgb, var(--blue) 22%, transparent); }
.pill.warn { color: var(--orange); background: var(--orange-soft); border-color: color-mix(in srgb, var(--orange) 24%, transparent); }
.pill.bad { color: var(--red); background: var(--red-soft); border-color: color-mix(in srgb, var(--red) 24%, transparent); }
.pill.muted { color: var(--muted); background: var(--glass-soft); border-color: var(--line-soft); }
.pill.no-dot::before { display: none; }
.icon-button, .soft-button, .primary-button, .step-button, .toggle, .segment {
border: 0;
cursor: pointer;
transition: transform 150ms ease, background 150ms ease, border-color 150ms ease, opacity 150ms ease, box-shadow 150ms ease;
}
.icon-button:hover, .soft-button:hover, .primary-button:hover, .step-button:hover, .toggle:hover, .segment:hover { transform: translateY(-1px); }
.icon-button:active, .soft-button:active, .primary-button:active, .step-button:active, .toggle:active, .segment:active { transform: translateY(0) scale(0.98); }
button:focus-visible, input:focus-visible { outline: 3px solid color-mix(in srgb, var(--blue) 32%, transparent); outline-offset: 2px; }
button:disabled { cursor: wait; opacity: 0.55; transform: none !important; }
.icon-button {
display: grid;
place-items: center;
width: 2.45rem;
height: 2.45rem;
border: 1px solid var(--line-soft);
border-radius: 0.82rem;
background: var(--glass-soft);
}
.icon-button svg { width: 1.12rem; height: 1.12rem; }
.soft-button, .primary-button {
min-height: 2.55rem;
padding: 0.65rem 1rem;
border-radius: 0.88rem;
font-size: 0.77rem;
font-weight: 750;
}
.soft-button { color: var(--text); background: var(--glass-soft); border: 1px solid var(--line-soft); }
.primary-button { color: white; background: linear-gradient(145deg, #35aae3, #157dbb); box-shadow: 0 9px 24px rgba(14, 119, 177, 0.25); }
.soft-button.danger { color: var(--red); background: var(--red-soft); border-color: color-mix(in srgb, var(--red) 22%, transparent); }
.stepper { display: flex; align-items: center; justify-content: center; gap: 0.5rem; }
.step-button {
display: grid;
place-items: center;
width: 2.28rem;
height: 2.28rem;
border-radius: 0.78rem;
color: var(--blue);
background: var(--blue-soft);
border: 1px solid color-mix(in srgb, var(--blue) 22%, transparent);
font-size: 1.25rem;
font-weight: 500;
line-height: 1;
}
.toggle {
display: inline-flex;
align-items: center;
justify-content: space-between;
gap: 0.65rem;
min-width: 5.5rem;
padding: 0.48rem 0.58rem 0.48rem 0.7rem;
border: 1px solid var(--line-soft);
border-radius: 999px;
background: var(--glass-soft);
font-size: 0.68rem;
font-weight: 800;
letter-spacing: 0.04em;
}
.toggle::after {
content: "";
width: 1.5rem;
height: 1.5rem;
border-radius: 50%;
background: var(--faint);
box-shadow: inset 0 1px 0 rgba(255,255,255,0.3);
}
.toggle[aria-pressed="true"] { color: var(--green); background: var(--green-soft); border-color: color-mix(in srgb, var(--green) 26%, transparent); }
.toggle[aria-pressed="true"]::after { background: var(--green); box-shadow: 0 0 14px color-mix(in srgb, var(--green) 52%, transparent); }
.toggle.orange[aria-pressed="true"] { color: var(--orange); background: var(--orange-soft); border-color: color-mix(in srgb, var(--orange) 28%, transparent); }
.toggle.orange[aria-pressed="true"]::after { background: var(--orange); box-shadow: 0 0 14px color-mix(in srgb, var(--orange) 48%, transparent); }
.value { font-variant-numeric: tabular-nums; }
.muted { color: var(--muted); }
.range {
--progress: 50%;
width: 100%;
height: 1.35rem;
margin: 0;
appearance: none;
background: transparent;
cursor: pointer;
}
.range::-webkit-slider-runnable-track {
height: 0.42rem;
border-radius: 99px;
background: linear-gradient(90deg, var(--blue) var(--progress), var(--line-soft) var(--progress));
}
.range::-moz-range-track { height: 0.42rem; border-radius: 99px; background: var(--line-soft); }
.range::-moz-range-progress { height: 0.42rem; border-radius: 99px; background: var(--blue); }
.range::-webkit-slider-thumb {
width: 1.35rem;
height: 1.35rem;
margin-top: -0.465rem;
appearance: none;
border: 0.26rem solid var(--glass-strong);
border-radius: 50%;
background: var(--blue);
box-shadow: 0 3px 12px rgba(14, 118, 177, 0.36);
}
.range::-moz-range-thumb {
width: 0.92rem;
height: 0.92rem;
border: 0.25rem solid var(--glass-strong);
border-radius: 50%;
background: var(--blue);
box-shadow: 0 3px 12px rgba(14, 118, 177, 0.36);
}
.toast-region { position: fixed; right: 1rem; bottom: 1rem; z-index: 50; display: grid; gap: 0.55rem; }
.toast {
max-width: min(23rem, calc(100vw - 2rem));
padding: 0.78rem 1rem;
border: 1px solid var(--line);
border-radius: 0.9rem;
background: var(--glass-strong);
box-shadow: var(--shadow-soft);
backdrop-filter: blur(18px);
font-size: 0.78rem;
animation: toast-in 180ms ease both;
}
.toast.error { color: var(--red); border-color: color-mix(in srgb, var(--red) 28%, transparent); }
@keyframes toast-in { from { transform: translateY(0.55rem); opacity: 0; } }
.skeleton { color: transparent !important; border-radius: 0.4rem; background: linear-gradient(100deg, var(--line-soft) 35%, var(--glass-soft) 50%, var(--line-soft) 65%); background-size: 200% 100%; animation: shimmer 1.3s infinite; }
@keyframes shimmer { to { background-position-x: -200%; } }
@media (prefers-reduced-motion: reduce) {
*, *::before, *::after { scroll-behavior: auto !important; animation-duration: 0.01ms !important; animation-iteration-count: 1 !important; transition-duration: 0.01ms !important; }
}
+109
View File
@@ -0,0 +1,109 @@
/* Elica-specific layout only.
IMPORTANT: body/.widget backgrounds are intentionally NOT overridden here.
Both Tion and Elica receive the exact same material from aeroglass-widget.css. */
.hood-icon svg { width: 1.75rem; height: 1.75rem; filter: drop-shadow(0 0 5px rgba(20,123,213,.18)); }
.exhaust-widget-speed { min-height: 12.2rem; }
.exhaust-widget-hero { grid-template-columns: 3.1rem 1fr 3.1rem; }
.hero-spacer { width: 3.1rem; height: 3.1rem; }
.exhaust-widget-segments { grid-template-columns: repeat(4, 1fr); }
.exhaust-widget-labels { grid-template-columns: repeat(4, 1fr); }
.external-fan-card { position: relative; overflow: hidden; }
.external-fan-card::after {
content: "";
position: absolute;
z-index: 0;
width: 10rem;
height: 10rem;
right: -4.4rem;
bottom: -5.4rem;
border-radius: 50%;
background: var(--blue-halo);
opacity: .16;
filter: blur(34px);
pointer-events: none;
}
.external-fan-card > * { position: relative; z-index: 1; }
.external-fan-card[data-on="true"] .fan-glyph { animation: exhaust-widget-spin 1.35s linear infinite; }
@keyframes exhaust-widget-spin { to { transform: rotate(360deg); } }
.exhaust-actions { display: grid; gap: .55rem; }
.exhaust-action-row { display: flex; align-items: center; justify-content: space-between; gap: .65rem; }
.exhaust-action-copy { min-width: 0; display: flex; align-items: center; gap: .55rem; }
.exhaust-action-copy > span { min-width: 0; display: grid; gap: .08rem; }
.exhaust-action-copy b { font-size: .78rem; }
.exhaust-action-copy small { color: var(--widget-muted); font-size: .58rem; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
.exhaust-action-copy .section-icon, .bulb-icon { width: 1.55rem; height: 1.55rem; flex: 0 0 auto; }
.bulb-icon { color: #d59d17; filter: drop-shadow(0 0 5px rgba(213,157,23,.15)); }
.exhaust-divider { display: block; width: 100%; height: 1px; background: linear-gradient(90deg, transparent, var(--tile-edge-soft) 12%, var(--tile-edge-soft) 88%, transparent); }
.glass-switch.compact { width: 5.1rem; min-height: 2.45rem; font-size: .78rem; }
.glass-action {
min-height: 2.45rem;
padding: .5rem .68rem;
flex: 0 0 auto;
border: 1px solid var(--tile-edge);
border-radius: .76rem;
color: var(--widget-ink);
background: radial-gradient(circle at 20% -30%, rgba(255,255,255,.46), transparent 48%), linear-gradient(145deg, var(--tile-strong), var(--tile));
box-shadow: var(--tile-shadow);
cursor: pointer;
font-size: .61rem;
font-weight: 760;
backdrop-filter: blur(14px);
-webkit-backdrop-filter: blur(14px);
transition: transform .15s ease, filter .15s ease;
}
.glass-action:hover { transform: translateY(-1px); filter: brightness(1.05); }
.glass-action:active { transform: scale(.98); }
:root[data-theme="dark"] .glass-action { border-color: rgba(193,228,245,.22); background: radial-gradient(circle at 20% -30%, rgba(208,243,255,.09), transparent 48%), linear-gradient(145deg, rgba(77,112,133,.21), rgba(20,44,59,.26)); }
.exhaust-widget .open-panel svg { width: 1.45rem; height: 1.45rem; }
:root[data-widget-layout="horizontal"] .exhaust-widget {
width: min(100%, 64rem);
grid-template-columns: minmax(0, 1.45fr) minmax(14rem, .92fr) minmax(15rem, .86fr);
grid-template-areas:
"header header header"
"speed switches actions"
"open open open";
}
:root[data-widget-layout="horizontal"] .exhaust-widget-header { grid-area: header; }
:root[data-widget-layout="horizontal"] .exhaust-widget-speed { grid-area: speed; min-height: 8.8rem; }
:root[data-widget-layout="horizontal"] .exhaust-switch-grid {
grid-area: switches;
min-width: 0;
display: grid !important;
grid-template-columns: 1fr;
grid-template-rows: repeat(2, minmax(0, 1fr));
gap: .48rem;
align-content: stretch;
}
:root[data-widget-layout="horizontal"] .exhaust-switch-grid > .switch-card {
grid-area: auto !important;
min-width: 0;
min-height: 4.15rem;
padding: .55rem .62rem;
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
align-items: center;
gap: .45rem;
}
:root[data-widget-layout="horizontal"] .exhaust-switch-grid .switch-title,
:root[data-widget-layout="horizontal"] .exhaust-switch-grid .switch-title > span { min-width: 0; }
:root[data-widget-layout="horizontal"] .exhaust-switch-grid .glass-switch { min-height: 2.45rem; width: 4.7rem; }
:root[data-widget-layout="horizontal"] .exhaust-actions { grid-area: actions; align-content: center; padding: .62rem .68rem; }
:root[data-widget-layout="horizontal"] .exhaust-action-copy small { max-width: 8.5rem; }
:root[data-widget-layout="horizontal"] .open-panel { grid-area: open; }
:root[data-widget-layout="horizontal"] .exhaust-widget-hero { margin: .45rem 0 .35rem; }
@media (max-width: 799px) {
:root[data-widget-layout="vertical"] .exhaust-widget { width: min(100%, 31.5rem); }
}
@media (max-width: 420px) {
.exhaust-action-copy small { max-width: 10rem; }
.glass-action { padding-inline: .55rem; }
}
+161
View File
@@ -0,0 +1,161 @@
/* Elica uses the same aeroglass material system as the Tion panel.
This file only defines the Elica-specific layout and controls. */
.exhaust-panel {
width: min(100%, 78rem);
min-height: auto;
display: grid;
gap: .75rem;
}
.exhaust-header { padding-bottom: .25rem; }
.exhaust-identity { min-width: 0; }
.exhaust-identity .identity-copy { min-width: 0; }
.exhaust-identity .title-row { display: flex; align-items: center; gap: .6rem; flex-wrap: wrap; }
.exhaust-identity .identity-copy > small { display: block; margin-top: .28rem; color: var(--panel-muted); font-size: .7rem; }
.hood-mark {
width: 3.25rem;
height: 3.25rem;
padding: .68rem;
display: grid;
place-items: center;
flex: 0 0 auto;
border-radius: 1rem;
color: #147bd5;
}
.hood-mark svg { width: 100%; height: 100%; filter: drop-shadow(0 0 6px rgba(20,123,213,.2)); }
.exhaust-badge { min-width: 19rem; }
.exhaust-badge svg { width: 2.25rem; height: 2.25rem; }
.panel-link { text-decoration: none; }
.exhaust-primary {
display: grid;
grid-template-columns: minmax(19rem, 1.42fr) repeat(2, minmax(13rem, .82fr));
grid-template-areas:
"speed power fan"
"speed action action";
gap: .75rem;
}
.exhaust-speed-card { grid-area: speed; min-height: 20rem; }
.exhaust-switch-card { min-height: 9.6rem; }
.power-card { grid-area: power; }
.exhaust-fan-card { grid-area: fan; }
.exhaust-action-card { grid-area: action; min-height: 9.6rem; justify-content: center; gap: .75rem; }
.exhaust-hero-control {
grid-template-columns: 3rem 1fr 3rem;
margin: auto 0 .9rem;
}
.hero-spacer { width: 3rem; height: 3rem; }
.exhaust-speed-segments { grid-template-columns: repeat(4, 1fr); gap: .2rem; }
.exhaust-speed-labels { grid-template-columns: repeat(4, 1fr); }
.exhaust-speed-segments button.active { transform: translateY(-1px); }
.exhaust-fan-card::after {
content: "";
position: absolute;
z-index: 0;
width: 13rem;
height: 13rem;
right: -5rem;
bottom: -7rem;
border-radius: 50%;
pointer-events: none;
filter: blur(44px);
background: var(--blue-halo);
opacity: .17;
}
.exhaust-fan-card > * { position: relative; z-index: 1; }
.exhaust-fan-card[data-on="true"] .fan-glyph { animation: exhaust-fan-spin 1.35s linear infinite; }
@keyframes exhaust-fan-spin { to { transform: rotate(360deg); } }
.action-row { display: flex; align-items: center; justify-content: space-between; gap: .9rem; }
.action-copy { display: flex; align-items: center; gap: .7rem; min-width: 0; }
.action-copy h2 { margin: 0; font-size: 1rem; line-height: 1.2; }
.action-copy p { margin: .18rem 0 0; color: var(--panel-muted); font-size: .68rem; line-height: 1.35; }
.bulb-icon { width: 2.1rem; height: 2.1rem; padding: .16rem; flex: 0 0 auto; color: #d59d17; filter: drop-shadow(0 0 6px rgba(213,157,23,.18)); }
.glass-divider { height: 1px; background: linear-gradient(90deg, transparent, var(--tile-line-soft) 12%, var(--tile-line-soft) 88%, transparent); }
.compact-switch {
width: 6.2rem;
min-height: 3.25rem;
flex: 0 0 auto;
font-size: 1.05rem;
}
.aero-button {
min-height: 3rem;
padding: .65rem .95rem;
flex: 0 0 auto;
border: 1px solid var(--tile-line);
border-radius: .9rem;
color: var(--panel-ink);
background:
radial-gradient(circle at 20% -25%, rgba(255,255,255,.48), transparent 48%),
linear-gradient(145deg, var(--tile-strong), var(--tile));
box-shadow: var(--tile-shadow);
backdrop-filter: blur(14px) saturate(122%);
-webkit-backdrop-filter: blur(14px) saturate(122%);
cursor: pointer;
font-size: .72rem;
font-weight: 760;
transition: transform .15s ease, filter .15s ease, box-shadow .15s ease;
}
.aero-button:hover { transform: translateY(-1px); filter: brightness(1.05); }
.aero-button:active { transform: scale(.98); }
:root[data-theme="dark"] .aero-button { border-color: rgba(193,228,245,.24); background: radial-gradient(circle at 20% -25%, rgba(208,243,255,.1), transparent 48%), linear-gradient(145deg, rgba(77,112,133,.22), rgba(20,44,59,.27)); }
.exhaust-status-section { margin-top: 0; }
.status-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: .55rem; }
.status-item { min-height: 5rem; padding: .75rem .85rem; border-radius: .85rem; display: grid; align-content: center; gap: .25rem; }
.status-item span { color: var(--panel-muted); font-size: .58rem; text-transform: uppercase; letter-spacing: .07em; font-weight: 800; }
.status-item strong { font-size: .78rem; }
.status-item strong.good { color: #0a8a50; }
.status-item strong.warn { color: #bc6b16; }
.status-item strong.bad { color: #bd4050; }
:root[data-theme="dark"] .status-item strong.good { color: #7de5ad; }
:root[data-theme="dark"] .status-item strong.warn { color: #ffc078; }
:root[data-theme="dark"] .status-item strong.bad { color: #ff98a2; }
.diagnostic-note { margin: .6rem .25rem .05rem; color: var(--panel-muted); font-size: .63rem; }
.pending { opacity: .72; }
button:disabled { cursor: wait; }
@media (max-width: 980px) {
.exhaust-badge { display: none; }
.exhaust-primary {
grid-template-columns: repeat(2, minmax(0, 1fr));
grid-template-areas:
"speed speed"
"power fan"
"action action";
}
.exhaust-speed-card { min-height: 16rem; }
}
@media (max-width: 640px) {
.exhaust-panel { gap: .6rem; }
.exhaust-header { align-items: flex-start; }
.exhaust-identity .identity-copy > small { display: none; }
.hood-mark { width: 2.8rem; height: 2.8rem; border-radius: .9rem; }
.exhaust-primary {
grid-template-columns: 1fr;
grid-template-areas: "speed" "power" "fan" "action";
}
.exhaust-speed-card { min-height: 14.5rem; }
.exhaust-switch-card { min-height: 8.2rem; }
.status-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); }
.action-row { gap: .55rem; }
.action-copy p { font-size: .62rem; }
}
@media (max-width: 430px) {
.header-tools { gap: .35rem; }
.panel-link { display: none; }
.exhaust-speed-card, .exhaust-switch-card, .exhaust-action-card { padding: .8rem; }
.compact-switch { width: 5.35rem; min-height: 2.8rem; }
.aero-button { padding-inline: .7rem; }
}
+85
View File
@@ -0,0 +1,85 @@
<!doctype html>
<html lang="ru">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="color-scheme" content="light dark">
<title>Elica — виджет</title>
<link rel="stylesheet" href="/ui/static/css/base.css?v=20260927-1">
<link rel="stylesheet" href="/ui/static/css/aeroglass-widget.css?v=20260927-1">
<link rel="stylesheet" href="/ui/static/css/elica-widget.css?v=20260927-1">
</head>
<body>
<div class="ambient" aria-hidden="true"></div>
<main class="widget exhaust-widget" aria-live="polite">
<header class="widget-header exhaust-widget-header">
<div class="identity">
<span class="brand-icon hood-icon" aria-hidden="true">
<svg viewBox="0 0 24 24" fill="none"><path d="M5 4h14M8 4v5l-3 4h14l-3-4V4M9 17c0 1.3-1 2-1 3M12 17c0 1.3-1 2-1 3M15 17c0 1.3-1 2-1 3" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/></svg>
</span>
<span class="identity-copy">
<span class="title-row"><h1>Elica</h1><span id="connection" class="pill muted">Загрузка</span></span>
<small id="header-detail">Вытяжная вентиляция</small>
</span>
</div>
<button id="theme-button" class="theme-button" type="button" title="Сменить тему">
<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M12 3v2m0 14v2M3 12h2m14 0h2M5.64 5.64l1.42 1.42m9.88 9.88 1.42 1.42m0-12.72-1.42 1.42M7.06 16.94l-1.42 1.42" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/><circle cx="12" cy="12" r="4" stroke="currentColor" stroke-width="1.8"/></svg>
</button>
</header>
<section class="widget-tile control-card speed-card exhaust-widget-speed" aria-labelledby="speed-title">
<div class="card-title">
<svg class="ui-icon feature-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#fan"></use></svg>
<span><h2 id="speed-title">Скорость вытяжки</h2><p id="speed-note">Фактическая ступень Elica</p></span>
</div>
<div class="hero-control exhaust-widget-hero">
<span class="hero-spacer" aria-hidden="true"></span>
<strong id="speed" class="hero-value value skeleton">0</strong>
<span class="hero-spacer" aria-hidden="true"></span>
</div>
<div class="speed-segments exhaust-widget-segments" role="group" aria-label="Выбор скорости">
<button type="button" data-speed="1" aria-label="Скорость 1"></button>
<button type="button" data-speed="2" aria-label="Скорость 2"></button>
<button type="button" data-speed="3" aria-label="Скорость 3"></button>
<button type="button" data-speed="4" aria-label="Скорость 4"></button>
</div>
<div class="scale-labels exhaust-widget-labels" aria-hidden="true"><span>1</span><span>2</span><span>3</span><span>4</span></div>
</section>
<section class="switch-grid exhaust-switch-grid" aria-label="Управление вентиляцией">
<article class="widget-tile switch-card power-card">
<div class="switch-title">
<svg class="ui-icon switch-icon green" aria-hidden="true"><use href="/ui/static/assets/icons.svg#power"></use></svg>
<span><h2>Вытяжка</h2><small id="power-detail">Выключена</small></span>
</div>
<button id="power-toggle" class="glass-switch green" type="button" aria-pressed="false">OFF</button>
</article>
<article id="external-fan-card" class="widget-tile switch-card external-fan-card" data-on="false">
<div class="switch-title">
<svg class="ui-icon switch-icon fan-glyph" aria-hidden="true"><use href="/ui/static/assets/icons.svg#fan"></use></svg>
<span><h2>Внешний</h2><small id="external-fan-detail">OUT5 · NC</small></span>
</div>
<button id="external-fan-toggle" class="glass-switch green" type="button" aria-pressed="false">OFF</button>
</article>
</section>
<section class="widget-tile info-card exhaust-actions" aria-label="Таймер и свет">
<div class="exhaust-action-row">
<span class="exhaust-action-copy"><svg class="ui-icon section-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#clock"></use></svg><span><b>Таймер</b><small id="timer-detail">Выключен</small></span></span>
<button id="timer-toggle" class="glass-switch compact green" type="button" aria-pressed="false">OFF</button>
</div>
<i class="exhaust-divider" aria-hidden="true"></i>
<div class="exhaust-action-row">
<span class="exhaust-action-copy"><svg class="bulb-icon" viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M9 18h6M10 21h4M8.5 14.5A6 6 0 1 1 15.5 14.5c-.9.7-1.5 1.5-1.7 2.5h-3.6c-.2-1-.8-1.8-1.7-2.5Z" stroke="currentColor" stroke-width="1.7" stroke-linecap="round"/></svg><span><b>Подсветка</b><small>Импульсное управление</small></span></span>
<button id="light-toggle" class="glass-action" type="button">Переключить</button>
</div>
</section>
<button id="open-panel" class="open-panel" type="button">
<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M5 4h14M8 4v5l-3 4h14l-3-4V4" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/></svg>
<span>Открыть панель вытяжки</span><b aria-hidden="true">↗</b>
</button>
</main>
<script type="module" src="/ui/static/js/elica-widget.js?v=20260927-1"></script>
</body>
</html>
+118
View File
@@ -0,0 +1,118 @@
<!doctype html>
<html lang="ru">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="color-scheme" content="light dark">
<title>Elica — управление вытяжкой</title>
<link rel="stylesheet" href="/ui/static/css/base.css?v=20260927-1">
<link rel="stylesheet" href="/ui/static/css/aeroglass-panel.css?v=20260927-1">
<link rel="stylesheet" href="/ui/static/css/elica.css?v=20260927-1">
</head>
<body>
<div class="ambient" aria-hidden="true"></div>
<main class="climate-panel exhaust-panel" aria-live="polite">
<header class="panel-header exhaust-header">
<div class="identity exhaust-identity">
<span class="hood-mark glass-tile" aria-hidden="true">
<svg viewBox="0 0 24 24" fill="none">
<path d="M5 4h14M8 4v5l-3 4h14l-3-4V4M9 17c0 1.3-1 2-1 3M12 17c0 1.3-1 2-1 3M15 17c0 1.3-1 2-1 3" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"/>
</svg>
</span>
<span class="identity-copy">
<span class="title-row"><h1>Elica</h1><span id="connection" class="pill muted">Загрузка</span></span>
<small>Кухонная вытяжка и внешний вытяжной вентилятор</small>
</span>
</div>
<div class="header-tools">
<div class="ventilation-badge glass-tile exhaust-badge">
<svg class="ui-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#fan"></use></svg>
<span><strong>Вытяжная вентиляция</strong><small>Управление Elica и внешним вентилятором</small></span>
</div>
<a class="icon-button panel-link" href="/ui/tion" title="Открыть Tion 4S" aria-label="Открыть Tion 4S">
<svg class="ui-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#wind"></use></svg>
</a>
<button id="refresh-button" class="icon-button" type="button" title="Обновить данные">
<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M20 11a8 8 0 1 0-2.34 5.66M20 5v6h-6" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/></svg>
</button>
<button id="theme-button" class="icon-button" type="button" title="Сменить тему">
<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M12 3v2m0 14v2M3 12h2m14 0h2M5.64 5.64l1.42 1.42m9.88 9.88 1.42 1.42m0-12.72-1.42 1.42M7.06 16.94l-1.42 1.42" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/><circle cx="12" cy="12" r="4" stroke="currentColor" stroke-width="1.8"/></svg>
</button>
</div>
</header>
<section class="primary-controls exhaust-primary" aria-label="Основное управление">
<article class="control-card glass-tile speed-card exhaust-speed-card">
<div class="card-title">
<svg class="ui-icon feature-icon fan-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#fan"></use></svg>
<span><h2>Скорость вытяжки</h2><p id="speed-caption">Скорость определяется по индикаторам Elica</p></span>
</div>
<div class="hero-control exhaust-hero-control">
<span class="hero-spacer" aria-hidden="true"></span>
<strong id="speed-value" class="hero-value">—</strong>
<span class="hero-spacer" aria-hidden="true"></span>
</div>
<div class="speed-segments exhaust-speed-segments" role="group" aria-label="Выбор скорости">
<button type="button" data-speed="1" aria-label="Скорость 1"></button>
<button type="button" data-speed="2" aria-label="Скорость 2"></button>
<button type="button" data-speed="3" aria-label="Скорость 3"></button>
<button type="button" data-speed="4" aria-label="Скорость 4"></button>
</div>
<div class="speed-labels exhaust-speed-labels" aria-hidden="true"><span>1</span><span>2</span><span>3</span><span>4</span></div>
</article>
<article class="switch-card glass-tile power-card exhaust-switch-card">
<div class="card-title compact">
<svg class="ui-icon feature-icon green" aria-hidden="true"><use href="/ui/static/assets/icons.svg#power"></use></svg>
<span><h2>Питание</h2><p id="power-caption">Ожидаем состояние панели</p></span>
</div>
<button id="power-toggle" class="glass-switch green" type="button" aria-pressed="false">OFF</button>
</article>
<article id="external-fan-card" class="switch-card glass-tile exhaust-fan-card exhaust-switch-card" data-on="false">
<div class="card-title compact">
<svg class="ui-icon feature-icon fan-glyph" aria-hidden="true"><use href="/ui/static/assets/icons.svg#fan"></use></svg>
<span><h2>Внешний вентилятор</h2><p id="external-fan-caption">Ожидаем состояние OUT5</p></span>
</div>
<button id="external-fan-toggle" class="glass-switch green" type="button" aria-pressed="false">OFF</button>
</article>
<article class="control-card glass-tile action-card exhaust-action-card">
<div class="action-row">
<div class="action-copy">
<svg class="ui-icon feature-icon orange" aria-hidden="true"><use href="/ui/static/assets/icons.svg#clock"></use></svg>
<div><h2>Таймер</h2><p id="timer-caption">По миганию индикатора скорости</p></div>
</div>
<button id="timer-toggle" class="glass-switch orange compact-switch" type="button" aria-pressed="false">OFF</button>
</div>
<div class="glass-divider"></div>
<div class="action-row">
<div class="action-copy">
<svg class="bulb-icon" viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M9 18h6M10 21h4M8.5 14.5A6 6 0 1 1 15.5 14.5c-.9.7-1.5 1.5-1.7 2.5h-3.6c-.2-1-.8-1.8-1.7-2.5Z" stroke="currentColor" stroke-width="1.7" stroke-linecap="round"/></svg>
<div><h2>Подсветка</h2><p>Без обратной связи по состоянию</p></div>
</div>
<button id="light-toggle" class="aero-button" type="button">Переключить</button>
</div>
</article>
</section>
<section class="content-section glass-section exhaust-status-section" aria-labelledby="status-title">
<div class="section-title">
<div><svg class="ui-icon section-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#settings"></use></svg><h2 id="status-title">Связь с контроллером</h2></div>
<span id="updated-at" class="updated">—</span>
</div>
<div class="status-grid">
<article class="status-item glass-tile"><span>MQTT</span><strong id="mqtt-status">—</strong></article>
<article class="status-item glass-tile"><span>ESP32</span><strong id="device-status">—</strong></article>
<article class="status-item glass-tile"><span>Панель Elica</span><strong id="feedback-status">—</strong></article>
<article class="status-item glass-tile"><span>OUT5 физически</span><strong id="relay5-status">—</strong></article>
</div>
<p id="diagnostic-note" class="diagnostic-note">Получаем данные…</p>
</section>
</main>
<script type="module" src="/ui/static/js/elica.js?v=20260927-1"></script>
</body>
</html>
+305
View File
@@ -0,0 +1,305 @@
const query = new URLSearchParams(window.location.search);
export const isDemo = query.get("demo") === "1";
const demoState = {
online: true,
running: true,
last_seen: new Date().toISOString(),
last_error: null,
tion: {
power: true,
heater: true,
heating: false,
sound: true,
mode: "outside",
out_temp: 21,
in_temp: 20,
target_temp: 21,
fan_speed: 3,
filter_remain: 136.7,
device_time: "22:45",
request_error_code: 0,
model: "S4",
light: true,
},
auto: {
available: true,
state: "inactive",
reason: null,
target_speed: null,
auto_speed: null,
target_heater: null,
auto_heater: null,
temperature: 25.9,
temperature_source: "qingping",
last_error: null,
config_error: null,
},
qingping: {
online: true,
temperature: 25.9,
humidity: 69.4,
co2: 780,
pm25: 0,
pm10: 0,
battery: 100,
last_error: null,
},
schedule: {
available: true,
enabled: true,
running: true,
paused: false,
current_action: "set",
current_time: "22:45",
next_time: "10:00",
next_action: "set",
override_until_time: "10:00",
auto_active: false,
auto_fallback_speed: 2,
auto_target_temp: 21,
scheduled_settings: { speed: 2, target_temp: 21, heater: true },
override_active: true,
override_until: new Date(Date.now() + 8 * 3600_000).toISOString(),
override_settings: { speed: 3 },
last_error: null,
},
};
const demoScheduleConfig = {
version: 1,
enabled: true,
timezone: "local",
templates: {
workday: [
{ time: "07:30", action: { type: "set", power: true, speed: 3, heater: true, target_temp: 21 } },
{ time: "09:00", action: { type: "auto", speed: 2, target_temp: 21 } },
{ time: "22:45", action: { type: "set", speed: 1 } },
],
weekend: [
{ time: "09:30", action: { type: "set", power: true, speed: 3, heater: true, target_temp: 21 } },
{ time: "11:00", action: { type: "auto", speed: 2, target_temp: 21 } },
{ time: "23:00", action: { type: "set", speed: 1 } },
],
},
days: { mon: "workday", tue: "workday", wed: "workday", thu: "workday", fri: "workday", sat: "weekend", sun: "weekend" },
};
const copy = value => JSON.parse(JSON.stringify(value));
const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
function mutateDemo(path) {
const tion = demoState.tion;
const schedule = demoState.schedule;
let match;
if ((match = path.match(/^\/api\/tion\/speed\/(\d)$/))) {
tion.fan_speed = Number(match[1]);
schedule.override_active = true;
schedule.override_until_time ||= schedule.next_time;
schedule.override_settings.speed = tion.fan_speed;
} else if ((match = path.match(/^\/api\/tion\/temperature\/(\d+)$/))) {
tion.target_temp = Number(match[1]);
schedule.override_active = true;
schedule.override_until_time ||= schedule.next_time;
schedule.override_settings.target_temp = tion.target_temp;
} else if ((match = path.match(/^\/api\/tion\/(power|heater|sound|light)\/(on|off)$/))) {
tion[match[1]] = match[2] === "on";
schedule.override_active = true;
schedule.override_settings[match[1]] = tion[match[1]];
} else if ((match = path.match(/^\/api\/tion\/mode\/(outside|recirculation)$/))) {
tion.mode = match[1];
schedule.override_active = true;
schedule.override_settings.mode = match[1];
} else if (path === "/api/schedule/override/clear") {
schedule.override_active = false;
schedule.override_until = null;
schedule.override_until_time = null;
schedule.override_settings = {};
} else if (path === "/api/schedule/pause") {
schedule.paused = true;
schedule.override_active = false;
schedule.override_until_time = null;
} else if (path === "/api/schedule/resume") {
schedule.paused = false;
}
demoState.last_seen = new Date().toISOString();
}
async function request(path, options = {}) {
if (isDemo) {
await wait(options.method === "POST" ? 220 : 80);
if (path === "/api/schedule/config") {
if (options.method === "PUT") {
const replacement = JSON.parse(options.body);
Object.keys(demoScheduleConfig).forEach(key => delete demoScheduleConfig[key]);
Object.assign(demoScheduleConfig, replacement);
return { ok: true, config: copy(demoScheduleConfig) };
}
return copy(demoScheduleConfig);
}
if (options.method === "POST") mutateDemo(path);
return copy(demoState);
}
const response = await fetch(path, {
cache: "no-store",
headers: { Accept: "application/json" },
...options,
});
if (!response.ok) {
let message = `Ошибка ${response.status}`;
try {
const body = await response.json();
if (body.detail && typeof body.detail === "object") {
message = [body.detail.message, body.detail.error].filter(Boolean).join(": ") || message;
} else {
message = body.detail || body.message || message;
}
} catch (_) {}
throw new Error(typeof message === "string" ? message : JSON.stringify(message));
}
return response.json();
}
export const api = {
status: () => request("/api/status"),
post: path => request(path, { method: "POST" }),
scheduleConfig: () => request("/api/schedule/config"),
saveScheduleConfig: config => request("/api/schedule/config", {
method: "PUT",
headers: { Accept: "application/json", "Content-Type": "application/json" },
body: JSON.stringify(config),
}),
};
export function configureTheme(button) {
const allowed = ["auto", "light", "dark"];
const explicit = query.get("theme");
let mode = allowed.includes(explicit)
? explicit
: (localStorage.getItem("climate-theme") || localStorage.getItem("tion-theme") || "auto");
const apply = () => {
const dark = mode === "dark" || (mode === "auto" && matchMedia("(prefers-color-scheme: dark)").matches);
document.documentElement.dataset.theme = dark ? "dark" : "light";
document.documentElement.dataset.themeMode = mode;
if (button) {
button.title = `Тема: ${mode === "auto" ? "системная" : mode === "dark" ? "тёмная" : "светлая"}`;
button.setAttribute("aria-label", button.title);
}
};
apply();
matchMedia("(prefers-color-scheme: dark)").addEventListener("change", () => mode === "auto" && apply());
if (button) button.addEventListener("click", () => {
mode = allowed[(allowed.indexOf(mode) + 1) % allowed.length];
localStorage.setItem("climate-theme", mode);
apply();
});
return () => mode;
}
export function setRangeProgress(input) {
const min = Number(input.min);
const max = Number(input.max);
const value = Number(input.value);
input.style.setProperty("--progress", `${((value - min) / (max - min)) * 100}%`);
}
export function airQuality(co2) {
if (!Number.isFinite(Number(co2))) return { label: "Нет данных", tone: "muted", pct: 0 };
const value = Number(co2);
if (value < 700) return { label: "Отличный воздух", tone: "good", pct: value / 20 };
if (value < 900) return { label: "Хороший воздух", tone: "good", pct: value / 20 };
if (value < 1300) return { label: "Повышенный CO₂", tone: "warn", pct: value / 20 };
if (value < 1600) return { label: "Душно", tone: "warn", pct: value / 20 };
return { label: "Нужна вентиляция", tone: "bad", pct: Math.min(100, value / 20) };
}
const AIR_METER_STOPS = [
[400, [35, 143, 83]],
[700, [46, 166, 99]],
[820, [82, 181, 111]],
[900, [190, 153, 55]],
[1200, [214, 128, 45]],
[1500, [215, 83, 55]],
[2000, [188, 48, 72]],
];
const interpolateChannel = (start, end, amount) => Math.round(start + (end - start) * amount);
export function airMeterPalette(co2) {
const value = Number(co2);
if (!Number.isFinite(value)) {
return {
color: "rgb(105, 137, 158)",
glow: "rgba(83, 123, 150, .2)",
};
}
const bounded = Math.max(AIR_METER_STOPS[0][0], Math.min(AIR_METER_STOPS.at(-1)[0], value));
let lower = AIR_METER_STOPS[0];
let upper = AIR_METER_STOPS.at(-1);
for (let index = 1; index < AIR_METER_STOPS.length; index += 1) {
if (bounded <= AIR_METER_STOPS[index][0]) {
lower = AIR_METER_STOPS[index - 1];
upper = AIR_METER_STOPS[index];
break;
}
}
const amount = upper[0] === lower[0] ? 0 : (bounded - lower[0]) / (upper[0] - lower[0]);
const [red, green, blue] = lower[1].map((channel, index) => interpolateChannel(channel, upper[1][index], amount));
return {
color: `rgb(${red}, ${green}, ${blue})`,
glow: `rgba(${red}, ${green}, ${blue}, .26)`,
};
}
export function modeInfo(status) {
const schedule = status?.schedule || {};
if (!schedule.available) return { label: "Без расписания", detail: "Недоступно", tone: "muted" };
if (schedule.paused) return { label: "Ручной режим", detail: "Расписание на паузе", tone: "warn" };
if (schedule.override_active) return {
label: "Ручное управление",
detail: schedule.override_until_time ? `До ${schedule.override_until_time}` : "До следующей точки",
tone: "warn",
};
if (schedule.auto_active) return { label: "AUTO", detail: "По качеству воздуха", tone: "info" };
return { label: "Расписание", detail: "Активно", tone: "info" };
}
export const numberOrDash = (value, digits = 0) => {
const number = Number(value);
return Number.isFinite(number) ? number.toFixed(digits) : "—";
};
export function showToast(message, error = false) {
let region = document.querySelector(".toast-region");
if (!region) {
region = document.createElement("div");
region.className = "toast-region";
document.body.append(region);
}
const toast = document.createElement("div");
toast.className = `toast${error ? " error" : ""}`;
toast.textContent = message;
region.append(toast);
setTimeout(() => toast.remove(), 3200);
}
export function panelUrl(themeMode = "auto", hash = "") {
const url = new URL("/ui/tion", window.location.origin);
url.searchParams.set("theme", themeMode);
if (isDemo) url.searchParams.set("demo", "1");
url.hash = hash;
return url.toString();
}
+190
View File
@@ -0,0 +1,190 @@
import { configureTheme, showToast } from "./api.js";
const requestedLayout = new URLSearchParams(window.location.search).get("layout");
const layoutMode = ["horizontal", "vertical"].includes(requestedLayout) ? requestedLayout : null;
const wideLayout = window.matchMedia("(min-width: 800px)");
function applyLayout() {
document.documentElement.dataset.widgetLayout = layoutMode || (wideLayout.matches ? "horizontal" : "vertical");
}
applyLayout();
wideLayout.addEventListener("change", () => !layoutMode && applyLayout());
const $ = selector => document.querySelector(selector);
const $$ = selector => [...document.querySelectorAll(selector)];
const themeMode = configureTheme($("#theme-button"));
let state = null;
let busy = false;
let polling = false;
function setPill(label, tone) {
const element = $("#connection");
element.textContent = label;
element.className = `pill ${tone}`;
}
function drawToggle(selector, active, label = null) {
const button = $(selector);
const enabled = Boolean(active);
button.setAttribute("aria-pressed", String(enabled));
button.textContent = label || (enabled ? "ON" : "OFF");
}
function ready(status) {
return Boolean(status?.running && status?.mqtt_connected && status?.device_online);
}
function feedbackReady(status) {
return ready(status) && Boolean(status?.feedback_ready);
}
function drawSpeed(value) {
const speed = Math.max(0, Math.min(4, Number(value) || 0));
const output = $("#speed");
output.textContent = speed || "—";
output.classList.remove("skeleton");
$$('[data-speed]').forEach(button => {
const segment = Number(button.dataset.speed);
button.classList.toggle("active", speed > 0 && segment <= speed);
button.setAttribute("aria-pressed", String(segment === speed));
});
}
function render(status) {
state = status;
const elica = status?.elica || {};
const external = status?.external_fan || {};
const controllerOnline = ready(status);
const panelOnline = feedbackReady(status);
if (!status?.running) setPill("Сервис остановлен", "bad");
else if (!status?.mqtt_connected) setPill("MQTT нет связи", "bad");
else if (!status?.device_online) setPill("ESP32 offline", "bad");
else if (!status?.feedback_ready) setPill("Синхронизация", "warn");
else setPill("Online", "good");
$("#header-detail").textContent = elica.power
? `Вытяжка включена${elica.speed ? ` · скорость ${elica.speed}` : ""}`
: "Вытяжная вентиляция";
drawSpeed(elica.speed);
$("#speed-note").textContent = panelOnline
? (elica.power ? "Фактическая ступень по индикаторам Elica" : "Выбор скорости включит вытяжку")
: "Ждём синхронизацию панели Elica";
drawToggle("#power-toggle", elica.power);
$("#power-detail").textContent = elica.power ? "Включена" : "Выключена";
if (external.available && typeof external.on === "boolean") {
drawToggle("#external-fan-toggle", external.on);
$("#external-fan-card").dataset.on = String(external.on);
$("#external-fan-detail").textContent = external.on ? "Работает · NC замкнут" : "Остановлен · NC разомкнут";
} else {
drawToggle("#external-fan-toggle", false, "—");
$("#external-fan-card").dataset.on = "false";
$("#external-fan-detail").textContent = "Ждём OUT5";
}
drawToggle("#timer-toggle", elica.timer);
$("#timer-detail").textContent = elica.timer ? "Активен" : "Выключен";
const hoodDisabled = busy || !panelOnline;
$("#power-toggle").disabled = hoodDisabled;
$$('[data-speed]').forEach(button => { button.disabled = hoodDisabled; });
$("#timer-toggle").disabled = hoodDisabled;
$("#light-toggle").disabled = hoodDisabled;
$("#external-fan-toggle").disabled = busy || !controllerOnline || !external.available;
}
async function request(path, options = {}) {
const response = await fetch(path, {
cache: "no-store",
headers: { Accept: "application/json" },
...options,
});
if (!response.ok) {
let message = `Ошибка ${response.status}`;
try {
const body = await response.json();
if (body?.detail && typeof body.detail === "object") {
message = [body.detail.message, body.detail.error].filter(Boolean).join(": ") || message;
} else message = body?.detail || body?.message || message;
} catch (_) {}
throw new Error(String(message));
}
return response.json();
}
async function refresh(silent = false) {
if (polling) return;
polling = true;
try { render(await request("/api/elica/status")); }
catch (error) {
setPill("API недоступен", "bad");
if (!silent) showToast(error.message, true);
} finally { polling = false; }
}
async function act(path, source, optimistic = null) {
if (busy) return;
busy = true;
optimistic?.();
if (state) render(state);
source?.setAttribute("disabled", "");
try { render(await request(path, { method: "POST" })); }
catch (error) { showToast(error.message, true); await refresh(true); }
finally {
busy = false;
source?.removeAttribute("disabled");
if (state) render(state);
}
}
$("#power-toggle").addEventListener("click", event => {
const next = !Boolean(state?.elica?.power);
act(`/api/elica/power/${next ? "on" : "off"}`, event.currentTarget, () => {
if (state?.elica) state.elica.power = next;
drawToggle("#power-toggle", next);
});
});
$$('[data-speed]').forEach(button => button.addEventListener("click", () => {
const speed = Number(button.dataset.speed);
act(`/api/elica/speed/${speed}`, button, () => {
if (state?.elica) { state.elica.power = true; state.elica.speed = speed; }
drawSpeed(speed);
});
}));
$("#timer-toggle").addEventListener("click", event => {
const next = !Boolean(state?.elica?.timer);
act(`/api/elica/timer/${next ? "on" : "off"}`, event.currentTarget, () => {
if (state?.elica) state.elica.timer = next;
drawToggle("#timer-toggle", next);
});
});
$("#light-toggle").addEventListener("click", event => {
act("/api/elica/light/toggle", event.currentTarget);
});
$("#external-fan-toggle").addEventListener("click", event => {
const next = !Boolean(state?.external_fan?.on);
act(`/api/elica/external-fan/${next ? "on" : "off"}`, event.currentTarget, () => {
if (state?.external_fan) state.external_fan.on = next;
drawToggle("#external-fan-toggle", next);
$("#external-fan-card").dataset.on = String(next);
});
});
$("#open-panel").addEventListener("click", () => {
const url = new URL("/ui/elica", window.location.origin);
url.searchParams.set("theme", themeMode());
window.open(url.toString(), "_blank", "noopener");
});
document.addEventListener("visibilitychange", () => { if (!document.hidden) refresh(true); });
refresh();
setInterval(() => !document.hidden && !busy && refresh(true), 1500);
+241
View File
@@ -0,0 +1,241 @@
import { configureTheme, showToast } from "./api.js";
const $ = selector => document.querySelector(selector);
const $$ = selector => [...document.querySelectorAll(selector)];
const connection = $("#connection");
const powerToggle = $("#power-toggle");
const powerCaption = $("#power-caption");
const speedValue = $("#speed-value");
const speedCaption = $("#speed-caption");
const speedButtons = $$("[data-speed]");
const timerToggle = $("#timer-toggle");
const timerCaption = $("#timer-caption");
const lightToggle = $("#light-toggle");
const externalFanToggle = $("#external-fan-toggle");
const externalFanCaption = $("#external-fan-caption");
const externalFanCard = $("#external-fan-card");
const mqttStatus = $("#mqtt-status");
const deviceStatus = $("#device-status");
const feedbackStatus = $("#feedback-status");
const relay5Status = $("#relay5-status");
const diagnosticNote = $("#diagnostic-note");
const updatedAt = $("#updated-at");
const refreshButton = $("#refresh-button");
const themeButton = $("#theme-button");
configureTheme(themeButton);
let latest = null;
let polling = false;
let commandBusy = false;
let refreshTimer = null;
function setTextState(element, text, tone = "") {
element.textContent = text;
element.className = tone;
}
function setPill(text, tone) {
connection.textContent = text;
connection.className = `pill ${tone}`;
}
function setToggle(button, enabled, label = null) {
const isOn = Boolean(enabled);
button.setAttribute("aria-pressed", String(isOn));
const text = button.querySelector("span");
if (text) text.textContent = label || (isOn ? "ON" : "OFF");
else button.textContent = label || (isOn ? "ON" : "OFF");
}
function controllerReady(status) {
return Boolean(
status?.running &&
status?.mqtt_connected &&
status?.device_online
);
}
function hoodReady(status) {
return controllerReady(status) && Boolean(status?.feedback_ready);
}
function render(status) {
latest = status;
const logical = status?.elica || {};
const external = status?.external_fan || {};
const ready = controllerReady(status);
const feedbackReady = hoodReady(status);
if (!status?.running) setPill("Сервис остановлен", "bad");
else if (!status?.mqtt_connected) setPill("MQTT нет связи", "bad");
else if (!status?.device_online) setPill("ESP32 offline", "bad");
else if (!status?.feedback_ready) setPill("Синхронизация", "warn");
else setPill("Online", "good");
setToggle(powerToggle, logical.power);
powerCaption.textContent = logical.power
? `Включена${logical.speed ? ` · скорость ${logical.speed}` : ""}`
: "Вытяжка выключена";
const speed = Number(logical.speed) || 0;
speedValue.textContent = speed || "—";
speedButtons.forEach(button => {
button.classList.toggle("active", speed > 0 && Number(button.dataset.speed) <= speed);
});
speedCaption.textContent = feedbackReady
? (logical.power ? "Фактическая скорость по индикаторам Elica." : "При выборе скорости вытяжка включится автоматически.")
: "Ждём синхронизацию входов панели Elica.";
setToggle(timerToggle, logical.timer);
timerCaption.textContent = logical.timer
? "Таймер активен · индикатор скорости мигает"
: "Таймер выключен";
if (external.available && typeof external.on === "boolean") {
setToggle(externalFanToggle, external.on);
externalFanCard.dataset.on = String(external.on);
externalFanCaption.textContent = external.on
? "Включён · NC замкнут, OUT5 выключен"
: "Выключен · NC разомкнут, OUT5 включен";
} else {
setToggle(externalFanToggle, false, "—");
externalFanCard.dataset.on = "false";
externalFanCaption.textContent = "Ждём обратную связь OUT5";
}
setTextState(mqttStatus, status?.mqtt_connected ? "Подключён" : "Нет связи", status?.mqtt_connected ? "good" : "bad");
setTextState(deviceStatus, status?.device_online ? "Online" : "Offline", status?.device_online ? "good" : "bad");
setTextState(feedbackStatus, status?.feedback_ready ? "Синхронизирована" : "Ожидание", status?.feedback_ready ? "good" : "warn");
if (external.available) {
setTextState(relay5Status, external.relay_on ? "ON · NC открыт" : "OFF · NC закрыт", external.relay_on ? "warn" : "good");
} else {
setTextState(relay5Status, "Нет данных", "warn");
}
const missing = status?.missing_feedback_inputs || [];
diagnosticNote.textContent = missing.length
? `Не получены входы Elica: ${missing.join(", ")}.`
: "Состояния вытяжки подтверждаются по MQTT и физическим входам ESP32.";
const stamp = status?.last_message_at ? new Date(status.last_message_at) : new Date();
updatedAt.textContent = Number.isNaN(stamp.getTime())
? "—"
: `Обновлено ${stamp.toLocaleTimeString("ru-RU", { hour: "2-digit", minute: "2-digit", second: "2-digit" })}`;
const disableHood = commandBusy || !feedbackReady;
powerToggle.disabled = disableHood;
speedButtons.forEach(button => { button.disabled = disableHood; });
timerToggle.disabled = disableHood;
lightToggle.disabled = disableHood;
externalFanToggle.disabled = commandBusy || !ready || !external.available;
document.body.classList.toggle("pending", commandBusy);
}
async function request(path, options = {}) {
const response = await fetch(path, {
cache: "no-store",
headers: { Accept: "application/json" },
...options,
});
if (!response.ok) {
let message = `Ошибка ${response.status}`;
try {
const body = await response.json();
if (body?.detail && typeof body.detail === "object") {
message = [body.detail.message, body.detail.error].filter(Boolean).join(": ") || message;
} else {
message = body?.detail || body?.message || message;
}
} catch (_) {}
throw new Error(String(message));
}
return response.json();
}
async function refresh({ silent = false } = {}) {
if (polling) return;
polling = true;
try {
render(await request("/api/elica/status"));
} catch (error) {
setPill("API недоступен", "bad");
if (!silent) showToast(error.message, true);
} finally {
polling = false;
}
}
async function command(path, optimistic = null) {
if (commandBusy) return;
commandBusy = true;
if (latest) render(latest);
if (optimistic) optimistic();
try {
const status = await request(path, { method: "POST" });
render(status);
} catch (error) {
showToast(error.message, true);
await refresh({ silent: true });
} finally {
commandBusy = false;
if (latest) render(latest);
}
}
powerToggle.addEventListener("click", () => {
const next = !Boolean(latest?.elica?.power);
command(`/api/elica/power/${next ? "on" : "off"}`, () => {
setToggle(powerToggle, next);
powerCaption.textContent = next ? "Включаем…" : "Выключаем…";
});
});
speedButtons.forEach(button => button.addEventListener("click", () => {
const speed = Number(button.dataset.speed);
command(`/api/elica/speed/${speed}`, () => {
speedValue.textContent = String(speed);
speedButtons.forEach(item => item.classList.toggle("active", item === button));
speedCaption.textContent = `Устанавливаем скорость ${speed}…`;
});
}));
timerToggle.addEventListener("click", () => {
const next = !Boolean(latest?.elica?.timer);
command(`/api/elica/timer/${next ? "on" : "off"}`, () => {
setToggle(timerToggle, next);
timerCaption.textContent = next ? "Включаем таймер…" : "Выключаем таймер…";
});
});
lightToggle.addEventListener("click", () => {
command("/api/elica/light/toggle", () => {
lightToggle.textContent = "Команда…";
setTimeout(() => { lightToggle.textContent = "Переключить"; }, 700);
});
});
externalFanToggle.addEventListener("click", () => {
const next = !Boolean(latest?.external_fan?.on);
command(`/api/elica/external-fan/${next ? "on" : "off"}`, () => {
setToggle(externalFanToggle, next);
externalFanCard.dataset.on = String(next);
externalFanCaption.textContent = next ? "Включаем…" : "Выключаем…";
});
});
refreshButton.addEventListener("click", () => refresh());
document.addEventListener("visibilitychange", () => {
if (!document.hidden) refresh({ silent: true });
});
refresh();
refreshTimer = window.setInterval(() => refresh({ silent: true }), 1000);
window.addEventListener("beforeunload", () => window.clearInterval(refreshTimer));
+172
View File
@@ -0,0 +1,172 @@
import { api, airMeterPalette, airQuality, configureTheme, isDemo, modeInfo, numberOrDash, panelUrl, showToast } from "./api.js";
const requestedLayout = new URLSearchParams(window.location.search).get("layout");
const layoutMode = ["horizontal", "vertical"].includes(requestedLayout) ? requestedLayout : null;
const wideLayout = window.matchMedia("(min-width: 800px)");
function applyLayout() {
document.documentElement.dataset.widgetLayout = layoutMode || (wideLayout.matches ? "horizontal" : "vertical");
}
applyLayout();
wideLayout.addEventListener("change", () => !layoutMode && applyLayout());
const $ = selector => document.querySelector(selector);
const themeMode = configureTheme($("#theme-button"));
let state = null;
let busy = false;
if (isDemo) $("#demo-note").hidden = false;
function setText(selector, value) { $(selector).textContent = value; }
function setPill(element, label, tone) { element.textContent = label; element.className = `pill ${tone}`; }
function toneClass(tone) { return ["good", "warn", "bad"].includes(tone) ? tone : "muted"; }
function updateSpeedVisual(value) {
const speed = Math.max(1, Math.min(6, Number(value) || 1));
setText("#speed", speed);
$("#speed").classList.remove("skeleton");
document.querySelectorAll("[data-speed]").forEach(button => {
const segment = Number(button.dataset.speed);
button.classList.toggle("active", segment <= speed);
button.setAttribute("aria-pressed", String(segment === speed));
});
}
function updateTemperatureVisual(value) {
const temperature = Math.max(5, Math.min(30, Number(value) || 5));
setText("#target-temp", temperature);
$("#target-temp").classList.remove("skeleton");
$("#temperature-range").value = temperature;
}
function drawToggle(selector, active) {
const button = $(selector);
button.setAttribute("aria-pressed", String(Boolean(active)));
button.textContent = active ? "ON" : "OFF";
}
function render(status) {
state = status;
const tion = status.tion || {};
const sensor = status.qingping || {};
const schedule = status.schedule || {};
const mode = modeInfo(status);
const quality = airQuality(sensor.co2);
const headerMode = schedule.override_active && schedule.override_until_time
? `Ручной до ${schedule.override_until_time}`
: mode.label;
setPill($("#connection"), status.online ? "Online" : "Offline", status.online ? "good" : "bad");
setPill($("#mode-pill"), headerMode, mode.tone);
setText("#mode-detail", mode.detail);
updateSpeedVisual(tion.fan_speed);
setText("#speed-note", status.auto?.state === "active" && status.auto?.target_speed
? `AUTO выбрал скорость ${status.auto.target_speed}`
: `Ступень ${numberOrDash(tion.fan_speed)} из 6`);
updateTemperatureVisual(tion.target_temp);
setText("#heating-note", tion.heating ? "Сейчас нагревает входящий воздух" : tion.heater ? "Обогрев разрешён" : "Желаемая температура воздуха");
drawToggle("#power-toggle", tion.power);
drawToggle("#heater-toggle", tion.heater);
setText("#power-detail", tion.power ? "Устройство включено" : "Устройство выключено");
setText("#heater-detail", tion.heating ? "Сейчас нагревает" : tion.heater ? "Автоматически" : "Выключен");
setText("#co2", numberOrDash(sensor.co2));
setText("#air-label", quality.label);
const airTone = toneClass(quality.tone);
const airPalette = airMeterPalette(sensor.co2);
const airCard = $(".air-card");
$("#air-label").className = `quality-chip ${airTone}`;
airCard.dataset.airTone = airTone;
airCard.style.setProperty("--air-color", airPalette.color);
airCard.style.setProperty("--air-glow", airPalette.glow);
$("#co2-progress").style.width = `${Math.max(0, Math.min(100, quality.pct))}%`;
setText("#room-temp", numberOrDash(sensor.temperature ?? tion.in_temp, 1));
setText("#humidity", numberOrDash(sensor.humidity));
setText("#current-time", schedule.current_time || tion.device_time || "—");
setText("#next-time", schedule.next_time || "—");
}
async function refresh(silent = false) {
try { render(await api.status()); }
catch (error) {
setPill($("#connection"), "Ошибка", "bad");
if (!silent) showToast(error.message, true);
}
}
async function act(path, source) {
if (busy) return;
busy = true;
source?.setAttribute("disabled", "");
try { await api.post(path); await refresh(true); }
catch (error) { showToast(error.message, true); await refresh(true); }
finally { busy = false; source?.removeAttribute("disabled"); }
}
function stepped(kind, delta, source) {
if (busy || !state?.tion) return;
const isSpeed = kind === "speed";
const current = Number(isSpeed ? state.tion.fan_speed : state.tion.target_temp);
const min = isSpeed ? 1 : 5;
const max = isSpeed ? 6 : 30;
const value = Math.min(max, Math.max(min, current + delta));
if (!Number.isFinite(value) || value === current) return;
if (isSpeed) {
state.tion.fan_speed = value;
updateSpeedVisual(value);
} else {
state.tion.target_temp = value;
updateTemperatureVisual(value);
}
act(`/api/tion/${isSpeed ? "speed" : "temperature"}/${value}`, source);
}
document.querySelectorAll("[data-step]").forEach(button => button.addEventListener("click", () => {
stepped(button.dataset.step, Number(button.dataset.delta), button);
}));
document.querySelectorAll("[data-speed]").forEach(button => button.addEventListener("click", () => {
if (busy || !state?.tion) return;
const value = Number(button.dataset.speed);
state.tion.fan_speed = value;
updateSpeedVisual(value);
act(`/api/tion/speed/${value}`, button);
}));
$("#temperature-range").addEventListener("input", event => setText("#target-temp", event.target.value));
$("#temperature-range").addEventListener("change", event => {
if (busy || !state?.tion) return;
const value = Number(event.target.value);
state.tion.target_temp = value;
updateTemperatureVisual(value);
act(`/api/tion/temperature/${value}`, event.target);
});
$("#power-toggle").addEventListener("click", event => {
if (busy || !state?.tion) return;
const value = !state.tion.power;
state.tion.power = value;
drawToggle("#power-toggle", value);
setText("#power-detail", value ? "Устройство включено" : "Устройство выключено");
act(`/api/tion/power/${value ? "on" : "off"}`, event.currentTarget);
});
$("#heater-toggle").addEventListener("click", event => {
if (busy || !state?.tion) return;
const value = !state.tion.heater;
state.tion.heater = value;
drawToggle("#heater-toggle", value);
setText("#heater-detail", value ? "Автоматически" : "Выключен");
act(`/api/tion/heater/${value ? "on" : "off"}`, event.currentTarget);
});
$("#open-panel").addEventListener("click", () => window.open(panelUrl(themeMode()), "_blank", "noopener"));
$("#air-link").addEventListener("click", () => window.open(panelUrl(themeMode(), "air"), "_blank", "noopener"));
$("#schedule-link").addEventListener("click", () => window.open(panelUrl(themeMode(), "schedule"), "_blank", "noopener"));
refresh();
setInterval(() => !document.hidden && !busy && refresh(true), 3000);
+476
View File
@@ -0,0 +1,476 @@
import { api, airMeterPalette, airQuality, configureTheme, isDemo, modeInfo, numberOrDash, setRangeProgress, showToast } from "./api.js";
const $ = selector => document.querySelector(selector);
configureTheme($("#theme-button"));
let state = null;
let busy = false;
let scheduleDraft = null;
let activeTemplate = null;
const weekdays = [
["mon", "Понедельник"],
["tue", "Вторник"],
["wed", "Среда"],
["thu", "Четверг"],
["fri", "Пятница"],
["sat", "Суббота"],
["sun", "Воскресенье"],
];
const templateNames = { workday: "Будний", weekend: "Выходной" };
const clone = value => JSON.parse(JSON.stringify(value));
function templateLabel(name) {
return templateNames[name] || name;
}
if (isDemo) $("#demo-note").hidden = false;
function text(selector, value) { $(selector).textContent = value; }
function setPill(selector, label, tone) { const element = $(selector); element.textContent = label; element.className = `pill ${tone}`; }
function toggle(selector, active, label = "") {
const button = $(selector);
button.setAttribute("aria-pressed", String(Boolean(active)));
button.textContent = `${label}${label ? " " : ""}${active ? "ON" : "OFF"}`;
}
function setRange(selector, value) {
const input = $(selector);
if (Number.isFinite(Number(value))) input.value = value;
setRangeProgress(input);
}
function updateSpeedVisual(value) {
const speed = Math.max(1, Math.min(6, Number(value) || 1));
text("#speed-value", speed);
setRange("#speed-range", speed);
document.querySelectorAll(".speed-segments button").forEach((segment, index) => {
segment.classList.toggle("active", index < speed);
segment.setAttribute("aria-pressed", String(index + 1 === speed));
});
}
function updateTemperatureVisual(value) {
const temperature = Math.max(5, Math.min(30, Number(value) || 5));
text("#temperature-value", temperature);
setRange("#temperature-range", temperature);
}
function actionLabel(value) {
return ({ set: "Настройка режима", auto: "Автоматический режим", off: "Выключение" })[value] || "Точка расписания";
}
function renderAir(sensor, tion) {
const quality = airQuality(sensor.co2);
const airTone = ["good", "warn", "bad"].includes(quality.tone) ? quality.tone : "muted";
const airPalette = airMeterPalette(sensor.co2);
const airCard = $(".co2-card");
text("#co2", numberOrDash(sensor.co2));
text("#air-label", quality.label);
text("#air-advice", quality.tone === "good" ? "Проветривание работает нормально" : quality.tone === "warn" ? "Автоматика при необходимости повысит скорость" : quality.tone === "bad" ? "Рекомендуется усилить вентиляцию" : "Ожидаем показания датчика");
$("#air-label").className = `quality-chip ${airTone}`;
airCard.dataset.airTone = airTone;
airCard.style.setProperty("--air-color", airPalette.color);
airCard.style.setProperty("--air-glow", airPalette.glow);
$("#co2-progress").style.width = `${Math.max(0, Math.min(100, quality.pct))}%`;
setPill("#sensor-status", sensor.online ? "Online" : "Offline", sensor.online ? "good" : "bad");
text("#room-temp", numberOrDash(sensor.temperature ?? tion.in_temp, 1));
text("#humidity", numberOrDash(sensor.humidity));
text("#pm25", numberOrDash(sensor.pm25));
text("#pm10", numberOrDash(sensor.pm10));
const pm25 = Number(sensor.pm25);
const pm10 = Number(sensor.pm10);
text("#pm25-quality", Number.isFinite(pm25) ? (pm25 <= 15 ? "Отлично" : pm25 <= 35 ? "Норма" : "Повышено") : "—");
text("#pm10-quality", Number.isFinite(pm10) ? (pm10 <= 30 ? "Отлично" : pm10 <= 60 ? "Норма" : "Повышено") : "—");
}
function renderSchedule(status) {
const schedule = status.schedule || {};
const mode = modeInfo(status);
text("#current-time", schedule.current_time || status.tion?.device_time || "—");
text("#next-time", schedule.next_time || "—");
text("#current-action", actionLabel(schedule.current_action));
text("#next-action", actionLabel(schedule.next_action));
text("#mode-title", mode.label);
text("#mode-detail", mode.detail);
setPill("#schedule-state", schedule.paused ? "Пауза" : schedule.enabled ? "Активно" : "Выкл", schedule.paused ? "warn" : schedule.enabled ? "info" : "muted");
const headerMode = schedule.override_active && schedule.override_until_time
? `Ручной до ${schedule.override_until_time}`
: mode.label;
setPill("#mode-pill", headerMode, mode.tone);
$("#mode-banner").className = `mode-banner ${mode.tone === "info" ? "info" : mode.tone === "muted" ? "muted" : "warn"}`;
$("#auto-button").disabled = !schedule.available || (!schedule.override_active && !schedule.paused);
$("#pause-button strong").textContent = schedule.paused ? "Возобновить расписание" : "Пауза расписания";
$("#pause-button small").textContent = schedule.paused ? "Продолжить по расписанию" : "Временно приостановить";
}
function render(status) {
state = status;
const tion = status.tion || {};
const sensor = status.qingping || {};
setPill("#connection", status.online ? "Online" : "Offline", status.online ? "good" : "bad");
updateSpeedVisual(tion.fan_speed);
updateTemperatureVisual(tion.target_temp);
text("#speed-note", status.auto?.state === "active" && status.auto?.target_speed ? `AUTO выбрал скорость ${status.auto.target_speed}` : `Ступень ${numberOrDash(tion.fan_speed)} из 6`);
text("#temperature-note", tion.heating ? "Сейчас нагревает входящий воздух" : "Желаемая температура в помещении");
toggle("#power-toggle", tion.power);
toggle("#heater-toggle", tion.heater);
toggle("#sound-toggle", tion.sound, "Звук");
toggle("#light-toggle", tion.light, "Свет");
text("#power-caption", tion.power ? "Устройство включено" : "Устройство выключено");
text("#heater-caption", tion.heating ? "Сейчас нагревает воздух" : "Поддержание температуры");
$("#mode-outside").classList.toggle("active", tion.mode === "outside");
$("#mode-recirculation").classList.toggle("active", tion.mode === "recirculation");
text("#mode-name", tion.mode === "recirculation" ? "Рециркуляция" : "Приточная вентиляция");
text("#outside-temp", numberOrDash(tion.out_temp));
text("#filter-remain", numberOrDash(tion.filter_remain));
const filterPercent = Math.max(0, Math.min(100, Number(tion.filter_remain || 0) / 2));
$("#filter-progress").style.width = `${filterPercent}%`;
text("#filter-percent", `${Math.round(filterPercent)}%`);
text("#model", tion.model || "—");
text("#battery", numberOrDash(sensor.battery));
renderAir(sensor, tion);
renderSchedule(status);
text("#updated-at", `Обновлено ${new Date().toLocaleTimeString("ru-RU", { hour: "2-digit", minute: "2-digit", second: "2-digit" })}`);
}
async function refresh(silent = false) {
try { render(await api.status()); }
catch (error) {
setPill("#connection", "Ошибка связи", "bad");
if (!silent) showToast(error.message, true);
}
}
async function act(path, source) {
if (busy) return;
busy = true;
source?.setAttribute("disabled", "");
source?.setAttribute("aria-busy", "true");
try { await api.post(path); await refresh(true); }
catch (error) { showToast(error.message, true); await refresh(true); }
finally { busy = false; source?.removeAttribute("disabled"); source?.removeAttribute("aria-busy"); }
}
function stepped(kind, delta, source) {
if (busy) return;
const isSpeed = kind === "speed";
const current = Number(isSpeed ? state?.tion?.fan_speed : state?.tion?.target_temp);
const min = isSpeed ? 1 : 5;
const max = isSpeed ? 6 : 30;
const value = Math.min(max, Math.max(min, current + delta));
if (Number.isFinite(value) && value !== current) {
if (isSpeed) {
state.tion.fan_speed = value;
updateSpeedVisual(value);
} else {
state.tion.target_temp = value;
updateTemperatureVisual(value);
}
act(`/api/tion/${isSpeed ? "speed" : "temperature"}/${value}`, source);
}
}
function optionList(values, current, emptyLabel = "Не менять") {
const items = emptyLabel === null ? [] : [["", emptyLabel]];
items.push(...values);
return items.map(([value, label]) => `<option value="${value}"${String(current ?? "") === String(value) ? " selected" : ""}>${label}</option>`).join("");
}
function booleanSetting(value) {
return value === true ? "on" : value === false ? "off" : "";
}
function pointMarkup(point, index) {
const action = point?.action || {};
const type = action.type === "auto" ? "auto" : "set";
const speedOptions = Array.from({ length: 6 }, (_, item) => [String(item + 1), String(item + 1)]);
const booleanOptions = [["on", "Включить"], ["off", "Выключить"]];
return `
<article class="point-editor ${type}" data-index="${index}">
<div class="point-header">
<span class="point-number">${index + 1}</span>
<label>Время<input data-field="time" type="time" value="${point?.time || ""}" required></label>
<label class="point-action">Действие<select data-field="type"><option value="set"${type === "set" ? " selected" : ""}>Задать параметры</option><option value="auto"${type === "auto" ? " selected" : ""}>AUTO по воздуху</option></select></label>
<button class="remove-point" data-remove-point="${index}" type="button" aria-label="Удалить точку">×</button>
</div>
<div class="point-settings">
<label class="point-setting">Скорость<select data-setting="speed">${optionList(speedOptions, action.speed, "Не менять")}</select></label>
<label class="point-setting">Температура<input data-setting="target_temp" type="number" min="5" max="30" step="1" value="${action.target_temp ?? ""}" placeholder="—"></label>
<label class="point-setting" data-set-only>Питание<select data-setting="power">${optionList(booleanOptions, booleanSetting(action.power))}</select></label>
<label class="point-setting" data-set-only>Обогрев<select data-setting="heater">${optionList(booleanOptions, booleanSetting(action.heater))}</select></label>
<label class="point-setting" data-set-only>Воздух<select data-setting="mode">${optionList([["outside", "С улицы"], ["recirculation", "Рециркуляция"]], action.mode)}</select></label>
<label class="point-setting" data-set-only>Звук<select data-setting="sound">${optionList(booleanOptions, booleanSetting(action.sound))}</select></label>
<label class="point-setting" data-set-only>Подсветка<select data-setting="light">${optionList(booleanOptions, booleanSetting(action.light))}</select></label>
</div>
</article>`;
}
function readRenderedPoints(strict = false) {
const points = [...document.querySelectorAll(".point-editor")].map(card => {
const time = card.querySelector('[data-field="time"]').value;
const type = card.querySelector('[data-field="type"]').value;
const action = { type };
card.querySelectorAll("[data-setting]").forEach(input => {
const field = input.dataset.setting;
const raw = input.value;
if (raw === "" || (type === "auto" && !["speed", "target_temp"].includes(field))) return;
if (["speed", "target_temp"].includes(field)) action[field] = Number(raw);
else if (["power", "heater", "sound", "light"].includes(field)) action[field] = raw === "on";
else action[field] = raw;
});
return { time, action };
});
if (strict) validateTemplate(activeTemplate, points);
return points;
}
function validateTemplate(name, points) {
const label = templateLabel(name);
if (!Array.isArray(points) || !points.length) throw new Error(`Шаблон «${label}» не может быть пустым`);
const times = new Set();
points.forEach((point, index) => {
if (!/^([01]\d|2[0-3]):[0-5]\d$/.test(point.time || "")) throw new Error(`Проверьте время в точке ${index + 1} шаблона «${label}»`);
if (times.has(point.time)) throw new Error(`В шаблоне «${label}» время ${point.time} указано дважды`);
times.add(point.time);
const action = point.action || {};
if (!["set", "auto"].includes(action.type)) throw new Error(`Неизвестное действие в шаблоне «${label}»`);
if (action.speed !== undefined && (!Number.isInteger(action.speed) || action.speed < 1 || action.speed > 6)) throw new Error(`Скорость в шаблоне «${label}» должна быть от 1 до 6`);
if (action.target_temp !== undefined && (!Number.isInteger(action.target_temp) || action.target_temp < 5 || action.target_temp > 30)) throw new Error(`Температура в шаблоне «${label}» должна быть от 5 до 30°`);
if (action.type === "auto" && action.speed === undefined) throw new Error(`Для AUTO в шаблоне «${label}» укажите базовую скорость`);
if (action.type === "set" && Object.keys(action).length === 1) throw new Error(`В точке ${point.time} шаблона «${label}» не выбран ни один параметр`);
});
}
function validateScheduleDraft() {
const names = Object.keys(scheduleDraft?.templates || {});
if (!names.length) throw new Error("В расписании должен быть хотя бы один шаблон");
names.forEach(name => validateTemplate(name, scheduleDraft.templates[name]));
weekdays.forEach(([day, label]) => {
if (!names.includes(scheduleDraft.days?.[day])) throw new Error(`Для дня «${label}» не выбран шаблон`);
});
}
function commitActiveTemplate(strict = false) {
if (scheduleDraft && activeTemplate) scheduleDraft.templates[activeTemplate] = readRenderedPoints(strict);
}
function renderTemplateUsage() {
const usedBy = weekdays.filter(([day]) => scheduleDraft.days?.[day] === activeTemplate).map(([, label]) => label.toLowerCase());
text("#template-usage", usedBy.length ? `Используют: ${usedBy.join(", ")}` : "Пока не назначен ни одному дню");
}
function renderTemplateSelector() {
const select = $("#template-select");
select.replaceChildren(...Object.keys(scheduleDraft.templates).map(name => new Option(templateLabel(name), name, false, name === activeTemplate)));
$("#delete-template").disabled = Object.keys(scheduleDraft.templates).length <= 1;
}
function renderDayAssignments() {
const host = $("#day-assignments");
const templateNames = Object.keys(scheduleDraft.templates);
host.replaceChildren(...weekdays.map(([day, label]) => {
const wrapper = document.createElement("label");
wrapper.className = "day-assignment";
wrapper.textContent = label;
const select = document.createElement("select");
select.dataset.day = day;
select.replaceChildren(...templateNames.map(name => new Option(templateLabel(name), name, false, scheduleDraft.days?.[day] === name)));
wrapper.append(select);
return wrapper;
}));
}
function renderSchedulePoints() {
const points = scheduleDraft.templates[activeTemplate] || [];
$("#schedule-points").innerHTML = points.length
? points.map(pointMarkup).join("")
: '<div class="empty-points">В этом шаблоне пока нет точек</div>';
renderTemplateUsage();
}
function setEditorStatus(message = "", error = false) {
const status = $("#schedule-editor-status");
status.textContent = message;
status.classList.toggle("error", error);
}
async function openScheduleEditor() {
const source = $("#schedule-edit-button");
source.disabled = true;
source.setAttribute("aria-busy", "true");
try {
scheduleDraft = clone(await api.scheduleConfig());
const names = Object.keys(scheduleDraft.templates || {});
if (!names.length) throw new Error("В расписании нет шаблонов");
const dayKeys = ["sun", "mon", "tue", "wed", "thu", "fri", "sat"];
activeTemplate = scheduleDraft.days?.[dayKeys[new Date().getDay()]] || names[0];
$("#schedule-enabled").checked = scheduleDraft.enabled !== false;
renderTemplateSelector();
renderDayAssignments();
renderSchedulePoints();
setEditorStatus();
$("#schedule-dialog").showModal();
} catch (error) {
showToast(`Не удалось открыть редактор: ${error.message}`, true);
} finally {
source.disabled = false;
source.removeAttribute("aria-busy");
}
}
function closeScheduleEditor() {
$("#schedule-dialog").close();
scheduleDraft = null;
activeTemplate = null;
}
async function saveScheduleEditor(event) {
event.preventDefault();
if (!scheduleDraft) return;
const saveButton = $("#schedule-save-button");
try {
commitActiveTemplate(true);
scheduleDraft.enabled = $("#schedule-enabled").checked;
validateScheduleDraft();
Object.values(scheduleDraft.templates).forEach(points => points.sort((left, right) => left.time.localeCompare(right.time)));
setEditorStatus("Сохраняем…");
saveButton.disabled = true;
saveButton.setAttribute("aria-busy", "true");
const result = await api.saveScheduleConfig(scheduleDraft);
$("#schedule-dialog").close();
scheduleDraft = null;
activeTemplate = null;
showToast(result.restart_required ? "Расписание сохранено. Перезапустите сервис для применения" : "Расписание сохранено и применено");
await refresh(true);
} catch (error) {
setEditorStatus(error.message, true);
} finally {
saveButton.disabled = false;
saveButton.removeAttribute("aria-busy");
}
}
document.querySelectorAll("[data-step]").forEach(button => button.addEventListener("click", () => stepped(button.dataset.step, Number(button.dataset.delta), button)));
document.querySelectorAll(".speed-segments button").forEach(button => button.addEventListener("click", () => {
if (busy || !state?.tion) return;
const value = Number(button.dataset.speed);
state.tion.fan_speed = value;
updateSpeedVisual(value);
act(`/api/tion/speed/${value}`, button);
}));
$("#speed-range").addEventListener("input", event => updateSpeedVisual(event.target.value));
$("#speed-range").addEventListener("change", event => act(`/api/tion/speed/${event.target.value}`, event.target));
$("#temperature-range").addEventListener("input", event => { setRangeProgress(event.target); text("#temperature-value", event.target.value); });
$("#temperature-range").addEventListener("change", event => act(`/api/tion/temperature/${event.target.value}`, event.target));
$("#power-toggle").addEventListener("click", event => act(`/api/tion/power/${state?.tion?.power ? "off" : "on"}`, event.currentTarget));
$("#heater-toggle").addEventListener("click", event => act(`/api/tion/heater/${state?.tion?.heater ? "off" : "on"}`, event.currentTarget));
$("#sound-toggle").addEventListener("click", event => act(`/api/tion/sound/${state?.tion?.sound ? "off" : "on"}`, event.currentTarget));
$("#light-toggle").addEventListener("click", event => act(`/api/tion/light/${state?.tion?.light ? "off" : "on"}`, event.currentTarget));
$("#mode-outside").addEventListener("click", event => act("/api/tion/mode/outside", event.currentTarget));
$("#mode-recirculation").addEventListener("click", event => act("/api/tion/mode/recirculation", event.currentTarget));
$("#auto-button").addEventListener("click", event => act(state?.schedule?.paused ? "/api/schedule/resume" : "/api/schedule/override/clear", event.currentTarget));
$("#pause-button").addEventListener("click", event => act(state?.schedule?.paused ? "/api/schedule/resume" : "/api/schedule/pause", event.currentTarget));
$("#refresh-button").addEventListener("click", event => { event.currentTarget.animate([{ transform: "rotate(0)" }, { transform: "rotate(360deg)" }], { duration: 450 }); refresh(); });
$("#schedule-edit-button").addEventListener("click", openScheduleEditor);
$("#schedule-close-button").addEventListener("click", closeScheduleEditor);
$("#schedule-cancel-button").addEventListener("click", closeScheduleEditor);
$("#schedule-form").addEventListener("submit", saveScheduleEditor);
$("#schedule-dialog").addEventListener("close", () => { scheduleDraft = null; activeTemplate = null; });
$("#template-select").addEventListener("change", event => {
if (!scheduleDraft) return;
commitActiveTemplate(false);
activeTemplate = event.target.value;
renderSchedulePoints();
});
$("#duplicate-template").addEventListener("click", () => {
if (!scheduleDraft || !activeTemplate) return;
commitActiveTemplate(false);
const base = `${activeTemplate}-copy`;
let name = base;
let suffix = 2;
while (scheduleDraft.templates[name]) name = `${base}-${suffix++}`;
scheduleDraft.templates[name] = clone(scheduleDraft.templates[activeTemplate]);
activeTemplate = name;
renderTemplateSelector();
renderDayAssignments();
renderSchedulePoints();
setEditorStatus(`Создан шаблон «${templateLabel(name)}». Назначьте его нужным дням`);
});
$("#delete-template").addEventListener("click", () => {
if (!scheduleDraft || Object.keys(scheduleDraft.templates).length <= 1) return;
if (!window.confirm(`Удалить шаблон «${templateLabel(activeTemplate)}»?`)) return;
const removed = activeTemplate;
delete scheduleDraft.templates[removed];
activeTemplate = Object.keys(scheduleDraft.templates)[0];
weekdays.forEach(([day]) => {
if (scheduleDraft.days[day] === removed) scheduleDraft.days[day] = activeTemplate;
});
renderTemplateSelector();
renderDayAssignments();
renderSchedulePoints();
setEditorStatus(`Шаблон «${templateLabel(removed)}» удалён`);
});
$("#day-assignments").addEventListener("change", event => {
const select = event.target.closest("[data-day]");
if (!select || !scheduleDraft) return;
scheduleDraft.days[select.dataset.day] = select.value;
renderTemplateUsage();
});
$("#schedule-points").addEventListener("change", event => {
if (event.target.dataset.field !== "type") return;
const card = event.target.closest(".point-editor");
const isAuto = event.target.value === "auto";
card.classList.toggle("auto", isAuto);
card.classList.toggle("set", !isAuto);
const speed = card.querySelector('[data-setting="speed"]');
if (isAuto && !speed.value) speed.value = "2";
});
$("#schedule-points").addEventListener("click", event => {
const button = event.target.closest("[data-remove-point]");
if (!button || !scheduleDraft) return;
commitActiveTemplate(false);
scheduleDraft.templates[activeTemplate].splice(Number(button.dataset.removePoint), 1);
renderSchedulePoints();
});
$("#add-schedule-point").addEventListener("click", () => {
if (!scheduleDraft) return;
commitActiveTemplate(false);
const points = scheduleDraft.templates[activeTemplate];
const used = new Set(points.map(point => point.time));
const existingTimes = points.map(point => {
const [hours, minute] = String(point.time || "").split(":").map(Number);
return hours * 60 + minute;
}).filter(Number.isFinite);
let minutes = existingTimes.length ? (Math.max(...existingTimes) + 60) % 1440 : 8 * 60;
for (let attempt = 0; attempt < 48; attempt += 1) {
const candidate = `${String(Math.floor(minutes / 60)).padStart(2, "0")}:${String(minutes % 60).padStart(2, "0")}`;
if (!used.has(candidate)) {
points.push({ time: candidate, action: { type: "set", speed: 2 } });
break;
}
minutes = (minutes + 30) % 1440;
}
points.sort((left, right) => left.time.localeCompare(right.time));
renderSchedulePoints();
$("#schedule-points .point-editor:last-of-type")?.scrollIntoView({ behavior: "smooth", block: "nearest" });
});
setRangeProgress($("#speed-range"));
setRangeProgress($("#temperature-range"));
refresh();
setInterval(() => !document.hidden && !busy && refresh(true), 3000);
+129
View File
@@ -0,0 +1,129 @@
<!doctype html>
<html lang="ru">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="color-scheme" content="light dark">
<title>Tion 4S — виджет</title>
<link rel="stylesheet" href="/ui/static/css/base.css?v=20260927-1">
<link rel="stylesheet" href="/ui/static/css/aeroglass-widget.css?v=20260927-1">
</head>
<body>
<div class="ambient" aria-hidden="true"></div>
<main class="widget" aria-live="polite">
<header class="widget-header">
<div class="identity">
<span class="brand-icon" aria-hidden="true">
<svg class="ui-icon"><use href="/ui/static/assets/icons.svg#wind"></use></svg>
</span>
<span class="identity-copy">
<span class="title-row"><h1>Tion 4S</h1><span id="connection" class="pill muted">Загрузка</span></span>
<small>Приточная вентиляция</small>
</span>
</div>
<button id="theme-button" class="theme-button" type="button" title="Сменить тему">
<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M12 3v2m0 14v2M3 12h2m14 0h2M5.64 5.64l1.42 1.42m9.88 9.88 1.42 1.42m0-12.72-1.42 1.42M7.06 16.94l-1.42 1.42" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/><circle cx="12" cy="12" r="4" stroke="currentColor" stroke-width="1.8"/></svg>
</button>
<div class="status-row">
<span id="mode-pill" class="pill muted">—</span>
<span id="mode-detail" class="mode-detail">Загрузка состояния</span>
</div>
</header>
<section class="widget-tile control-card speed-card" aria-labelledby="speed-title">
<div class="card-title">
<svg class="ui-icon feature-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#fan"></use></svg>
<span><h2 id="speed-title">Скорость вентиляции</h2><p id="speed-note">Ступень — из 6</p></span>
</div>
<div class="hero-control">
<button class="hero-step" data-step="speed" data-delta="-1" type="button" aria-label="Уменьшить скорость">−</button>
<strong id="speed" class="hero-value value skeleton">0</strong>
<button class="hero-step primary" data-step="speed" data-delta="1" type="button" aria-label="Увеличить скорость">+</button>
</div>
<div id="speed-segments" class="speed-segments" role="group" aria-label="Выбор скорости">
<button type="button" data-speed="1" aria-label="Скорость 1"></button>
<button type="button" data-speed="2" aria-label="Скорость 2"></button>
<button type="button" data-speed="3" aria-label="Скорость 3"></button>
<button type="button" data-speed="4" aria-label="Скорость 4"></button>
<button type="button" data-speed="5" aria-label="Скорость 5"></button>
<button type="button" data-speed="6" aria-label="Скорость 6"></button>
</div>
<div class="scale-labels" aria-hidden="true"><span>1</span><span>2</span><span>3</span><span>4</span><span>5</span><span>6</span></div>
</section>
<section class="widget-tile control-card temperature-card" aria-labelledby="temperature-title">
<div class="card-title">
<svg class="ui-icon feature-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#thermometer"></use></svg>
<span><h2 id="temperature-title">Целевая температура</h2><p id="heating-note">Желаемая температура воздуха</p></span>
</div>
<div class="hero-control">
<button class="hero-step" data-step="temperature" data-delta="-1" type="button" aria-label="Уменьшить температуру">−</button>
<strong class="hero-value value"><span id="target-temp" class="skeleton">00</span>°</strong>
<button class="hero-step primary" data-step="temperature" data-delta="1" type="button" aria-label="Увеличить температуру">+</button>
</div>
<input id="temperature-range" class="temperature-range" type="range" min="5" max="30" step="1" value="21" aria-label="Целевая температура">
<div class="temperature-labels" aria-hidden="true"><span>5°</span><span>15°</span><span>20°</span><span>25°</span><span>30°</span></div>
</section>
<section class="switch-grid" aria-label="Питание и обогрев">
<article class="widget-tile switch-card power-card">
<div class="switch-title">
<svg class="ui-icon switch-icon green" aria-hidden="true"><use href="/ui/static/assets/icons.svg#power"></use></svg>
<span><h2>Питание</h2><small id="power-detail">Устройство выключено</small></span>
</div>
<button id="power-toggle" class="glass-switch green" type="button" aria-pressed="false">OFF</button>
</article>
<article class="widget-tile switch-card heater-card">
<div class="switch-title">
<svg class="ui-icon switch-icon orange" aria-hidden="true"><use href="/ui/static/assets/icons.svg#heat"></use></svg>
<span><h2>Обогрев</h2><small id="heater-detail">Выключен</small></span>
</div>
<button id="heater-toggle" class="glass-switch orange" type="button" aria-pressed="false">OFF</button>
</article>
</section>
<section class="widget-tile info-card air-card" data-air-tone="muted" aria-labelledby="air-title">
<header class="section-title">
<span><svg class="ui-icon section-icon leaf" aria-hidden="true"><use href="/ui/static/assets/icons.svg#leaf"></use></svg><h2 id="air-title">Воздух в комнате</h2></span>
<button id="air-link" class="open-section" type="button" aria-label="Открыть показатели воздуха в панели">↗</button>
</header>
<div class="co2-summary">
<span class="co2-label">CO₂</span>
<strong><span id="co2" class="value">—</span> <small>ppm</small></strong>
<span id="air-label" class="quality-chip muted">Нет данных</span>
</div>
<div class="co2-meter" aria-hidden="true"><i id="co2-progress"></i></div>
<div class="meter-labels" aria-hidden="true"><span>400</span><span>800</span><span>1200</span><span>2000</span></div>
<div class="mini-metrics">
<div class="mini-metric">
<svg class="ui-icon metric-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#thermometer"></use></svg>
<span><small>Температура</small><strong><span id="room-temp" class="value">—</span>°</strong></span>
</div>
<div class="mini-metric">
<svg class="ui-icon metric-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#drop"></use></svg>
<span><small>Влажность</small><strong><span id="humidity" class="value">—</span>%</strong></span>
</div>
</div>
</section>
<section class="widget-tile info-card schedule-card" aria-labelledby="schedule-title">
<header class="section-title">
<span><svg class="ui-icon section-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#clock"></use></svg><h2 id="schedule-title">Расписание</h2></span>
<button id="schedule-link" class="open-section" type="button" aria-label="Открыть расписание в панели">↗</button>
</header>
<div class="schedule-times">
<span><small>Сейчас</small><strong id="current-time" class="value">—</strong></span>
<i aria-hidden="true"></i>
<span><small>Следующая точка</small><strong id="next-time" class="value">—</strong></span>
</div>
</section>
<button id="open-panel" class="open-panel" type="button">
<svg class="ui-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#wind"></use></svg>
<span>Открыть полную панель</span><b aria-hidden="true">↗</b>
</button>
<span id="demo-note" class="demo-note" hidden>Демонстрационный режим — команды не отправляются устройству</span>
</main>
<script type="module" src="/ui/static/js/tion-widget.js?v=20260927-1"></script>
</body>
</html>
+163
View File
@@ -0,0 +1,163 @@
<!doctype html>
<html lang="ru">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="color-scheme" content="light dark">
<title>Tion 4S — панель управления</title>
<link rel="stylesheet" href="/ui/static/css/base.css?v=20260927-1">
<link rel="stylesheet" href="/ui/static/css/aeroglass-panel.css?v=20260927-1">
</head>
<body>
<div class="ambient"></div>
<main class="climate-panel glass" aria-live="polite">
<header class="panel-header">
<div class="identity">
<h1>Tion 4S</h1>
<span id="connection" class="pill muted">Загрузка</span>
<span id="mode-pill" class="pill muted">—</span>
</div>
<div class="header-tools">
<div class="ventilation-badge glass-tile">
<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M3 7h9a3 3 0 1 0-2.6-4.5M3 12h15a3 3 0 1 1-2.7 4.3M3 17h7" stroke="currentColor" stroke-width="1.9" stroke-linecap="round"/></svg>
<span><strong>Приточная вентиляция</strong><small>Чистый воздух для вашего дома</small></span>
</div>
<button id="refresh-button" class="icon-button" type="button" title="Обновить данные">
<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M20 11a8 8 0 1 0-2.34 5.66M20 5v6h-6" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"/></svg>
</button>
<button id="theme-button" class="icon-button" type="button" title="Сменить тему">
<svg viewBox="0 0 24 24" fill="none" aria-hidden="true"><path d="M12 3v2m0 14v2M3 12h2m14 0h2M5.64 5.64l1.42 1.42m9.88 9.88 1.42 1.42m0-12.72-1.42 1.42M7.06 16.94l-1.42 1.42" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/><circle cx="12" cy="12" r="4" stroke="currentColor" stroke-width="1.8"/></svg>
</button>
</div>
</header>
<section class="primary-controls" aria-label="Основное управление">
<article class="control-card glass-tile speed-card">
<div class="card-title"><svg class="ui-icon feature-icon fan-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#fan"></use></svg><span><h2>Скорость вентиляции</h2><p id="speed-note">Текущая ступень вентилятора</p></span></div>
<div class="hero-control">
<button class="hero-step" data-step="speed" data-delta="-1" type="button" aria-label="Уменьшить скорость">−</button>
<strong id="speed-value" class="hero-value">—</strong>
<button class="hero-step primary" data-step="speed" data-delta="1" type="button" aria-label="Увеличить скорость">+</button>
</div>
<input id="speed-range" class="range speed-range" type="range" min="1" max="6" step="1" value="3" aria-label="Скорость вентилятора">
<div class="speed-segments" aria-label="Выбор скорости">
<button type="button" data-speed="1" aria-label="Скорость 1"></button>
<button type="button" data-speed="2" aria-label="Скорость 2"></button>
<button type="button" data-speed="3" aria-label="Скорость 3"></button>
<button type="button" data-speed="4" aria-label="Скорость 4"></button>
<button type="button" data-speed="5" aria-label="Скорость 5"></button>
<button type="button" data-speed="6" aria-label="Скорость 6"></button>
</div>
<div class="speed-labels" aria-hidden="true"><span>1</span><span>2</span><span>3</span><span>4</span><span>5</span><span>6</span></div>
</article>
<article class="control-card glass-tile temperature-card">
<div class="card-title"><svg class="ui-icon feature-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#thermometer"></use></svg><span><h2>Цель (температура)</h2><p id="temperature-note">Желаемая температура воздуха</p></span></div>
<div class="hero-control">
<button class="hero-step" data-step="temperature" data-delta="-1" type="button" aria-label="Уменьшить температуру">−</button>
<strong class="hero-value"><span id="temperature-value">—</span>°</strong>
<button class="hero-step primary" data-step="temperature" data-delta="1" type="button" aria-label="Увеличить температуру">+</button>
</div>
<input id="temperature-range" class="range temperature-range" type="range" min="5" max="30" step="1" value="21" aria-label="Целевая температура">
<div class="temperature-labels" aria-hidden="true"><span>5°</span><span>10°</span><span>15°</span><span>20°</span><span>25°</span><span>30°</span></div>
</article>
<article class="switch-card glass-tile power-card">
<div class="card-title compact"><svg class="ui-icon feature-icon green" aria-hidden="true"><use href="/ui/static/assets/icons.svg#power"></use></svg><span><h2>Питание</h2><p id="power-caption">Устройство выключено</p></span></div>
<button id="power-toggle" class="glass-switch green" type="button" aria-pressed="false">OFF</button>
</article>
<article class="switch-card glass-tile heater-card">
<div class="card-title compact"><svg class="ui-icon feature-icon orange" aria-hidden="true"><use href="/ui/static/assets/icons.svg#heat"></use></svg><span><h2>Обогрев</h2><p id="heater-caption">Поддержание температуры</p></span></div>
<button id="heater-toggle" class="glass-switch orange" type="button" aria-pressed="false">OFF</button>
</article>
</section>
<section id="air" class="content-section glass-section" aria-labelledby="air-title">
<div class="section-title">
<div><svg class="ui-icon section-icon leaf" aria-hidden="true"><use href="/ui/static/assets/icons.svg#leaf"></use></svg><h2 id="air-title">Показатели воздуха</h2></div>
<span id="sensor-status" class="pill muted">Датчик</span>
<span id="updated-at" class="updated">Обновление…</span>
</div>
<div class="air-grid">
<article class="metric-card co2-card glass-tile" data-air-tone="muted">
<div class="metric-head"><span>CO₂</span><span id="air-label" class="quality-chip muted">Нет данных</span></div>
<strong><span id="co2">—</span> <small>ppm</small></strong>
<p id="air-advice">Ожидаем показания датчика</p>
<div class="meter co2-meter"><i id="co2-progress"></i></div>
<div class="meter-labels"><span>400</span><span>800</span><span>1200</span><span>2000</span></div>
</article>
<article class="metric-card glass-tile"><div class="metric-heading"><svg class="ui-icon metric-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#thermometer"></use></svg><span>Температура<br>в помещении</span></div><strong><span id="room-temp">—</span>°</strong></article>
<article class="metric-card glass-tile"><div class="metric-heading"><svg class="ui-icon metric-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#drop"></use></svg><span>Влажность</span></div><strong><span id="humidity">—</span>%</strong></article>
<article class="metric-card glass-tile"><div class="metric-heading"><svg class="ui-icon metric-icon particles" aria-hidden="true"><use href="/ui/static/assets/icons.svg#particles"></use></svg><span>PM2.5</span></div><strong><span id="pm25">—</span> <small>мкг/м³</small></strong><span id="pm25-quality" class="quality-chip small">—</span></article>
<article class="metric-card glass-tile"><div class="metric-heading"><svg class="ui-icon metric-icon particles" aria-hidden="true"><use href="/ui/static/assets/icons.svg#particles"></use></svg><span>PM10</span></div><strong><span id="pm10">—</span> <small>мкг/м³</small></strong><span id="pm10-quality" class="quality-chip small">—</span></article>
<article class="metric-card filter-card glass-tile"><div class="metric-heading"><svg class="ui-icon metric-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#filter"></use></svg><span>Фильтр</span></div><strong><span id="filter-remain">—</span> <small>дней осталось</small></strong><div class="filter-line"><div class="meter filter-meter"><i id="filter-progress"></i></div><span id="filter-percent">—</span></div></article>
</div>
</section>
<div class="bottom-grid">
<section id="schedule" class="content-section glass-section schedule-section" aria-labelledby="schedule-title">
<div class="section-title"><div><svg class="ui-icon section-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#clock"></use></svg><h2 id="schedule-title">Расписание</h2></div><div class="schedule-title-tools"><button id="schedule-edit-button" class="schedule-edit-button" type="button"><svg class="ui-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#settings"></use></svg><span>Изменить</span></button><span id="schedule-state" class="pill muted">—</span></div></div>
<div class="schedule-layout">
<div class="schedule-times glass-tile">
<div><span>Текущая точка</span><strong id="current-time">—</strong><small id="current-action">Нет данных</small></div><i></i><div><span>Следующая точка</span><strong id="next-time">—</strong><small id="next-action">Нет данных</small></div>
</div>
<div class="schedule-buttons">
<button id="auto-button" class="schedule-button auto" type="button"><svg class="ui-icon action-symbol" aria-hidden="true"><use href="/ui/static/assets/icons.svg#auto"></use></svg><span><strong>Вернуться в AUTO</strong><small>Отменить ручной режим</small></span></button>
<button id="pause-button" class="schedule-button pause" type="button"><svg class="ui-icon action-symbol" aria-hidden="true"><use href="/ui/static/assets/icons.svg#pause"></use></svg><span><strong>Пауза расписания</strong><small>Временно приостановить</small></span></button>
</div>
</div>
<div id="mode-banner" class="mode-banner warn"><span id="mode-title">Загрузка состояния</span><small id="mode-detail">Пожалуйста, подождите</small></div>
</section>
<section class="content-section glass-section extras-section" aria-labelledby="extras-title">
<div class="section-title"><div><svg class="ui-icon section-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#settings"></use></svg><h2 id="extras-title">Дополнительно</h2></div></div>
<div class="extras-grid">
<article class="extra-card glass-tile"><svg class="ui-icon extra-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#home"></use></svg><span><small>На улице</small><strong><span id="outside-temp">—</span>°</strong></span></article>
<article class="extra-card mode-card glass-tile">
<svg class="ui-icon extra-icon wind" aria-hidden="true"><use href="/ui/static/assets/icons.svg#wind"></use></svg><span><small>Режим работы</small><strong id="mode-name">Приточная вентиляция</strong><em>Подача и очистка воздуха</em></span>
<div class="segments" role="group" aria-label="Режим забора воздуха"><button id="mode-outside" class="segment" type="button">С улицы</button><button id="mode-recirculation" class="segment" type="button">Рециркуляция</button></div>
</article>
</div>
<div class="micro-settings">
<span>Модель <strong id="model">—</strong></span><span>Батарея Qingping <strong><span id="battery">—</span>%</strong></span>
<button id="sound-toggle" class="micro-toggle" type="button" aria-pressed="false">Звук OFF</button><button id="light-toggle" class="micro-toggle" type="button" aria-pressed="false">Свет OFF</button>
</div>
</section>
</div>
<span id="demo-note" class="demo-note" hidden>Демонстрационный режим — команды не отправляются устройству</span>
</main>
<dialog id="schedule-dialog" class="schedule-dialog" aria-labelledby="schedule-dialog-title">
<form id="schedule-form" class="schedule-editor">
<header class="editor-header">
<span class="editor-heading"><svg class="ui-icon" aria-hidden="true"><use href="/ui/static/assets/icons.svg#clock"></use></svg><span><h2 id="schedule-dialog-title">Редактор расписания</h2><small>Изменения сохраняются в config/schedule.yaml</small></span></span>
<button id="schedule-close-button" class="editor-close" type="button" aria-label="Закрыть редактор">×</button>
</header>
<div class="editor-scroll">
<label class="schedule-enabled"><input id="schedule-enabled" type="checkbox"><span><strong>Расписание включено</strong><small>Если выключить, автоматические точки применяться не будут</small></span></label>
<section class="editor-section" aria-labelledby="days-title">
<div class="editor-section-title"><span><h3 id="days-title">Дни недели</h3><small>Назначьте каждому дню один из шаблонов</small></span></div>
<div id="day-assignments" class="day-assignments"></div>
</section>
<section class="editor-section" aria-labelledby="points-title">
<div class="editor-section-title template-toolbar">
<span><h3 id="points-title">Точки расписания</h3><small id="template-usage">Выберите шаблон</small></span>
<label>Шаблон<select id="template-select"></select></label>
<span class="template-actions"><button id="duplicate-template" type="button">Дублировать</button><button id="delete-template" type="button">Удалить</button></span>
</div>
<div id="schedule-points" class="schedule-points"></div>
<button id="add-schedule-point" class="add-schedule-point" type="button">+ Добавить точку</button>
</section>
</div>
<footer class="editor-footer">
<span id="schedule-editor-status" class="editor-status" role="status"></span>
<button id="schedule-cancel-button" class="editor-button secondary" type="button">Отмена</button>
<button id="schedule-save-button" class="editor-button primary" type="submit">Сохранить расписание</button>
</footer>
</form>
</dialog>
<script type="module" src="/ui/static/js/tion.js?v=20260927-1"></script>
</body>
</html>