boneIO 0.3.0.dev6__py3-none-any.whl → 0.3.0.dev7__py3-none-any.whl

boneio/const.py

@@ -2,12 +2,13 @@
 from datetime import timedelta
 
 try:
-    from Adafruit_BBIO.GPIO import HIGH, LOW, BOTH, FALLING
+    from Adafruit_BBIO.GPIO import HIGH, LOW, BOTH, FALLING, RISING
 except ModuleNotFoundError:
     HIGH = "high"
     LOW = "low"
     BOTH = "both"
     FALLING = "falling"
+    RISING = "rising"
     pass
 from typing_extensions import Literal
 
@@ -50,12 +51,6 @@ UARTS = {
     "uart4": {ID: "/dev/ttyS4", TX: "P9.13", RX: "P9.11"},
 }
 
-# TIMINGS FOR BUTTONS
-DEBOUNCE_DURATION = timedelta(seconds=0.2)
-LONG_PRESS_DURATION = timedelta(seconds=0.7)
-DELAY_DURATION = 0.1
-SECOND_DELAY_DURATION = 0.3
-
 # HA CONSTS
 HOMEASSISTANT = "homeassistant"
 HA_DISCOVERY = "ha_discovery"

boneio/example_config/config.yaml

@@ -9,8 +9,8 @@ mqtt:
 oled:
 
 lm75:
-  id: temp
-  address: 0x48
+  - id: temp
+    address: 0x48
 
 mcp23017:
   - id: mcp1

boneio/example_config/cover.yaml

@@ -2,7 +2,7 @@ cover:
   - id: kitchen
     open_relay: test1
     close_relay: test2
-    open_time: 20
-    close_time: 22
+    open_time: 20s
+    close_time: 22s
     show_in_ha: yes
     restore_state: yes

boneio/helper/config.py

@@ -2,6 +2,7 @@
 Module to provide basic config options.
 """
 from boneio.const import BONEIO, HOMEASSISTANT
+from _collections_abc import dict_values
 
 
 class ConfigHelper:
@@ -14,6 +15,7 @@ class ConfigHelper:
         self._topic_prefix = topic_prefix
         self._ha_discovery = ha_discovery
         self._ha_discovery_prefix = ha_discovery_prefix
+        self._autodiscovery_messages = {}
 
     @property
     def topic_prefix(self) -> str:
@@ -34,3 +36,12 @@ class ConfigHelper:
     @property
     def subscribe_topic(self) -> str:
         return f"{self.cmd_topic_prefix}+/+/#"
+
+    def add_autodiscovery_msg(self, topic: str, payload: str):
+        """Add autodiscovery message."""
+        self._autodiscovery_messages[topic] = {"topic": topic, "payload": payload}
+
+    @property
+    def autodiscovery_msgs(self) -> dict_values:
+        """Get autodiscovery messages"""
+        return self._autodiscovery_messages.values()

boneio/helper/gpio.py

@@ -97,7 +97,7 @@ class GpioBaseClass:
         self._pin = pin
         gpio = kwargs.get("rest_pin", {GPIO_MODE: GPIO_STR})
         gpio_mode = gpio.get(GPIO_MODE, GPIO_STR)
-        self._bounce_time = gpio.get("bounce_time", TimePeriod(milliseconds=25))
+        self._bounce_time = gpio.get("bounce_time", TimePeriod(milliseconds=10))
         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,21 @@
 """GPIOInputButton to receive signals."""
 import logging
-from datetime import datetime
+from datetime import datetime, timedelta
 from functools import partial
 
 from boneio.const import (
-    DEBOUNCE_DURATION,
-    DELAY_DURATION,
     DOUBLE,
     LONG,
-    LONG_PRESS_DURATION,
-    SECOND_DELAY_DURATION,
     SINGLE,
 )
 from boneio.helper import edge_detect, GpioBaseClass
 
+# TIMINGS FOR BUTTONS
+DEBOUNCE_DURATION = timedelta(microseconds=150000)
+LONG_PRESS_DURATION = timedelta(microseconds=700000)
+DELAY_DURATION = 0.08
+SECOND_DELAY_DURATION = 0.14
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -54,7 +56,6 @@ class GpioInputButton(GpioBaseClass):
             and now - self._second_press_timestamp < DEBOUNCE_DURATION
         ):
             return
-
         if not self._first_press_timestamp:
             self._first_press_timestamp = now
         elif not self._second_press_timestamp:
@@ -105,7 +106,7 @@ class GpioInputButton(GpioBaseClass):
             if self._second_check:
                 if self._second_press_timestamp:
                     _LOGGER.debug(
-                        "Double click event on pin %s, roznica %s",
+                        "Double click event on pin %s, diff %s",
                         self._pin,
                         self._second_press_timestamp - self._first_press_timestamp,
                     )

boneio/manager.py

@@ -374,14 +374,14 @@ class Manager:
         if not self._config_helper.ha_discovery:
             return
         topic_prefix = topic_prefix or self._config_helper.topic_prefix
-        msg = availability_msg_func(topic=topic_prefix, id=id, name=name, **kwargs)
+        payload = availability_msg_func(topic=topic_prefix, id=id, name=name, **kwargs)
         topic = f"{self._config_helper.ha_discovery_prefix}/{ha_type}/{topic_prefix}/{id}/config"
         _LOGGER.debug("Sending HA discovery for %s, %s.", ha_type, name)
-        self._autodiscovery_messages.append({"topic": topic, "payload": msg})
-        self.send_message(topic=topic, payload=msg, retain=True)
+        self._config_helper.add_autodiscovery_msg(topic=topic, payload=payload)
+        self.send_message(topic=topic, payload=payload, retain=True)
 
     def resend_autodiscovery(self):
-        for msg in self._autodiscovery_messages:
+        for msg in self._config_helper.autodiscovery_msgs:
             self.send_message(**msg, retain=True)
 
     async def receive_message(self, topic: str, message: str) -> None:

boneio/sensor/modbus/__init__.py

@@ -122,20 +122,20 @@ class ModbusSensor(BasicMqtt):
     ) -> None:
         """Send HA autodiscovery information for each Modbus sensor."""
         _LOGGER.debug("Sending HA discovery for sensor %s %s.", sdm_name, sensor_id)
-        self._send_message(
-            topic=(
-                f"{self._config_helper.ha_discovery_prefix}/{SENSOR}/{self._config_helper.topic_prefix}{id}"
-                f"/{id}{sensor_id.replace('_', '').replace(' ', '').lower()}/config"
-            ),
-            payload=modbus_sensor_availabilty_message(
-                topic=self._config_helper.topic_prefix,
-                id=id,
-                name=sdm_name,
-                model=self._model,
-                sensor_id=sensor_id,
-                **kwargs,
-            ),
+        topic = (
+            f"{self._config_helper.ha_discovery_prefix}/{SENSOR}/{self._config_helper.topic_prefix}{id}"
+            f"/{id}{sensor_id.replace('_', '').replace(' ', '').lower()}/config"
         )
+        payload = modbus_sensor_availabilty_message(
+            topic=self._config_helper.topic_prefix,
+            id=id,
+            name=sdm_name,
+            model=self._model,
+            sensor_id=sensor_id,
+            **kwargs,
+        )
+        self._config_helper.add_autodiscovery_msg(topic=topic, payload=payload)
+        self._send_message(topic=topic, payload=payload)
 
     def _send_discovery_for_all_registers(self, register: int = 0) -> bool:
         """Send discovery message to HA for each register."""

boneio/version.py

@@ -1,2 +1,2 @@
 # flake8: noqa
-__version__ = "0.3.0.dev6"
+__version__ = "0.3.0.dev7"

{boneio-0.3.0.dev6.dist-info → boneio-0.3.0.dev7.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.3.0.dev6
+Version: 0.3.0.dev7
 Summary: Python App for BoneIO
 Home-page: https://github.com/boneIO-eu/app_bbb
-Download-URL: https://github.com/boneIO-eu/app_bbb/archive/0.3.0.dev6.zip
+Download-URL: https://github.com/boneIO-eu/app_bbb/archive/0.3.0.dev7.zip
 License: GNU General Public License v3.0
 Platform: UNKNOWN
 Classifier: Programming Language :: Python

{boneio-0.3.0.dev6.dist-info → boneio-0.3.0.dev7.dist-info}/RECORD

@@ -1,26 +1,26 @@
 boneio/__init__.py,sha256=hoLKnu6h1uEsiCHA9Ql2MMDC7VQS0E-s_2cxBS-CTOg,147
 boneio/bonecli.py,sha256=Alvpbf3gZteV3IMX7DBUD6F_XV_-juKfZ1d4YpIM7PI,3093
-boneio/const.py,sha256=nkL8SAMnZT3SfQiNOhWQ5RKoxUIoJV_9dH0BwLAJzXI,2636
+boneio/const.py,sha256=XnmTQ9eDjpQegUiUmom4ROJJHpzNq5HP_JsmC9xODxE,2506
 boneio/cover.py,sha256=Oi25Be0umRfKJ12kEBZYASw07bvRbLOT2s0emh4Kals,8298
-boneio/manager.py,sha256=jyQSbPOTbXWj1YuLviwugs5F4eKnG2DIEhc4F0Uf3TY,16321
+boneio/manager.py,sha256=0VrwPKf8PiACIGNenElR6W6EM9sUmN_iU5pvNnd8DWU,16341
 boneio/modbus.py,sha256=QWUAYHXLcP7A_vVKTMbZ7x8KS72qLw65t_UzTDI3448,4003
 boneio/mqtt_client.py,sha256=Y_Vt0pKEETIy1XKQ-WFhowlRJhuv9tWLtyoD8Vdz7hk,6983
 boneio/oled.py,sha256=Be9QeTHX1mmCQOshYY1KNGvqt4nzEtJCD3gCE3gRSsc,4836
 boneio/runner.py,sha256=IdAV1Yu--LncQYbNjx6w2uGjqUDBxNcNPW5ZH3hZuBo,2162
-boneio/version.py,sha256=x346uF6-PqYb8v3BN7X9RPPWeWgBJitJpH-sVmzKGEg,42
+boneio/version.py,sha256=CWun651lWjDS9iEJ1-V43b0GxjyUOvsUQUgWMvkO8hk,42
 boneio/example_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 boneio/example_config/adc.yaml,sha256=KaNfPuZmrhpiKJVUKC6uQXQ0YRCp0DoXVxYtqsbiSGI,168
-boneio/example_config/config.yaml,sha256=_gNf0Yo6p10Ao_rcSmHA_gCGMtDsvAdso3jNt3r3gqE,322
-boneio/example_config/cover.yaml,sha256=CltHkNRbIAM8tDEcj5Qbv-1EULfhrIqvQzc-WeiPXIw,148
+boneio/example_config/config.yaml,sha256=JBUNy-dnsxUzDnvXBf4CLBTcNCuqa1EXyO0HaeMTB-4,326
+boneio/example_config/cover.yaml,sha256=rs7lv3vIEgAb3q96RKsJL7VMRsEvSNHG848dzZzSKsI,150
 boneio/example_config/input.yaml,sha256=U5pN5Dyb8XrhqHeXsa3rYE5VFI4Y_BapNJkv9c1ireQ,2883
 boneio/example_config/output24x16A.yaml,sha256=uCj6U1j8qrnb3-Ui78-UjSFNZ3h_evNlab1p6P0H3-g,1691
 boneio/example_config/output32x5A.yaml,sha256=HuNSZ7S1qGMQi_XDAGJiMDe-W-aPcigvm6v-FYPgMeE,2471
 boneio/fonts/danube__.ttf,sha256=KBRPUcGvmroCjrWC8zK4MulUb9lV8R0lXkOY7lNnQWc,19372
 boneio/helper/__init__.py,sha256=zXVY9cTcFumVLf4wuNIutkL5UATTKL-ODcv8VjjxGfw,1816
-boneio/helper/config.py,sha256=WuHsEP7FazMuCB55Qgc6m-X2gMsSoscmXTS8BoX8vPE,881
+boneio/helper/config.py,sha256=8oct6dzp1SRF7yE8DcJpnDCQr6ms3OsZUNTxFxnJBTc,1310
 boneio/helper/events.py,sha256=jXRyWyq_yFJHURs0YPyhKo4tR6dQ7FvGGqen9RfGqp4,5261
 boneio/helper/exceptions.py,sha256=2t7WvfE2vS17eK9cV4l_RmBEug1ZlkPXWLRMxDSPLFI,474
-boneio/helper/gpio.py,sha256=HOImpow_6rVOtgZ5FAZd-En61jNyigp2AVZMXYW0x3U,2765
+boneio/helper/gpio.py,sha256=5EJwzrSTTurAolp2VHLSJm1T78_BluUgNYSSz_BaEKs,2765
 boneio/helper/ha_discovery.py,sha256=0Ab5xwplKoxArYTSwt5xyBtn5MaVbKlzdoRNw3tpRN8,5480
 boneio/helper/loader.py,sha256=qF0AKEz6TQhB0WLCHMx8LVV8l2CkiFgooW1ejvJtc34,11427
 boneio/helper/logger.py,sha256=8B0qeNPALGG5Dlz0cfujjknbf-TOPv4axLF3xj_Bzs8,1800
@@ -36,7 +36,7 @@ boneio/helper/ds2482/__init__.py,sha256=Zsh_6hLOta9gjognR_ECideMmwtMTYpWN757eybC
 boneio/helper/ds2482/ds2482.py,sha256=c2t_hdAMtFsHw4Vw41QzO_hEDDNMeb3J71mEwEMUBhM,5169
 boneio/helper/ds2482/onewire.py,sha256=KTNFmFFhNQsxnu0ue_GpBjilv54F1XJnWgVly-0BTIU,1085
 boneio/input/__init__.py,sha256=u9wuehuC_TNizL4tyn7EygZW5LaTFjSnFaZeZr3zZ1U,99
-boneio/input/gpio.py,sha256=kLsi6KRD_cZGnmsIp758TZ3tj5hegNYQPyEXYlkmc-s,4318
+boneio/input/gpio.py,sha256=dGWVB10FY8FCwoZFDa1zIzcxVCTjA3dcLa-veuw2fuk,4408
 boneio/relay/__init__.py,sha256=L_Peoep10-DdeMrEe-5YnnNCS-mxHtavCqtAesTPWFQ,135
 boneio/relay/basic.py,sha256=QTax7fGU3YrVx1wBH2Z91w3Hv_ALMs8EiJ4Tdkh1xno,2629
 boneio/relay/gpio.py,sha256=miuE2fOozmBnFf2Es4wqa5RivtZlUR8NFDGNAoajUk0,1163
@@ -48,7 +48,7 @@ boneio/schema/schema.yaml,sha256=uSA-o14-l7hcOb9Iu9OFiSGDHwBjlMEvsL4YWmyc5po,111
 boneio/sensor/__init__.py,sha256=jE2rgBN3eR0mh2nYA3J-H15RSjZB0J7k1eYNjnm47f4,419
 boneio/sensor/adc.py,sha256=mAxzgs0Eul1V6Fmye9V7TsJiPRnc59TQ-s7nb_PV7G8,1245
 boneio/sensor/gpio.py,sha256=9f_hNcCYvrEb7FvA00Xm-L5-fUXdH4SM-jZiOamOz2Q,1230
-boneio/sensor/modbus/__init__.py,sha256=Pk1xrgRl126-9WkIXMair6H9HZWpD9_WoKfgFKVrA8M,8430
+boneio/sensor/modbus/__init__.py,sha256=Ioym7nViLQPWqb0Be1iKezTB8dQSdyNzrnCe6zi-iqc,8483
 boneio/sensor/modbus/sdm120.json,sha256=4sueFfSw7G6a77gdIUhbfJvE-MNVJFOeVbRvHDw5Rvk,4145
 boneio/sensor/modbus/sdm630.json,sha256=6LbIfXWk_PVRW-OuJwrsFEnRGLVEmEqqGIbj-1FDaiI,10969
 boneio/sensor/modbus/sofar.json,sha256=A_YztQN_ctyItIm2LH1tfcs-pSyG18I530qleLd2tOw,5592
@@ -56,9 +56,9 @@ boneio/sensor/temp/__init__.py,sha256=AgjEbpkyY1D2Wo7tOGSFKr_uD2LexwLiezkaYP36yE
 boneio/sensor/temp/dallas.py,sha256=K-dOme8s1AGEvsbHeb3Tt3pkHrFwhX7_CAXiq8Se2uY,1168
 boneio/sensor/temp/lm75.py,sha256=aTvNlG6z7Kk2QnKtjTxq6NLV46-BH7AVHFt7g9XExbY,241
 boneio/sensor/temp/mcp9808.py,sha256=1DKfZyzFHA425xNSPS5is8nWWsClT-D0AbrQx9zgAJg,269
-boneio-0.3.0.dev6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneio-0.3.0.dev6.dist-info/METADATA,sha256=NUHm0qYpXDomocRBX9T2RPNAjqvi_HT9dmF5TPVcw-Y,1944
-boneio-0.3.0.dev6.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-boneio-0.3.0.dev6.dist-info/entry_points.txt,sha256=JX7gluDIkQ6MBlzzxGHMItnBjciiJ73tsXwYcazMW_U,47
-boneio-0.3.0.dev6.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
-boneio-0.3.0.dev6.dist-info/RECORD,,
+boneio-0.3.0.dev7.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneio-0.3.0.dev7.dist-info/METADATA,sha256=tZGNGrZaKKi7VxIU2udrcpH23qa1ZvjG_MJ9ihvUlxY,1944
+boneio-0.3.0.dev7.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+boneio-0.3.0.dev7.dist-info/entry_points.txt,sha256=JX7gluDIkQ6MBlzzxGHMItnBjciiJ73tsXwYcazMW_U,47
+boneio-0.3.0.dev7.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
+boneio-0.3.0.dev7.dist-info/RECORD,,