boneIO 0.3.0.dev6__tar.gz → 0.3.0.dev8__tar.gz

{boneio-0.3.0.dev6/boneio.egg-info → boneio-0.3.0.dev8}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.3.0.dev6
+Version: 0.3.0.dev8
 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.dev8.zip
 License: GNU General Public License v3.0
 Platform: UNKNOWN
 Classifier: Programming Language :: Python

{boneio-0.3.0.dev6 → boneio-0.3.0.dev8}/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
 
@@ -47,14 +48,12 @@ RESTORE_STATE = "restore_state"
 MODEL = "model"
 UARTS = {
     "uart1": {ID: "/dev/ttyS1", TX: "P9.24", RX: "P9.26"},
+    "uart2": {ID: "/dev/ttyS2", TX: "P9.21", RX: "P9.22"},
+    "uart3": {ID: "/dev/ttyS3", TX: "P9.42", RX: None},
     "uart4": {ID: "/dev/ttyS4", TX: "P9.13", RX: "P9.11"},
+    "uart5": {ID: "/dev/ttyS5", TX: "P8.37", RX: "P8.38"},
 }
 
-# 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"

{boneio-0.3.0.dev6 → boneio-0.3.0.dev8}/boneio/example_config/config.yaml

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

{boneio-0.3.0.dev6 → boneio-0.3.0.dev8}/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-0.3.0.dev6 → boneio-0.3.0.dev8}/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-0.3.0.dev6 → boneio-0.3.0.dev8}/boneio/helper/exceptions.py

@@ -23,3 +23,7 @@ class ConfigurationException(BoneIOException):
 
 class CoverRelayException(BoneIOException):
     """Cover configuration exception."""
+
+
+class ModbusUartException(BoneIOException):
+    """Cover configuration exception."""

{boneio-0.3.0.dev6 → boneio-0.3.0.dev8}/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-0.3.0.dev6 → boneio-0.3.0.dev8}/boneio/helper/loader.py

@@ -127,7 +127,6 @@ def create_temp_sensor(
             ha_type=SENSOR,
             availability_msg_func=ha_sensor_temp_availabilty_message,
         )
-        manager.append_task(asyncio.create_task(temp_sensor.send_state()))
         return temp_sensor
     except I2CError as err:
         _LOGGER.error("Can't configure Temp sensor. %s", err)

{boneio-0.3.0.dev6 → boneio-0.3.0.dev8}/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-0.3.0.dev6 → boneio-0.3.0.dev8}/boneio/manager.py

@@ -46,6 +46,7 @@ from boneio.helper import (
 
 from boneio.helper.config import ConfigHelper
 from boneio.helper.events import EventBus
+from boneio.helper.exceptions import ModbusUartException
 from boneio.helper.loader import (
     configure_cover,
     configure_input,
@@ -107,7 +108,14 @@ class Manager:
         self._temp_sensors = []
         self._modbus = None
         if modbus and modbus.get(UART) in UARTS:
-            self._modbus = Modbus(UARTS[modbus.get(UART)])
+            try:
+                self._modbus = Modbus(UARTS[modbus.get(UART)])
+            except ModbusUartException:
+                _LOGGER.error(
+                    "This UART %s can't be used for modbus communication.",
+                    modbus.get(UART),
+                )
+                self._modbus = None
 
         for sensor_type in (LM75, MCP_TEMP_9808):
             if sensors.get(sensor_type):
@@ -374,14 +382,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-0.3.0.dev6 → boneio-0.3.0.dev8}/boneio/modbus.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import logging
 from boneio.helper import configure_pin
+from boneio.helper.exceptions import ModbusUartException
 from boneio.const import ID, RX, TX, UART, REGISTERS
 from pymodbus.client.sync import (
     BaseModbusClient,
@@ -23,9 +24,13 @@ class Modbus:
 
     def __init__(self, uart: dict[str, Any]) -> None:
         """Initialize the Modbus hub."""
+        rx = uart.get(RX)
+        tx = uart.get(TX)
+        if not tx or not rx:
+            raise ModbusUartException
 
-        configure_pin(pin=uart[RX], mode=UART)
-        configure_pin(pin=uart[TX], mode=UART)
+        configure_pin(pin=rx, mode=UART)
+        configure_pin(pin=tx, mode=UART)
         self._uart = uart
 
         # generic configuration

{boneio-0.3.0.dev6 → boneio-0.3.0.dev8}/boneio/schema/schema.yaml

@@ -93,6 +93,7 @@ modbus:
     uart:
       type: string
       required: True
+      allowed: ["uart1", "uart2", "uart3", "uart4", "uart5"]
       meta:
         label: Uart ID to use
 

{boneio-0.3.0.dev6 → boneio-0.3.0.dev8}/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-0.3.0.dev8/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "0.3.0.dev8"

{boneio-0.3.0.dev6 → boneio-0.3.0.dev8/boneio.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.3.0.dev6
+Version: 0.3.0.dev8
 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.dev8.zip
 License: GNU General Public License v3.0
 Platform: UNKNOWN
 Classifier: Programming Language :: Python

boneio-0.3.0.dev6/boneio/version.py

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