boneIO 0.6.3.dev1__py3-none-any.whl → 0.6.3.dev2__py3-none-any.whl

{boneIO-0.6.3.dev1.dist-info → boneIO-0.6.3.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boneIO
-Version: 0.6.3_dev1
+Version: 0.6.3_dev2
 Summary: Python App for BoneIO
 License: GNU General Public License v3.0
 Author-email: Paweł Szafer <pszafer@gmail.com>

{boneIO-0.6.3.dev1.dist-info → boneIO-0.6.3.dev2.dist-info}/RECORD

@@ -13,12 +13,12 @@ boneio/example_config/output32x5A.yaml,sha256=G2Pb6qL8mXs6MliIM1roAanPag9ozRe3Mc
 boneio/fonts/danube__.ttf,sha256=KBRPUcGvmroCjrWC8zK4MulUb9lV8R0lXkOY7lNnQWc,19372
 boneio/helper/__init__.py,sha256=r-9dubCtDlrs_HFF2OGPQEPmw1XREgb4qQF6I486Li4,2039
 boneio/helper/async_updater.py,sha256=BVh5mXFxgaZqoekjQbQSCTssfyVIdCQ80LCJny-rOo4,985
-boneio/helper/click_timer.py,sha256=blWofzFIwuYcF_yFfCGDtI8nGSMpSdXdl9qMLXlKdXc,1169
+boneio/helper/click_timer.py,sha256=dVYdX3VNpAEKHCIqWs3u0PCJLSPIGr0K2kMffc_kGdc,1138
 boneio/helper/config.py,sha256=tOYbr6Axf-91eHyCgRNuIkSC7nrAFO0XVqImajpPpZI,2277
 boneio/helper/events.py,sha256=EHYJy507RF1LikWQ2s4r990JRvR9rO4z7FkaJqt1Mrk,7494
 boneio/helper/exceptions.py,sha256=vyYSUojwB7OttOPUjbxeHFM7C_o5ZQmRUcZ_vYpxYYI,717
 boneio/helper/filter.py,sha256=UcjifjaC5wHDW2He7wmwCX2IjSSeLVhXyhrXHeT8RmA,885
-boneio/helper/gpio.py,sha256=DJuve2TjqyqHaTovHfU6OK1TB7sO1zpY0SuiKuk7VlU,2719
+boneio/helper/gpio.py,sha256=sxvkYtKVt5alGoXFBRzG8ONEo112fsKsX-zK2C-_YKg,3249
 boneio/helper/ha_discovery.py,sha256=s80gwx1Fik2_vtq-6kqabUqPx4KwwZUt4G1Oy6RgGgU,6278
 boneio/helper/loader.py,sha256=dKlk42tI7RkyI_FmX6CneN3FIGnHQ55c20sfn11B_bk,13547
 boneio/helper/logger.py,sha256=zyF_Vk3o2eSHuXypJhNzK99eZgkWDWybuB5KcJgurDs,1801
@@ -35,7 +35,7 @@ boneio/helper/timeperiod.py,sha256=xpg9oe30Z5WiLDQPq3EBKKScejOnN47NhcpeFvDd3bY,5
 boneio/helper/util.py,sha256=QfSoT3H3WnOQAKO5bFRIBCy62HT5NMa9Ek-FmfTW_rw,508
 boneio/helper/yaml_util.py,sha256=gAX7hCaHUlPgkhGCIQ4zjv0Vj9JmLzQsSyF51ZmSb9g,11304
 boneio/input/__init__.py,sha256=u9wuehuC_TNizL4tyn7EygZW5LaTFjSnFaZeZr3zZ1U,99
-boneio/input/gpio.py,sha256=bDRsoqOXjbS0M_yJCVoj-A68-sRdHKIBgJfQ5xBYHtc,2515
+boneio/input/gpio.py,sha256=vldjzyi-gFqRJUw6Jucj56XXbVQxriLpZtWDcRnFQz0,3440
 boneio/manager.py,sha256=ZldVPnmQ_IRu3ldj7p2HR0-tobNeRjRf2pBM3V3qm-E,20922
 boneio/modbus.py,sha256=eA_sGnmdcIneXX75ZcXOI223-UkKN1UYmWFqiJBAhJo,4176
 boneio/mqtt_client.py,sha256=NYvok8y_g8iRXDopVojzcDGVnDJEFqHBEYhOGy8m7T8,8331
@@ -52,7 +52,7 @@ boneio/schema/actions_switch.yaml,sha256=sdqhwz0LrcfaiAN3-RfAR_xApxo5dh9RxXQubuK
 boneio/schema/filters.yaml,sha256=WopX1SmCZsSZXNiGccLoi7uMCsUpdbs0eVfsAjmbay4,286
 boneio/schema/filters_adc.yaml,sha256=3e0ts92MoFKOnfGOOn6WYIHxu0-tnZe9OjAjN9m7hiI,304
 boneio/schema/id.yaml,sha256=vHI_6dxkJwoiGp5ien_pPpyaWA1F06eirTgfWMyWa1E,75
-boneio/schema/schema.yaml,sha256=aRpK-uOaXeJAwXj0NpPkaNEjmgaZe28YjFxVE8Vk5C0,12989
+boneio/schema/schema.yaml,sha256=47FIR47bF6VemVJ_prE3D-d0leXlKFhZXuJYGfc9Rds,12988
 boneio/schema/temp_unit.yaml,sha256=m32VGz9RTW92Lz08l9n6RftkcVNZquOGPPr5mc3eZVc,65
 boneio/schema/update_interval.yaml,sha256=L_YLddAZdybcdO-T57Qhlv1GaWIVDwhvH-GadD1oOIo,133
 boneio/sensor/__init__.py,sha256=VjFBEQQv_U0T2ENkzefuBdzmqNvBTEv4M-gQKScc8o0,431
@@ -69,9 +69,9 @@ boneio/sensor/temp/__init__.py,sha256=OViqBb7DwVn_aFIy6V0iqkSUDjsDNLQ5sOS_4frYdw
 boneio/sensor/temp/dallas.py,sha256=xrvd1LNBh1fRcjz_yd_9S29Lv26ItVtLCmhZgVQWJos,2485
 boneio/sensor/temp/lm75.py,sha256=-mpOv78429plRPBp9s09Ljz1x2Bdxuagalqz40vlAKE,243
 boneio/sensor/temp/mcp9808.py,sha256=yAh5yJzZLGTqa39xV4fyqsruj7oy3niOZAUV2W6eyCM,271
-boneio/version.py,sha256=iGYf3O4_k_Jh7VtducfOlQk2wVOHt-Ngoh7d5ferZjA,42
-boneIO-0.6.3.dev1.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
-boneIO-0.6.3.dev1.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-boneIO-0.6.3.dev1.dist-info/METADATA,sha256=YwSSmAxBffCHIW-fO6tZDQMOjlTVMXYndw_CezDS_UQ,1699
-boneIO-0.6.3.dev1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneIO-0.6.3.dev1.dist-info/RECORD,,
+boneio/version.py,sha256=lELkUhPyqz9wrO0Yfi4xgdYwqNB6En4AmL1Or73si50,42
+boneIO-0.6.3.dev2.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
+boneIO-0.6.3.dev2.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+boneIO-0.6.3.dev2.dist-info/METADATA,sha256=zJ01oNSWDqEAVffzyM8MNdNnwToTq9A-Zvle3K69ES0,1699
+boneIO-0.6.3.dev2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneIO-0.6.3.dev2.dist-info/RECORD,,

boneio/helper/click_timer.py

@@ -1,37 +1,33 @@
 from __future__ import annotations
 import asyncio
-from boneio.helper.events import async_call_later_miliseconds
-
+from boneio.helper.timeperiod import TimePeriod
+import time
 
 class ClickTimer:
     """Represent async call later function with variable to check if timing is ON."""
 
-    def __init__(self, delay: float, action) -> None:
+    def __init__(self, delay: TimePeriod, action) -> None:
         """Initialize Click timer."""
         self._loop = asyncio.get_running_loop()
         self._remove_listener = None
-        self._delay = delay
+        self._delay: float = delay.total_in_seconds
         self._action = action
 
     def is_waiting(self) -> bool:
         """If variable is set then timer is ON, if None is Off."""
         return self._remove_listener is not None
 
-    def action(self, x: float) -> None:
-        """Reset Call later variable and call action."""
-        self.reset()
-        self._action(x)
-
     def reset(self) -> None:
         """Uninitialize variable remove_listener."""
         if self._remove_listener:
-            self._remove_listener()
+            self._remove_listener.cancel()
             self._remove_listener = None
 
+    async def _start_async_timer(self) -> None:
+        await asyncio.sleep(self._delay)
+        self._remove_listener = None
+        self._action(time.time())
+
     def start_timer(self) -> None:
         """Start timer."""
-        self._remove_listener = async_call_later_miliseconds(
-            loop=self._loop,
-            action=self.action,
-            delay=self._delay,
-        )
+        self._remove_listener = self._loop.create_task(self._start_async_timer())

boneio/helper/gpio.py

@@ -80,6 +80,24 @@ def edge_detect(
         GPIO.add_event_detect(gpio=pin, edge=edge, callback=callback, bouncetime=bounce)
     except RuntimeError as err:
         raise GPIOInputException(err)
+    
+def add_event_detect(
+    pin: str, edge: Gpio_Edges = FALLING
+) -> None:
+    """Add detection for RISING and FALLING events."""
+    try:
+        GPIO.add_event_detect(gpio=pin, edge=edge)
+    except RuntimeError as err:
+        raise GPIOInputException(err)
+    
+def add_event_callback(
+    pin: str, callback: Callable
+) -> None:
+    """Add detection for RISING and FALLING events."""
+    try:
+        GPIO.add_event_callback(gpio=pin,callback=callback)
+    except RuntimeError as err:
+        raise GPIOInputException(err)
 
 
 class GpioBaseClass:
@@ -91,7 +109,7 @@ class GpioBaseClass:
         """Setup GPIO Input Button"""
         self._pin = pin
         gpio_mode = kwargs.get(GPIO_MODE, GPIO_STR)
-        self._bounce_time = kwargs.get("bounce_time", TimePeriod(milliseconds=120))
+        self._bounce_time = kwargs.get("bounce_time", TimePeriod(milliseconds=50))
         self._loop = asyncio.get_running_loop()
         self._press_callback = press_callback
         setup_input(pin=self._pin, pull_mode=gpio_mode)

boneio/input/gpio.py

@@ -1,19 +1,20 @@
 """GPIOInputButton to receive signals."""
 from __future__ import annotations
+import time
 import logging
-import asyncio
 from functools import partial
-from boneio.const import DOUBLE, LONG, SINGLE, ClickTypes
+from boneio.const import DOUBLE, LONG, SINGLE, ClickTypes, BOTH
 from boneio.helper import GpioBaseClass, ClickTimer
-
-
+from boneio.helper.gpio import add_event_callback, add_event_detect
+from boneio.helper.timeperiod import TimePeriod
 # TIMINGS FOR BUTTONS
 
-DOUBLE_CLICK_DURATION_MS = 350
-LONG_PRESS_DURATION_MS = 600
 
 _LOGGER = logging.getLogger(__name__)
 
+PERIOD_TO_WAIT_FOR_SECOND_PRESS_MS = 30
+DOUBLE_CLICK_DURATION_MS = 250
+LONG_PRESS_DURATION_MS = 500
 
 class GpioInputButton(GpioBaseClass):
     """Represent Gpio input switch."""
@@ -22,52 +23,68 @@ class GpioInputButton(GpioBaseClass):
         """Setup GPIO Input Button"""
         super().__init__(**kwargs)
         self._state = self.is_pressed
-        _LOGGER.debug("Configured listening for input pin %s", self._pin)
+        self.button_pressed_time = 0.0
+        self._debounce_time: float = self._bounce_time.total_in_seconds
+
+        self._timer_single = ClickTimer(
+            delay=TimePeriod(milliseconds=PERIOD_TO_WAIT_FOR_SECOND_PRESS_MS),
+            action=lambda x: self.press_callback(click_type=SINGLE),
+        )
+
         self._timer_double = ClickTimer(
-            delay=DOUBLE_CLICK_DURATION_MS,
+            delay=TimePeriod(milliseconds=DOUBLE_CLICK_DURATION_MS),
             action=lambda x: self.double_click_press_callback(),
         )
         self._timer_long = ClickTimer(
-            delay=LONG_PRESS_DURATION_MS,
+            delay=TimePeriod(milliseconds=LONG_PRESS_DURATION_MS),
             action=lambda x: self.press_callback(click_type=LONG),
         )
         self._double_click_ran = False
         self._is_waiting_for_second_click = False
         self._long_press_ran = False
-        asyncio.create_task(self._run())
 
-    def press_callback(self, click_type: ClickTypes):
-        self._loop.call_soon_threadsafe(
-            partial(self._press_callback, click_type, self._pin)
-        )
+        add_event_detect(pin=self._pin, edge=BOTH)
+        add_event_callback(pin=self._pin, callback=self.check_state)
+        _LOGGER.debug("Configured listening for input pin %s", self._pin)
 
     def double_click_press_callback(self):
         self._is_waiting_for_second_click = False
         if not self._state and not self._timer_long.is_waiting():
             self.press_callback(click_type=SINGLE)
 
-    async def _run(self) -> None:
-        while True:
-            self.check_state(state=self.is_pressed)
-            await asyncio.sleep(self._bounce_time.total_in_seconds)
-
-    def check_state(self, state: bool) -> None:
-        if state == self._state:
-            return
-        self._state = state
-        if state:
-            self._timer_long.start_timer()
-            if self._timer_double.is_waiting():
-                self._timer_double.reset()
-                self._double_click_ran = True
-                self.press_callback(click_type=DOUBLE)
-            else:
-                self._timer_double.start_timer()
-                self._is_waiting_for_second_click = True
+    def check_state(self, channel) -> None:
+        self._state = self.is_pressed
+        time_now = time.time()
+        if self._state:
+            if time_now - self.button_pressed_time >= self._debounce_time:
+                self.button_pressed_time = time_now
+                self._timer_long.start_timer()
+                self._timer_single.reset()
+                if self._timer_double.is_waiting():
+                    self._double_click_ran = True
+                    self.press_callback(click_type=DOUBLE)
+                    self._is_waiting_for_second_click = False
+                    return
+                else:
+                    self._timer_double.start_timer()
+                    self._is_waiting_for_second_click = True
 
         else:
             if not self._is_waiting_for_second_click and not self._double_click_ran:
                 if self._timer_long.is_waiting():
                     self.press_callback(click_type=SINGLE)
+            elif self._is_waiting_for_second_click:
+                self._timer_single.start_timer()
             self._timer_long.reset()
             self._double_click_ran = False
+
+    def reset_all_timers(self) -> None:
+        self._timer_single.reset()
+        self._timer_double.reset()
+        self._timer_long.reset()
+
+    def press_callback(self, click_type: ClickTypes):
+        self.reset_all_timers()
+        self._loop.call_soon(
+            partial(self._press_callback, click_type, self._pin)
+        )

boneio/schema/schema.yaml

@@ -354,7 +354,7 @@ input:
           - str
           - positive_time_period
         required: True
-        default: "120ms"
+        default: "50ms"
         meta:
           label: Bounce time for GPIO in miliseconds. Only for advanced usage.
       show_in_ha:

boneio/version.py

@@ -1,2 +1,2 @@
 # flake8: noqa
-__version__ = "0.6.3_dev1"
+__version__ = "0.6.3_dev2"