Merge of previous commit

This commit is contained in:
Dirk Alders 2024-09-01 12:43:31 +02:00
parent 4bda94e4f7
commit 66a471979d
2 changed files with 14 additions and 1 deletions

View File

@ -104,6 +104,7 @@ class physical_devices(base):
self.__init_ffw__(mqtt_client) self.__init_ffw__(mqtt_client)
self.__init_ffe__(mqtt_client) self.__init_ffe__(mqtt_client)
self.__init_stw__(mqtt_client) self.__init_stw__(mqtt_client)
self.__init_gar__(mqtt_client)
def __init_gfw__(self, mqtt_client): def __init_gfw__(self, mqtt_client):
loc = props.LOC_GFW loc = props.LOC_GFW
@ -136,8 +137,13 @@ class physical_devices(base):
self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx) # Brennenstuhl Heatingvalve self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx) # Brennenstuhl Heatingvalve
self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_AMB, props.DTY_MAM_THP) # My Ambient information self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_AMB, props.DTY_MAM_THP) # My Ambient information
def __init_gar__(self, mqtt_client):
loc = props.LOC_GAR
# GARDEN # GARDEN
self.add(mqtt_client, props.STG_ZGW, props.LOC_GAR, props.ROO_GAR, props.FUN_GAR, props.DTY_SPP_SW1) roo = props.ROO_GAR
self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_GAR, props.DTY_SPP_SW1) # Powerplugs Garden
self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_REP, props.DTY_SPP_SW1) # WiFi Garden
def __init_ffw__(self, mqtt_client): def __init_ffw__(self, mqtt_client):
loc = props.LOC_FFW loc = props.LOC_FFW
@ -198,6 +204,7 @@ class physical_devices(base):
self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLD, props.DTY_TLI_SBx) # Tradfri Bed Light Dirk self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLD, props.DTY_TLI_SBx) # Tradfri Bed Light Dirk
self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLM, props.DTY_SPP_SW1) # Powerplug Bed Light Marion self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLM, props.DTY_SPP_SW1) # Powerplug Bed Light Marion
self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx) # Brennenstuhl Heatingvalve self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx) # Brennenstuhl Heatingvalve
self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_WLI, props.DTY_TLI_SBx) # Tradfri Wardobe light
# LIVINGROOM # LIVINGROOM
roo = props.ROO_LIV roo = props.ROO_LIV

View File

@ -135,6 +135,10 @@ FUN_DCK = 19
""" Docking Station """ """ Docking Station """
FUN_AMB = 20 FUN_AMB = 20
""" Ambient information """ """ Ambient information """
FUN_REP = 21
"""" Repeater suppla """
FUN_WLI = 22
""" Wardrobe light """
class topic_by_props(UserString): class topic_by_props(UserString):
@ -199,4 +203,6 @@ class topic_by_props(UserString):
FUN_ASM: 'audio_status_mpd', FUN_ASM: 'audio_status_mpd',
FUN_ASB: 'audio_status_bt', FUN_ASB: 'audio_status_bt',
FUN_AMB: 'ambient', FUN_AMB: 'ambient',
FUN_REP: 'repeater',
FUN_WLI: 'wardrobe_light',
}.get(fun) }.get(fun)