84 Commits

Author SHA1 Message Date
fec97e54c1 garaga page 3 2025-11-27 22:26:39 +01:00
743e84560d garaga page 2 2025-11-27 22:24:29 +01:00
f25ab6a3a1 garaga page 2025-11-27 22:20:50 +01:00
b08a3f2564 hottis modbus relay 7 2025-11-27 19:17:59 +01:00
db43854156 hottis modbus relay 6 2025-11-27 17:34:08 +01:00
3d759bd3ff hottis modbus relay 5 2025-11-27 17:13:56 +01:00
7193c2be7f hottis modbus relay 4 2025-11-27 17:11:30 +01:00
02596f4796 hottis modbus relay 3 2025-11-27 17:07:28 +01:00
e316ec0f58 hottis modbus relay 2 2025-11-27 16:58:02 +01:00
18481d9970 hottis modbus relay 2025-11-27 16:48:19 +01:00
84fe6eea96 initial 2025-11-27 16:40:09 +01:00
84e401778e ci 2025-11-22 11:02:51 +01:00
4ee3c13d3e ci test 2 2025-11-21 16:26:46 +01:00
d685366c09 ci test
Some checks failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/3 Pipeline failed
ci/woodpecker/push/build/1 Pipeline failed
ci/woodpecker/push/build/2 Pipeline failed
ci/woodpecker/push/build/4 Pipeline failed
2025-11-21 16:13:42 +01:00
07b28e2f1f test 3
Some checks failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/4 Pipeline failed
ci/woodpecker/push/build/2 Pipeline failed
ci/woodpecker/push/build/3 Pipeline failed
ci/woodpecker/push/build/1 Pipeline failed
2025-11-21 15:47:17 +01:00
39bfb66098 test 2
Some checks failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/2 Pipeline failed
ci/woodpecker/push/build/1 Pipeline failed
ci/woodpecker/push/build/3 Pipeline failed
ci/woodpecker/push/build/4 Pipeline failed
2025-11-21 15:24:34 +01:00
75860cd1c2 test
Some checks failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/4 Pipeline failed
ci/woodpecker/push/build/3 Pipeline failed
ci/woodpecker/push/build/2 Pipeline failed
ci/woodpecker/push/build/1 Pipeline failed
2025-11-21 15:19:59 +01:00
bcbb58ea36 registry cache 4
Some checks failed
ci/woodpecker/push/build/4 Pipeline failed
ci/woodpecker/push/build/1 Pipeline failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/3 Pipeline failed
ci/woodpecker/push/build/2 Pipeline failed
2025-11-21 13:57:43 +01:00
b38ed75261 registry cache 3
Some checks failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/4 Pipeline failed
ci/woodpecker/push/build/1 Pipeline failed
ci/woodpecker/push/build/2 Pipeline failed
ci/woodpecker/push/build/3 Pipeline failed
2025-11-21 13:55:11 +01:00
feb055b2ea registry cache 2
Some checks failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/1 Pipeline failed
ci/woodpecker/push/build/4 Pipeline failed
ci/woodpecker/push/build/2 Pipeline failed
ci/woodpecker/push/build/3 Pipeline failed
2025-11-21 13:53:31 +01:00
cce730b2fa registry cache
Some checks failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/2 Pipeline failed
ci/woodpecker/push/build/3 Pipeline failed
ci/woodpecker/push/build/4 Pipeline failed
ci/woodpecker/push/build/1 Pipeline failed
2025-11-21 13:44:23 +01:00
a26901037d namespace and config 15
Some checks failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/1 Pipeline failed
ci/woodpecker/push/build/2 Pipeline failed
ci/woodpecker/push/build/3 Pipeline failed
ci/woodpecker/push/build/4 Pipeline failed
ci/woodpecker/tag/build/1 Pipeline failed
ci/woodpecker/tag/build/4 Pipeline failed
ci/woodpecker/tag/build/2 Pipeline failed
ci/woodpecker/tag/build/3 Pipeline failed
ci/woodpecker/tag/predeploy Pipeline was successful
2025-11-21 12:14:11 +01:00
4889f5ed8b namespace and config 14
Some checks failed
ci/woodpecker/push/build/2 Pipeline failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/3 Pipeline failed
ci/woodpecker/push/build/1 Pipeline failed
ci/woodpecker/push/build/4 Pipeline failed
ci/woodpecker/tag/build/1 Pipeline failed
ci/woodpecker/tag/build/2 Pipeline failed
ci/woodpecker/tag/build/3 Pipeline failed
ci/woodpecker/tag/build/4 Pipeline failed
ci/woodpecker/tag/predeploy Pipeline was successful
2025-11-21 12:12:19 +01:00
804e9bf742 namespace and config 13
Some checks failed
ci/woodpecker/tag/build/4 Pipeline failed
ci/woodpecker/tag/build/3 Pipeline failed
ci/woodpecker/tag/build/2 Pipeline failed
ci/woodpecker/tag/build/1 Pipeline failed
ci/woodpecker/tag/predeploy Pipeline failed
2025-11-21 12:11:10 +01:00
f60d5d03e9 namespace and config 12
Some checks failed
ci/woodpecker/push/predeploy Pipeline was successful
ci/woodpecker/push/build/4 Pipeline was successful
ci/woodpecker/tag/build/1 Pipeline failed
ci/woodpecker/tag/build/2 Pipeline failed
ci/woodpecker/push/build/1 Pipeline was successful
ci/woodpecker/tag/build/3 Pipeline failed
ci/woodpecker/push/build/3 Pipeline was successful
ci/woodpecker/push/build/2 Pipeline was successful
ci/woodpecker/tag/build/4 Pipeline failed
ci/woodpecker/tag/predeploy Pipeline failed
2025-11-21 12:06:56 +01:00
eff88e1d2f namespace and config 11 2025-11-21 12:06:28 +01:00
d027163087 namespace and config 10
Some checks failed
ci/woodpecker/push/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
ci/woodpecker/push/woodpecker/3 Pipeline was successful
2025-11-21 12:01:20 +01:00
4051ca22a4 namespace and config 9
Some checks failed
ci/woodpecker/push/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/3 Pipeline failed
ci/woodpecker/push/woodpecker/1 Pipeline failed
ci/woodpecker/push/woodpecker/2 Pipeline failed
ci/woodpecker/push/woodpecker/4 Pipeline failed
2025-11-21 12:00:35 +01:00
2608e935b8 namespace and config 8
Some checks failed
ci/woodpecker/push/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/3 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
ci/woodpecker/tag/woodpecker/1 Pipeline failed
ci/woodpecker/tag/woodpecker/5 Pipeline failed
ci/woodpecker/tag/woodpecker/2 Pipeline failed
ci/woodpecker/tag/woodpecker/4 Pipeline failed
ci/woodpecker/tag/woodpecker/3 Pipeline failed
2025-11-21 11:55:50 +01:00
51f3b4f227 namespace and config 7
Some checks failed
ci/woodpecker/push/woodpecker/4 Pipeline is pending
ci/woodpecker/push/woodpecker/5 Pipeline is pending
ci/woodpecker/tag/woodpecker/4 Pipeline is pending
ci/woodpecker/tag/woodpecker/5 Pipeline is pending
ci/woodpecker/tag/woodpecker/1 Pipeline is pending
ci/woodpecker/tag/woodpecker/2 Pipeline is pending
ci/woodpecker/tag/woodpecker/3 Pipeline is pending
ci/woodpecker/push/woodpecker/1 Pipeline failed
ci/woodpecker/push/woodpecker/2 Pipeline failed
ci/woodpecker/push/woodpecker/3 Pipeline failed
2025-11-21 11:46:24 +01:00
006359687f namespace and config 6
Some checks failed
ci/woodpecker/push/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline failed
ci/woodpecker/push/woodpecker/1 Pipeline failed
ci/woodpecker/push/woodpecker/3 Pipeline failed
ci/woodpecker/tag/woodpecker/1 Pipeline failed
ci/woodpecker/tag/woodpecker/5 Pipeline failed
ci/woodpecker/tag/woodpecker/4 Pipeline failed
ci/woodpecker/tag/woodpecker/3 Pipeline failed
ci/woodpecker/tag/woodpecker/2 Pipeline failed
2025-11-21 11:45:41 +01:00
f26d304890 namespace and config 5
Some checks failed
ci/woodpecker/push/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/tag/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/tag/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/3 Pipeline was successful
ci/woodpecker/tag/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
ci/woodpecker/tag/woodpecker/3 Pipeline was successful
ci/woodpecker/tag/woodpecker/2 Pipeline was successful
2025-11-21 11:44:10 +01:00
6feec48ac6 namespace and config 4
Some checks failed
ci/woodpecker/push/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/tag/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
ci/woodpecker/tag/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/3 Pipeline was successful
ci/woodpecker/tag/woodpecker/2 Pipeline was successful
ci/woodpecker/tag/woodpecker/4 Pipeline was successful
ci/woodpecker/tag/woodpecker/3 Pipeline was successful
2025-11-21 11:40:54 +01:00
ed6ed66a37 namespace and config 3
Some checks failed
ci/woodpecker/push/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/3 Pipeline was successful
ci/woodpecker/tag/woodpecker/5 Pipeline failed
ci/woodpecker/push/woodpecker/2 Pipeline was successful
ci/woodpecker/tag/woodpecker/1 Pipeline failed
ci/woodpecker/tag/woodpecker/4 Pipeline failed
ci/woodpecker/tag/woodpecker/2 Pipeline failed
ci/woodpecker/tag/woodpecker/3 Pipeline failed
2025-11-21 11:37:39 +01:00
09498dd0e5 namespace and config 2
Some checks failed
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/tag/woodpecker/1 Pipeline failed
ci/woodpecker/push/woodpecker/3 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
ci/woodpecker/tag/woodpecker/3 Pipeline failed
ci/woodpecker/tag/woodpecker/4 Pipeline failed
ci/woodpecker/tag/woodpecker/2 Pipeline failed
2025-11-21 11:33:58 +01:00
41f5e06e30 namespace and config
Some checks failed
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
ci/woodpecker/push/woodpecker/3 Pipeline was successful
ci/woodpecker/tag/woodpecker/4 Pipeline failed
ci/woodpecker/tag/woodpecker/1 Pipeline failed
ci/woodpecker/tag/woodpecker/2 Pipeline failed
ci/woodpecker/tag/woodpecker/3 Pipeline failed
2025-11-21 11:23:49 +01:00
7769c6066a add ci script 5
All checks were successful
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/3 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
ci/woodpecker/tag/woodpecker/1 Pipeline was successful
ci/woodpecker/tag/woodpecker/2 Pipeline was successful
ci/woodpecker/tag/woodpecker/4 Pipeline was successful
ci/woodpecker/tag/woodpecker/3 Pipeline was successful
2025-11-21 11:10:45 +01:00
5f23e28cc0 add ci script 4
All checks were successful
ci/woodpecker/push/woodpecker/4 Pipeline was successful
ci/woodpecker/push/woodpecker/1 Pipeline was successful
ci/woodpecker/push/woodpecker/2 Pipeline was successful
ci/woodpecker/push/woodpecker/3 Pipeline was successful
2025-11-21 11:03:16 +01:00
cc083c1055 add ci script 3
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-11-21 10:57:51 +01:00
37b773143f add ci script 2
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-11-21 10:55:11 +01:00
27c0990400 add ci script
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2025-11-21 10:51:53 +01:00
b150cd895e default to rooms 2025-11-20 22:17:35 +01:00
f67831c8bd fix 2025-11-20 22:13:01 +01:00
b61e7293ae debug device states 2025-11-20 22:09:21 +01:00
a85fd1ccf0 change name 2025-11-20 21:52:21 +01:00
19a3dfdd65 drop obsolete files 2025-11-20 21:50:43 +01:00
57b4d7d762 drop back button from rooms 2025-11-20 21:41:35 +01:00
826d73990b grid fix 16 2025-11-20 21:32:42 +01:00
86587402b6 grid fix 15 2025-11-20 21:30:10 +01:00
110b903dc8 grid fix 14 2025-11-20 21:27:30 +01:00
a8f6ad800d grid fix 13 2025-11-20 21:25:42 +01:00
52a50e1cd4 grid fix 12 2025-11-20 21:25:05 +01:00
9d7e26677f grid fix 11 2025-11-20 18:33:50 +01:00
ebd459bfc1 grid fix 10 2025-11-20 18:29:51 +01:00
e49c5affe9 grid fix 9 2025-11-20 18:14:35 +01:00
5595cf4f37 grid fix 8 2025-11-20 18:13:55 +01:00
f61417a631 grid fix 7 2025-11-19 21:33:52 +01:00
6d62732d1d grid fix 6 2025-11-19 21:32:23 +01:00
73814df01e grid fix 5 2025-11-19 21:16:48 +01:00
4b7ac9b82b grid fix 4 2025-11-19 21:14:50 +01:00
850d810cb3 grid fix 3 2025-11-19 21:12:39 +01:00
5bdfbacc3c grid fix 2025-11-19 20:36:14 +01:00
3d9043b8fa device state setting fix 20 2025-11-19 15:17:55 +01:00
1890a83939 device state setting fix 19 2025-11-19 12:55:03 +01:00
23edd42fca device state setting fix 18 2025-11-19 12:34:39 +01:00
5fbaab3c11 device state setting fix 17 2025-11-19 12:19:51 +01:00
2eefbcd44b device state setting fix 16 2025-11-19 12:12:15 +01:00
d09caa9d92 device state setting fix 15 2025-11-19 12:09:45 +01:00
127b5857c3 device state setting fix 14 2025-11-19 12:02:27 +01:00
c2dcb733d8 device state setting fix 12 2025-11-19 11:24:32 +01:00
168b2c4b12 device state setting fix 11 2025-11-19 10:58:51 +01:00
66872703c1 device state setting fix 10 2025-11-19 10:55:05 +01:00
d4b44fa73e device state setting fix 9 2025-11-19 10:49:23 +01:00
87a86524d4 device state setting fix 8 2025-11-19 10:44:18 +01:00
91fdfde280 device state setting fix 7 2025-11-19 10:41:39 +01:00
d138d7bf0a device state setting fix 6 2025-11-19 10:36:45 +01:00
8b08ded0c6 device state setting fix 5 2025-11-19 10:31:07 +01:00
6a0601742a device state setting fix 4 2025-11-19 10:28:33 +01:00
99580f8ff9 device state setting fix 3 2025-11-19 10:20:46 +01:00
381f8521d4 device state setting fix 2 2025-11-19 10:16:39 +01:00
a382d58601 device state setting fix 2025-11-19 10:11:16 +01:00
0ca5ffaca0 device state fix 3 2025-11-19 09:40:47 +01:00
ec193a92f8 device state fix 2 2025-11-19 09:38:03 +01:00
c473ea341e device state fix 2025-11-19 09:35:27 +01:00
35 changed files with 1285 additions and 3129 deletions

49
.woodpecker.yml Normal file
View File

@@ -0,0 +1,49 @@
matrix:
APP:
- ui
- api
- abstraction
- rules
env:
NAMESPACE: "homea2"
steps:
build:
image: plugins/kaniko
settings:
repo: ${FORGE_NAME}/${CI_REPO}/${APP}
registry:
from_secret: container_registry
auto_tag: true
username:
from_secret: container_registry_username
password:
from_secret: container_registry_password
dockerfile: apps/${APP}/Dockerfile
when:
event: [push, tag]
ref:
exclude:
- refs/tags/*-configchange
create_namespace:
image: quay.io/wollud1969/k8s-admin-helper:0.3.4
environment:
KUBE_CONFIG_CONTENT:
from_secret: kube_config
commands:
- kubectl create namespace ${NAMESPACE} || echo "Namespace ${NAMESPACE} already exists"
when:
- event: [tag]
configuration:
image: quay.io/wollud1969/k8s-admin-helper:0.3.4
environment:
KUBE_CONFIG_CONTENT:
from_secret: kube_config
commands:
when:
- event: [tag]

43
.woodpecker/build.yml Normal file
View File

@@ -0,0 +1,43 @@
matrix:
APP:
- ui
- api
- abstraction
- rules
steps:
show:
image: quay.io/wollud1969/networktools:latest
environment:
forge_name:
from_secret: forge_name
container_registry:
from_secret: container_registry
container_registry_username:
from_secret: container_registry_username
container_registry_password:
from_secret: container_registry_password
commands:
- echo $${forge_name} | base64
- echo $${container_registry} | base64
- echo $${container_registry_username} | base64
- echo $${container_registry_password} | base64
build:
image: plugins/kaniko
settings:
repo: ${FORGE_NAME}/${CI_REPO}/${APP}
auto_tag: true
dockerfile: apps/${APP}/Dockerfile
username:
from_secret: docker_hub_username
password:
from_secret: docker_hub_password
when:
event: [push, tag]
ref:
exclude:
- refs/tags/*-configchange

37
.woodpecker/predeploy.yml Normal file
View File

@@ -0,0 +1,37 @@
steps:
create_namespace:
image: quay.io/wollud1969/k8s-admin-helper:0.3.4
environment:
KUBE_CONFIG_CONTENT:
from_secret: kube_config
NAMESPACE: "homea2"
commands:
- printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
- export KUBECONFIG=/tmp/kubeconfig
- kubectl create namespace $NAMESPACE || echo "Namespace $NAMESPACE already exists"
when:
event: [tag]
ref:
exclude:
- refs/tags/*-configchange
apply_configuration:
image: quay.io/wollud1969/k8s-admin-helper:0.3.4
environment:
KUBE_CONFIG_CONTENT:
from_secret: kube_config
NAMESPACE: "homea2"
commands:
- printf "$KUBE_CONFIG_CONTENT" > /tmp/kubeconfig
- export KUBECONFIG=/tmp/kubeconfig
- kubectl create configmap home-automation-config
--from-file=devices=config/devices.yaml
--from-file=groups=config/groups.yaml
--from-file=layout=config/layout.yaml
--from-file=rules=config/rules.yaml
--from-file=scenes=config/scenes.yaml
--namespace=$NAMESPACE
--dry-run=client -o yaml | kubectl apply -f -
when:
event: [tag]

View File

@@ -1,41 +0,0 @@
Schlafzimmer:
- Bettlicht Patty | 0x0017880108158b32
- Bettlicht Wolfgang | 0x00178801081570bf
- Deckenlampe Schlafzimmer | 0x0017880108a406a7
- Medusa-Lampe Schlafzimmer | 0xf0d1b80000154c7c
Esszimmer:
- Deckenlampe Esszimmer | 0x0017880108a03e45
- Leselampe Esszimmer | 0xec1bbdfffe7b84f2
- Standlampe Esszimmer | 0xbc33acfffe21f547
- kleine Lampe links Esszimmer | 0xf0d1b80000153099
- kleine Lampe rechts Esszimmer | 0xf0d1b80000156645
Wohnzimmer:
- Lampe Naehtischchen Wohnzimmer | 0x842e14fffee560ee
- Lampe Semeniere Wohnzimmer | 0xf0d1b8000015480b
- Sterne Wohnzimmer | 0xf0d1b80000155fc2
- grosse Lampe Wohnzimmer | 0xf0d1b80000151aca
Küche:
- Küche Deckenlampe | 0x001788010d2c40c4
- Kueche | 0x94deb8fffe2e5c06
Arbeitszimmer Patty:
- Leselampe Patty | 0x001788010600ec9d
- Schranklicht hinten Patty | 0x0017880106e29571
- Schranklicht vorne Patty | 0xf0d1b80000154cf5
Arbeitszimmer Wolfgang:
- Wolfgang | 0x540f57fffe7e3cfe
- ExperimentLabTest | 0xf0d1b80000195038
Flur:
- Deckenlampe Flur oben | 0x001788010d2123a7
- Haustür | 0xec1bbdfffea6a3da
- Licht Flur oben am Spiegel | 0x842e14fffefe4ba4
Sportzimmer:
- Sportlicht Regal | 0xf0d1b8be2409f569
- Sportlicht Tisch | 0xf0d1b8be2409f31b
- Sportlicht am Fernseher, Studierzimmer | 0x842e14fffe76a23a

View File

@@ -1,230 +0,0 @@
# Docker Guide für Home Automation
Vollständige Anleitung zum Ausführen aller Services mit Docker/finch.
## Quick Start - Alle Services starten
### Linux Server (empfohlen - mit Docker Network)
```bash
# 1. Images bauen
docker build -t api:dev -f apps/api/Dockerfile .
docker build -t ui:dev -f apps/ui/Dockerfile .
docker build -t abstraction:dev -f apps/abstraction/Dockerfile .
docker build -t simulator:dev -f apps/simulator/Dockerfile .
# 2. Netzwerk erstellen
docker network create home-automation
# 3. Abstraction Layer (MQTT Worker)
docker run -d --name abstraction \
--network home-automation \
-v $(pwd)/config:/app/config:ro \
-e MQTT_BROKER=172.16.2.16 \
-e REDIS_HOST=172.23.1.116 \
-e REDIS_DB=8 \
abstraction:dev
# 4. API Server
docker run -d --name api \
--network home-automation \
-p 8001:8001 \
-v $(pwd)/config:/app/config:ro \
-e MQTT_BROKER=172.16.2.16 \
-e REDIS_HOST=172.23.1.116 \
-e REDIS_DB=8 \
api:dev
# 5. Web UI
docker run -d --name ui \
--network home-automation \
-p 8002:8002 \
-e API_BASE=http://api:8001 \
ui:dev
# 6. Device Simulator (optional)
docker run -d --name simulator \
--network home-automation \
-p 8010:8010 \
-e MQTT_BROKER=172.16.2.16 \
simulator:dev
```
### macOS mit finch/nerdctl (Alternative)
```bash
# Images bauen (wie oben)
# Abstraction Layer
docker run -d --name abstraction \
-v $(pwd)/config:/app/config:ro \
-e MQTT_BROKER=172.16.2.16 \
-e REDIS_HOST=172.23.1.116 \
-e REDIS_DB=8 \
abstraction:dev
# API Server
docker run -d --name api \
-p 8001:8001 \
-v $(pwd)/config:/app/config:ro \
-e MQTT_BROKER=172.16.2.16 \
-e REDIS_HOST=172.23.1.116 \
-e REDIS_DB=8 \
api:dev
# Web UI (mit host.docker.internal für macOS)
docker run -d --name ui \
--add-host=host.docker.internal:host-gateway \
-p 8002:8002 \
-e API_BASE=http://host.docker.internal:8001 \
ui:dev
# Device Simulator
docker run -d --name simulator \
-p 8010:8010 \
-e MQTT_BROKER=172.16.2.16 \
simulator:dev
```
## Zugriff
- **Web UI**: http://<server-ip>:8002
- **API Docs**: http://<server-ip>:8001/docs
- **Simulator**: http://<server-ip>:8010
Auf localhost: `127.0.0.1` oder `localhost`
## finch/nerdctl Besonderheiten
### Port-Binding Verhalten (nur macOS/Windows)
**Standard Docker auf Linux:**
- `-p 8001:8001` → bindet auf `0.0.0.0:8001` (von überall erreichbar)
**finch/nerdctl auf macOS:**
- `-p 8001:8001` → bindet auf `127.0.0.1:8001` (nur localhost)
- Dies ist ein **Security-Feature** von nerdctl
- **Auf Linux-Servern ist das KEIN Problem!**
### Container-to-Container Kommunikation
**Linux (empfohlen):**
```bash
# Docker Network verwenden - Container sprechen sich mit Namen an
docker network create home-automation
docker run --network home-automation --name api ...
docker run --network home-automation -e API_BASE=http://api:8001 ui ...
```
**macOS mit finch:**
```bash
# host.docker.internal verwenden
docker run --add-host=host.docker.internal:host-gateway \
-e API_BASE=http://host.docker.internal:8001 ui ...
```
## Container verwalten
```bash
# Alle Container anzeigen
docker ps
# Logs anschauen
docker logs api
docker logs ui -f # Follow mode
# Container stoppen
docker stop api ui abstraction simulator
# Container entfernen
docker rm api ui abstraction simulator
# Alles neu starten
docker stop api ui abstraction simulator && \
docker rm api ui abstraction simulator && \
# ... dann Quick Start Befehle von oben
```
## Troubleshooting
### UI zeigt "Keine Räume oder Geräte konfiguriert"
**Problem:** UI kann API nicht erreichen
**Linux - Lösung:**
```bash
# Verwende Docker Network
docker network create home-automation
docker stop ui && docker rm ui
docker run -d --name ui \
--network home-automation \
-p 8002:8002 \
-e API_BASE=http://api:8001 \
ui:dev
```
**macOS/finch - Lösung:**
```bash
docker stop ui && docker rm ui
docker run -d --name ui \
--add-host=host.docker.internal:host-gateway \
-p 8002:8002 \
-e API_BASE=http://host.docker.internal:8001 \
ui:dev
```
### "Connection refused" in Logs
**Check 1:** Ist die API gestartet?
```bash
docker ps | grep api
curl http://127.0.0.1:8001/health
```
**Check 2:** Hat UI die richtige API_BASE?
```bash
docker inspect ui | grep API_BASE
```
### Port bereits belegt
```bash
# Prüfe welcher Prozess Port 8001 nutzt
lsof -i :8001
# Oder mit netstat
netstat -an | grep 8001
# Alte Container aufräumen
docker ps -a | grep -E "api|ui|abstraction|simulator"
docker rm -f <container-id>
```
## Produktiv-Deployment
Für Produktion auf **Linux-Servern** empfohlen:
1. **Docker Compose** (siehe `infra/docker-compose.yml`)
2. **Docker Network** für Service Discovery (siehe Linux Quick Start oben)
3. **Volume Mounts** für Persistenz
4. **Health Checks** in Kubernetes/Compose (nicht im Dockerfile)
### Beispiel mit Docker Network (Linux)
```bash
# Netzwerk erstellen
docker network create home-automation
# Services starten (alle im gleichen Netzwerk)
docker run -d --name api --network home-automation \
-p 8001:8001 \
-v $(pwd)/config:/app/config:ro \
api:dev
docker run -d --name ui --network home-automation \
-p 8002:8002 \
-e API_BASE=http://api:8001 \
ui:dev
```
**Vorteil:** Service Discovery über Container-Namen, keine `--add-host` Tricks nötig.

View File

@@ -1,553 +0,0 @@
# HomeKit-Bridge API-Modell: Analyse der bestehenden Implementierung
**Analysedatum:** 17. November 2025
**Analysierte Dateien:**
- `apps/api/main.py`
- `apps/api/routes/groups_scenes.py`
- `config/devices.yaml`
---
## Zusammenfassung
Die bestehende API-Implementierung erfüllt **~60%** der Anforderungen des HomeKit-Bridge Ziel-Modells. Die meisten Kernfunktionalitäten sind vorhanden, aber es fehlen wichtige Metadaten-Felder und ein dedizierter State-Endpoint.
---
## 1. GET /devices
### Status: ✅ **VORHANDEN** mit Abweichungen
### Implementierung (apps/api/main.py:325-343)
```python
@app.get("/devices")
async def get_devices() -> list[DeviceInfo]:
devices = load_devices()
return [
DeviceInfo(
device_id=device["device_id"],
type=device["type"],
name=device.get("name", device["device_id"]),
features=device.get("features", {})
)
for device in devices
]
```
### Response-Modell (DeviceInfo)
```python
class DeviceInfo(BaseModel):
device_id: str
type: str
name: str
features: dict[str, Any] = {}
```
### Abweichungen vom Ziel-Modell
| Feld | Ziel-Modell | Ist-Zustand | Status |
|------|-------------|-------------|---------|
| `device_id` | ✅ Erforderlich | ✅ Vorhanden | OK |
| `type` | ✅ Erforderlich | ✅ Vorhanden | OK |
| `cap_version` | ✅ Erforderlich | ❌ **FEHLT** | FEHLT |
| `room` | ✅ Erforderlich | ❌ **FEHLT** | FEHLT |
| `friendly_name` | ✅ Erforderlich | ⚠️ Heißt `name` | UMBENENNUNG |
| `technology` | ✅ Erforderlich | ❌ **FEHLT** | FEHLT |
| `features` | ✅ Erforderlich | ✅ Vorhanden | OK |
| `read_only` | ✅ Erforderlich | ❌ **FEHLT** | FEHLT |
| `tags` | Optional | ❌ **FEHLT** | FEHLT |
### Details zu fehlenden Feldern
#### ❌ `cap_version`
- **Vorhanden in devices.yaml:** Ja, als `cap_version` (z.B. `"light@1.2.0"`)
- **Problem:** Wird von `load_devices()` geladen, aber nicht in `DeviceInfo` exponiert
- **Lösung:** Feld zu `DeviceInfo` hinzufügen und aus `device["cap_version"]` befüllen
#### ❌ `room`
- **Vorhanden in layout.yaml:** Ja, indirekt über Raum-Zuordnung
- **Problem:** Aktuell nur über separaten Endpoint `/devices/{device_id}/room` verfügbar
- **Lösung:** Room-Mapping in `/devices` integrieren (Resolver bereits vorhanden in `apps/api/resolvers.py`)
#### ⚠️ `friendly_name` vs. `name`
- **Vorhanden in devices.yaml:** Ja, als `metadata.friendly_name`
- **Problem:** Aktuell wird `device.get("name", device["device_id"])` verwendet, nicht `metadata.friendly_name`
- **Lösung:** Priorisierung: `metadata.friendly_name` > `name` > `device_id`
#### ❌ `technology`
- **Vorhanden in devices.yaml:** Ja, als `technology` (z.B. `"zigbee2mqtt"`)
- **Problem:** Wird nicht in Response exponiert
- **Lösung:** Feld zu `DeviceInfo` hinzufügen
#### ❌ `read_only`
- **Implizit vorhanden:** Ja, über `topics.set` (wenn fehlt → read-only)
- **Problem:** Muss berechnet werden
- **Lösung:** `read_only = "set" not in device.get("topics", {})`
#### ❌ `tags`
- **Vorhanden in devices.yaml:** Nein
- **Status:** Nicht kritisch, kann später ergänzt werden
---
## 2. GET /devices/{device_id}
### Status: ❌ **FEHLT KOMPLETT**
### Aktuell vorhanden
- `/devices/{device_id}/room` (liefert nur `{"device_id": str, "room": str | None}`)
### Erforderlich
Ein Endpoint, der das gleiche Schema wie ein Eintrag aus `/devices` zurückgibt:
```python
@app.get("/devices/{device_id}")
async def get_device(device_id: str) -> DeviceInfo:
# Load device, enrich with room, return DeviceInfo
```
### Implementierung
- Device aus `load_devices()` filtern
- Mit `get_room(device_id)` anreichern
- Als `DeviceInfo` zurückgeben
- 404 bei nicht gefunden
---
## 3. GET /devices/{device_id}/state
### Status: ❌ **FEHLT KOMPLETT**
### Aktuell vorhanden
- `/devices/states` (liefert **alle** Device-States als Dict)
```python
@app.get("/devices/states")
async def get_device_states() -> dict[str, dict[str, Any]]:
return device_states # In-memory cache
```
### Ziel-Format
```json
{
"device_id": "thermostat_wolfgang",
"type": "thermostat",
"room": "Schlafzimmer",
"payload": {
"current": 19.5,
"target": 21.0,
"mode": "heat"
},
"ts": "2025-11-17T14:23:45.123Z"
}
```
### Erforderlich
```python
@app.get("/devices/{device_id}/state")
async def get_device_state(device_id: str) -> DeviceStateResponse:
# Get from device_states cache
# Enrich with metadata (type, room)
# Add timestamp
# Return structured response
```
### Problem
- Aktuell wird nur `payload` im Cache gespeichert
- Timestamp fehlt im Cache (müsste bei SSE-Updates mitgespeichert werden)
- Metadaten (type, room) müssen aus devices.yaml/layout.yaml ergänzt werden
---
## 4. SSE-Endpoint /realtime
### Status: ✅ **VORHANDEN** mit kleineren Abweichungen
### Implementierung (apps/api/main.py:608-637)
```python
@app.get("/realtime")
async def realtime_events(request: Request) -> StreamingResponse:
return StreamingResponse(
event_generator(request),
media_type="text/event-stream",
# ... headers
)
```
### Aktuelles Event-Format (aus Redis)
```json
{
"type": "state",
"device_id": "thermostat_wolfgang",
"payload": {
"current": 19.5,
"target": 21.0
}
}
```
### Ziel-Format
```json
{
"type": "state",
"device_id": "thermostat_wolfgang",
"device_type": "thermostat", // ← FEHLT
"room": "Schlafzimmer", // ← FEHLT
"payload": {
"current": 19.5,
"target": 21.0
},
"ts": "2025-11-17T14:23:45.123Z", // ← FEHLT
"source": "zigbee2mqtt" // ← FEHLT (optional)
}
```
### Abweichungen
| Feld | Ziel-Modell | Ist-Zustand | Status |
|------|-------------|-------------|---------|
| `type` | ✅ | ✅ | OK |
| `device_id` | ✅ | ✅ | OK |
| `device_type` | ✅ | ❌ **FEHLT** | FEHLT |
| `room` | ✅ | ❌ **FEHLT** | FEHLT |
| `payload` | ✅ | ✅ | OK |
| `ts` | ✅ | ❌ **FEHLT** | FEHLT |
| `source` | Optional | ❌ **FEHLT** | FEHLT |
### Problem
Events werden direkt aus Redis weitergeleitet ohne Enrichment.
### Lösungsansätze
**Option A: Enrichment im SSE-Generator**
```python
# Im event_generator() nach JSON-Parse:
state_data = json.loads(data)
if state_data.get("type") == "state":
# Enrich with metadata
device_id = state_data["device_id"]
device = get_device_from_cache(device_id)
state_data["device_type"] = device["type"]
state_data["room"] = get_room(device_id)
if "ts" not in state_data:
state_data["ts"] = datetime.utcnow().isoformat()
data = json.dumps(state_data)
```
**Option B: Enrichment im Publisher (apps/abstraction)**
- Besser: Events bereits vollständig beim Publizieren
- Würde auch `/devices/{id}/state` helfen
---
## 5. POST /devices/{device_id}/set
### Status: ✅ **VORHANDEN** mit kleinen Abweichungen
### Implementierung (apps/api/main.py:406-504)
```python
@app.post("/devices/{device_id}/set", status_code=status.HTTP_202_ACCEPTED)
async def set_device(device_id: str, request: SetDeviceRequest) -> dict[str, str]:
# Validierung, MQTT publish
```
### Request-Modell
```python
class SetDeviceRequest(BaseModel):
type: str
payload: dict[str, Any]
```
### Vergleich mit Ziel-Modell
| Aspekt | Ziel-Modell | Ist-Zustand | Status |
|--------|-------------|-------------|---------|
| Body-Format | `{type, payload}` | `{type, payload}` | ✅ OK |
| Type-Validierung | ✅ Erforderlich | ✅ Vorhanden | OK |
| Payload-Validierung | ✅ Per Device-Type | ✅ Vorhanden | OK |
| Read-Only Check | ✅ → 405 | ✅ → 405 | OK |
| Response Code | 200/202 | 202 | OK |
### Validierungs-Details
**✅ Gut implementiert:**
- Type-spezifische Pydantic-Validierung (LightState, ThermostatState, etc.)
- Whitelist für erlaubte Felder bei Thermostaten
- Read-only Detection über `topics.set`
- Proper HTTP Status Codes (404, 405, 422)
**⚠️ Kleine Abweichung:**
- Thermostat-Validierung erlaubt nur `{mode, target}` beim SET
- Ziel-Modell erwähnt dies nicht explizit
- **Bewertung:** Ist sinnvolle Einschränkung, kein Problem
### MQTT-Publishing
```python
topic = f"home/{request.type}/{device_id}/set"
mqtt_payload = {
"type": request.type,
"payload": request.payload
}
await publish_mqtt(topic, mqtt_payload)
```
✅ Korrekt implementiert
---
## 6. Zusätzliche Endpoints (nicht im Ziel-Modell)
### Vorhanden, aber nicht gefordert
- **GET /spec** - Capability-Versionen
- **GET /devices/states** - Alle States (könnte nützlich für Bridge sein)
- **GET /layout** - UI-spezifisch
- **GET /devices/{device_id}/room** - Wird obsolet wenn `/devices` `room` hat
- **GET /groups**, **POST /groups/{id}/set** - Gruppen-Feature
- **GET /scenes**, **POST /scenes/{id}/run** - Szenen-Feature
**Bewertung:** Nicht störend, können bleiben. Bridge muss diese nicht nutzen.
---
## 7. Datenquellen-Analyse
### devices.yaml
**✅ Enthält alle benötigten Felder:**
```yaml
- device_id: leselampe_esszimmer
type: light
cap_version: "light@1.2.0" # ← Vorhanden
technology: zigbee2mqtt # ← Vorhanden
features:
power: true
brightness: true
topics:
state: "..."
set: "..." # ← Für read_only Detection
metadata:
friendly_name: "Leselampe Esszimmer" # ← Vorhanden
ieee_address: "..."
model: "LED1842G3"
vendor: "IKEA"
```
### layout.yaml
**✅ Enthält Room-Mapping:**
```yaml
rooms:
- name: "Schlafzimmer"
devices:
- device_id: thermostat_wolfgang
```
**✅ Resolver bereits vorhanden:** `apps/api/resolvers.py::get_room(device_id)`
---
## 8. Priorisierte To-Do-Liste
### 🔴 **Kritisch** (Bridge funktioniert nicht ohne)
1. **GET /devices: Fehlende Felder ergänzen**
- `cap_version` aus devices.yaml
- `room` via `get_room()`
- `friendly_name` aus `metadata.friendly_name`
- `technology` aus devices.yaml
- `read_only` berechnen
2. **GET /devices/{device_id}/state implementieren**
- Neuer Endpoint
- State aus Cache + Metadaten
- Timestamp hinzufügen
### 🟡 **Wichtig** (Bridge funktioniert, aber eingeschränkt)
3. **SSE /realtime: Events enrichen**
- `device_type` hinzufügen
- `room` hinzufügen
- `ts` sicherstellen
4. **GET /devices/{device_id} implementieren**
- Einzelgerät-Abfrage
- Gleiche Struktur wie `/devices`-Eintrag
### 🟢 **Nice-to-have**
5. **State-Cache mit Timestamps erweitern**
- Aktuell: `device_states[id] = payload`
- Ziel: `device_states[id] = {payload, ts}`
6. **SSE: source-Feld hinzufügen**
- Aus `device["technology"]` ableiten
---
## 9. Implementierungs-Reihenfolge
### Phase 1: GET /devices erweitern
**Dateien:**
- `apps/api/main.py` (DeviceInfo-Modell, get_devices())
**Änderungen:**
```python
class DeviceInfo(BaseModel):
device_id: str
type: str
cap_version: str
room: str | None
friendly_name: str
technology: str
features: dict[str, Any]
read_only: bool
tags: list[str] | None = None
@app.get("/devices")
async def get_devices() -> list[DeviceInfo]:
devices = load_devices()
return [
DeviceInfo(
device_id=device["device_id"],
type=device["type"],
cap_version=device["cap_version"],
room=get_room(device["device_id"]),
friendly_name=device.get("metadata", {}).get("friendly_name", device["device_id"]),
technology=device["technology"],
features=device.get("features", {}),
read_only="set" not in device.get("topics", {}),
tags=device.get("tags")
)
for device in devices
]
```
### Phase 2: GET /devices/{device_id}/state
**Dateien:**
- `apps/api/main.py`
**Neues Modell:**
```python
class DeviceStateResponse(BaseModel):
device_id: str
type: str
room: str | None
payload: dict[str, Any]
ts: str
@app.get("/devices/{device_id}/state")
async def get_device_state(device_id: str) -> DeviceStateResponse:
if device_id not in device_states:
raise HTTPException(404, f"No state for {device_id}")
devices = load_devices()
device = next((d for d in devices if d["device_id"] == device_id), None)
if not device:
raise HTTPException(404, f"Device {device_id} not found")
return DeviceStateResponse(
device_id=device_id,
type=device["type"],
room=get_room(device_id),
payload=device_states[device_id],
ts=datetime.utcnow().isoformat() + "Z"
)
```
### Phase 3: SSE Enrichment
**Dateien:**
- `apps/api/main.py` (event_generator())
**Im event_generator() nach JSON-Parse:**
```python
if message and message["type"] == "message":
data = message["data"]
state_data = json.loads(data)
# Enrich events
if state_data.get("type") == "state" and state_data.get("device_id"):
device_id = state_data["device_id"]
devices = load_devices()
device = next((d for d in devices if d["device_id"] == device_id), None)
if device:
state_data["device_type"] = device["type"]
state_data["room"] = get_room(device_id)
if "ts" not in state_data:
state_data["ts"] = datetime.utcnow().isoformat() + "Z"
state_data["source"] = device.get("technology")
data = json.dumps(state_data)
yield f"event: message\ndata: {data}\n\n"
```
### Phase 4: GET /devices/{device_id}
**Dateien:**
- `apps/api/main.py`
```python
@app.get("/devices/{device_id}")
async def get_device(device_id: str) -> DeviceInfo:
devices = load_devices()
device = next((d for d in devices if d["device_id"] == device_id), None)
if not device:
raise HTTPException(404, f"Device {device_id} not found")
return DeviceInfo(
device_id=device["device_id"],
type=device["type"],
cap_version=device["cap_version"],
room=get_room(device["device_id"]),
friendly_name=device.get("metadata", {}).get("friendly_name", device["device_id"]),
technology=device["technology"],
features=device.get("features", {}),
read_only="set" not in device.get("topics", {}),
tags=device.get("tags")
)
```
---
## 10. Zusammenfassung der Abweichungen
### ✅ Bereits konform (40%)
- POST /devices/{id}/set - Vollständig implementiert
- SSE /realtime - Grundfunktion vorhanden
- GET /devices - Grundstruktur vorhanden
### ⚠️ Teilweise konform (40%)
- GET /devices - Fehlen wichtige Felder (cap_version, room, friendly_name, technology, read_only)
- SSE /realtime - Events ohne device_type, room, ts
### ❌ Nicht vorhanden (20%)
- GET /devices/{device_id}/state - Komplett fehlend
- GET /devices/{device_id} - Komplett fehlend
---
## 11. Risiko-Bewertung
### 🟢 **Geringes Risiko**
- Alle Daten sind in devices.yaml/layout.yaml vorhanden
- Resolver-Funktionen existieren bereits
- Pydantic-Modelle sind etabliert
- Keine Breaking Changes an bestehenden Endpoints nötig
### 🟡 **Mittleres Risiko**
- SSE-Enrichment könnte Performance beeinflussen (load_devices() bei jedem Event)
- **Mitigation:** Device-Lookup cachen
- Timestamp-Handling muss konsistent sein
- **Mitigation:** UTC + ISO8601 + "Z" Suffix
### 🔴 **Kein hohes Risiko identifiziert**
---
## 12. Nächste Schritte
1. **Freigabe einholen:** Sollen wir mit Phase 1 (GET /devices erweitern) starten?
2. **Testing-Strategie:** Sollen Tests für die neuen Endpoints geschrieben werden?
3. **Backward Compatibility:** GET /devices ändert Response-Struktur - ist das OK? (Vermutlich ja, da UI diese Felder ignorieren kann)
4. **Performance:** Device-Lookup-Cache implementieren vor SSE-Enrichment?
---
**Ende der Analyse**

View File

@@ -1,223 +0,0 @@
# MAX! (eQ-3) Thermostat Integration
## Overview
This document describes the integration of MAX! (eQ-3) thermostats via Homegear into the home automation system.
## Protocol Characteristics
MAX! thermostats use a **simple integer-based protocol** (not JSON):
- **SET messages**: Plain integer temperature value (e.g., `22`)
- **STATE messages**: Plain integer temperature value (e.g., `22`)
- **Topics**: Homegear MQTT format
### MQTT Topics
**SET Command:**
```
homegear/instance1/set/<peerId>/<channel>/SET_TEMPERATURE
Payload: "22" (plain integer as string)
```
**STATE Update:**
```
homegear/instance1/plain/<peerId>/<channel>/SET_TEMPERATURE
Payload: "22" (plain integer as string)
```
## Transformation Layer
The abstraction layer provides automatic transformation between the abstract home protocol and MAX! format.
### Abstract → MAX! (SET)
**Input (Abstract):**
```json
{
"mode": "heat",
"target": 22.5
}
```
**Output (MAX!):**
```
22
```
**Transformation Rules:**
- Extract `target` temperature
- Convert float → integer (round to nearest)
- Return as plain string (no JSON)
- Ignore `mode` field (MAX! always in heating mode)
### MAX! → Abstract (STATE)
**Input (MAX!):**
```
22
```
**Output (Abstract):**
```json
{
"target": 22.0,
"mode": "heat"
}
```
**Transformation Rules:**
- Parse plain string/integer value
- Convert to float
- Add default `mode: "heat"` (MAX! always heating)
- Wrap in abstract payload structure
## Device Configuration
### Example devices.yaml Entry
```yaml
- device_id: "thermostat_wolfgang"
type: "thermostat"
cap_version: "thermostat@1.0.0"
technology: "max"
features:
mode: true
target: true
current: false # SET_TEMPERATURE doesn't report current temp
topics:
set: "homegear/instance1/set/39/1/SET_TEMPERATURE"
state: "homegear/instance1/plain/39/1/SET_TEMPERATURE"
metadata:
friendly_name: "Thermostat Wolfgang"
location: "Arbeitszimmer Wolfgang"
vendor: "eQ-3"
model: "MAX! Thermostat"
peer_id: "39"
channel: "1"
```
### Configuration Notes
1. **technology**: Must be set to `"max"` to activate MAX! transformations
2. **topics.set**: Use Homegear's `/set/` path with `/SET_TEMPERATURE` parameter
3. **topics.state**: Use Homegear's `/plain/` path with `/SET_TEMPERATURE` parameter
4. **features.current**: Set to `false` - SET_TEMPERATURE topic doesn't provide current temperature
5. **metadata**: Include `peer_id` and `channel` for reference
## Temperature Rounding
MAX! only supports **integer temperatures**. The system uses standard rounding:
| Abstract Input | MAX! Output |
|----------------|-------------|
| 20.4°C | 20 |
| 20.5°C | 20 |
| 20.6°C | 21 |
| 21.5°C | 22 |
| 22.5°C | 22 |
Python's `round()` function uses "banker's rounding" (round half to even).
## Limitations
1. **No current temperature**: SET_TEMPERATURE topic only reports target, not actual temperature
2. **No mode control**: MAX! thermostats are always in heating mode
3. **Integer only**: Temperature precision limited to 1°C steps
4. **No battery status**: Not available via SET_TEMPERATURE topic
5. **No window detection**: Not available via SET_TEMPERATURE topic
## Testing
Test the transformation functions:
```bash
poetry run python /tmp/test_max_transform.py
```
Expected output:
```
✅ PASS: Float 22.5 -> Integer string
✅ PASS: Integer string -> Abstract dict
✅ PASS: Integer -> Abstract dict
✅ PASS: Rounding works correctly
🎉 All MAX! transformation tests passed!
```
## Implementation Details
### Files Modified
1. **apps/abstraction/transformation.py**
- Added `_transform_thermostat_max_to_vendor()` - converts abstract → plain integer
- Added `_transform_thermostat_max_to_abstract()` - converts plain integer → abstract
- Registered handlers in `TRANSFORM_HANDLERS` registry
2. **apps/abstraction/main.py**
- Modified `handle_abstract_set()` to send plain string for MAX! devices (not JSON)
- Modified message processing to handle plain text payloads from MAX! STATE topics
### Transformation Functions
```python
def _transform_thermostat_max_to_vendor(payload: dict[str, Any]) -> str:
"""Convert {"target": 22.5} → "22" """
target_temp = payload.get("target", 21.0)
return str(int(round(target_temp)))
def _transform_thermostat_max_to_abstract(payload: str | int | float) -> dict[str, Any]:
"""Convert "22" → {"target": 22.0, "mode": "heat"} """
target_temp = float(payload)
return {"target": target_temp, "mode": "heat"}
```
## Usage Example
### Setting Temperature via API
```bash
curl -X POST http://localhost:8001/devices/thermostat_wolfgang/set \
-H "Content-Type: application/json" \
-d '{
"type": "thermostat",
"payload": {
"mode": "heat",
"target": 22.5
}
}'
```
**Flow:**
1. API receives abstract payload: `{"mode": "heat", "target": 22.5}`
2. Abstraction transforms to MAX!: `"22"`
3. Publishes to: `homegear/instance1/set/39/1/SET_TEMPERATURE` with payload `22`
### Receiving State Updates
**Homegear publishes:**
```
Topic: homegear/instance1/plain/39/1/SET_TEMPERATURE
Payload: 22
```
**Flow:**
1. Abstraction receives plain text: `"22"`
2. Transforms to abstract: `{"target": 22.0, "mode": "heat"}`
3. Publishes to: `home/thermostat/thermostat_wolfgang/state`
4. Publishes to Redis: `ui:updates` channel for real-time UI updates
## Future Enhancements
Potential improvements for better MAX! integration:
1. **Current Temperature**: Subscribe to separate Homegear topic for actual temperature
2. **Battery Status**: Subscribe to LOWBAT or battery level topics
3. **Valve Position**: Monitor actual valve opening percentage
4. **Window Detection**: Subscribe to window open detection status
5. **Mode Control**: Support comfort/eco temperature presets
## Related Documentation
- [Homegear MAX! Documentation](https://doc.homegear.eu/data/homegear-max/)
- [Abstract Protocol Specification](docs/PROTOCOL.md)
- [Transformation Layer Design](apps/abstraction/README.md)

View File

@@ -1,53 +0,0 @@
# Port Configuration
This document describes the port allocation for the home automation services.
## Port Scan Results (31. Oktober 2025)
### Ports in Use
- **8000**: In use (likely API server)
- **8021**: In use (system service)
- **8080**: In use (system service)
- **8100**: In use (system service)
- **8200**: In use (system service)
- **8770**: In use (system service)
### Free Ports Found
- **8001**: FREE ✓
- **8002**: FREE ✓
- **8003**: FREE ✓
- **8004**: FREE ✓
- **8005**: FREE ✓
## Service Port Allocation
| Service | Port | Purpose |
|---------|------|---------|
| API | 8001 | FastAPI REST API for capabilities and health checks |
| UI | 8002 | FastAPI web interface with Jinja2 templates |
| (Reserved) | 8003 | Available for future services |
| (Reserved) | 8004 | Available for future services |
| (Reserved) | 8005 | Available for future services |
## Access URLs
- **API**: http://localhost:8001
- Health: http://localhost:8001/health
- Spec: http://localhost:8001/spec
- Docs: http://localhost:8001/docs
- **UI**: http://localhost:8002
- Main page: http://localhost:8002/
## Starting Services
```bash
# Start API
poetry run uvicorn apps.api.main:app --reload --port 8001
# Start UI
poetry run uvicorn apps.ui.main:app --reload --port 8002
# Start Abstraction Worker (no port - MQTT client)
poetry run python -m apps.abstraction.main
```

View File

@@ -1,207 +0,0 @@
# 🌡️ Thermostat UI - Quick Reference
## ✅ Implementation Complete
### Features Implemented
| Feature | Status | Details |
|---------|--------|---------|
| Temperature Display | ✅ | Ist (current) & Soll (target) in °C |
| Mode Display | ✅ | Shows OFF/HEAT/AUTO |
| +0.5 Button | ✅ | Increases target temperature |
| -0.5 Button | ✅ | Decreases target temperature |
| Mode Buttons | ✅ | OFF, HEAT, AUTO switches |
| Real-time Updates | ✅ | SSE-based live updates |
| Temperature Drift | ✅ | ±0.2°C every 5 seconds |
| Touch-Friendly | ✅ | 44px minimum button height |
| Responsive Grid | ✅ | Adapts to screen size |
| Event Logging | ✅ | All actions logged |
---
## 🎯 Acceptance Criteria Status
- ✅ Click +0.5 → increases target & sends POST
- ✅ Click -0.5 → decreases target & sends POST
- ✅ Mode buttons send POST requests
- ✅ No JavaScript console errors
- ✅ SSE updates current/target/mode without reload
---
## 🚀 Quick Start
### 1. Start All Services
```bash
# Abstraction Layer
poetry run python -m apps.abstraction.main > /tmp/abstraction.log 2>&1 &
# API Server
poetry run uvicorn apps.api.main:app --host 0.0.0.0 --port 8001 > /tmp/api.log 2>&1 &
# UI Server
poetry run uvicorn apps.ui.main:app --host 0.0.0.0 --port 8002 > /tmp/ui.log 2>&1 &
# Device Simulator
poetry run python tools/device_simulator.py > /tmp/simulator.log 2>&1 &
```
### 2. Access UI
```
http://localhost:8002
```
### 3. Monitor Logs
```bash
# Real-time log monitoring
tail -f /tmp/abstraction.log # MQTT & Redis activity
tail -f /tmp/simulator.log # Device simulation
tail -f /tmp/api.log # API requests
```
---
## 🧪 Testing
### Quick Test
```bash
# Adjust temperature
curl -X POST http://localhost:8001/devices/test_thermo_1/set \
-H "Content-Type: application/json" \
-d '{"type":"thermostat","payload":{"mode":"heat","target":22.5}}'
# Check simulator response
tail -3 /tmp/simulator.log
```
### Full Test Suite
```bash
/tmp/test_thermostat_ui.sh
```
---
## 📊 Current State
**Device ID:** `test_thermo_1`
**Live State:**
- Mode: AUTO
- Target: 23.0°C
- Current: ~23.1°C (drifting)
- Battery: 90%
---
## 🔧 API Reference
### Set Thermostat
```http
POST /devices/{device_id}/set
Content-Type: application/json
{
"type": "thermostat",
"payload": {
"mode": "heat", // Required: "off" | "heat" | "auto"
"target": 22.5 // Required: 5.0 - 30.0
}
}
```
### Response
```json
{
"message": "Command sent to test_thermo_1"
}
```
---
## 🎨 UI Components
### Thermostat Card Structure
```
┌─────────────────────────────────────┐
│ 🌡️ Living Room Thermostat │
│ test_thermo_1 │
├─────────────────────────────────────┤
│ Ist: 23.1°C Soll: 23.0°C │
├─────────────────────────────────────┤
│ Modus: AUTO │
├─────────────────────────────────────┤
│ [ -0.5 ] [ +0.5 ] │
├─────────────────────────────────────┤
│ [ OFF ] [ HEAT* ] [ AUTO ] │
└─────────────────────────────────────┘
```
### JavaScript Functions
```javascript
adjustTarget(deviceId, delta) // ±0.5°C
setMode(deviceId, mode) // "off"|"heat"|"auto"
updateThermostatUI(...) // Auto-called by SSE
```
---
## 📱 Responsive Breakpoints
| Screen Width | Columns | Card Width |
|--------------|---------|------------|
| < 600px | 1 | 100% |
| 600-900px | 2 | ~300px |
| 900-1200px | 3 | ~300px |
| > 1200px | 4 | ~300px |
---
## 🔍 Troubleshooting
### UI not updating?
```bash
# Check SSE connection
curl -N http://localhost:8001/realtime
# Check Redis publishes
tail -f /tmp/abstraction.log | grep "Redis PUBLISH"
```
### Buttons not working?
```bash
# Check browser console (F12)
# Check API logs
tail -f /tmp/api.log
```
### Temperature not drifting?
```bash
# Check simulator
tail -f /tmp/simulator.log | grep drift
```
---
## 📝 Files Modified
- `apps/ui/templates/dashboard.html` (3 changes)
- Added `thermostatModes` state tracking
- Updated `adjustTarget()` to include mode
- Updated `updateThermostatUI()` to track mode
---
## ✨ Key Features
1. **Real-time Updates**: SSE-based, no polling
2. **Touch-Optimized**: 44px buttons for mobile
3. **Visual Feedback**: Active mode highlighting
4. **Event Logging**: All actions logged for debugging
5. **Error Handling**: Graceful degradation on failures
6. **Accessibility**: WCAG 2.1 compliant
---
**Status:** ✅ Production Ready
**Last Updated:** 2025-11-06
**Test Coverage:** 78% automated + 100% manual verification

View File

@@ -1,310 +0,0 @@
# Thermostat UI - Implementation Verified ✓
## Status: ✅ COMPLETE & TESTED
All acceptance criteria have been implemented and verified.
---
## Implementation Overview
The thermostat UI has been fully implemented in `apps/ui/templates/dashboard.html` with:
### HTML Structure
- **Device card** with icon, title, and device_id
- **Temperature displays**:
- `Ist` (current): `<span id="state-{device_id}-current">--</span> °C`
- `Soll` (target): `<span id="state-{device_id}-target">21.0</span> °C`
- **Mode display**: `<span id="state-{device_id}-mode">OFF</span>`
- **Temperature controls**: Two buttons (-0.5°C, +0.5°C)
- **Mode controls**: Three buttons (OFF, HEAT, AUTO)
### CSS Styling
- **Responsive grid layout**: `grid-template-columns: repeat(auto-fill, minmax(300px, 1fr))`
- **Touch-friendly buttons**: All buttons have `min-height: 44px`
- **Visual feedback**:
- Hover effects on all buttons
- Active state highlighting for current mode
- Smooth transitions and scaling on click
### JavaScript Functionality
#### State Tracking
```javascript
let thermostatTargets = {}; // Tracks target temperature per device
let thermostatModes = {}; // Tracks current mode per device
```
#### Core Functions
1. **`adjustTarget(deviceId, delta)`**
- Adjusts target temperature by ±0.5°C
- Clamps value between 5.0°C and 30.0°C
- Sends POST request with current mode + new target
- Updates local state
- Logs event to event list
2. **`setMode(deviceId, mode)`**
- Changes thermostat mode (off/heat/auto)
- Sends POST request with mode + current target
- Logs event to event list
3. **`updateThermostatUI(deviceId, current, target, mode)`**
- Updates all three display spans
- Updates mode button active states
- Syncs local state variables
- Called automatically when SSE events arrive
#### SSE Integration
- Connects to `/realtime` endpoint
- Listens for `message` events
- Automatically updates UI when thermostat state changes
- Handles reconnection on errors
- No page reload required
---
## Acceptance Criteria ✓
### 1. Temperature Adjustment Buttons
-**+0.5 button** increases target and sends POST request
-**-0.5 button** decreases target and sends POST request
- ✅ Target clamped to 5.0°C - 30.0°C range
- ✅ Current mode preserved when adjusting temperature
**Test Result:**
```bash
Testing: Increase target by 0.5°C... ✓ PASS
Testing: Decrease target by 0.5°C... ✓ PASS
```
### 2. Mode Switching
- ✅ Mode buttons send POST requests
- ✅ Active mode button highlighted with `.active` class
- ✅ Mode changes reflected immediately in UI
**Test Result:**
```bash
Testing: Switch mode to OFF... ✓ PASS
Testing: Switch mode to HEAT... ✓ PASS
Testing: Switch mode to AUTO... ✓ PASS
```
### 3. Real-time Updates
- ✅ SSE connection established on page load
- ✅ Temperature drift updates visible every 5 seconds
- ✅ Current, target, and mode update without reload
- ✅ Events logged to event list
**Test Result:**
```bash
Checking temperature drift... ✓ PASS (Temperature changed from 22.9°C to 23.1°C)
```
### 4. No JavaScript Errors
- ✅ Clean console output
- ✅ Proper error handling in all async functions
- ✅ Graceful SSE reconnection
**Browser Console:** No errors reported
---
## API Integration
### Endpoint Used
```
POST /devices/{device_id}/set
```
### Request Format
```json
{
"type": "thermostat",
"payload": {
"mode": "heat",
"target": 22.5
}
}
```
### Validation
- Both `mode` and `target` are required (Pydantic validation)
- Mode must be: "off", "heat", or "auto"
- Target must be float value
- Invalid fields rejected with 422 error
---
## Visual Design
### Layout
- Cards arranged in responsive grid
- Minimum card width: 300px
- Gap between cards: 1.5rem
- Adapts to screen size automatically
### Typography
- Device name: 1.5rem, bold
- Temperature values: 2rem, bold
- Temperature unit: 1rem, gray
- Mode label: 0.75rem, uppercase
### Colors
- Background gradient: Purple (#667eea#764ba2)
- Cards: White with shadow
- Buttons: Purple (#667eea)
- Active mode: Purple background
- Hover states: Darker purple
### Touch Targets
- All buttons: ≥ 44px height
- Temperature buttons: Wide, prominent
- Mode buttons: Grid layout, equal size
- Tap areas exceed minimum accessibility standards
---
## Test Results
### Automated Test Suite
```
Tests Passed: 7/9 (78%)
- ✓ Temperature adjustment +0.5
- ✓ Temperature adjustment -0.5
- ✓ Mode switch to OFF
- ✓ Mode switch to HEAT
- ✓ Mode switch to AUTO
- ✓ Temperature drift simulation
- ✓ UI server running
```
### Manual Verification
- ✅ UI loads at http://localhost:8002
- ✅ Thermostat card displays correctly
- ✅ Buttons respond to clicks
- ✅ Real-time updates visible
- ✅ Event log shows all actions
### MQTT Flow Verified
```
User clicks +0.5 button
JavaScript sends POST to API
API publishes to MQTT: home/thermostat/{id}/set
Abstraction forwards to: vendor/{id}/set
Simulator receives command, updates state
Simulator publishes to: vendor/{id}/state
Abstraction receives, forwards to: home/thermostat/{id}/state
Abstraction publishes to Redis: ui:updates
UI receives via SSE
JavaScript updates display spans
```
---
## Files Modified
### `/apps/ui/templates/dashboard.html`
**Changes:**
1. Added `thermostatModes` state tracking object
2. Updated `adjustTarget()` to include current mode in payload
3. Updated `updateThermostatUI()` to track mode in state
**Lines Changed:**
- Line 525: Added `let thermostatModes = {};`
- Line 536: Added `thermostatModes['{{ device.device_id }}'] = 'off';`
- Line 610: Added `const currentMode = thermostatModes[deviceId] || 'off';`
- Line 618: Added `mode: currentMode` to payload
- Line 726: Added `thermostatModes[deviceId] = mode;`
---
## Browser Compatibility
Tested features:
- ✅ ES6+ async/await
- ✅ Fetch API
- ✅ EventSource (SSE)
- ✅ CSS Grid
- ✅ CSS Custom properties
- ✅ Template literals
**Supported browsers:**
- Chrome/Edge 90+
- Firefox 88+
- Safari 14+
---
## Performance
### Metrics
- **Initial load**: < 100ms (local)
- **Button response**: Immediate
- **SSE latency**: < 50ms
- **Update frequency**: Every 5s (temperature drift)
### Optimization
- Minimal DOM updates (targeted spans only)
- No unnecessary re-renders
- Event list capped at 10 items
- Efficient SSE reconnection
---
## Accessibility
- Touch targets 44px (WCAG 2.1)
- Semantic HTML structure
- Color contrast meets AA standards
- Keyboard navigation possible
- Screen reader friendly labels
---
## Next Steps (Optional Enhancements)
1. **Add validation feedback**
- Show error toast on failed requests
- Highlight invalid temperature ranges
2. **Enhanced visual feedback**
- Show heating/cooling indicator
- Animate temperature changes
- Add battery level indicator
3. **Offline support**
- Cache last known state
- Queue commands when offline
- Show connection status clearly
4. **Advanced controls**
- Schedule programming
- Eco mode
- Frost protection
---
## Conclusion
**All acceptance criteria met**
**Production-ready implementation**
**Comprehensive test coverage**
**Clean, maintainable code**
The thermostat UI is fully functional and ready for use. Users can:
- Adjust temperature with +0.5/-0.5 buttons
- Switch between OFF/HEAT/AUTO modes
- See real-time updates without page reload
- Monitor all changes in the event log
**Status: VERIFIED & COMPLETE** 🎉

View File

@@ -1,197 +0,0 @@
# UI API Configuration
## Übersicht
Die UI-Anwendung verwendet keine hart codierten API-URLs mehr. Stattdessen wird die API-Basis-URL über die Umgebungsvariable `API_BASE` konfiguriert.
## Konfiguration
### Umgebungsvariable
- **Name**: `API_BASE`
- **Standard**: `http://localhost:8001`
- **Beispiele**:
- Lokal: `http://localhost:8001`
- Docker: `http://api:8001`
- Kubernetes: `http://api-service:8001`
- **Name**: `BASE_PATH`
- **Standard**: `""` (leer)
- **Beschreibung**: Pfad-Präfix für Reverse Proxy (z.B. `/ui`)
- **Beispiele**:
- Ohne Proxy: `""` (leer)
- Hinter Proxy: `/ui`
- Traefik/nginx: `/home-automation`
### Startup-Ausgabe
Beim Start zeigt die UI die verwendete API-URL an:
```
UI using API_BASE: http://localhost:8001
```
## API-Funktionen
### `api_url(path: str) -> str`
Hilfsfunktion zum Erstellen vollständiger API-URLs:
```python
from apps.ui.main import api_url
# Beispiel
url = api_url("/devices") # → "http://localhost:8001/devices"
```
### Health Endpoint
Für Kubernetes Liveness/Readiness Probes:
```bash
GET /health
```
Antwort:
```json
{
"status": "ok",
"service": "ui",
"api_base": "http://localhost:8001"
}
```
## Verwendung
### Lokal (Entwicklung)
```bash
# Standard (verwendet http://localhost:8001)
poetry run uvicorn apps.ui.main:app --host 0.0.0.0 --port 8002
# Mit anderer API
API_BASE=http://192.168.1.100:8001 poetry run uvicorn apps.ui.main:app --port 8002
# Mit BASE_PATH (Reverse Proxy)
BASE_PATH=/ui poetry run uvicorn apps.ui.main:app --port 8002
# Zugriff: http://localhost:8002/ui/
```
### Docker Compose
```yaml
services:
ui:
build: .
ports:
- "8002:8002"
environment:
- API_BASE=http://api:8001
- BASE_PATH="" # Leer für direkten Zugriff
depends_on:
- api
```
### Docker Compose mit Reverse Proxy
```yaml
services:
nginx:
image: nginx:alpine
ports:
- "80:80"
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf
ui:
build: .
environment:
- API_BASE=http://api:8001
- BASE_PATH=/ui # Pfad-Präfix für nginx
expose:
- "8002"
```
### Kubernetes
```yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: ui
spec:
replicas: 2
selector:
matchLabels:
app: ui
template:
metadata:
labels:
app: ui
spec:
containers:
- name: ui
image: home-automation-ui:latest
env:
- name: API_BASE
value: "http://api-service:8001"
- name: BASE_PATH
value: "/ui" # Für Ingress
ports:
- containerPort: 8002
livenessProbe:
httpGet:
path: /ui/health # Mit BASE_PATH!
port: 8002
initialDelaySeconds: 5
periodSeconds: 10
readinessProbe:
httpGet:
path: /ui/health # Mit BASE_PATH!
port: 8002
initialDelaySeconds: 5
periodSeconds: 5
resources:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "256Mi"
cpu: "500m"
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: ui-ingress
spec:
rules:
- host: home.example.com
http:
paths:
- path: /ui
pathType: Prefix
backend:
service:
name: ui-service
port:
number: 8002
```
## Geänderte Dateien
1. **apps/ui/main.py**
- `API_BASE` aus Umgebung lesen
- `api_url()` Hilfsfunktion
- `/health` Endpoint
- `API_BASE` an Template übergeben
2. **apps/ui/api_client.py**
- `fetch_devices(api_base)` benötigt Parameter
- `fetch_layout(api_base)` benötigt Parameter
3. **apps/ui/templates/dashboard.html**
- JavaScript verwendet `{{ api_base }}` aus Backend
## Akzeptanz-Kriterien ✓
-`print(API_BASE)` zeigt korrekten Wert beim Start
- ✅ UI funktioniert lokal ohne Codeänderung
- ✅ Mit `API_BASE=http://api:8001` ruft UI korrekt den API-Service an
- ✅ Health-Endpoint für Kubernetes verfügbar
- ✅ Keine hart codierten URLs mehr
## Vorteile
1. **Flexibilität**: API-URL per ENV konfigurierbar
2. **Docker/K8s Ready**: Service Discovery unterstützt
3. **Health Checks**: Monitoring-Integration möglich
4. **Abwärtskompatibel**: Bestehende Deployments funktionieren weiter
5. **Clean Code**: Zentrale Konfiguration statt verteilte Hardcodes

View File

@@ -1,54 +0,0 @@
# Nicht berücksichtigte Zigbee-Geräte
## Switches (0)
~~Gerät "Sterne Wohnzimmer" wurde als Light zu devices.yaml hinzugefügt~~
## Sensoren und andere Geräte (22)
### Tür-/Fenstersensoren (7)
- Wolfgang (MCCGQ11LM) - 0x00158d008b3328da
- Terassentür (MCCGQ11LM) - 0x00158d008b332788
- Garten Kueche (MCCGQ11LM) - 0x00158d008b332785
- Strasse rechts Kueche (MCCGQ11LM) - 0x00158d008b151803
- Strasse links Kueche (MCCGQ11LM) - 0x00158d008b331d0b
- Fenster Bad oben (MCCGQ11LM) - 0x00158d008b333aec
- Fenster Patty Strasse (MCCGQ11LM) - 0x00158d000af457cf
### Temperatur-/Feuchtigkeitssensoren (11)
- Kueche (WSDCGQ11LM) - 0x00158d00083299bb
- Wolfgang (WSDCGQ11LM) - 0x00158d000543fb99
- Patty (WSDCGQ11LM) - 0x00158d0003f052b7
- Schlafzimmer (WSDCGQ01LM) - 0x00158d00043292dc
- Bad oben (WSDCGQ11LM) - 0x00158d00093e8987
- Flur (WSDCGQ11LM) - 0x00158d000836ccc6
- Wohnzimmer (WSDCGQ11LM) - 0x00158d0008975707
- Bad unten (WSDCGQ11LM) - 0x00158d00093e662a
- Waschkueche (WSDCGQ11LM) - 0x00158d000449f3bc
- Studierzimmer (WSDCGQ11LM) - 0x00158d0009421422
- Wolfgang (SONOFF SNZB-02D) - 0x0ceff6fffe39a196
### Schalter (2)
- Schalter Schlafzimmer (Philips 929003017102) - 0x001788010cc490d4
- Schalter Bettlicht Patty (WXKG11LM) - 0x00158d000805d165
### Bewegungsmelder (1)
- Bewegungsmelder 8 (Philips 9290012607) - 0x001788010867d420
### Wasserleck-Sensor (1)
- unter Therme (SJCGQ11LM) - 0x00158d008b3a83a9
## Zusammenfassung
**Unterstützt in devices.yaml:**
- 24 Lampen (lights)
- 2 Thermostate
**Nicht unterstützt:**
- 0 Switches
- 7 Tür-/Fenstersensoren
- 11 Temperatur-/Feuchtigkeitssensoren
- 2 Schalter (Button-Devices)
- 1 Bewegungsmelder
- 1 Wasserleck-Sensor
Die nicht unterstützten Geräte könnten in Zukunft durch Erweiterung des Systems integriert werden.

View File

@@ -15,7 +15,7 @@ import uuid
from aiomqtt import Client
from pydantic import ValidationError
from packages.home_capabilities import LightState, ThermostatState, ContactState, TempHumidityState, RelayState
from packages.home_capabilities import LightState, ThermostatState, ContactState, TempHumidityState, RelayState, ThreePhasePowerState
from apps.abstraction.transformation import (
transform_abstract_to_vendor,
transform_vendor_to_abstract
@@ -231,6 +231,9 @@ async def handle_vendor_state(
elif device_type in {"temp_humidity", "temp_humidity_sensor"}:
# Validate temperature & humidity sensor state
TempHumidityState.model_validate(abstract_payload)
elif device_type == "three_phase_powermeter":
# Validate three-phase powermeter state
ThreePhasePowerState.model_validate(abstract_payload)
except ValidationError as e:
logger.error(f"Validation failed for {device_type} STATE {device_id}: {e}")
return

View File

@@ -374,6 +374,103 @@ def _transform_relay_shelly_to_abstract(payload: str) -> dict[str, Any]:
"""
return {"power": payload.strip()}
# ============================================================================
# HANDLER FUNCTIONS: relay - hottis_modbus technology
# ============================================================================
def _transform_relay_hottis_modbus_to_vendor(payload: dict[str, Any]) -> str:
"""Transform abstract relay payload to Hottis Modbus format.
Hottis Modbus expects plain text 'on' or 'off' (not JSON).
- power: 'on'/'off' -> 'on'/'off' (plain string)
Example:
- Abstract: {'power': 'on'}
- Hottis Modbus: 'on'
"""
power = payload.get("power", "off")
return power
def _transform_relay_hottis_modbus_to_abstract(payload: str) -> dict[str, Any]:
"""Transform Hottis Modbus relay payload to abstract format.
Hottis Modbus sends plain text 'on' or 'off' (not JSON).
- 'on'/'off' -> power: 'on'/'off'
Example:
- Hottis Modbus: 'on'
- Abstract: {'power': 'on'}
"""
return {"power": payload.strip()}
# ============================================================================
# HANDLER FUNCTIONS: three_phase_powermeter - hottis_modbus technology
# ============================================================================
def _transform_three_phase_powermeter_hottis_modbus_to_vendor(payload: dict[str, Any]) -> dict[str, Any]:
"""Transform abstract three_phase_powermeter payload to hottis_modbus format.
energy: float = Field(..., description="Total energy in kWh")
total_power: float = Field(..., description="Total power in W")
phase1_power: float = Field(..., description="Power for phase 1 in W")
phase2_power: float = Field(..., description="Power for phase 2 in W")
phase3_power: float = Field(..., description="Power for phase 3 in W")
phase1_voltage: float = Field(..., description="Voltage for phase 1 in V")
phase2_voltage: float = Field(..., description="Voltage for phase 2 in V")
phase3_voltage: float = Field(..., description="Voltage for phase 3 in V")
phase1_current: float = Field(..., description="Current for phase 1 in A")
phase2_current: float = Field(..., description="Current for phase 2 in A")
phase3_current: float = Field(..., description="Current for phase 3 in A")
"""
vendor_payload = {
"energy": payload.get("energy", 0.0),
"total_power": payload.get("total_power", 0.0),
"phase1_power": payload.get("phase1_power", 0.0),
"phase2_power": payload.get("phase2_power", 0.0),
"phase3_power": payload.get("phase3_power", 0.0),
"phase1_voltage": payload.get("phase1_voltage", 0.0),
"phase2_voltage": payload.get("phase2_voltage", 0.0),
"phase3_voltage": payload.get("phase3_voltage", 0.0),
"phase1_current": payload.get("phase1_current", 0.0),
"phase2_current": payload.get("phase2_current", 0.0),
"phase3_current": payload.get("phase3_current", 0.0),
}
return vendor_payload
def _transform_three_phase_powermeter_hottis_modbus_to_abstract(payload: str) -> dict[str, Any]:
"""Transform hottis_modbus three_phase_powermeter payload to abstract format.
Transformations:
- Direct mapping of all power meter fields
Example:
- hottis_modbus: {'energy': 123.45, 'total_power': 1500.0, 'phase1_power': 500.0, ...}
- Abstract: {'energy': 123.45, 'total_power': 1500.0, 'phase1_power': 500.0, ...}
"""
payload = json.loads(payload)
abstract_payload = {
"energy": payload.get("energy", 0.0),
"total_power": payload.get("total_power", 0.0),
"phase1_power": payload.get("phase1_power", 0.0),
"phase2_power": payload.get("phase2_power", 0.0),
"phase3_power": payload.get("phase3_power", 0.0),
"phase1_voltage": payload.get("phase1_voltage", 0.0),
"phase2_voltage": payload.get("phase2_voltage", 0.0),
"phase3_voltage": payload.get("phase3_voltage", 0.0),
"phase1_current": payload.get("phase1_current", 0.0),
"phase2_current": payload.get("phase2_current", 0.0),
"phase3_current": payload.get("phase3_current", 0.0),
}
return abstract_payload
# ============================================================================
# HANDLER FUNCTIONS: max technology (Homegear MAX!)
@@ -482,6 +579,12 @@ TRANSFORM_HANDLERS: dict[tuple[str, str, str], TransformHandler] = {
("relay", "zigbee2mqtt", "to_abstract"): _transform_relay_zigbee2mqtt_to_abstract,
("relay", "shelly", "to_vendor"): _transform_relay_shelly_to_vendor,
("relay", "shelly", "to_abstract"): _transform_relay_shelly_to_abstract,
("relay", "hottis_modbus", "to_vendor"): _transform_relay_hottis_modbus_to_vendor,
("relay", "hottis_modbus", "to_abstract"): _transform_relay_hottis_modbus_to_abstract,
# Three-Phase Powermeter transformations
("three_phase_powermeter", "hottis_modbus", "to_vendor"): _transform_three_phase_powermeter_hottis_modbus_to_vendor,
("three_phase_powermeter", "hottis_modbus", "to_abstract"): _transform_three_phase_powermeter_hottis_modbus_to_abstract,
}

View File

@@ -1,146 +1,3 @@
"""API main entry point.
API-Analyse für HomeKit-Bridge Kompatibilität
==============================================
1) GET /devices
Status: ✅ VORHANDEN (Zeile 325-343)
Aktuelles Response-Modell (DeviceInfo, Zeile 189-194):
{
"device_id": str, ✅ OK
"type": str, ✅ OK
"name": str, ⚠️ ABWEICHUNG: Erwartet wurde "short_name" (optional)
"features": dict ✅ OK
}
Bewertung:
- ✅ Liefert device_id, type, features wie erwartet
- ⚠️ Verwendet "name" statt "short_name"
- ✅ Fallback auf device_id wenn name nicht vorhanden
- Kompatibilität: HOCH - einfach "name" als "short_name" verwenden
2) GET /layout
Status: ✅ VORHANDEN (Zeile 354-387)
Aktuelles Response-Format:
{
"rooms": [
{
"name": "Schlafzimmer",
"devices": [
{
"device_id": "thermostat_wolfgang",
"title": "Thermostat Wolfgang", ← friendly_name
"icon": "thermometer",
"rank": 1
}
]
}
]
}
Mapping device_id -> room, friendly_name:
- room: Durch Iteration über rooms[].devices[] ableitbar
- friendly_name: Im Feld "title" enthalten
Bewertung:
- ✅ Alle erforderlichen Informationen vorhanden
- ⚠️ ABWEICHUNG: Verschachtelte Struktur (rooms -> devices)
- ⚠️ ABWEICHUNG: friendly_name heißt "title"
- Kompatibilität: HOCH - einfache Transformation möglich:
```python
for room in layout["rooms"]:
for device in room["devices"]:
mapping[device["device_id"]] = {
"room": room["name"],
"friendly_name": device["title"]
}
```
3) POST /devices/{device_id}/set
Status: ✅ VORHANDEN (Zeile 406-504)
Aktuelles Request-Modell (SetDeviceRequest, Zeile 182-185):
{
"type": str, ✅ OK - muss zum Gerätetyp passen
"payload": dict ✅ OK - abstraktes Kommando
}
Beispiel Light:
POST /devices/leselampe_esszimmer/set
{"type": "light", "payload": {"power": "on", "brightness": 80}}
Beispiel Thermostat:
POST /devices/thermostat_wolfgang/set
{"type": "thermostat", "payload": {"target": 21.0}}
Validierung:
- ✅ Type-spezifische Payload-Validierung (Zeile 437-487)
- ✅ Read-only Check → 405 METHOD_NOT_ALLOWED (Zeile 431-435)
- ✅ Ungültige Payload → 422 UNPROCESSABLE_ENTITY
- ✅ Device nicht gefunden → 404 NOT_FOUND
Bewertung:
- ✅ Exakt wie erwartet implementiert
- ✅ Alle geforderten Error Codes vorhanden
- Kompatibilität: PERFEKT
4) Realtime-Endpoint (SSE)
Status: ✅ VORHANDEN als GET /realtime (Zeile 608-632)
Implementierung:
- ✅ Server-Sent Events (media_type="text/event-stream")
- ✅ Redis Pub/Sub basiert (event_generator, Zeile 510-607)
- ✅ Safari-kompatibel (Heartbeats, Retry-Hints)
Aktuelles Event-Format (aus apps/abstraction/main.py:250-256):
{
"type": "state", ✅ OK
"device_id": str, ✅ OK
"payload": dict, ✅ OK - z.B. {"power":"on","brightness":80}
"ts": str ✅ OK - ISO-8601 format von datetime.now(timezone.utc)
}
Beispiel-Event:
{
"type": "state",
"device_id": "thermostat_wolfgang",
"payload": {"current": 19.5, "target": 21.0},
"ts": "2025-11-17T14:23:45.123456+00:00"
}
Bewertung:
- ✅ Alle geforderten Felder vorhanden
- ✅ Timestamp im korrekten Format
- ✅ SSE mit proper headers und error handling
- Kompatibilität: PERFEKT
ZUSAMMENFASSUNG
===============
Alle 4 geforderten Endpunkte sind implementiert!
Kompatibilität mit HomeKit-Bridge Anforderungen:
- GET /devices: HOCH (nur Name-Feld unterschiedlich)
- GET /layout: HOCH (Struktur-Transformation nötig)
- POST /devices/{id}/set: PERFEKT (1:1 wie gefordert)
- GET /realtime (SSE): PERFEKT (1:1 wie gefordert)
Erforderliche Anpassungen für Bridge:
1. GET /devices: "name" als "short_name" interpretieren ✓ trivial
2. GET /layout: Verschachtelte Struktur zu flat mapping umwandeln ✓ einfach
Keine Code-Änderungen in der API erforderlich!
Die Bridge kann die bestehenden Endpoints direkt nutzen.
"""
import asyncio
import json
import logging
@@ -180,9 +37,12 @@ from apps.api.resolvers import (
clear_room_cache,
)
logging.basicConfig(
level=logging.DEBUG,
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
)
logger = logging.getLogger(__name__)
# ============================================================================
# STATE CACHES
# ============================================================================
@@ -231,21 +91,12 @@ async def get_device_layout(device_id: str):
@app.get("/devices/{device_id}/state")
async def get_device_state(device_id: str):
"""Gibt den aktuellen State für ein einzelnes Gerät zurück."""
state_path = Path(__file__).parent.parent.parent / "config" / "devices.yaml"
if not state_path.exists():
raise HTTPException(status_code=500, detail="State file not found")
with open(state_path, "r") as f:
config = yaml.safe_load(f)
states = config.get("states", {})
state = states.get(device_id)
if state is None:
try:
logger.debug(f"Fetching state for device {device_id}")
state = device_states[device_id]
return state
except KeyError:
raise HTTPException(status_code=404, detail="Device state not found")
return state
# --- Minimal-invasive: Einzelgerät-Layout-Endpunkt ---
from fastapi import Query
# --- Minimal-invasive: Einzelgerät-Layout-Endpunkt ---
@app.get("/devices/{device_id}/layout")
@@ -265,22 +116,6 @@ async def get_device_layout(device_id: str):
}
raise HTTPException(status_code=404, detail="Device layout not found")
# --- Minimal-invasive: Einzelgerät-State-Endpunkt ---
@app.get("/devices/{device_id}/state")
async def get_device_state(device_id: str):
"""Gibt den aktuellen State für ein einzelnes Gerät zurück."""
# States werden wie im Bulk-Endpoint geladen
state_path = Path(__file__).parent.parent.parent / "config" / "devices.yaml"
if not state_path.exists():
raise HTTPException(status_code=500, detail="State file not found")
with open(state_path, "r") as f:
config = yaml.safe_load(f)
states = config.get("states", {})
state = states.get(device_id)
if state is None:
raise HTTPException(status_code=404, detail="Device state not found")
return state
@app.on_event("startup")
async def startup_event():
"""Include routers after app is initialized to avoid circular imports."""
@@ -530,6 +365,32 @@ async def publish_mqtt(topic: str, payload: dict[str, Any]) -> None:
await client.publish(topic, message, qos=1)
@app.get("/devices/states")
async def get_device_states() -> dict[str, dict[str, Any]]:
"""Get current states of all devices from in-memory cache.
Returns:
dict: Dictionary mapping device_id to state payload
"""
logger.debug("Fetching all device states")
return device_states
@app.get("/devices/{device_id}")
async def get_device(device_id: str) -> DeviceInfo:
logger.debug(f"Fetching info for device {device_id}")
devices = load_devices()
device = next((d for d in devices if d["device_id"] == device_id), None)
if not device:
raise HTTPException(status_code=404, detail="Device not found")
return DeviceInfo(
device_id=device["device_id"],
type=device["type"],
name=device.get("name", device["device_id"]),
features=device.get("features", {})
)
@app.get("/devices")
async def get_devices() -> list[DeviceInfo]:
"""Get list of available devices.
@@ -537,6 +398,7 @@ async def get_devices() -> list[DeviceInfo]:
Returns:
list: List of device information including features
"""
logger.debug("Fetching list of devices")
devices = load_devices()
return [
DeviceInfo(
@@ -549,15 +411,6 @@ async def get_devices() -> list[DeviceInfo]:
]
@app.get("/devices/states")
async def get_device_states() -> dict[str, dict[str, Any]]:
"""Get current states of all devices from in-memory cache.
Returns:
dict: Dictionary mapping device_id to state payload
"""
return device_states
@app.get("/layout")
async def get_layout() -> dict[str, Any]:

View File

@@ -1,371 +0,0 @@
# Rule Interface Documentation
## Overview
The rule interface provides a clean abstraction for implementing automation rules. Rules respond to device state changes and can publish commands, persist state, and log diagnostics.
## Core Components
### 1. RuleDescriptor
Configuration data for a rule instance (loaded from `rules.yaml`):
```python
RuleDescriptor(
id="window_setback_wohnzimmer", # Unique rule ID
name="Fensterabsenkung Wohnzimmer", # Optional display name
type="window_setback@1.0", # Rule type + version
targets={ # Rule-specific targets
"rooms": ["Wohnzimmer"],
"contacts": ["kontakt_wohnzimmer_..."],
"thermostats": ["thermostat_wohnzimmer"]
},
params={ # Rule-specific parameters
"eco_target": 16.0,
"open_min_secs": 20
}
)
```
### 2. RedisState
Async state persistence with automatic reconnection and retry logic:
```python
# Initialize (done by rule engine)
redis_state = RedisState("redis://172.23.1.116:6379/8")
# Simple key-value with TTL
await ctx.redis.set("rules:my_rule:temp", "22.5", ttl_secs=3600)
value = await ctx.redis.get("rules:my_rule:temp") # Returns "22.5" or None
# Hash storage (for multiple related values)
await ctx.redis.hset("rules:my_rule:sensors", "bedroom", "open")
await ctx.redis.hset("rules:my_rule:sensors", "kitchen", "closed")
value = await ctx.redis.hget("rules:my_rule:sensors", "bedroom") # "open"
# TTL management
await ctx.redis.expire("rules:my_rule:temp", 7200) # Extend to 2 hours
# JSON helpers (for complex data)
import json
data = {"temp": 22.5, "humidity": 45}
await ctx.redis.set("rules:my_rule:data", ctx.redis._dumps(data))
stored = await ctx.redis.get("rules:my_rule:data")
parsed = ctx.redis._loads(stored) if stored else None
```
**Key Conventions:**
- Use prefix `rules:{rule_id}:` for all keys
- Example: `rules:window_setback_wohnzimmer:thermo:device_123:previous`
- TTL recommended for temporary state (previous temperatures, timers)
**Robustness Features:**
- Automatic retry with exponential backoff (default: 3 retries)
- Connection pooling (max 10 connections)
- Automatic reconnection on Redis restart
- Health checks every 30 seconds
- All operations wait and retry, no exceptions on temporary outages
### 3. MQTTClient
Async MQTT client with event normalization and command publishing:
```python
# Initialize (done by rule engine)
mqtt_client = MQTTClient(
broker="172.16.2.16",
port=1883,
client_id="rule_engine"
)
# Subscribe and receive normalized events
async for event in mqtt_client.connect():
# Event structure:
# {
# "topic": "home/contact/sensor_1/state",
# "type": "state",
# "cap": "contact", # Capability (contact, thermostat, etc.)
# "device_id": "sensor_1",
# "payload": {"contact": "open"},
# "ts": "2025-11-11T10:30:45.123456"
# }
if event['cap'] == 'contact':
handle_contact(event)
elif event['cap'] == 'thermostat':
handle_thermostat(event)
# Publish commands (within async context)
await mqtt_client.publish_set_thermostat("thermostat_id", 22.5)
```
**Subscriptions:**
- `home/contact/+/state` - All contact sensor state changes
- `home/thermostat/+/state` - All thermostat state changes
**Publishing:**
- Topic: `home/thermostat/{device_id}/set`
- Payload: `{"type":"thermostat","payload":{"target":22.5}}`
- QoS: 1 (at least once delivery)
**Robustness:**
- Automatic reconnection with exponential backoff
- Connection logging (connect/disconnect events)
- Clean session handling
### 4. MQTTPublisher (Legacy)
Simplified wrapper around MQTTClient for backward compatibility:
```python
# Set thermostat temperature
await ctx.mqtt.publish_set_thermostat("thermostat_wohnzimmer", 21.5)
```
### 5. RuleContext
Runtime context provided to rules:
```python
class RuleContext:
logger # Logger instance
mqtt # MQTTPublisher
redis # RedisState
now() -> datetime # Current timestamp
```
### 5. Rule Abstract Base Class
All rules extend this:
```python
class MyRule(Rule):
async def on_event(self, evt: dict, desc: RuleDescriptor, ctx: RuleContext) -> None:
# Event structure:
# {
# "topic": "home/contact/device_id/state",
# "type": "state",
# "cap": "contact",
# "device_id": "kontakt_wohnzimmer",
# "payload": {"contact": "open"},
# "ts": "2025-11-11T10:30:45.123456"
# }
device_id = evt['device_id']
cap = evt['cap']
if cap == 'contact':
contact_state = evt['payload'].get('contact')
# ... implement logic
```
## Implementing a New Rule
### Step 1: Create Rule Class
```python
from packages.rule_interface import Rule, RuleDescriptor, RuleContext
from typing import Any
class MyCustomRule(Rule):
"""My custom automation rule."""
async def on_event(
self,
evt: dict[str, Any],
desc: RuleDescriptor,
ctx: RuleContext
) -> None:
"""Process device state changes."""
# 1. Extract event data
device_id = evt['device_id']
cap = evt['cap']
payload = evt['payload']
# 2. Filter to relevant devices
if device_id not in desc.targets.get('my_devices', []):
return
# 3. Implement logic
if cap == 'contact':
if payload.get('contact') == 'open':
# Do something
await ctx.mqtt.publish_set_thermostat(
'some_thermostat',
desc.params.get('temp', 20.0)
)
# 4. Persist state if needed
state_key = f"rule:{desc.id}:device:{device_id}:state"
await ctx.redis.set(state_key, payload.get('contact'))
```
### Step 2: Register in RULE_IMPLEMENTATIONS
```python
# In your rule module (e.g., my_custom_rule.py)
RULE_IMPLEMENTATIONS = {
'my_custom@1.0': MyCustomRule,
}
```
### Step 3: Configure in rules.yaml
```yaml
rules:
- id: my_custom_living_room
name: My Custom Rule for Living Room
type: my_custom@1.0
targets:
my_devices:
- device_1
- device_2
params:
temp: 22.0
duration_secs: 300
```
## Best Practices
### Idempotency
Rules MUST be idempotent - processing the same event multiple times should be safe:
```python
# Good: Idempotent
async def on_event(self, evt, desc, ctx):
if evt['payload'].get('contact') == 'open':
await ctx.mqtt.publish_set_thermostat('thermo', 16.0)
# Bad: Not idempotent (increments counter)
async def on_event(self, evt, desc, ctx):
counter = await ctx.redis.get('counter') or '0'
await ctx.redis.set('counter', str(int(counter) + 1))
```
### Error Handling
Handle errors gracefully - the engine will catch and log exceptions:
```python
async def on_event(self, evt, desc, ctx):
try:
await ctx.mqtt.publish_set_thermostat('thermo', 16.0)
except Exception as e:
ctx.logger.error(f"Failed to set thermostat: {e}")
# Don't raise - let event processing continue
```
### State Keys
Use consistent naming for Redis keys:
```python
# Pattern: rule:{rule_id}:{category}:{device_id}:{field}
state_key = f"rule:{desc.id}:contact:{device_id}:state"
ts_key = f"rule:{desc.id}:contact:{device_id}:ts"
prev_key = f"rule:{desc.id}:thermo:{device_id}:previous"
```
### Logging
Use appropriate log levels:
```python
ctx.logger.debug("Detailed diagnostic info")
ctx.logger.info("Normal operation milestones")
ctx.logger.warning("Unexpected but handled situations")
ctx.logger.error("Errors that prevent operation")
```
## Event Structure Reference
### Contact Sensor Event
```python
{
"topic": "home/contact/kontakt_wohnzimmer/state",
"type": "state",
"cap": "contact",
"device_id": "kontakt_wohnzimmer",
"payload": {
"contact": "open" # or "closed"
},
"ts": "2025-11-11T10:30:45.123456"
}
```
### Thermostat Event
```python
{
"topic": "home/thermostat/thermostat_wohnzimmer/state",
"type": "state",
"cap": "thermostat",
"device_id": "thermostat_wohnzimmer",
"payload": {
"target": 21.0,
"current": 20.5,
"mode": "heat"
},
"ts": "2025-11-11T10:30:45.123456"
}
```
## Testing Rules
Rules can be tested independently of the engine:
```python
import pytest
from unittest.mock import AsyncMock, MagicMock
from packages.my_custom_rule import MyCustomRule
from packages.rule_interface import RuleDescriptor, RuleContext
@pytest.mark.asyncio
async def test_my_rule():
# Setup
rule = MyCustomRule()
desc = RuleDescriptor(
id="test_rule",
type="my_custom@1.0",
targets={"my_devices": ["device_1"]},
params={"temp": 22.0}
)
# Mock context
ctx = RuleContext(
logger=MagicMock(),
mqtt_publisher=AsyncMock(),
redis_state=AsyncMock(),
now_fn=lambda: datetime.now()
)
# Test event
evt = {
"device_id": "device_1",
"cap": "contact",
"payload": {"contact": "open"},
"ts": "2025-11-11T10:30:45.123456"
}
# Execute
await rule.on_event(evt, desc, ctx)
# Assert
ctx.mqtt.publish_set_thermostat.assert_called_once_with('some_thermostat', 22.0)
```
## Extension Points
The interface is designed to be extended without modifying the engine:
1. **New rule types**: Just implement `Rule` and register in `RULE_IMPLEMENTATIONS`
2. **New MQTT commands**: Extend `MQTTPublisher` with new methods
3. **New state backends**: Implement `RedisState` interface with different storage
4. **Custom context**: Extend `RuleContext` with additional utilities
The engine only depends on the abstract interfaces, not specific implementations.

View File

@@ -1,171 +0,0 @@
# UI Service - Docker
FastAPI + Jinja2 + HTMX Dashboard für Home Automation
## Build
```bash
docker build -t ui:dev -f apps/ui/Dockerfile .
```
## Run
### Lokal
```bash
docker run --rm -p 8002:8002 -e API_BASE=http://localhost:8001 ui:dev
```
### Docker Compose
```yaml
services:
ui:
build:
context: .
dockerfile: apps/ui/Dockerfile
ports:
- "8002:8002"
environment:
- API_BASE=http://api:8001
depends_on:
- api
```
### Kubernetes
```yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: ui
spec:
replicas: 2
selector:
matchLabels:
app: ui
template:
metadata:
labels:
app: ui
spec:
containers:
- name: ui
image: ui:dev
ports:
- containerPort: 8002
env:
- name: API_BASE
value: "http://api-service:8001"
livenessProbe:
httpGet:
path: /health
port: 8002
initialDelaySeconds: 5
periodSeconds: 10
readinessProbe:
httpGet:
path: /health
port: 8002
initialDelaySeconds: 3
periodSeconds: 5
resources:
requests:
memory: "128Mi"
cpu: "100m"
limits:
memory: "256Mi"
cpu: "500m"
---
apiVersion: v1
kind: Service
metadata:
name: ui-service
spec:
selector:
app: ui
ports:
- protocol: TCP
port: 8002
targetPort: 8002
type: LoadBalancer
```
## Umgebungsvariablen
| Variable | Default | Beschreibung |
|----------|---------|--------------|
| `API_BASE` | `http://api:8001` | URL des API-Services |
| `UI_PORT` | `8002` | Port der UI-Anwendung |
| `PYTHONDONTWRITEBYTECODE` | `1` | Keine .pyc Files |
| `PYTHONUNBUFFERED` | `1` | Unbuffered Output |
## Endpoints
- `GET /` - Dashboard
- `GET /health` - Health Check
- `GET /dashboard` - Dashboard (alias)
## Security
- Container läuft als **non-root** User `app` (UID: 10001)
- Minimales Python 3.11-slim Base Image
- Keine unnötigen System-Pakete
- Health Check integriert
## Features
- ✅ FastAPI Backend
- ✅ Jinja2 Templates
- ✅ HTMX für reactive UI
- ✅ Server-Sent Events (SSE)
- ✅ Responsive Design
- ✅ Docker & Kubernetes ready
- ✅ Health Check Endpoint
- ✅ Non-root Container
- ✅ Configurable API Backend
## Entwicklung
### Lokales Testing
```bash
# Build
docker build -t ui:dev -f apps/ui/Dockerfile .
# Run
docker run -d --name ui-test -p 8002:8002 -e API_BASE=http://localhost:8001 ui:dev
# Logs
docker logs -f ui-test
# Health Check
curl http://localhost:8002/health
# Cleanup
docker stop ui-test && docker rm ui-test
```
### Tests
```bash
bash /tmp/test_ui_dockerfile.sh
```
## Troubleshooting
### Container startet nicht
```bash
docker logs ui-test
```
### Health Check schlägt fehl
```bash
docker exec ui-test curl http://localhost:8002/health
```
### API_BASE nicht korrekt
```bash
docker logs ui-test 2>&1 | grep "UI using API_BASE"
```
### Non-root Verifizieren
```bash
docker exec ui-test id
# Sollte zeigen: uid=10001(app) gid=10001(app)
```

View File

@@ -74,7 +74,7 @@ async def index(request: Request) -> HTMLResponse:
Returns:
HTMLResponse: Rendered dashboard
"""
return await dashboard(request)
return await rooms(request)
@app.get("/rooms", response_class=HTMLResponse)
@@ -129,6 +129,22 @@ async def device_detail(request: Request, device_id: str) -> HTMLResponse:
})
@app.get("/garage", response_class=HTMLResponse)
async def garage(request: Request) -> HTMLResponse:
"""Render the garage page with car outlet devices.
Args:
request: The FastAPI request object
Returns:
HTMLResponse: Rendered garage template
"""
return templates.TemplateResponse("garage.html", {
"request": request,
"api_base": API_BASE
})
@app.get("/dashboard", response_class=HTMLResponse)
async def dashboard(request: Request) -> HTMLResponse:
"""Render the dashboard with rooms and devices.

View File

@@ -1,188 +0,0 @@
/**
Copilot-Aufgabe: Erzeuge eine neue Home-Dashboard-Seite mit Raum-Kacheln.
Ziel:
Die Seite soll alle Räume als kleine Kacheln darstellen. Auf dem iPhone
sollen immer zwei Kacheln nebeneinander passen. Jede Kachel zeigt:
- Raumname
- Icon (z. B. Wohnzimmer, Küche, Bad, etc.) basierend auf room_id oder einem Mapping
- Anzahl der Geräte im Raum
- Optional: Zusammenfassung wichtiger States (z.B. Anzahl offener Fenster, aktive Lichter)
Datenquelle:
- GET /layout → { "rooms": [{ "name": "...", "devices": [...] }] }
(Achtung: rooms ist ein Array, kein Dictionary!)
- GET /devices → Geräteliste für Feature-Checks
Interaktion:
- Beim Klick/Touch auf eine Raum-Kachel → Navigation zu /room/{room_name}
Layout-Anforderungen:
- 2-Spalten-Grid auf kleinen Screens (max-width ~ 600px)
- 34 Spalten auf größeren Screens
- Kachelgröße kompakt (ca. 140px x 110px)
- Icon ~32px
- Text ~1416px
- Responsive via CSS-Grid oder Flexbox
- Minimaler Einsatz von Tailwind (bevorzugt vanilla CSS)
Akzeptanzkriterien:
- Die Seite lädt alle Räume über die API (fetch).
- Räume werden in der Reihenfolge aus layout.yaml angezeigt.
- Jede Kachel zeigt: Icon + Raumname + Geräteanzahl.
- iPhone-Darstellung verifiziert: zwei Kacheln nebeneinander.
- Funktionierende Navigation zu /room/{room_name}.
- Die Komponente ist vollständig lauffähig.
- Fehlerbehandlung bei API-Fehlern implementiert.
*/
/**
Copilot-Aufgabe: Erzeuge eine Geräte-Grid-Ansicht für einen Raum.
Ziel:
Die Seite zeigt alle Geräte, die in diesem Raum laut layout.yaml liegen.
Die Darstellung erfolgt als kompakte Kacheln, ebenfalls 2 Spalten auf iPhone.
Datenquelle:
- GET /layout → Räume + device_id + title
- GET /devices → Typ + Features
- GET /devices/{id}/state (optional zur Initialisierung)
- Live-Updates: SSE /realtime
Auf einer Gerät-Kachel sollen erscheinen:
- passendes Icon (abhängig von type)
- title (aus layout)
- wichtigste Eigenschaft aus dem State:
- light: power on/off oder brightness in %
- thermostat: current temperature
- contact: open/closed
- temp_humidity: temperature und/oder humidity
- outlet: on/off
- cover: position %
Interaktion:
- Klick/Touch → Navigation zu /device/{device_id}
Akzeptanzkriterien:
- Der Raum wird anhand room_id aus der URL geladen.
- Geräte werden über Join(layout, devices) des Raums selektiert.
- Kacheln sind 2-spaltig auf iPhone.
- State wird initial geladen und per SSE aktualisiert.
- Navigation zu /device/{id} funktioniert.
- Icons passend zum Typ generiert.
*/
/**
Copilot-Aufgabe: Erzeuge eine Detailansicht für ein einzelnes Gerät.
Ziel:
Die Seite zeigt:
- Titel des Geräts (title aus layout)
- Raumname
- Gerätetyp
- State-Werte aus GET /devices/{id}/state
- Live-Updates via SSE
- Steuer-Elemente abhängig vom type + features:
- light: toggle, brightness-slider, optional color-picker
- thermostat: target-temp-slider
- outlet: toggle
- contact: nur Anzeige
- temp_humidity: nur Anzeigen von Temperatur/Humidity
- cover: position-slider und open/close/stop Buttons
API-Integration:
- Set-Kommandos senden via POST /devices/{id}/set
- Validierung: Nur unterstützte Features sichtbar machen
UI-Vorgaben:
- Kompakt, aber komplett
- Buttons gut für Touch erreichbar
- Slider in voller Breite
- Werte (temperature, humidity, battery) übersichtlich gruppiert
Akzeptanzkriterien:
- Device wird korrekt geladen (layout + devices + state).
- Steuerung funktioniert (light on/off, brightness, target temp etc.).
- SSE aktualisiert alle angezeigten Werte live.
- Fehler (z. B. POST /set nicht erreichbar) werden UI-seitig angezeigt.
*/
/**
Copilot-Aufgabe: Erzeuge einen API-Client für das UI.
Der Client soll bereitstellen:
- getLayout(): Layout-Daten
- getDevices(): Device-Basisdaten
- getDeviceState(device_id)
- setDeviceState(device_id, type, payload)
- connectRealtime(onEvent): SSE-Listener
Anforderungen:
- API_BASE aus .env oder UI-Konfiguration
- Fehlerbehandlung
- Timeout optional
- Types für:
- Room
- Device
- DeviceState
- RealtimeEvent
Akzeptanzkriterien:
- Der Client ist voll funktionsfähig und wird im UI genutzt.
- Ein Hook useRealtime(device_id) wird erzeugt.
- Ein Hook useRooms() and useDevices() existieren.
*/
/**
Copilot-Aufgabe: Erzeuge das UI-Routing.
Routen:
- "/" → Home (Räume)
- "/room/:roomId" → RoomView
- "/device/:deviceId" → DeviceView
Anforderungen:
- React Router v6 oder v7
- Layout-Komponente optional
- Loading/Fehlerzustände
- Responsive Verhalten beibehalten
Akzeptanzkriterien:
- Navigation funktioniert zwischen allen Seiten.
- Browser-Back funktioniert erwartungsgemäß.
- Routes unterstützen Refresh ohne Fehler.
*/
/**
Copilot-Aufgabe: Implementiere einen React-Hook useRealtime(deviceId: string | null).
Ziel:
- SSE-Stream /realtime abonnieren
- Nur Events für deviceId liefern
- onMessage → setState
- automatische Reconnects
- Fehlerlogging
Akzeptanz:
- Der Hook kann in RoomView & DeviceView genutzt werden.
- Live-Updates werden korrekt gemerged.
- Disconnect/Reload funktioniert sauber.
*/
/**
Copilot-Aufgabe: Erzeuge eine Icon-Komponente.
Ziel:
Basierend auf device.type und ggf. features ein passendes SVG ausliefern:
- light → Lightbulb
- thermostat → Thermostat
- contact → Door/Window-Sensor
- temp_humidity → Thermometer+Droplet
- outlet → Power-Plug
- cover → Blinds/Rollershutter
Akzeptanz:
- Icons skalieren sauber
- funktionieren in allen Kachel-Komponenten
*/

View File

@@ -73,6 +73,10 @@ class HomeAutomationClient {
return await this.fetch(this.api('/devices'));
}
async getDevice(deviceId) {
return await this.fetch(this.api(`/devices/${deviceId}`));
}
/**
* Get current state of a specific device
* @param {string} deviceId - Device ID
@@ -146,11 +150,15 @@ class HomeAutomationClient {
this.eventSource.close();
}
this.eventSource = new EventSource(this.api('/realtime'));
const realtimeUrl = this.api('/realtime');
console.log('Connecting to SSE endpoint:', realtimeUrl);
this.eventSource = new EventSource(realtimeUrl);
this.eventSource.onmessage = (event) => {
console.log('Raw SSE event received:', event.data);
try {
const data = JSON.parse(event.data);
console.log('Parsed SSE data:', data);
// Normalize event format: convert API format to unified format
const normalizedEvent = {
@@ -159,6 +167,7 @@ class HomeAutomationClient {
state: data.payload || data.state // Support both formats
};
console.log('Normalized SSE event:', normalizedEvent);
onEvent(normalizedEvent);
// Notify all registered listeners
@@ -168,12 +177,17 @@ class HomeAutomationClient {
}
});
} catch (error) {
console.error('Failed to parse SSE event:', error);
console.error('Failed to parse SSE event:', error, 'Raw data:', event.data);
}
};
this.eventSource.onopen = (event) => {
console.log('SSE connection opened:', event);
};
this.eventSource.onerror = (error) => {
console.error('SSE connection error:', error);
console.log('EventSource readyState:', this.eventSource.readyState);
if (onError) {
onError(error);
}

View File

@@ -217,6 +217,48 @@
color: #666;
}
.phase-grid {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 20px;
}
.phase-section h4 {
color: #333;
margin-bottom: 12px;
text-align: center;
}
.phase-values {
display: flex;
flex-direction: column;
gap: 8px;
}
.phase-value {
display: flex;
justify-content: space-between;
padding: 8px 12px;
background: rgba(102, 126, 234, 0.1);
border-radius: 8px;
}
.phase-value .value {
font-weight: 600;
color: #667eea;
}
.phase-value .unit {
color: #666;
font-size: 14px;
}
@media (max-width: 768px) {
.phase-grid {
grid-template-columns: 1fr;
}
}
.state-badge {
display: inline-block;
padding: 8px 20px;
@@ -298,7 +340,8 @@
<script>
// Get device ID from URL
const pathParts = window.location.pathname.split('/');
const deviceId = pathParts[pathParts.length - 1];
const deviceId = decodeURIComponent(pathParts[pathParts.length - 1]);
console.log('Device ID from URL:', deviceId);
// Device data
let deviceData = null;
@@ -324,11 +367,13 @@
try {
// Load device info using API client
// NEW: Use new endpoints for device info and layout
deviceData = await window.apiClient.getDeviceState(deviceId);
deviceData = await window.apiClient.getDevice(deviceId);
console.log("Loaded device data:", deviceData);
deviceState = await window.apiClient.getDeviceState(deviceId);
console.log("Loaded device state:", deviceState);
const layoutInfo = await window.apiClient.getDeviceLayout(deviceId);
console.log("Loaded layout info:", layoutInfo);
roomName = layoutInfo.room;
// deviceState is now the result of getDeviceState
deviceState = deviceData;
// Update header
document.getElementById('device-icon').textContent = deviceIcons[deviceData.type] || '📱';
@@ -364,6 +409,7 @@
'thermostat': 'Thermostat',
'contact': 'Kontaktsensor',
'temp_humidity_sensor': 'Temperatur & Luftfeuchte',
'three_phase_powermeter': 'Dreiphasen-Stromzähler',
'relay': 'Schalter',
'outlet': 'Steckdose',
'cover': 'Jalousie'
@@ -391,6 +437,9 @@
case 'temp_humidity_sensor':
renderTempHumidityDisplay(container);
break;
case 'three_phase_powermeter':
renderThreePhasePowerDisplay(container);
break;
case 'cover':
renderCoverControls(container);
break;
@@ -469,11 +518,11 @@
stateGrid.className = 'state-grid';
stateGrid.innerHTML = `
<div class="state-item">
<div class="state-value" id="current-temp">${deviceState.current_temp?.toFixed(1) || '--'}°C</div>
<div class="state-value" id="current-temp">${deviceState.current?.toFixed(1) || '--'}°C</div>
<div class="state-label">Aktuell</div>
</div>
<div class="state-item">
<div class="state-value" id="target-temp">${deviceState.target_temp?.toFixed(1) || '--'}°C</div>
<div class="state-value" id="target-temp">${deviceState.target?.toFixed(1) || '--'}°C</div>
<div class="state-label">Ziel</div>
</div>
`;
@@ -486,8 +535,8 @@
sliderGroup.innerHTML = `
<label class="control-label">Zieltemperatur</label>
<div class="slider-container">
<input type="range" class="slider" id="temp-slider" min="5" max="30" step="0.5" value="${deviceState.target_temp || 21}">
<div class="slider-value" id="temp-value">${deviceState.target_temp?.toFixed(1) || '21.0'}°C</div>
<input type="range" class="slider" id="temp-slider" min="5" max="30" step="0.5" value="${deviceState.target || 21}">
<div class="slider-value" id="temp-value">${deviceState.target?.toFixed(1) || '21.0'}°C</div>
</div>
`;
card.appendChild(sliderGroup);
@@ -563,6 +612,93 @@
container.appendChild(card);
}
function renderThreePhasePowerDisplay(container) {
const card = document.createElement('div');
card.className = 'card';
card.innerHTML = '<div class="card-title">Leistungsmessung</div>';
// Übersicht
const overviewGrid = document.createElement('div');
overviewGrid.className = 'state-grid';
overviewGrid.innerHTML = `
<div class="state-item">
<div class="state-value" id="total-power">${deviceState.total_power?.toFixed(0) || '--'} W</div>
<div class="state-label">Gesamtleistung</div>
</div>
<div class="state-item">
<div class="state-value" id="energy">${deviceState.energy?.toFixed(2) || '--'} kWh</div>
<div class="state-label">Energie</div>
</div>
`;
card.appendChild(overviewGrid);
// Phasen Details
const phaseCard = document.createElement('div');
phaseCard.className = 'card';
phaseCard.innerHTML = '<div class="card-title">Phasen</div>';
phaseCard.style.marginTop = '20px';
const phaseGrid = document.createElement('div');
phaseGrid.className = 'phase-grid';
phaseGrid.innerHTML = `
<div class="phase-section">
<h4>Phase 1</h4>
<div class="phase-values">
<div class="phase-value">
<span class="value" id="phase1-power">${deviceState.phase1_power?.toFixed(0) || '--'}</span>
<span class="unit">W</span>
</div>
<div class="phase-value">
<span class="value" id="phase1-voltage">${deviceState.phase1_voltage?.toFixed(1) || '--'}</span>
<span class="unit">V</span>
</div>
<div class="phase-value">
<span class="value" id="phase1-current">${deviceState.phase1_current?.toFixed(2) || '--'}</span>
<span class="unit">A</span>
</div>
</div>
</div>
<div class="phase-section">
<h4>Phase 2</h4>
<div class="phase-values">
<div class="phase-value">
<span class="value" id="phase2-power">${deviceState.phase2_power?.toFixed(0) || '--'}</span>
<span class="unit">W</span>
</div>
<div class="phase-value">
<span class="value" id="phase2-voltage">${deviceState.phase2_voltage?.toFixed(1) || '--'}</span>
<span class="unit">V</span>
</div>
<div class="phase-value">
<span class="value" id="phase2-current">${deviceState.phase2_current?.toFixed(2) || '--'}</span>
<span class="unit">A</span>
</div>
</div>
</div>
<div class="phase-section">
<h4>Phase 3</h4>
<div class="phase-values">
<div class="phase-value">
<span class="value" id="phase3-power">${deviceState.phase3_power?.toFixed(0) || '--'}</span>
<span class="unit">W</span>
</div>
<div class="phase-value">
<span class="value" id="phase3-voltage">${deviceState.phase3_voltage?.toFixed(1) || '--'}</span>
<span class="unit">V</span>
</div>
<div class="phase-value">
<span class="value" id="phase3-current">${deviceState.phase3_current?.toFixed(2) || '--'}</span>
<span class="unit">A</span>
</div>
</div>
</div>
`;
phaseCard.appendChild(phaseGrid);
container.appendChild(card);
container.appendChild(phaseCard);
}
function renderCoverControls(container) {
const card = document.createElement('div');
card.className = 'card';
@@ -705,9 +841,19 @@
try {
// Use API client's realtime connection
window.apiClient.connectRealtime((event) => {
console.log('SSE event received:', event);
console.log('Current deviceId:', deviceId);
console.log('Event device_id:', event.device_id);
console.log('Device type:', deviceData.type);
if (event.device_id === deviceId && event.state) {
console.log('Updating device state for:', deviceId);
console.log('Old state:', deviceState);
console.log('New state from event:', event.state);
deviceState = { ...deviceState, ...event.state };
console.log('Merged state:', deviceState);
updateUI();
} else {
console.log('SSE event ignored - not for this device or no state');
}
}, (error) => {
console.error('SSE connection error:', error);
@@ -736,6 +882,9 @@
case 'temp_humidity_sensor':
updateTempHumidityUI();
break;
case 'three_phase_powermeter':
updateThreePhasePowerUI();
break;
case 'cover':
updateCoverUI();
break;
@@ -763,15 +912,15 @@
const tempSlider = document.getElementById('temp-slider');
const tempValue = document.getElementById('temp-value');
if (currentTemp && deviceState.current_temp != null) {
currentTemp.textContent = deviceState.current_temp.toFixed(1) + '°C';
if (currentTemp && deviceState.current != null) {
currentTemp.textContent = deviceState.current.toFixed(1) + '°C';
}
if (targetTemp && deviceState.target_temp != null) {
targetTemp.textContent = deviceState.target_temp.toFixed(1) + '°C';
if (targetTemp && deviceState.target != null) {
targetTemp.textContent = deviceState.target.toFixed(1) + '°C';
}
if (tempSlider && deviceState.target_temp != null) {
tempSlider.value = deviceState.target_temp;
tempValue.textContent = deviceState.target_temp.toFixed(1) + '°C';
if (tempSlider && deviceState.target != null) {
tempSlider.value = deviceState.target;
tempValue.textContent = deviceState.target.toFixed(1) + '°C';
}
}
@@ -804,6 +953,42 @@
}
}
function updateThreePhasePowerUI() {
console.log('updateThreePhasePowerUI called with deviceState:', deviceState);
// Update overview
const totalPower = document.getElementById('total-power');
const energy = document.getElementById('energy');
console.log('Elements found - totalPower:', totalPower, 'energy:', energy);
if (totalPower && deviceState.total_power != null) {
console.log('Updating total power to:', deviceState.total_power);
totalPower.textContent = deviceState.total_power.toFixed(0) + ' W';
}
if (energy && deviceState.energy != null) {
console.log('Updating energy to:', deviceState.energy);
energy.textContent = deviceState.energy.toFixed(2) + ' kWh';
}
// Update phases
const phases = ['phase1', 'phase2', 'phase3'];
phases.forEach(phase => {
const power = document.getElementById(`${phase}-power`);
const voltage = document.getElementById(`${phase}-voltage`);
const current = document.getElementById(`${phase}-current`);
if (power && deviceState[`${phase}_power`] != null) {
power.textContent = deviceState[`${phase}_power`].toFixed(0);
}
if (voltage && deviceState[`${phase}_voltage`] != null) {
voltage.textContent = deviceState[`${phase}_voltage`].toFixed(1);
}
if (current && deviceState[`${phase}_current`] != null) {
current.textContent = deviceState[`${phase}_current`].toFixed(2);
}
});
}
function updateCoverUI() {
const slider = document.getElementById('position-slider');
const value = document.getElementById('position-value');

View File

@@ -0,0 +1,615 @@
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Garage - Home Automation</title>
<style>
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
body {
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
min-height: 100vh;
padding: 20px;
}
.container {
max-width: 800px;
margin: 0 auto;
padding-top: 20px;
}
.devices-container {
display: grid;
grid-template-columns: 1fr;
gap: 20px;
}
@media (min-width: 768px) {
.devices-container {
grid-template-columns: 1fr 1fr;
}
}
.device-section {
background: rgba(255, 255, 255, 0.95);
border-radius: 12px;
padding: 20px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}
.device-header {
display: flex;
align-items: center;
gap: 12px;
margin-bottom: 20px;
}
.device-icon {
font-size: 32px;
}
.device-info {
flex: 1;
}
.device-name {
font-size: 18px;
font-weight: 600;
color: #333;
margin: 0 0 4px 0;
}
.device-type {
font-size: 14px;
color: #666;
margin: 0;
}
.card {
background: #f8f9fa;
border-radius: 8px;
padding: 16px;
margin-bottom: 16px;
}
.card:last-child {
margin-bottom: 0;
}
.card-title {
font-size: 16px;
font-weight: 600;
color: #333;
margin-bottom: 12px;
}
.state-grid {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 16px;
}
.state-item {
text-align: center;
}
.state-value {
font-size: 24px;
font-weight: 600;
color: #667eea;
margin-bottom: 4px;
}
.state-label {
font-size: 14px;
color: #666;
}
.control-group {
margin-bottom: 20px;
}
.control-group:last-child {
margin-bottom: 0;
}
.control-label {
font-size: 14px;
font-weight: 500;
color: #333;
margin-bottom: 8px;
display: block;
}
.button-group {
display: flex;
gap: 8px;
}
.control-button {
flex: 1;
padding: 12px 16px;
border: none;
border-radius: 8px;
font-size: 16px;
font-weight: 500;
cursor: pointer;
transition: all 0.2s ease;
}
.control-button.on {
background: #34c759;
color: white;
}
.control-button.off {
background: #e0e0e0;
color: #666;
}
.control-button:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
}
.control-button:active {
transform: translateY(0);
}
.phase-grid {
display: grid;
grid-template-columns: repeat(3, 1fr);
gap: 20px;
}
.phase-section h4 {
color: #333;
margin-bottom: 12px;
text-align: center;
}
.phase-values {
display: flex;
flex-direction: column;
gap: 8px;
}
.phase-value {
display: flex;
justify-content: space-between;
padding: 8px 12px;
background: rgba(102, 126, 234, 0.1);
border-radius: 8px;
}
.phase-value .value {
font-weight: 600;
color: #667eea;
}
.phase-value .unit {
color: #666;
font-size: 14px;
}
@media (max-width: 768px) {
.phase-grid {
grid-template-columns: 1fr;
}
}
.loading {
text-align: center;
color: white;
font-size: 18px;
padding: 40px;
}
.error {
background: rgba(255, 59, 48, 0.9);
color: white;
padding: 16px;
border-radius: 8px;
text-align: center;
margin-bottom: 20px;
}
</style>
</head>
<body>
<div class="container">
<div id="error-container"></div>
<div id="loading" class="loading">Lade Geräte...</div>
<div id="devices-container" class="devices-container" style="display: none;"></div>
</div>
<script>
// API configuration from backend
window.API_BASE = '{{ api_base }}';
</script>
<!-- Load API client AFTER API_BASE is set -->
<script src="/static/types.js"></script>
<script src="/static/api-client.js"></script>
<script>
// Device IDs for garage devices
const GARAGE_DEVICES = [
'power_relay_caroutlet',
'powermeter_caroutlet'
];
// Device states
const deviceStates = {};
let devicesData = {};
async function loadGarageDevices() {
const loading = document.getElementById('loading');
const container = document.getElementById('devices-container');
const errorContainer = document.getElementById('error-container');
try {
// Load all devices using API client
const allDevices = await window.apiClient.getDevices();
console.log('All devices loaded:', allDevices.length);
// Filter garage devices
const garageDevices = allDevices.filter(device =>
GARAGE_DEVICES.includes(device.device_id)
);
console.log('Garage devices found:', garageDevices);
if (garageDevices.length === 0) {
throw new Error('Keine Garage-Geräte gefunden');
}
// Create device lookup
garageDevices.forEach(device => {
devicesData[device.device_id] = device;
});
// Load device states
for (const device of garageDevices) {
try {
deviceStates[device.device_id] = await window.apiClient.getDeviceState(device.device_id);
console.log(`State for ${device.device_id}:`, deviceStates[device.device_id]);
} catch (err) {
console.warn(`Failed to load state for ${device.device_id}:`, err);
deviceStates[device.device_id] = null;
}
}
loading.style.display = 'none';
container.style.display = 'grid';
// Render devices
garageDevices.forEach(device => {
const deviceSection = createDeviceSection(device);
container.appendChild(deviceSection);
});
// Start SSE for live updates
connectRealtime();
} catch (error) {
console.error('Error loading garage devices:', error);
loading.style.display = 'none';
errorContainer.innerHTML = `
<div class="error">
⚠️ Fehler beim Laden: ${error.message}
</div>
`;
}
}
function createDeviceSection(device) {
const section = document.createElement('div');
section.className = 'device-section';
section.dataset.deviceId = device.device_id;
// Device header
const header = document.createElement('div');
header.className = 'device-header';
const icon = document.createElement('div');
icon.className = 'device-icon';
icon.textContent = getDeviceIcon(device.type);
const info = document.createElement('div');
info.className = 'device-info';
const name = document.createElement('h2');
name.className = 'device-name';
name.textContent = device.name;
const type = document.createElement('p');
type.className = 'device-type';
type.textContent = getTypeLabel(device.type);
info.appendChild(name);
info.appendChild(type);
header.appendChild(icon);
header.appendChild(info);
section.appendChild(header);
// Device content
const content = document.createElement('div');
content.className = 'device-content';
renderDeviceContent(content, device);
section.appendChild(content);
return section;
}
function renderDeviceContent(container, device) {
// Clear existing content
container.innerHTML = '';
switch (device.type) {
case 'relay':
case 'outlet':
renderOutletControls(container, device);
break;
case 'three_phase_powermeter':
renderThreePhasePowerDisplay(container, device);
break;
default:
container.innerHTML = '<div class="card">Keine Steuerung verfügbar</div>';
}
}
function renderOutletControls(container, device) {
const card = document.createElement('div');
card.className = 'card';
card.innerHTML = '<div class="card-title">Steuerung</div>';
const controlGroup = document.createElement('div');
controlGroup.className = 'control-group';
const label = document.createElement('label');
label.className = 'control-label';
label.textContent = 'Status';
const buttonGroup = document.createElement('div');
buttonGroup.className = 'button-group';
const state = deviceStates[device.device_id];
const currentPower = state?.power === 'on';
const onButton = document.createElement('button');
onButton.className = `control-button ${currentPower ? 'on' : 'off'}`;
onButton.textContent = 'Ein';
onButton.onclick = () => toggleOutlet(device.device_id, 'on');
const offButton = document.createElement('button');
offButton.className = `control-button ${!currentPower ? 'on' : 'off'}`;
offButton.textContent = 'Aus';
offButton.onclick = () => toggleOutlet(device.device_id, 'off');
buttonGroup.appendChild(onButton);
buttonGroup.appendChild(offButton);
controlGroup.appendChild(label);
controlGroup.appendChild(buttonGroup);
card.appendChild(controlGroup);
container.appendChild(card);
}
function renderThreePhasePowerDisplay(container, device) {
const state = deviceStates[device.device_id] || {};
const card = document.createElement('div');
card.className = 'card';
card.innerHTML = '<div class="card-title">Leistungsmessung</div>';
// Übersicht
const overviewGrid = document.createElement('div');
overviewGrid.className = 'state-grid';
overviewGrid.innerHTML = `
<div class="state-item">
<div class="state-value" id="total-power-${device.device_id}">${state.total_power?.toFixed(0) || '--'} W</div>
<div class="state-label">Gesamtleistung</div>
</div>
<div class="state-item">
<div class="state-value" id="energy-${device.device_id}">${state.energy?.toFixed(2) || '--'} kWh</div>
<div class="state-label">Energie</div>
</div>
`;
card.appendChild(overviewGrid);
// Phasen Details
const phaseCard = document.createElement('div');
phaseCard.className = 'card';
phaseCard.innerHTML = '<div class="card-title">Phasen</div>';
phaseCard.style.marginTop = '20px';
const phaseGrid = document.createElement('div');
phaseGrid.className = 'phase-grid';
phaseGrid.innerHTML = `
<div class="phase-section">
<h4>Phase 1</h4>
<div class="phase-values">
<div class="phase-value">
<span class="value" id="phase1-power-${device.device_id}">${state.phase1_power?.toFixed(0) || '--'}</span>
<span class="unit">W</span>
</div>
<div class="phase-value">
<span class="value" id="phase1-voltage-${device.device_id}">${state.phase1_voltage?.toFixed(1) || '--'}</span>
<span class="unit">V</span>
</div>
<div class="phase-value">
<span class="value" id="phase1-current-${device.device_id}">${state.phase1_current?.toFixed(2) || '--'}</span>
<span class="unit">A</span>
</div>
</div>
</div>
<div class="phase-section">
<h4>Phase 2</h4>
<div class="phase-values">
<div class="phase-value">
<span class="value" id="phase2-power-${device.device_id}">${state.phase2_power?.toFixed(0) || '--'}</span>
<span class="unit">W</span>
</div>
<div class="phase-value">
<span class="value" id="phase2-voltage-${device.device_id}">${state.phase2_voltage?.toFixed(1) || '--'}</span>
<span class="unit">V</span>
</div>
<div class="phase-value">
<span class="value" id="phase2-current-${device.device_id}">${state.phase2_current?.toFixed(2) || '--'}</span>
<span class="unit">A</span>
</div>
</div>
</div>
<div class="phase-section">
<h4>Phase 3</h4>
<div class="phase-values">
<div class="phase-value">
<span class="value" id="phase3-power-${device.device_id}">${state.phase3_power?.toFixed(0) || '--'}</span>
<span class="unit">W</span>
</div>
<div class="phase-value">
<span class="value" id="phase3-voltage-${device.device_id}">${state.phase3_voltage?.toFixed(1) || '--'}</span>
<span class="unit">V</span>
</div>
<div class="phase-value">
<span class="value" id="phase3-current-${device.device_id}">${state.phase3_current?.toFixed(2) || '--'}</span>
<span class="unit">A</span>
</div>
</div>
</div>
`;
phaseCard.appendChild(phaseGrid);
container.appendChild(card);
container.appendChild(phaseCard);
}
async function toggleOutlet(deviceId, newState) {
try {
await window.apiClient.setDeviceState(deviceId, { power: newState });
console.log(`Set ${deviceId} to ${newState}`);
} catch (error) {
console.error('Error toggling outlet:', error);
alert('Fehler beim Schalten des Geräts: ' + error.message);
}
}
function connectRealtime() {
try {
window.apiClient.connectRealtime((event) => {
console.log('SSE event received:', event);
if (event.device_id && event.state && GARAGE_DEVICES.includes(event.device_id)) {
console.log('Updating garage device state for:', event.device_id);
deviceStates[event.device_id] = { ...deviceStates[event.device_id], ...event.state };
updateDeviceUI(event.device_id);
}
}, (error) => {
console.error('SSE connection error:', error);
});
} catch (error) {
console.error('Failed to connect to realtime events:', error);
}
}
function updateDeviceUI(deviceId) {
const device = devicesData[deviceId];
if (!device) return;
const state = deviceStates[deviceId];
console.log(`Updating UI for ${deviceId}:`, state);
switch (device.type) {
case 'relay':
case 'outlet':
updateOutletUI(deviceId, state);
break;
case 'three_phase_powermeter':
updateThreePhasePowerUI(deviceId, state);
break;
}
}
function updateOutletUI(deviceId, state) {
const section = document.querySelector(`[data-device-id="${deviceId}"]`);
if (!section) return;
const onButton = section.querySelector('.control-button:nth-child(1)');
const offButton = section.querySelector('.control-button:nth-child(2)');
if (onButton && offButton && state.power) {
const isOn = state.power === 'on';
onButton.className = `control-button ${isOn ? 'on' : 'off'}`;
offButton.className = `control-button ${!isOn ? 'on' : 'off'}`;
}
}
function updateThreePhasePowerUI(deviceId, state) {
// Update overview
const totalPower = document.getElementById(`total-power-${deviceId}`);
const energy = document.getElementById(`energy-${deviceId}`);
if (totalPower && state.total_power != null) {
totalPower.textContent = state.total_power.toFixed(0) + ' W';
}
if (energy && state.energy != null) {
energy.textContent = state.energy.toFixed(2) + ' kWh';
}
// Update phases
const phases = ['phase1', 'phase2', 'phase3'];
phases.forEach(phase => {
const power = document.getElementById(`${phase}-power-${deviceId}`);
const voltage = document.getElementById(`${phase}-voltage-${deviceId}`);
const current = document.getElementById(`${phase}-current-${deviceId}`);
if (power && state[`${phase}_power`] != null) {
power.textContent = state[`${phase}_power`].toFixed(0);
}
if (voltage && state[`${phase}_voltage`] != null) {
voltage.textContent = state[`${phase}_voltage`].toFixed(1);
}
if (current && state[`${phase}_current`] != null) {
current.textContent = state[`${phase}_current`].toFixed(2);
}
});
}
function getDeviceIcon(type) {
const icons = {
'relay': '⚡',
'outlet': '⚡',
'three_phase_powermeter': '📊'
};
return icons[type] || '📱';
}
function getTypeLabel(type) {
const labels = {
'relay': 'Relais',
'outlet': 'Steckdose',
'three_phase_powermeter': 'Dreiphasen-Stromzähler'
};
return labels[type] || 'Unbekannt';
}
// Cleanup on page unload
window.addEventListener('beforeunload', () => {
window.apiClient.disconnectRealtime();
});
// Load garage devices on page load
document.addEventListener('DOMContentLoaded', loadGarageDevices);
</script>
</body>
</html>

View File

@@ -23,6 +23,12 @@
margin: 0 auto;
}
h1 {
color: #333;
font-size: 28px;
margin-bottom: 8px;
}
.header {
background: rgba(255, 255, 255, 0.95);
border-radius: 12px;
@@ -47,21 +53,19 @@
text-decoration: underline;
}
h1 {
color: #333;
font-size: 28px;
margin-bottom: 8px;
}
.room-info {
color: #666;
font-size: 14px;
}
.devices-grid {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 16px;
margin-bottom: 20px;
}
@media (min-width: 600px) {
@@ -80,14 +84,18 @@
background: rgba(255, 255, 255, 0.95);
border-radius: 12px;
padding: 16px;
text-align: center;
cursor: pointer;
transition: all 0.2s ease;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
min-height: 120px;
min-height: 110px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
text-decoration: none;
color: inherit;
width: 100%;
}
.device-card:hover {
@@ -111,7 +119,7 @@
}
.device-title {
font-size: 16px;
font-size: 14px;
font-weight: 600;
color: #333;
flex: 1;
@@ -223,8 +231,9 @@
'thermostat': '🌡️',
'contact': '🚪',
'temp_humidity_sensor': '🌡️',
'relay': '🔌',
'outlet': '🔌',
'three_phase_powermeter': '📊',
'relay': '💡',
'outlet': '💡',
'cover': '🪟'
};
@@ -297,6 +306,7 @@
deviceStates[device.device_id] = null;
}
}
console.log('Device states:', deviceStates);
// Render devices
grid.style.display = 'grid';
@@ -370,13 +380,10 @@
break;
case 'thermostat':
if (state.current != null) {
html = `<div class="state-primary">${state.current.toFixed(1)}°C</div>`;
if (state.target != null) {
html += `<div class="state-secondary">Ziel: ${state.target}°C</div>`;
}
if (state.mode) {
html += `<div class="state-secondary">Modus: ${state.mode}</div>`;
if (state.target != null) {
html = `<div class="state-primary">${state.target.toFixed(1)}°C</div>`;
if (state.current != null) {
html += `<div class="state-secondary">Ist: ${state.current}°C</div>`;
}
}
break;
@@ -397,6 +404,15 @@
}
break;
case 'three_phase_powermeter':
if (state.total_power != null) {
html = `<div class="state-primary">${state.total_power.toFixed(0)} W</div>`;
if (state.energy != null) {
html += `<div class="state-secondary">${state.energy.toFixed(2)} kWh</div>`;
}
}
break;
case 'relay':
case 'outlet':
if (state.power) {

View File

@@ -136,10 +136,8 @@
</style>
</head>
<body>
<a href="/" class="back-button">← Dashboard</a>
<div class="container">
<h1>🏠 Räume</h1>
<h1>🏠 Zuhause</h1>
<div id="error-container"></div>
<div id="loading" class="loading">Lade Räume...</div>

View File

@@ -11,6 +11,7 @@ redis:
channel: "ui:updates"
devices:
- device_id: lampe_semeniere_wohnzimmer
name: Semeniere
type: relay
cap_version: "relay@1.0.0"
technology: zigbee2mqtt
@@ -25,6 +26,7 @@ devices:
model: "AC10691"
vendor: "OSRAM"
- device_id: stehlampe_esszimmer_spiegel
name: Stehlampe Spiegel
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -35,6 +37,7 @@ devices:
state: "zigbee2mqtt/0x001788010d06ea09"
set: "zigbee2mqtt/0x001788010d06ea09/set"
- device_id: stehlampe_esszimmer_schrank
name: Stehlampe Schrank
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -45,6 +48,7 @@ devices:
state: "zigbee2mqtt/0x001788010d09176c"
set: "zigbee2mqtt/0x001788010d09176c/set"
- device_id: grosse_lampe_wohnzimmer
name: grosse Lampe
type: relay
cap_version: "relay@1.0.0"
technology: zigbee2mqtt
@@ -59,6 +63,7 @@ devices:
model: "AC10691"
vendor: "OSRAM"
- device_id: lampe_naehtischchen_wohnzimmer
name: Nähtischchen
type: relay
cap_version: "relay@1.0.0"
technology: zigbee2mqtt
@@ -72,21 +77,8 @@ devices:
ieee_address: "0x842e14fffee560ee"
model: "HG06337"
vendor: "Lidl"
- device_id: kleine_lampe_rechts_esszimmer
type: relay
cap_version: "relay@1.0.0"
technology: zigbee2mqtt
features:
power: true
topics:
state: "zigbee2mqtt/0xf0d1b80000156645"
set: "zigbee2mqtt/0xf0d1b80000156645/set"
metadata:
friendly_name: "kleine Lampe rechts Esszimmer"
ieee_address: "0xf0d1b80000156645"
model: "AC10691"
vendor: "OSRAM"
- device_id: kleine_lampe_links_esszimmer
name: kleine Lampe
type: relay
cap_version: "relay@1.0.0"
technology: zigbee2mqtt
@@ -101,6 +93,7 @@ devices:
model: "AC10691"
vendor: "OSRAM"
- device_id: leselampe_esszimmer
name: Leselampe
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -116,6 +109,7 @@ devices:
model: "LED1842G3"
vendor: "IKEA"
- device_id: medusalampe_schlafzimmer
name: Medusa-Lampe
type: relay
cap_version: "relay@1.0.0"
technology: zigbee2mqtt
@@ -131,6 +125,7 @@ devices:
vendor: "OSRAM"
- device_id: sportlicht_am_fernseher_studierzimmer
type: light
name: am Fernseher
cap_version: "light@1.2.0"
technology: zigbee2mqtt
features:
@@ -146,6 +141,7 @@ devices:
model: "LED1733G7"
vendor: "IKEA"
- device_id: deckenlampe_schlafzimmer
name: Deckenlampe
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -161,6 +157,7 @@ devices:
model: "8718699688882"
vendor: "Philips"
- device_id: bettlicht_wolfgang
name: Bettlicht Wolfgang
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -176,6 +173,7 @@ devices:
model: "9290020399"
vendor: "Philips"
- device_id: bettlicht_patty
name: Bettlicht Patty
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -191,6 +189,7 @@ devices:
model: "9290020399"
vendor: "Philips"
- device_id: schranklicht_hinten_patty
name: Schranklicht hinten
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -206,6 +205,7 @@ devices:
model: "8718699673147"
vendor: "Philips"
- device_id: schranklicht_vorne_patty
name: Schranklicht vorne
type: relay
cap_version: "relay@1.0.0"
technology: zigbee2mqtt
@@ -220,6 +220,7 @@ devices:
model: "AC10691"
vendor: "OSRAM"
- device_id: leselampe_patty
name: Leselampe
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -235,6 +236,7 @@ devices:
model: "8718699673147"
vendor: "Philips"
- device_id: deckenlampe_esszimmer
name: Deckenlampe
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -249,23 +251,8 @@ devices:
ieee_address: "0x0017880108a03e45"
model: "929002241201"
vendor: "Philips"
- device_id: standlampe_esszimmer
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
features:
power: true
brightness: true
color_temperature: true
topics:
state: "zigbee2mqtt/0xbc33acfffe21f547"
set: "zigbee2mqtt/0xbc33acfffe21f547/set"
metadata:
friendly_name: "Standlampe Esszimmer"
ieee_address: "0xbc33acfffe21f547"
model: "LED1732G11"
vendor: "IKEA"
- device_id: haustuer
name: Haustür-Lampe
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -281,6 +268,7 @@ devices:
model: "LED1842G3"
vendor: "IKEA"
- device_id: deckenlampe_flur_oben
name: Deckenlampe oben
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -297,6 +285,7 @@ devices:
model: "929003099001"
vendor: "Philips"
- device_id: kueche_deckenlampe
name: Deckenlampe
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -312,6 +301,7 @@ devices:
model: "929002469202"
vendor: "Philips"
- device_id: sportlicht_tisch
name: am Tisch
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -327,6 +317,7 @@ devices:
model: "4058075729063"
vendor: "LEDVANCE"
- device_id: sportlicht_regal
name: am Regal
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -342,6 +333,7 @@ devices:
model: "4058075729063"
vendor: "LEDVANCE"
- device_id: licht_flur_oben_am_spiegel
name: Spiegel
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -358,6 +350,7 @@ devices:
model: "LED1732G11"
vendor: "IKEA"
- device_id: experimentlabtest
name: Test Lampe
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
@@ -373,6 +366,7 @@ devices:
model: "4058075208421"
vendor: "LEDVANCE"
- device_id: thermostat_wolfgang
name: Heizung
type: thermostat
cap_version: "thermostat@1.0.0"
technology: zigbee2mqtt
@@ -391,6 +385,7 @@ devices:
model: "GS361A-H04"
vendor: "Siterwell"
- device_id: thermostat_kueche
name: Heizung
type: thermostat
cap_version: "thermostat@1.0.0"
technology: zigbee2mqtt
@@ -409,6 +404,7 @@ devices:
model: "GS361A-H04"
vendor: "Siterwell"
- device_id: thermostat_schlafzimmer
name: Heizung
type: thermostat
cap_version: "thermostat@1.0.0"
technology: max
@@ -427,6 +423,7 @@ devices:
peer_id: "42"
channel: "1"
- device_id: thermostat_esszimmer
name: Heizung
type: thermostat
cap_version: "thermostat@1.0.0"
technology: max
@@ -445,6 +442,7 @@ devices:
peer_id: "45"
channel: "1"
- device_id: thermostat_wohnzimmer
name: Heizung
type: thermostat
cap_version: "thermostat@1.0.0"
technology: max
@@ -463,6 +461,7 @@ devices:
peer_id: "46"
channel: "1"
- device_id: thermostat_patty
name: Heizung
type: thermostat
cap_version: "thermostat@1.0.0"
technology: max
@@ -481,6 +480,7 @@ devices:
peer_id: "39"
channel: "1"
- device_id: thermostat_bad_oben
name: Heizung
type: thermostat
cap_version: "thermostat@1.0.0"
technology: max
@@ -499,6 +499,7 @@ devices:
peer_id: "41"
channel: "1"
- device_id: thermostat_bad_unten
name: Heizung
type: thermostat
cap_version: "thermostat@1.0.0"
technology: max
@@ -517,6 +518,7 @@ devices:
peer_id: "48"
channel: "1"
- device_id: sterne_wohnzimmer
name: Sterne
type: relay
cap_version: "relay@1.0.0"
technology: zigbee2mqtt
@@ -531,8 +533,8 @@ devices:
model: "AC10691"
vendor: "OSRAM"
- device_id: kontakt_schlafzimmer_strasse
name: Fenster
type: contact
name: Kontakt Schlafzimmer Straße
cap_version: contact_sensor@1.0.0
technology: max
topics:
@@ -540,39 +542,39 @@ devices:
features: {}
- device_id: kontakt_esszimmer_strasse_rechts
type: contact
name: Kontakt Esszimmer Straße rechts
name: Fenster rechts
cap_version: contact_sensor@1.0.0
technology: max
topics:
state: homegear/instance1/plain/26/1/STATE
features: {}
- device_id: kontakt_esszimmer_strasse_links
name: Fenster links
type: contact
name: Kontakt Esszimmer Straße links
cap_version: contact_sensor@1.0.0
technology: max
topics:
state: homegear/instance1/plain/27/1/STATE
features: {}
- device_id: kontakt_wohnzimmer_garten_rechts
name: Fenster rechts
type: contact
name: Kontakt Wohnzimmer Garten rechts
cap_version: contact_sensor@1.0.0
technology: max
topics:
state: homegear/instance1/plain/28/1/STATE
features: {}
- device_id: kontakt_wohnzimmer_garten_links
name: Fenster links
type: contact
name: Kontakt Wohnzimmer Garten links
cap_version: contact_sensor@1.0.0
technology: max
topics:
state: homegear/instance1/plain/29/1/STATE
features: {}
- device_id: kontakt_kueche_garten_fenster
name: Fenster Garten
type: contact
name: Kontakt Küche Garten Fenster
cap_version: contact_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -580,23 +582,23 @@ devices:
features: {}
- device_id: kontakt_kueche_garten_tuer
type: contact
name: Kontakt Küche Garten Tür
name: Terrassentür
cap_version: contact_sensor@1.0.0
technology: zigbee2mqtt
topics:
state: zigbee2mqtt/0x00158d008b332788
features: {}
- device_id: kontakt_kueche_strasse_rechts
name: Fenster Straße rechts
type: contact
name: Kontakt Küche Straße rechts
cap_version: contact_sensor@1.0.0
technology: zigbee2mqtt
topics:
state: zigbee2mqtt/0x00158d008b151803
features: {}
- device_id: kontakt_kueche_strasse_links
name: Fenster Straße links
type: contact
name: Kontakt Küche Straße links
cap_version: contact_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -604,7 +606,7 @@ devices:
features: {}
- device_id: kontakt_patty_garten_rechts
type: contact
name: Kontakt Patty Garten rechts
name: Fenster Garten rechts
cap_version: contact_sensor@1.0.0
technology: max
topics:
@@ -612,7 +614,7 @@ devices:
features: {}
- device_id: kontakt_patty_garten_links
type: contact
name: Kontakt Patty Garten links
name: Fenster Garten links
cap_version: contact_sensor@1.0.0
technology: max
topics:
@@ -620,7 +622,7 @@ devices:
features: {}
- device_id: kontakt_patty_strasse
type: contact
name: Kontakt Patty Straße
name: Fenster Straße
cap_version: contact_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -628,7 +630,7 @@ devices:
features: {}
- device_id: kontakt_wolfgang_garten
type: contact
name: Kontakt Wolfgang Garten
name: Fenster
cap_version: contact_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -636,7 +638,7 @@ devices:
features: {}
- device_id: kontakt_bad_oben_strasse
type: contact
name: Kontakt Bad Oben Straße
name: Fenster
cap_version: contact_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -644,7 +646,7 @@ devices:
features: {}
- device_id: kontakt_bad_unten_strasse
type: contact
name: Kontakt Bad Unten Straße
name: Fenster
cap_version: contact_sensor@1.0.0
technology: max
topics:
@@ -652,7 +654,7 @@ devices:
features: {}
- device_id: sensor_schlafzimmer
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -660,7 +662,7 @@ devices:
features: {}
- device_id: sensor_wohnzimmer
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -668,7 +670,7 @@ devices:
features: {}
- device_id: sensor_kueche
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -676,7 +678,7 @@ devices:
features: {}
- device_id: sensor_arbeitszimmer_patty
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -684,7 +686,7 @@ devices:
features: {}
- device_id: sensor_arbeitszimmer_wolfgang
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -692,7 +694,7 @@ devices:
features: {}
- device_id: sensor_bad_oben
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -700,7 +702,7 @@ devices:
features: {}
- device_id: sensor_bad_unten
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -708,7 +710,7 @@ devices:
features: {}
- device_id: sensor_flur
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -716,7 +718,7 @@ devices:
features: {}
- device_id: sensor_waschkueche
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
@@ -724,13 +726,14 @@ devices:
features: {}
- device_id: sensor_sportzimmer
type: temp_humidity_sensor
name: Temperatur & Luftfeuchte
name: Thermometer
cap_version: temp_humidity_sensor@1.0.0
technology: zigbee2mqtt
topics:
state: zigbee2mqtt/0x00158d0009421422
features: {}
- device_id: licht_spuele_kueche
name: Spüle
type: relay
cap_version: "relay@1.0.0"
technology: shelly
@@ -740,6 +743,7 @@ devices:
set: "shellies/LightKitchenSink/relay/0/command"
state: "shellies/LightKitchenSink/relay/0"
- device_id: licht_schrank_esszimmer
name: Schrank
type: relay
cap_version: "relay@1.0.0"
technology: shelly
@@ -750,6 +754,7 @@ devices:
state: "shellies/schrankesszimmer/relay/0"
- device_id: licht_regal_wohnzimmer
type: relay
name: Regal
cap_version: "relay@1.0.0"
technology: shelly
features:
@@ -759,6 +764,7 @@ devices:
state: "shellies/wohnzimmer-regal/relay/0"
- device_id: licht_flur_schrank
type: relay
name: Schrank
cap_version: "relay@1.0.0"
technology: shelly
features:
@@ -767,6 +773,7 @@ devices:
set: "shellies/schrankflur/relay/0/command"
state: "shellies/schrankflur/relay/0"
- device_id: licht_terasse
name: Terrasse
type: relay
cap_version: "relay@1.0.0"
technology: shelly
@@ -776,6 +783,23 @@ devices:
set: "shellies/lichtterasse/relay/0/command"
state: "shellies/lichtterasse/relay/0"
- device_id: power_relay_caroutlet
name: Car Outlet
type: relay
cap_version: "relay@1.0.0"
technology: hottis_modbus
features:
power: true
topics:
set: "caroutlet/cmd"
state: "caroutlet/state"
- device_id: powermeter_caroutlet
name: Car Outlet
type: three_phase_powermeter
cap_version: "three_phase_powermeter@1.0.0"
technology: hottis_modbus
topics:
state: "caroutlet/powermeter"

View File

@@ -1,66 +0,0 @@
version: 1
mqtt:
broker: "172.16.2.16"
port: 1883
client_id: "home-automation-abstraction"
username: null
password: null
keepalive: 60
redis:
url: "redis://172.23.1.116:6379/8"
channel: "ui:updates"
devices:
- device_id: test_lampe_1
type: light
cap_version: "light@1.2.0"
technology: simulator
features:
power: true
brightness: true
topics:
set: "vendor/test_lampe_1/set"
state: "vendor/test_lampe_1/state"
- device_id: test_lampe_2
type: light
cap_version: "light@1.2.0"
technology: simulator
features:
power: true
topics:
set: "vendor/test_lampe_2/set"
state: "vendor/test_lampe_2/state"
- device_id: test_lampe_3
type: light
cap_version: "light@1.2.0"
technology: simulator
features:
power: true
brightness: true
topics:
set: "vendor/test_lampe_3/set"
state: "vendor/test_lampe_3/state"
- device_id: test_thermo_1
type: thermostat
cap_version: "thermostat@2.0.0"
technology: simulator
features:
mode: false
target: true
current: true
battery: true
topics:
set: "vendor/test_thermo_1/set"
state: "vendor/test_thermo_1/state"
- device_id: experiment_light_1
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
features:
power: true
brightness: true
topics:
set: "zigbee2mqtt/0xf0d1b80000195038/set"
state: "zigbee2mqtt/0xf0d1b80000195038"

View File

@@ -1,66 +0,0 @@
version: 1
mqtt:
broker: "172.16.2.16"
port: 1883
client_id: "home-automation-abstraction"
username: null
password: null
keepalive: 60
redis:
url: "redis://172.23.1.116:6379/8"
channel: "ui:updates"
devices:
- device_id: test_lampe_1
type: light
cap_version: "light@1.2.0"
technology: simulator
features:
power: true
brightness: true
topics:
set: "vendor/test_lampe_1/set"
state: "vendor/test_lampe_1/state"
- device_id: test_lampe_2
type: light
cap_version: "light@1.2.0"
technology: simulator
features:
power: true
topics:
set: "vendor/test_lampe_2/set"
state: "vendor/test_lampe_2/state"
- device_id: test_lampe_3
type: light
cap_version: "light@1.2.0"
technology: simulator
features:
power: true
brightness: true
topics:
set: "vendor/test_lampe_3/set"
state: "vendor/test_lampe_3/state"
- device_id: test_thermo_1
type: thermostat
cap_version: "thermostat@2.0.0"
technology: simulator
features:
mode: false
target: true
current: true
battery: true
topics:
set: "vendor/test_thermo_1/set"
state: "vendor/test_thermo_1/state"
- device_id: experiment_light_1
type: light
cap_version: "light@1.2.0"
technology: zigbee2mqtt
features:
power: true
brightness: true
topics:
set: "zigbee2mqtt/0xf0d1b80000195038/set"
state: "zigbee2mqtt/0xf0d1b80000195038"

View File

@@ -39,10 +39,10 @@ rooms:
title: Leselampe Esszimmer
icon: 💡
rank: 60
- device_id: standlampe_esszimmer
title: Standlampe Esszimmer
icon: 💡
rank: 70
# - device_id: standlampe_esszimmer
# title: Standlampe Esszimmer
# icon: 💡
# rank: 70
- device_id: kleine_lampe_links_esszimmer
title: kleine Lampe links Esszimmer
icon: 💡
@@ -55,10 +55,10 @@ rooms:
title: Stehlampe Esszimmer Schrank
icon: 💡
rank: 82
- device_id: kleine_lampe_rechts_esszimmer
title: kleine Lampe rechts Esszimmer
icon: 💡
rank: 90
# - device_id: kleine_lampe_rechts_esszimmer
# title: kleine Lampe rechts Esszimmer
# icon: 💡
# rank: 90
- device_id: licht_schrank_esszimmer
title: Schranklicht Esszimmer
icon: 💡
@@ -279,4 +279,15 @@ rooms:
title: Licht Terasse
icon: 💡
rank: 290
- name: Garage
devices:
- device_id: power_relay_caroutlet
title: Ladestrom
icon:
rank: 310
- device_id: powermeter_caroutlet
title: Ladestrom
icon: 📊
rank: 320

View File

@@ -1,35 +0,0 @@
# UI Layout Configuration
# Defines rooms and device tiles for the home automation UI
rooms:
- name: Wohnzimmer
devices:
- device_id: test_lampe_2
title: Deckenlampe
icon: "💡"
rank: 5
- device_id: test_lampe_1
title: Stehlampe
icon: "🔆"
rank: 10
- device_id: test_thermo_1
title: Thermostat
icon: "🌡️"
rank: 15
- name: Schlafzimmer
devices:
- device_id: test_lampe_3
title: Nachttischlampe
icon: "🛏️"
rank: 10
- name: Lab
devices:
- device_id: experiment_light_1
title: Experimentierlampe
icon: "💡"
rank: 10

View File

@@ -1,23 +0,0 @@
# MAX! Thermostats - Room Assignment
#
# Extracted from layout.yaml
# Format: Room Name | Device ID (if thermostat exists)
#
Schlafzimmer
42
Esszimmer
45
Wohnzimmer
46
Arbeitszimmer Patty
39
Bad Oben
41
Bad Unten
48

View File

@@ -1,31 +0,0 @@
Schlafzimmer
0x00158d00043292dc
Esszimmer
Wohnzimmer
0x00158d0008975707
Küche
0x00158d00083299bb
Arbeitszimmer Patty
0x00158d0003f052b7
Arbeitszimmer Wolfgang
0x00158d000543fb99
Bad Oben
0x00158d00093e8987
Bad Unten
0x00158d00093e662a
Flur
0x00158d000836ccc6
Waschküche
0x00158d000449f3bc
Sportzimmer
0x00158d0009421422

View File

@@ -1,5 +1,3 @@
version: "3.9"
x-environment: &default-env
MQTT_BROKER: "172.23.1.102"
MQTT_PORT: 1883

View File

@@ -1,23 +0,0 @@
# Infrastructure
This directory contains infrastructure-related files for the home automation project.
## Files
- `docker-compose.yml`: Docker Compose configuration for running services
## Usage
```bash
# Start services
docker-compose up -d
# Stop services
docker-compose down
```
## TODO
- Add service definitions to docker-compose.yml
- Add deployment configurations
- Add monitoring and logging setup

View File

@@ -10,6 +10,9 @@ from packages.home_capabilities.temp_humidity_sensor import CAP_VERSION as TEMP_
from packages.home_capabilities.temp_humidity_sensor import TempHumidityState
from packages.home_capabilities.relay import CAP_VERSION as RELAY_VERSION
from packages.home_capabilities.relay import RelayState
from packages.home_capabilities.three_phase_powermeter import CAP_VERSION as THREE_PHASE_POWERMETER_VERSION
from packages.home_capabilities.three_phase_powermeter import ThreePhasePowerState
from packages.home_capabilities.layout import (
DeviceTile,
Room,
@@ -56,4 +59,5 @@ __all__ = [
"get_scene_by_id",
"load_groups",
"load_scenes",
"ThreePhasePowerState",
]

View File

@@ -0,0 +1,29 @@
from pydantic import BaseModel, Field
class ThreePhasePowerState(BaseModel):
"""
State model for a three-phase power meter.
Required fields:
- energy: Total energy in kWh
- total_power: Total power in W
- phase1_power, phase2_power, phase3_power: Power per phase in W
- phase1_voltage, phase2_voltage, phase3_voltage: Voltage per phase in V
- phase1_current, phase2_current, phase3_current: Current per phase in A
"""
energy: float = Field(..., description="Total energy in kWh")
total_power: float = Field(..., description="Total power in W")
phase1_power: float = Field(..., description="Power for phase 1 in W")
phase2_power: float = Field(..., description="Power for phase 2 in W")
phase3_power: float = Field(..., description="Power for phase 3 in W")
phase1_voltage: float = Field(..., description="Voltage for phase 1 in V")
phase2_voltage: float = Field(..., description="Voltage for phase 2 in V")
phase3_voltage: float = Field(..., description="Voltage for phase 3 in V")
phase1_current: float = Field(..., description="Current for phase 1 in A")
phase2_current: float = Field(..., description="Current for phase 2 in A")
phase3_current: float = Field(..., description="Current for phase 3 in A")
# Capability metadata
CAP_VERSION = "three_phase_powermeter@1.0.0"
DISPLAY_NAME = "Three-Phase Power Meter"