zcc-helper 3.6.dev18__tar.gz → 3.6.dev19__tar.gz

{zcc_helper-3.6.dev18/zcc_helper.egg-info → zcc_helper-3.6.dev19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zcc_helper
-Version: 3.6.dev18
+Version: 3.6.dev19
 Summary: ZIMI ZCC helper module
 Author: Mark Hannon
 Author-email: mark.hannon@gmail.com

{zcc_helper-3.6.dev18 → zcc_helper-3.6.dev19}/zcc/constants.py

@@ -9,4 +9,4 @@ APP_ID = "ZvWqWJQB"
 APP_TOKEN = "3422ecbb-cf6a-404c-b3dc-2023dd213535"
 
 NAME = "zcc_helper"
-VERSION = "3.6dev18"
+VERSION = "3.6dev19"

{zcc_helper-3.6.dev18 → zcc_helper-3.6.dev19}/zcc/device.py

@@ -4,14 +4,12 @@
 
 from __future__ import annotations
 
-import asyncio
-
 from pprint import pformat
 
 from zcc.errors import ControlPointError
 from zcc.manufacture_info import ControlPointManufactureInfo
 
-OPEN_AND_CLOSE_PERCENTAGE_TOLERANCE = 10
+OPEN_AND_CLOSE_TOLERANCE = 5
 OPEN_AND_CLOSE_WORKAROUND = True
 
 
@@ -172,6 +170,8 @@ class ControlPointDevice:
     @property
     def is_closing(self) -> bool:
         """Returns True if door is closing."""
+        if abs(self.percentage - self._target_percentage) <= OPEN_AND_CLOSE_TOLERANCE:
+            return False
         if self.percentage and self._target_percentage:
             return self.percentage > self._target_percentage and not self.is_closed
         return False
@@ -181,7 +181,7 @@ class ControlPointDevice:
         """Returns True if door is closed."""
 
         if self.percentage:
-            return self.percentage <= OPEN_AND_CLOSE_PERCENTAGE_TOLERANCE
+            return self.percentage <= OPEN_AND_CLOSE_TOLERANCE
         return True
 
     @property
@@ -214,7 +214,8 @@ class ControlPointDevice:
     @property
     def is_opening(self) -> bool:
         """Returns True if door is opening and is NOT already open."""
-
+        if abs(self.percentage - self._target_percentage) <= OPEN_AND_CLOSE_TOLERANCE:
+            return False
         if self.percentage and self._target_percentage:
             return self.percentage < self._target_percentage and not self.is_open
         return False
@@ -224,7 +225,7 @@ class ControlPointDevice:
         """Returns True if door is open."""
 
         if self.percentage:
-            return self.percentage >= 100 - OPEN_AND_CLOSE_PERCENTAGE_TOLERANCE
+            return self.percentage >= 100 - OPEN_AND_CLOSE_TOLERANCE
         return False
 
     @property
@@ -259,17 +260,12 @@ class ControlPointDevice:
 
     async def open_to_percentage(self, percentage):
         """OpenToPercentage if the action is supported"""
+        if OPEN_AND_CLOSE_WORKAROUND and percentage == 0:
+            percentage = 1
         self._target_percentage = percentage
         await self.__action(
             "OpenToPercentage", params={"openpercentage": int(percentage)}
         )
-        if OPEN_AND_CLOSE_WORKAROUND:
-            wait_time = 10
-            while self.percentage != percentage:
-                await asyncio.sleep(1)
-                wait_time -= 1
-                if wait_time <= 0:
-                    break
 
     @property
     def percentage(self) -> int | None:

{zcc_helper-3.6.dev18 → zcc_helper-3.6.dev19/zcc_helper.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: zcc_helper
-Version: 3.6.dev18
+Version: 3.6.dev19
 Summary: ZIMI ZCC helper module
 Author: Mark Hannon
 Author-email: mark.hannon@gmail.com