Windowlights gfw/marion and ffw/sleep added

devices.py

@@ -114,6 +114,7 @@ class physical_devices(base):
         #
         self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
         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_WIL, props.DTY_TLI_SBT)            # Tradfri Windowlight
 
         # FLOOR
         roo = props.ROO_FLO
@@ -178,6 +179,7 @@ class physical_devices(base):
         self.add(mqtt_client, props.STG_SHE, loc, roo, props.FUN_MAL, props.DTY_SHY_SW1)            # Shelly Main Light
         self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_MAL, props.DTY_TLI_SBx)            # Tradfri Main Light
         self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_HEA, props.DTY_BVL_xxx)            # Brennenstuhl Heatingvalve
+        self.add(mqtt_client, props.STG_ZFW, loc, roo, props.FUN_WIL, props.DTY_TLI_SBT)            # Tradfri Windowlight
 
     def __init_ffe__(self, mqtt_client):
         loc = props.LOC_FFE

topic.py

@@ -139,6 +139,8 @@ FUN_REP = 21
 """" Repeater suppla """
 FUN_WLI = 22
 """ Wardrobe light """
+FUN_WIL = 23
+""" Wardrobe light """
 
 
 class topic_by_props(UserString):
@@ -156,13 +158,12 @@ class topic_by_props(UserString):
 
     def __loc_repr__(self, loc):
         return {
-            LOC_GFW: 'gfw',
             LOC_GFE: 'gfe',
-            LOC_STW: 'stw',
-            LOC_FFW: 'ffw',
+            LOC_GFW: 'gfw',
             LOC_FFE: 'ffe',
-            LOC_STW: 'stw',
+            LOC_FFW: 'ffw',
             LOC_GAR: 'gar',
+            LOC_STW: 'stw',
         }.get(loc)
 
     def __roo_repr__(self, roo):
@@ -205,4 +206,5 @@ class topic_by_props(UserString):
             FUN_AMB: 'ambient',
             FUN_REP: 'repeater',
             FUN_WLI: 'wardrobe_light',
+            FUN_WIL: 'window_light',
         }.get(fun)