Compare commits

..

2 Commits

Author SHA1 Message Date
d162664ac7 5.0 when window open
All checks were successful
ci/woodpecker/tag/namespace Pipeline was successful
ci/woodpecker/tag/config Pipeline was successful
2026-01-10 16:05:48 +01:00
a190ba208b switch added 2026-01-03 22:21:33 +01:00
7 changed files with 129 additions and 28 deletions

View File

@@ -1,8 +1,5 @@
when: when:
event: [tag] event: [tag]
ref:
exclude:
- refs/tags/*-configchange
steps: steps:
create_namespace: create_namespace:

View File

@@ -15,7 +15,7 @@ import uuid
from aiomqtt import Client from aiomqtt import Client
from pydantic import ValidationError from pydantic import ValidationError
from packages.home_capabilities import LightState, ThermostatState, ContactState, TempHumidityState, RelayState, ThreePhasePowerState from packages.home_capabilities import LightState, ThermostatState, ContactState, TempHumidityState, RelayState, ThreePhasePowerState, SwitchState
from apps.abstraction.transformation import ( from apps.abstraction.transformation import (
transform_abstract_to_vendor, transform_abstract_to_vendor,
transform_vendor_to_abstract transform_vendor_to_abstract
@@ -174,6 +174,10 @@ async def handle_abstract_set(
# Contact sensors are read-only - SET commands should not occur # Contact sensors are read-only - SET commands should not occur
logger.warning(f"Contact sensor {device_id} received SET command - ignoring (read-only device)") logger.warning(f"Contact sensor {device_id} received SET command - ignoring (read-only device)")
return return
elif device_type == "switch":
# Switches are read-only - SET commands should not occur
logger.warning(f"Switch {device_id} received SET command - ignoring (read-only device)")
return
except ValidationError as e: except ValidationError as e:
logger.error(f"Validation failed for {device_type} SET {device_id}: {e}") logger.error(f"Validation failed for {device_type} SET {device_id}: {e}")
return return
@@ -227,6 +231,9 @@ async def handle_vendor_state(
elif device_type == "three_phase_powermeter": elif device_type == "three_phase_powermeter":
# Validate three-phase powermeter state # Validate three-phase powermeter state
ThreePhasePowerState.model_validate(abstract_payload) ThreePhasePowerState.model_validate(abstract_payload)
elif device_type == "switch":
# Validate switch state
SwitchState.model_validate(abstract_payload)
except ValidationError as e: except ValidationError as e:
logger.error(f"Validation failed for {device_type} STATE {device_id}: {e}") logger.error(f"Validation failed for {device_type} STATE {device_id}: {e}")
return return

View File

@@ -161,6 +161,24 @@ def transform_temp_humidity_sensor_to_abstract(payload: str) -> dict[str, Any]:
return payload return payload
def transform_switch_to_vendor(payload: dict[str, Any]) -> str:
"""Transform abstract switch payload to zigbee2mqtt format.
Switches are read-only, so this should not be called for SET commands.
"""
logger.warning("Switches are read-only - SET commands should not be used")
return json.dumps(payload)
def transform_switch_to_abstract(payload: str) -> dict[str, Any]:
"""Transform zigbee2mqtt switch payload to abstract format.
Passthrough - zigbee2mqtt provides action, battery, linkquality directly.
"""
payload = json.loads(payload)
return payload
def transform_relay_to_vendor(payload: dict[str, Any]) -> str: def transform_relay_to_vendor(payload: dict[str, Any]) -> str:
"""Transform abstract relay payload to zigbee2mqtt format. """Transform abstract relay payload to zigbee2mqtt format.
@@ -204,6 +222,8 @@ HANDLERS = {
("temp_humidity_sensor", "to_abstract"): transform_temp_humidity_sensor_to_abstract, ("temp_humidity_sensor", "to_abstract"): transform_temp_humidity_sensor_to_abstract,
("temp_humidity", "to_vendor"): transform_temp_humidity_sensor_to_vendor, ("temp_humidity", "to_vendor"): transform_temp_humidity_sensor_to_vendor,
("temp_humidity", "to_abstract"): transform_temp_humidity_sensor_to_abstract, ("temp_humidity", "to_abstract"): transform_temp_humidity_sensor_to_abstract,
("switch", "to_vendor"): transform_switch_to_vendor,
("switch", "to_abstract"): transform_switch_to_abstract,
("relay", "to_vendor"): transform_relay_to_vendor, ("relay", "to_vendor"): transform_relay_to_vendor,
("relay", "to_abstract"): transform_relay_to_abstract, ("relay", "to_abstract"): transform_relay_to_abstract,
} }

View File

@@ -466,6 +466,26 @@ 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: max
features:
mode: true
target: true
current: false
topics:
set: "homegear/instance1/set/48/1/SET_TEMPERATURE"
state: "homegear/instance1/plain/48/1/SET_TEMPERATURE"
metadata:
friendly_name: "Thermostat Bad Unten"
location: "Bad Unten"
vendor: "eQ-3"
model: "MAX! Thermostat"
peer_id: "48"
channel: "1"
- device_id: sterne_wohnzimmer - device_id: sterne_wohnzimmer
homekit_aid: 32 homekit_aid: 32
name: Sterne name: Sterne
@@ -1137,19 +1157,3 @@ devices:
topics: topics:
state: "zigbee2mqtt/0x842e14fffefe4ba4" state: "zigbee2mqtt/0x842e14fffefe4ba4"
set: "zigbee2mqtt/0x842e14fffefe4ba4/set" set: "zigbee2mqtt/0x842e14fffefe4ba4/set"
- 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"

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,6 @@ rules:
thermostats: thermostats:
- thermostat_bad_oben - thermostat_bad_oben
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

View File

@@ -8,6 +8,8 @@ from packages.home_capabilities.contact_sensor import CAP_VERSION as CONTACT_SEN
from packages.home_capabilities.contact_sensor import ContactState from packages.home_capabilities.contact_sensor import ContactState
from packages.home_capabilities.temp_humidity_sensor import CAP_VERSION as TEMP_HUMIDITY_SENSOR_VERSION from packages.home_capabilities.temp_humidity_sensor import CAP_VERSION as TEMP_HUMIDITY_SENSOR_VERSION
from packages.home_capabilities.temp_humidity_sensor import TempHumidityState from packages.home_capabilities.temp_humidity_sensor import TempHumidityState
from packages.home_capabilities.switch import CAP_VERSION as SWITCH_VERSION
from packages.home_capabilities.switch import SwitchState
from packages.home_capabilities.relay import CAP_VERSION as RELAY_VERSION from packages.home_capabilities.relay import CAP_VERSION as RELAY_VERSION
from packages.home_capabilities.relay import RelayState 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 CAP_VERSION as THREE_PHASE_POWERMETER_VERSION
@@ -42,6 +44,8 @@ __all__ = [
"CONTACT_SENSOR_VERSION", "CONTACT_SENSOR_VERSION",
"TempHumidityState", "TempHumidityState",
"TEMP_HUMIDITY_SENSOR_VERSION", "TEMP_HUMIDITY_SENSOR_VERSION",
"SwitchState",
"SWITCH_VERSION",
"RelayState", "RelayState",
"RELAY_VERSION", "RELAY_VERSION",
"DeviceTile", "DeviceTile",

View File

@@ -0,0 +1,69 @@
"""Switch Capability - Wireless Button/Switch (read-only).
This module defines the SwitchState model for wireless switches/buttons.
These devices report action events (e.g., button presses) and are read-only devices.
Capability Version: switch@1.0.0
"""
from datetime import datetime
from typing import Annotated
from pydantic import BaseModel, Field
# Capability metadata
CAP_VERSION = "switch@1.0.0"
DISPLAY_NAME = "Switch"
class SwitchState(BaseModel):
"""State model for wireless switches/buttons.
Wireless switches are read-only devices that report button actions such as
single press, double press, long press, etc. They typically also report
battery level and signal quality.
Attributes:
action: Action type (e.g., "single", "double", "long", "hold", etc.)
battery: Battery level percentage (0-100), optional
linkquality: MQTT link quality indicator, optional
voltage: Battery voltage in mV, optional
ts: Timestamp of the action event, optional
Examples:
>>> SwitchState(action="single")
SwitchState(action='single', battery=None, ...)
>>> SwitchState(action="double", battery=95, linkquality=87)
SwitchState(action='double', battery=95, linkquality=87, ...)
"""
action: str = Field(
...,
description="Action type: 'single', 'double', 'long', 'hold', etc."
)
battery: Annotated[int, Field(ge=0, le=100)] | None = Field(
None,
description="Battery level in percent (0-100)"
)
linkquality: int | None = Field(
None,
description="Link quality indicator (typically 0-255)"
)
voltage: int | None = Field(
None,
description="Battery voltage in millivolts"
)
ts: datetime | None = Field(
None,
description="Timestamp of the action event"
)
# Public API
__all__ = ["SwitchState", "CAP_VERSION", "DISPLAY_NAME"]