Fix is_opening/is_closing for RTS covers (#463)

iMicknl · Jun 29, 2021 · c467aa4 · c467aa4
1 parent 60f0766
commit c467aa4
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/custom_components/tahoma/cover.py b/custom_components/tahoma/cover.py
@@ -324,11 +324,12 @@ def is_opening(self):
         ):
             return True
 
-        is_moving = self.device.states[CORE_MOVING_STATE].value
-        current_closure = self.device.states[CORE_CLOSURE_STATE]
-        target_closure = self.device.states[CORE_TARGET_CLOSURE_STATE]
+        is_moving = self.device.states.get(CORE_MOVING_STATE)
+        current_closure = self.device.states.get(CORE_CLOSURE_STATE)
+        target_closure = self.device.states.get(CORE_TARGET_CLOSURE_STATE)
         return (
             is_moving
+            and is_moving.value
             and current_closure
             and target_closure
             and current_closure.value > target_closure.value
@@ -344,11 +345,12 @@ def is_closing(self):
         ):
             return True
 
-        is_moving = self.device.states.get(CORE_MOVING_STATE).value
-        current_closure = self.device.states[CORE_CLOSURE_STATE]
-        target_closure = self.device.states[CORE_TARGET_CLOSURE_STATE]
+        is_moving = self.device.states.get(CORE_MOVING_STATE)
+        current_closure = self.device.states.get(CORE_CLOSURE_STATE)
+        target_closure = self.device.states.get(CORE_TARGET_CLOSURE_STATE)
         return (
             is_moving
+            and is_moving.value
             and current_closure
             and target_closure
             and current_closure.value < target_closure.value