Quellcode durchsuchen

Merge of previous commit

master
Dirk Alders vor 3 Monaten
Ursprung
Commit
66a471979d
2 geänderte Dateien mit 14 neuen und 1 gelöschten Zeilen
  1. 8
    1
      devices.py
  2. 6
    0
      topic.py

+ 8
- 1
devices.py Datei anzeigen

104
         self.__init_ffw__(mqtt_client)
104
         self.__init_ffw__(mqtt_client)
105
         self.__init_ffe__(mqtt_client)
105
         self.__init_ffe__(mqtt_client)
106
         self.__init_stw__(mqtt_client)
106
         self.__init_stw__(mqtt_client)
107
+        self.__init_gar__(mqtt_client)
107
 
108
 
108
     def __init_gfw__(self, mqtt_client):
109
     def __init_gfw__(self, mqtt_client):
109
         loc = props.LOC_GFW
110
         loc = props.LOC_GFW
136
         self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
137
         self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
137
         self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_AMB, props.DTY_MAM_THP)            # My Ambient information
138
         self.add(mqtt_client, props.STG_MYA, loc, roo, props.FUN_AMB, props.DTY_MAM_THP)            # My Ambient information
138
 
139
 
140
+    def __init_gar__(self, mqtt_client):
141
+        loc = props.LOC_GAR
142
+
139
         # GARDEN
143
         # GARDEN
140
-        self.add(mqtt_client, props.STG_ZGW, props.LOC_GAR, props.ROO_GAR, props.FUN_GAR, props.DTY_SPP_SW1)
144
+        roo = props.ROO_GAR
145
+        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_GAR, props.DTY_SPP_SW1)            # Powerplugs Garden
146
+        self.add(mqtt_client, props.STG_ZGW, loc, roo, props.FUN_REP, props.DTY_SPP_SW1)            # WiFi Garden
141
 
147
 
142
     def __init_ffw__(self, mqtt_client):
148
     def __init_ffw__(self, mqtt_client):
143
         loc = props.LOC_FFW
149
         loc = props.LOC_FFW
198
         self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLD, props.DTY_TLI_SBx)            # Tradfri Bed Light Dirk
204
         self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLD, props.DTY_TLI_SBx)            # Tradfri Bed Light Dirk
199
         self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLM, props.DTY_SPP_SW1)            # Powerplug Bed Light Marion
205
         self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_BLM, props.DTY_SPP_SW1)            # Powerplug Bed Light Marion
200
         self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
206
         self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
207
+        self.add(mqtt_client, props.STG_ZFE, loc, roo, props.FUN_WLI, props.DTY_TLI_SBx)            # Tradfri Wardobe light
201
 
208
 
202
         # LIVINGROOM
209
         # LIVINGROOM
203
         roo = props.ROO_LIV
210
         roo = props.ROO_LIV

+ 6
- 0
topic.py Datei anzeigen

135
 """ Docking Station """
135
 """ Docking Station """
136
 FUN_AMB = 20
136
 FUN_AMB = 20
137
 """ Ambient information """
137
 """ Ambient information """
138
+FUN_REP = 21
139
+"""" Repeater suppla """
140
+FUN_WLI = 22
141
+""" Wardrobe light """
138
 
142
 
139
 
143
 
140
 class topic_by_props(UserString):
144
 class topic_by_props(UserString):
199
             FUN_ASM: 'audio_status_mpd',
203
             FUN_ASM: 'audio_status_mpd',
200
             FUN_ASB: 'audio_status_bt',
204
             FUN_ASB: 'audio_status_bt',
201
             FUN_AMB: 'ambient',
205
             FUN_AMB: 'ambient',
206
+            FUN_REP: 'repeater',
207
+            FUN_WLI: 'wardrobe_light',
202
         }.get(fun)
208
         }.get(fun)

Laden…
Abbrechen
Speichern