Compare commits

..

6 Commits

Author SHA1 Message Date
4f5bcd7dbf test devices
All checks were successful
ci/woodpecker/tag/build/5 Pipeline was successful
ci/woodpecker/tag/build/6 Pipeline was successful
ci/woodpecker/tag/build/4 Pipeline was successful
ci/woodpecker/tag/namespace Pipeline was successful
ci/woodpecker/tag/build/1 Pipeline was successful
ci/woodpecker/tag/build/7 Pipeline was successful
ci/woodpecker/tag/config Pipeline was successful
ci/woodpecker/tag/build/2 Pipeline was successful
ci/woodpecker/tag/build/3 Pipeline was successful
ci/woodpecker/tag/deploy/5 Pipeline was successful
ci/woodpecker/tag/deploy/6 Pipeline was successful
ci/woodpecker/tag/deploy/2 Pipeline was successful
ci/woodpecker/tag/deploy/3 Pipeline was successful
ci/woodpecker/tag/deploy/1 Pipeline was successful
ci/woodpecker/tag/deploy/4 Pipeline was successful
ci/woodpecker/tag/ingress Pipeline was successful
2026-01-13 13:04:04 +01:00
3bcaa93570 merged 2026-01-13 12:59:25 +01:00
331945f789 changes in devices.yaml 2026-01-13 12:56:15 +01:00
52235be637 changes in rules.yaml 2026-01-13 12:55:43 +01:00
94589f52d7 initial 2026-01-13 12:52:49 +01:00
474b41ffce deploy confguuration script 2026-01-06 14:02:11 +01:00
5 changed files with 141 additions and 14 deletions

View File

@@ -15,6 +15,7 @@ from apps.abstraction.vendors import (
simulator, simulator,
zigbee2mqtt, zigbee2mqtt,
max, max,
test,
shelly, shelly,
tasmota, tasmota,
hottis_pv_modbus, hottis_pv_modbus,
@@ -40,6 +41,7 @@ for vendor_name, vendor_module in [
("simulator", simulator), ("simulator", simulator),
("zigbee2mqtt", zigbee2mqtt), ("zigbee2mqtt", zigbee2mqtt),
("max", max), ("max", max),
("test", test),
("shelly", shelly), ("shelly", shelly),
("tasmota", tasmota), ("tasmota", tasmota),
("hottis_pv_modbus", hottis_pv_modbus), ("hottis_pv_modbus", hottis_pv_modbus),

62
apps/abstraction/vendors/test.py vendored Normal file
View File

@@ -0,0 +1,62 @@
"""test vendor transformations."""
import json
import logging
from typing import Any
logger = logging.getLogger(__name__)
def transform_contact_sensor_to_vendor(payload: dict[str, Any]) -> str:
"""Transform abstract contact sensor payload to MAX! format.
Contact sensors are read-only.
"""
logger.warning("Contact sensors are read-only - SET commands should not be used")
return json.dumps(payload)
def transform_contact_sensor_to_abstract(payload: str) -> dict[str, Any]:
try:
contact_value = payload.strip().lower()
return {
"contact": "open" if (contact_value == "open") else "closed"
}
except (ValueError, TypeError) as e:
logger.error(f"contact sensor failed to parse: {payload}, error: {e}")
return {"contact": "closed"}
def transform_thermostat_to_vendor(payload: dict[str, Any]) -> str:
if "target" not in payload:
logger.warning(f"thermostat payload missing 'target': {payload}")
return "21"
target_temp = payload["target"]
if isinstance(target_temp, (int, float)):
int_temp = int(round(target_temp))
return str(int_temp)
logger.warning(f"invalid target temperature type: {type(target_temp)}")
return "21"
def transform_thermostat_to_abstract(payload: str) -> dict[str, Any]:
target_temp = float(payload.strip())
return {
"target": target_temp,
"mode": "heat"
}
# Registry of handlers for this vendor
HANDLERS = {
("contact_sensor", "to_vendor"): transform_contact_sensor_to_vendor,
("contact_sensor", "to_abstract"): transform_contact_sensor_to_abstract,
("contact", "to_vendor"): transform_contact_sensor_to_vendor,
("contact", "to_abstract"): transform_contact_sensor_to_abstract,
("thermostat", "to_vendor"): transform_thermostat_to_vendor,
("thermostat", "to_abstract"): transform_thermostat_to_abstract,
}

View File

@@ -466,6 +466,21 @@ devices:
model: "MAX! Thermostat" model: "MAX! Thermostat"
peer_id: "41" peer_id: "41"
channel: "1" channel: "1"
- device_id: thermostat_bad_unten
homekit_aid: 31
name: Heizung
type: thermostat
cap_version: "thermostat@1.0.0"
technology: zigbee2mqtt
features:
heating: true
temperature_range:
- 5
- 30
temperature_step: 0.5
topics:
state: "zigbee2mqtt/0x003c84fffebdcc28"
set: "zigbee2mqtt/0x003c84fffebdcc28/set"
- device_id: sterne_wohnzimmer - device_id: sterne_wohnzimmer
homekit_aid: 32 homekit_aid: 32
name: Sterne name: Sterne
@@ -1138,12 +1153,30 @@ devices:
state: "zigbee2mqtt/0x842e14fffefe4ba4" state: "zigbee2mqtt/0x842e14fffefe4ba4"
set: "zigbee2mqtt/0x842e14fffefe4ba4/set" set: "zigbee2mqtt/0x842e14fffefe4ba4/set"
- device_id: thermostat_bad_unten - device_id: kontakt_test_1
homekit_aid: 31 homekit_aid: 97
name: Heizung name: Kontakt Test 1
type: contact
cap_version: contact_sensor@1.0.0
technology: test
topics:
state: test/kontakt1/state
features: {}
- device_id: kontakt_test_2
homekit_aid: 98
name: Kontakt Test 2
type: contact
cap_version: contact_sensor@1.0.0
technology: test
topics:
state: test/kontakt2/state
features: {}
- device_id: thermostat_test
homekit_aid: 99
name: Thermostat Test
type: thermostat type: thermostat
cap_version: "thermostat@1.0.0" cap_version: "thermostat@1.0.0"
technology: zigbee2mqtt technology: test
features: features:
heating: true heating: true
temperature_range: temperature_range:
@@ -1151,5 +1184,6 @@ devices:
- 30 - 30
temperature_step: 0.5 temperature_step: 0.5
topics: topics:
state: "zigbee2mqtt/0x003c84fffebdcc28" state: "test/thermostat1/state"
set: "zigbee2mqtt/0x003c84fffebdcc28/set" set: "test/thermostat1/set"

View File

@@ -9,7 +9,7 @@ rules:
thermostats: thermostats:
- thermostat_bad_unten - thermostat_bad_unten
params: params:
eco_target: 16.0 eco_target: 5.0
open_min_secs: 20 open_min_secs: 20
close_min_secs: 20 close_min_secs: 20
- id: window_setback_esszimmer - id: window_setback_esszimmer
@@ -23,7 +23,7 @@ rules:
thermostats: thermostats:
- thermostat_esszimmer - thermostat_esszimmer
params: params:
eco_target: 16.0 eco_target: 5.0
open_min_secs: 20 open_min_secs: 20
close_min_secs: 20 close_min_secs: 20
previous_target_ttl_secs: 86400 previous_target_ttl_secs: 86400
@@ -38,7 +38,7 @@ rules:
thermostats: thermostats:
- thermostat_wohnzimmer - thermostat_wohnzimmer
params: params:
eco_target: 16.0 eco_target: 5.0
open_min_secs: 20 open_min_secs: 20
close_min_secs: 20 close_min_secs: 20
previous_target_ttl_secs: 86400 previous_target_ttl_secs: 86400
@@ -55,7 +55,7 @@ rules:
thermostats: thermostats:
- thermostat_kueche - thermostat_kueche
params: params:
eco_target: 16.0 eco_target: 5.0
open_min_secs: 20 open_min_secs: 20
close_min_secs: 20 close_min_secs: 20
previous_target_ttl_secs: 86400 previous_target_ttl_secs: 86400
@@ -71,7 +71,7 @@ rules:
thermostats: thermostats:
- thermostat_patty - thermostat_patty
params: params:
eco_target: 16.0 eco_target: 5.0
open_min_secs: 20 open_min_secs: 20
close_min_secs: 20 close_min_secs: 20
previous_target_ttl_secs: 86400 previous_target_ttl_secs: 86400
@@ -85,7 +85,7 @@ rules:
thermostats: thermostats:
- thermostat_schlafzimmer - thermostat_schlafzimmer
params: params:
eco_target: 16.0 eco_target: 5.0
open_min_secs: 20 open_min_secs: 20
close_min_secs: 20 close_min_secs: 20
previous_target_ttl_secs: 86400 previous_target_ttl_secs: 86400
@@ -99,7 +99,7 @@ rules:
thermostats: thermostats:
- thermostat_wolfgang - thermostat_wolfgang
params: params:
eco_target: 16.0 eco_target: 5.0
open_min_secs: 20 open_min_secs: 20
close_min_secs: 20 close_min_secs: 20
- id: window_setback_bad_oben - id: window_setback_bad_oben
@@ -112,6 +112,20 @@ rules:
thermostats: thermostats:
- thermostat_bad_oben - thermostat_bad_oben
params: params:
eco_target: 16.0 eco_target: 5.0
open_min_secs: 20
close_min_secs: 20
- id: window_setback_test
enabled: true
name: Fensterabsenkung Test
type: window_setback@1.0
objects:
contacts:
- kontakt_test_1
- kontakt_test_2
thermostats:
- thermostat_test
params:
eco_target: 7.0
open_min_secs: 20 open_min_secs: 20
close_min_secs: 20 close_min_secs: 20

15
tools/deploy-configuration.sh Executable file
View File

@@ -0,0 +1,15 @@
#!/bin/bash
NAMESPACE=homea2
kubectl create configmap home-automation-config \
--from-file=devices.yaml=config/devices.yaml \
--from-file=groups.yaml=config/groups.yaml \
--from-file=layout.yaml=config/layout.yaml \
--from-file=rules.yaml=config/rules.yaml \
--from-file=scenes.yaml=config/scenes.yaml \
--namespace=$NAMESPACE \
--dry-run=client -o yaml | kubectl apply -f -
kubectl apply -f deployment/configmap.yaml -n $NAMESPACE