Add effect_v2

Update light effects to effects_v2. Add effects to mqtt. #1053
diyhue · Nov 24, 2024 · 5515247 · 5515247
1 parent e64e613
commit 5515247
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/BridgeEmulator/HueObjects/Light.py b/BridgeEmulator/HueObjects/Light.py
@@ -186,6 +186,9 @@ def setV1State(self, state, advertise=True):
 
     def setV2State(self, state):
         v1State = v2StateToV1(state)
+        if "effects_v2" in state and "action" in state["effects_v2"]:
+            v1State["effect"] = state["effects_v2"]["action"]["effect"]
+            self.effect = v1State["effect"]
         if "effects" in state:
             v1State["effect"] = state["effects"]["effect"]
             self.effect = v1State["effect"]

diff --git a/BridgeEmulator/configManager/configHandler.py b/BridgeEmulator/configManager/configHandler.py
@@ -346,9 +346,9 @@ def download_debug(self):
         debug["apiUsers"] = "privately"
         debug["Hue Essentials key"] = "privately"
         debug["users"] = "privately"
-        if debug["mqtt"]["enabled"]:
+        if debug["mqtt"]["enabled"] or "mqttPassword" in debug["mqtt"]:
             debug["mqtt"]["mqttPassword"] = "privately"
-        if debug["homeassistant"]["enabled"]:
+        if debug["homeassistant"]["enabled"] or "homeAssistantToken" in debug["homeassistant"]:
             debug["homeassistant"]["homeAssistantToken"] = "privately"
         if debug["hue"]:
             debug["hue"]["hueUser"] = "privately"

diff --git a/BridgeEmulator/flaskUI/restful.py b/BridgeEmulator/flaskUI/restful.py
@@ -95,7 +95,9 @@ def post(self):
             else:
                 logging.error("link button not pressed")
                 logging.error("last_button_press " + str(last_button_press))
-                logging.error("current time " + str(datetime.now().timestamp()))
+                logging.error("current_time      " + str(datetime.now().timestamp()))
+                if last_button_press != datetime.now().timestamp():
+                    logging.error("last_button_press is not current_time, please check timezone setting")
                 return [{"error": {"type": 101, "address": "/api/", "description": "link button not pressed"}}]
         else:
             logging.error("parameter, " + list(postDict.keys())[0] + ", not available")

diff --git a/BridgeEmulator/lights/protocols/mqtt.py b/BridgeEmulator/lights/protocols/mqtt.py
@@ -44,6 +44,8 @@ def set_light(light, data):
                 payload['alert'] = value
             if key == "transitiontime":
                 payload['transition'] = value / 10
+            if key == "effect":
+                payload["effect"] = value
         if colorFromHsv:
             color = hsv_to_rgb(data['hue'], data['sat'], light.state["bri"])
             payload['color'] = { 'r': color[0], 'g': color[1], 'b': color[2] }