Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
db52da4094
|
|||
|
645178b3f9
|
|||
|
59445888bf
|
|||
|
641843832f
|
|||
|
851d4a5581
|
|||
|
d0db94280d
|
|||
|
3abd760d85
|
|||
|
d092565e78
|
|||
|
9431572008
|
|||
|
a4bfa265b9
|
|||
|
61b9437b71
|
|||
|
d162664ac7
|
|||
|
a190ba208b
|
@@ -1,9 +1,6 @@
|
||||
when:
|
||||
event: [tag]
|
||||
|
||||
depends_on:
|
||||
- namespace
|
||||
|
||||
steps:
|
||||
apply_configuration:
|
||||
image: quay.io/wollud1969/k8s-admin-helper:0.3.4
|
||||
|
||||
@@ -15,7 +15,7 @@ import uuid
|
||||
from aiomqtt import Client
|
||||
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 (
|
||||
transform_abstract_to_vendor,
|
||||
transform_vendor_to_abstract
|
||||
@@ -174,6 +174,10 @@ async def handle_abstract_set(
|
||||
# Contact sensors are read-only - SET commands should not occur
|
||||
logger.warning(f"Contact sensor {device_id} received SET command - ignoring (read-only device)")
|
||||
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:
|
||||
logger.error(f"Validation failed for {device_type} SET {device_id}: {e}")
|
||||
return
|
||||
@@ -227,6 +231,9 @@ async def handle_vendor_state(
|
||||
elif device_type == "three_phase_powermeter":
|
||||
# Validate three-phase powermeter state
|
||||
ThreePhasePowerState.model_validate(abstract_payload)
|
||||
elif device_type == "switch":
|
||||
# Validate switch state
|
||||
SwitchState.model_validate(abstract_payload)
|
||||
except ValidationError as e:
|
||||
logger.error(f"Validation failed for {device_type} STATE {device_id}: {e}")
|
||||
return
|
||||
|
||||
78
apps/abstraction/vendors/hottis_pv_modbus.py
vendored
78
apps/abstraction/vendors/hottis_pv_modbus.py
vendored
@@ -80,12 +80,89 @@ def transform_three_phase_powermeter_to_vendor(payload: dict[str, Any]) -> str:
|
||||
def transform_three_phase_powermeter_to_abstract(payload: str) -> dict[str, Any]:
|
||||
"""Transform hottis_pv_modbus three_phase_powermeter payload to abstract format.
|
||||
|
||||
|
||||
Transformations:
|
||||
- totalImportEnergy -> energy
|
||||
- powerL1/powerL2/powerL3 -> phase1_power/phase2_power/phase3_power
|
||||
- voltageL1/voltageL2/voltageL3 -> phase1_voltage/phase2_voltage/phase3_voltage
|
||||
- currentL1/currentL2/currentL3 -> phase1_current/phase2_current/phase3_current
|
||||
- Sum of powerL1..3 -> total_power
|
||||
|
||||
"""
|
||||
data = json.loads(payload)
|
||||
|
||||
def _get_float(key: str, default: float = 0.0) -> float:
|
||||
return float(data.get(key, default))
|
||||
|
||||
|
||||
phase1_power = _get_float("powerL1")
|
||||
phase2_power = _get_float("powerL2")
|
||||
phase3_power = _get_float("powerL3")
|
||||
|
||||
phase1_voltage = _get_float("voltageL1")
|
||||
phase2_voltage = _get_float("voltageL2")
|
||||
phase3_voltage = _get_float("voltageL3")
|
||||
|
||||
phase1_current = _get_float("currentL1")
|
||||
phase2_current = _get_float("currentL2")
|
||||
phase3_current = _get_float("currentL3")
|
||||
|
||||
energy = _get_float("totalImportEnergy")
|
||||
|
||||
return {
|
||||
"energy": energy,
|
||||
"total_power": phase1_power + phase2_power + phase3_power,
|
||||
"phase1_power": phase1_power,
|
||||
"phase2_power": phase2_power,
|
||||
"phase3_power": phase3_power,
|
||||
"phase1_voltage": phase1_voltage,
|
||||
"phase2_voltage": phase2_voltage,
|
||||
"phase3_voltage": phase3_voltage,
|
||||
"phase1_current": phase1_current,
|
||||
"phase2_current": phase2_current,
|
||||
"phase3_current": phase3_current,
|
||||
}
|
||||
|
||||
def transform_one_phase_powermeter_to_vendor(payload: dict[str, Any]) -> str:
|
||||
"""Transform abstract one_phase_powermeter payload to hottis_pv_modbus format."""
|
||||
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 json.dumps(vendor_payload)
|
||||
|
||||
|
||||
def transform_one_phase_powermeter_to_abstract(payload: str) -> dict[str, Any]:
|
||||
"""Transform hottis_pv_modbus one_phase_powermeter payload to abstract format.
|
||||
|
||||
{
|
||||
"status": "Ok",
|
||||
"timestamp": "2026-03-05T08:32:45.523805",
|
||||
"importEnergyActive": 0.04,
|
||||
"importEnergyReactive": 0.0,
|
||||
"exportEnergyActive": 5.44,
|
||||
"exportEnergyReactive": 2.4,
|
||||
"powerApparent": 27.06,
|
||||
"powerActive": 0.0,
|
||||
"powerReactive": -27.12,
|
||||
"powerDemandPositive": 0.4,
|
||||
"powerDemandReverse": 0.0,
|
||||
"factor": 0.01,
|
||||
"angle": 271.17,
|
||||
"voltage": 228.04,
|
||||
"current": 0.12,
|
||||
"cnt": 73500
|
||||
}
|
||||
|
||||
"""
|
||||
data = json.loads(payload)
|
||||
|
||||
@@ -121,6 +198,7 @@ def transform_three_phase_powermeter_to_abstract(payload: str) -> dict[str, Any]
|
||||
}
|
||||
|
||||
|
||||
|
||||
# Registry of handlers for this vendor
|
||||
HANDLERS = {
|
||||
("relay", "to_vendor"): transform_relay_to_vendor,
|
||||
|
||||
20
apps/abstraction/vendors/zigbee2mqtt.py
vendored
20
apps/abstraction/vendors/zigbee2mqtt.py
vendored
@@ -161,6 +161,24 @@ def transform_temp_humidity_sensor_to_abstract(payload: str) -> dict[str, Any]:
|
||||
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:
|
||||
"""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", "to_vendor"): transform_temp_humidity_sensor_to_vendor,
|
||||
("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_abstract"): transform_relay_to_abstract,
|
||||
}
|
||||
|
||||
@@ -992,19 +992,6 @@ devices:
|
||||
state: "zigbee2mqtt/0x64028ffffe50e79e"
|
||||
set: "zigbee2mqtt/0x64028ffffe50e79e/set"
|
||||
|
||||
- device_id: regallicht_kueche
|
||||
homekit_aid: 83
|
||||
name: Regallicht
|
||||
type: light
|
||||
cap_version: "light@1.2.0"
|
||||
technology: zigbee2mqtt
|
||||
features:
|
||||
power: true
|
||||
brightness: true
|
||||
topics:
|
||||
state: "zigbee2mqtt/0x001788010d0ff4ba"
|
||||
set: "zigbee2mqtt/0x001788010d0ff4ba/set"
|
||||
|
||||
- device_id: regallicht_flur
|
||||
homekit_aid: 84
|
||||
name: Regallicht Flur
|
||||
@@ -1188,3 +1175,60 @@ devices:
|
||||
state: "test/thermostat1/state"
|
||||
set: "test/thermostat1/set"
|
||||
|
||||
- device_id: regallicht_kueche
|
||||
homekit_aid: 100
|
||||
name: Regallicht
|
||||
type: light
|
||||
cap_version: "light@1.2.0"
|
||||
technology: zigbee2mqtt
|
||||
features:
|
||||
power: true
|
||||
brightness: true
|
||||
topics:
|
||||
state: "zigbee2mqtt/0x001788010d0ff4ba"
|
||||
set: "zigbee2mqtt/0x001788010d0ff4ba/set"
|
||||
|
||||
- device_id: licht_dachboden
|
||||
homekit_aid: 101
|
||||
name: Dachboden
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "pulsegen/command/6/17"
|
||||
state: "pulsegen/status/6"
|
||||
|
||||
- device_id: schreibtischlampe_wolfgang
|
||||
homekit_aid: 102
|
||||
name: Schreibtischlampe Wolfgang
|
||||
type: light
|
||||
cap_version: "light@1.2.0"
|
||||
technology: zigbee2mqtt
|
||||
features:
|
||||
power: true
|
||||
brightness: true
|
||||
topics:
|
||||
state: "zigbee2mqtt/0x001788010ec1eb18"
|
||||
set: "zigbee2mqtt/0x001788010ec1eb18/set"
|
||||
|
||||
- device_id: power_relay_pv
|
||||
homekit_aid: 103
|
||||
name: PV Inverter
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_pv_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "IoT/PV/Control"
|
||||
state: "IoT/PV/Control/State"
|
||||
#- device_id: powermeter_pv
|
||||
# homekit_aid: 104
|
||||
# name: PV Inverter
|
||||
# type: one_phase_powermeter
|
||||
# cap_version: "one_phase_powermeter@1.0.0"
|
||||
# technology: hottis_pv_modbus
|
||||
# topics:
|
||||
# state: "IoT/PV/Values"
|
||||
|
||||
@@ -227,11 +227,11 @@ rooms:
|
||||
name: Arbeitszimmer Wolfgang
|
||||
devices:
|
||||
- device_id: thermostat_wolfgang
|
||||
title: Wolfgang
|
||||
title: Heizung
|
||||
icon: 🌡️
|
||||
rank: 190
|
||||
- device_id: experimentlabtest
|
||||
title: ExperimentLabTest
|
||||
- device_id: schreibtischlampe_wolfgang
|
||||
title: Schreibtischlampe
|
||||
icon: 💡
|
||||
rank: 200
|
||||
- device_id: kontakt_wolfgang_garten
|
||||
@@ -418,6 +418,14 @@ rooms:
|
||||
title: Schütz Waschküche
|
||||
icon: ⚡
|
||||
rank: 410
|
||||
- device_id: power_relay_pv
|
||||
title: PV Inverter
|
||||
icon: ⚡
|
||||
rank: 420
|
||||
#- device_id: powermeter_pv
|
||||
# title: PV Messwerte
|
||||
# icon: 📊
|
||||
# rank: 430
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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.temp_humidity_sensor import CAP_VERSION as TEMP_HUMIDITY_SENSOR_VERSION
|
||||
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 RelayState
|
||||
from packages.home_capabilities.three_phase_powermeter import CAP_VERSION as THREE_PHASE_POWERMETER_VERSION
|
||||
@@ -42,6 +44,8 @@ __all__ = [
|
||||
"CONTACT_SENSOR_VERSION",
|
||||
"TempHumidityState",
|
||||
"TEMP_HUMIDITY_SENSOR_VERSION",
|
||||
"SwitchState",
|
||||
"SWITCH_VERSION",
|
||||
"RelayState",
|
||||
"RELAY_VERSION",
|
||||
"DeviceTile",
|
||||
|
||||
69
packages/home_capabilities/switch.py
Normal file
69
packages/home_capabilities/switch.py
Normal 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"]
|
||||
Reference in New Issue
Block a user