Merge pull request #181 from koying/remote_tweaks

FIX: last_button_event attr + force update
robmarkcole · Jan 29, 2020 · 7cbb35c · 7cbb35c
2 parents 0837e82 + 21eacd0
commit 7cbb35c
Showing 1 changed file with 18 additions and 5 deletions.
diff --git a/custom_components/huesensor/remote.py b/custom_components/huesensor/remote.py
@@ -38,12 +38,13 @@
 }
 DEVICE_CLASSES = {"SML": "motion"}
 ATTRS = {
-    "RWL": ["last_updated", "battery", "on", "reachable"],
-    "ROM": ["last_updated", "battery", "on", "reachable"],
-    "ZGP": ["last_updated"],
-    "FOH": ["last_updated"],
+    "RWL": ["last_updated", "last_button_event", "battery", "on", "reachable"],
+    "ROM": ["last_updated", "last_button_event", "battery", "on", "reachable"],
+    "ZGP": ["last_updated", "last_button_event"],
+    "FOH": ["last_updated", "last_button_event"],
     "Z3-": [
         "last_updated",
+        "last_button_event",
         "battery",
         "on",
         "reachable",
@@ -107,6 +108,7 @@ def parse_zgp(response):
         "model": "ZGP",
         "name": response["name"],
         "state": button,
+        "last_button_event": button,
         "last_updated": response["state"]["lastupdated"].split("T"),
     }
     return data
@@ -133,6 +135,7 @@ def parse_rwl(response):
         "battery": response["config"]["battery"],
         "on": response["config"]["on"],
         "reachable": response["config"]["reachable"],
+        "last_button_event": button,
         "last_updated": response["state"]["lastupdated"].split("T"),
     }
     return data
@@ -165,6 +168,7 @@ def parse_foh(response):
         "model": "FOH",
         "name": response["name"],
         "state": button,
+        "last_button_event": button,
         "last_updated": response["state"]["lastupdated"].split("T"),
     }
     return data
@@ -191,6 +195,7 @@ def parse_z3_rotary(response):
         "battery": response["config"]["battery"],
         "on": response["config"]["on"],
         "reachable": response["config"]["reachable"],
+        "last_button_event": button,
         "last_updated": response["state"]["lastupdated"].split("T"),
     }
     return data
@@ -212,7 +217,10 @@ def parse_z3_switch(response):
     else:
         button = Z3_BUTTON[press]
 
-    data = {"state": button}
+    data = {
+        "last_button_event": button,
+        "state": button
+    }
     return data
 
 
@@ -371,6 +379,11 @@ def device_state_attributes(self):
         if data:
             return {key: data.get(key) for key in ATTRS.get(data["model"], [])}
 
+    @property
+    def force_update(self):
+        """Force update."""
+        return True
+
     def turn_on(self, **kwargs):
         """Do nothing."""