Compare commits
11 Commits
0.11.7-con
...
0.12.6-con
| Author | SHA1 | Date | |
|---|---|---|---|
|
0548996110
|
|||
|
35141f71a4
|
|||
|
eb5532739c
|
|||
|
42411b1377
|
|||
|
b99158fd25
|
|||
|
d86e7eecc9
|
|||
|
8ab9db796c
|
|||
|
a2ddcf7de2
|
|||
|
3cc3683e8c
|
|||
|
e0810c72ea
|
|||
|
3c1253da08
|
@@ -20,6 +20,7 @@ from apps.abstraction.vendors import (
|
||||
hottis_pv_modbus,
|
||||
hottis_wago_modbus,
|
||||
hottis_wifi_relay,
|
||||
hottis_led_stripe
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -44,6 +45,7 @@ for vendor_name, vendor_module in [
|
||||
("hottis_pv_modbus", hottis_pv_modbus),
|
||||
("hottis_wago_modbus", hottis_wago_modbus),
|
||||
("hottis_wifi_relay", hottis_wifi_relay),
|
||||
("hottis_led_stripe", hottis_led_stripe),
|
||||
]:
|
||||
for (device_type, direction), handler in vendor_module.HANDLERS.items():
|
||||
key = (device_type, vendor_name, direction)
|
||||
|
||||
46
apps/abstraction/vendors/hottis_led_stripe.py
vendored
Normal file
46
apps/abstraction/vendors/hottis_led_stripe.py
vendored
Normal file
@@ -0,0 +1,46 @@
|
||||
"""Hottis LED Stripe vendor transformations."""
|
||||
|
||||
import logging
|
||||
from typing import Any
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def transform_light_to_vendor(payload: dict[str, Any]) -> str:
|
||||
"""Transform abstract relay payload to Hottis LED Stripe format.
|
||||
|
||||
Hottis LED Stripe expects plain text 'on' or 'off' (not JSON).
|
||||
|
||||
Example:
|
||||
- Abstract: {'power': 'on'}
|
||||
- Hottis LED Stripe: 'ON'
|
||||
"""
|
||||
|
||||
bri = 89.0 / 254.0
|
||||
r = int(255 * bri)
|
||||
g = int(103 * bri)
|
||||
b = int(25 * bri)
|
||||
|
||||
cmd = f"{r} {g} {b}" if payload.get("power", "off").lower() == "on" else "0 0 0"
|
||||
return cmd
|
||||
|
||||
|
||||
def transform_light_to_abstract(payload: str) -> dict[str, Any]:
|
||||
"""Transform Hottis LED Stripe relay payload to abstract format.
|
||||
|
||||
Hottis LED Stripe sends plain text 'on' or 'off'.
|
||||
|
||||
Example:
|
||||
- Hottis LED Stripe: 'ON'
|
||||
- Abstract: {'power': 'on'}
|
||||
"""
|
||||
|
||||
power = "on" if payload.strip() != "0 0 0" else "off"
|
||||
return {"power": power}
|
||||
|
||||
|
||||
# Registry of handlers for this vendor
|
||||
HANDLERS = {
|
||||
("light", "to_vendor"): transform_light_to_vendor,
|
||||
("light", "to_abstract"): transform_light_to_abstract,
|
||||
}
|
||||
@@ -1042,3 +1042,138 @@ devices:
|
||||
topics:
|
||||
state: "zigbee2mqtt/herdlicht"
|
||||
set: "zigbee2mqtt/herdlicht/set"
|
||||
|
||||
- device_id: regallicht_kueche
|
||||
homekit_aid: 83
|
||||
name: Regallicht
|
||||
type: light
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_led_stripe
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
state: "IoT/RgbLedStripeKitchen/ColorCommand"
|
||||
set: "IoT/RgbLedStripeKitchen/ColorCommand"
|
||||
|
||||
- device_id: regallicht_flur
|
||||
homekit_aid: 84
|
||||
name: Regallicht Flur
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wifi_relay
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "deconzhelper/flurregallist"
|
||||
state: "deconzhelper/flurregallist"
|
||||
|
||||
- device_id: steckdose_strandkorb
|
||||
homekit_aid: 85
|
||||
name: Steckdose Strandkorb
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "dt1/coil/8"
|
||||
state: "dt1/ci/8"
|
||||
- device_id: steckdose_vor_waschkueche
|
||||
homekit_aid: 86
|
||||
name: Steckdose vor Waschküche
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "dt1/coil/9"
|
||||
state: "dt1/ci/9"
|
||||
- device_id: wasser_vorne
|
||||
homekit_aid: 87
|
||||
name: Wasser Vorgarten
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "dt1/coil/13"
|
||||
state: "dt1/ci/13"
|
||||
- device_id: wasser_hinten
|
||||
homekit_aid: 88
|
||||
name: Wasser Garten
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "dt1/coil/12"
|
||||
state: "dt1/ci/12"
|
||||
- device_id: lampe_haustuer
|
||||
homekit_aid: 89
|
||||
name: Lampe Haustür
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "dt1/coil/3"
|
||||
state: "dt1/ci/3"
|
||||
- device_id: power_relay_oven
|
||||
homekit_aid: 90
|
||||
name: Schütz Herd
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "dt1/coil/1"
|
||||
state: "dt1/di/1"
|
||||
- device_id: power_relay_kitchen
|
||||
homekit_aid: 91
|
||||
name: Schütz Küche
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "dt1/coil/0"
|
||||
state: "dt1/di/0"
|
||||
- device_id: power_relay_laundry
|
||||
homekit_aid: 92
|
||||
name: Schütz Waschküche
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "dt1/coil/2"
|
||||
state: "dt1/di/2"
|
||||
- device_id: spot_garden
|
||||
homekit_aid: 93
|
||||
name: Spot Garten
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "dt1/coil/6"
|
||||
state: "dt1/ci/6"
|
||||
- device_id: licht_schuppen
|
||||
homekit_aid: 94
|
||||
name: Licht Schuppen
|
||||
type: relay
|
||||
cap_version: "relay@1.0.0"
|
||||
technology: hottis_wago_modbus
|
||||
features:
|
||||
power: true
|
||||
topics:
|
||||
set: "pulsegen/command/5/18"
|
||||
state: "pulsegen/status/5"
|
||||
|
||||
@@ -1,10 +1,13 @@
|
||||
version: 1
|
||||
groups:
|
||||
- id: "kueche_lichter"
|
||||
name: "Küche – alle Lampen"
|
||||
selector:
|
||||
type: "light"
|
||||
room: "Küche"
|
||||
name: "Küche – alle Lampen ausser Putzlicht"
|
||||
device_ids:
|
||||
- kueche_deckenlampe
|
||||
- licht_spuele_kueche
|
||||
- herdlicht
|
||||
- kueche_fensterbank_licht
|
||||
- regallicht_kueche
|
||||
capabilities:
|
||||
power: true
|
||||
brightness: true
|
||||
@@ -34,7 +37,7 @@ groups:
|
||||
- schranklicht_vorne_patty
|
||||
- leselampe_patty
|
||||
- kugellampe_patty
|
||||
- schreibtischlampe_patty
|
||||
- licht_schreibtisch_patty
|
||||
capabilities:
|
||||
power: true
|
||||
brightness: true
|
||||
|
||||
@@ -148,6 +148,10 @@ rooms:
|
||||
title: Herdlicht
|
||||
icon: 💡
|
||||
rank: 145
|
||||
- device_id: regallicht_kueche
|
||||
title: Regallicht Küche
|
||||
icon: 💡
|
||||
rank: 146
|
||||
- device_id: thermostat_kueche
|
||||
title: Kueche
|
||||
icon: 🌡️
|
||||
@@ -261,6 +265,14 @@ rooms:
|
||||
title: Schranklicht vor Küche
|
||||
icon: 💡
|
||||
rank: 232
|
||||
- device_id: regallicht_flur
|
||||
title: Regallicht Flur
|
||||
icon: 💡
|
||||
rank: 233
|
||||
- device_id: lampe_haustuer
|
||||
title: Lampe Haustür
|
||||
icon: 💡
|
||||
rank: 234
|
||||
- device_id: sensor_flur
|
||||
title: Temperatur & Luftfeuchte
|
||||
icon: 🌡️
|
||||
@@ -341,6 +353,30 @@ rooms:
|
||||
title: Gartenlicht vorne
|
||||
icon: 💡
|
||||
rank: 291
|
||||
- device_id: spot_garden
|
||||
title: Spot Garten
|
||||
icon: 💡
|
||||
rank: 292
|
||||
- device_id: licht_schuppen
|
||||
title: Licht Schuppen
|
||||
icon: 💡
|
||||
rank: 293
|
||||
- device_id: steckdose_strandkorb
|
||||
title: Steckdose Strandkorb
|
||||
icon: 🔌
|
||||
rank: 294
|
||||
- device_id: steckdose_vor_waschkueche
|
||||
title: Steckdose vor Waschküche
|
||||
icon: 🔌
|
||||
rank: 295
|
||||
- device_id: wasser_vorne
|
||||
title: Wasser Vorgarten
|
||||
icon: 💧
|
||||
rank: 296
|
||||
- device_id: wasser_hinten
|
||||
title: Wasser Garten
|
||||
icon: 💧
|
||||
rank: 297
|
||||
- id: garage
|
||||
name: Garage
|
||||
devices:
|
||||
@@ -367,6 +403,21 @@ rooms:
|
||||
title: Werkstatt Licht
|
||||
icon: 💡
|
||||
rank: 350
|
||||
- id: devices
|
||||
name: Devices
|
||||
devices:
|
||||
- device_id: power_relay_oven
|
||||
title: Schütz Herd
|
||||
icon: ⚡
|
||||
rank: 400
|
||||
- device_id: power_relay_kitchen
|
||||
title: Schütz Küche
|
||||
icon: ⚡
|
||||
rank: 405
|
||||
- device_id: power_relay_laundry
|
||||
title: Schütz Waschküche
|
||||
icon: ⚡
|
||||
rank: 410
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user