boneIO 0.3.0.dev7__tar.gz → 0.3.0.dev9__tar.gz

{boneio-0.3.0.dev7/boneio.egg-info → boneio-0.3.0.dev9}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.3.0.dev7
+Version: 0.3.0.dev9
 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.dev7.zip
+Download-URL: https://github.com/boneIO-eu/app_bbb/archive/0.3.0.dev9.zip
 License: GNU General Public License v3.0
 Platform: UNKNOWN
 Classifier: Programming Language :: Python

{boneio-0.3.0.dev7 → boneio-0.3.0.dev9}/boneio/const.py

@@ -48,9 +48,13 @@ 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"},
 }
 
+
 # HA CONSTS
 HOMEASSISTANT = "homeassistant"
 HA_DISCOVERY = "ha_discovery"

{boneio-0.3.0.dev7 → boneio-0.3.0.dev9}/boneio/helper/events.py

@@ -79,6 +79,7 @@ class EventBus:
         self._loop = loop or asyncio.get_event_loop()
         self._listeners = {}
         self._sigterm_listeners = []
+        self._haonline_listeners = []
         self._timer_handle = _async_create_timer(self._loop, self._run_second_event)
         for signame in {"SIGINT", "SIGTERM"}:
             self._loop.add_signal_handler(
@@ -113,6 +114,15 @@ class EventBus:
         """Add sigterm listener."""
         self._sigterm_listeners.append(target)
 
+    def add_haonline_listener(self, target):
+        """Add HA Online listener."""
+        self._haonline_listeners.append(target)
+
+    def signal_ha_online(self):
+        """Call events if HA goes online."""
+        for target in self._haonline_listeners:
+            target()
+
     def remove_listener(self, name):
         """Remove regular listener."""
         if name in self._listeners:

{boneio-0.3.0.dev7 → boneio-0.3.0.dev9}/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.dev7 → boneio-0.3.0.dev9}/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)
@@ -157,12 +156,7 @@ def create_mcp23017(
     return grouped_outputs
 
 
-def create_modbus_sensors(
-    manager: Manager,
-    config_helper: ConfigHelper,
-    modbus: Modbus,
-    sensors,
-) -> None:
+def create_modbus_sensors(manager: Manager, sensors, **kwargs) -> None:
     """Create Modbus sensor for each device."""
     from boneio.sensor.modbus import ModbusSensor
 
@@ -171,14 +165,13 @@ def create_modbus_sensors(
         id = name.replace(" ", "")
         try:
             sdm = ModbusSensor(
-                modbus=modbus,
                 address=sensor[ADDRESS],
                 id=id,
                 name=name,
                 model=sensor[MODEL],
                 send_message=manager.send_message,
-                config_helper=config_helper,
                 update_interval=sensor.get(UPDATE_INTERVAL, TimePeriod(seconds=60)),
+                **kwargs,
             )
             manager.append_task(asyncio.create_task(sdm.send_state()))
         except FileNotFoundError as err:

{boneio-0.3.0.dev7 → boneio-0.3.0.dev9}/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):
@@ -127,6 +135,7 @@ class Manager:
 
             create_modbus_sensors(
                 manager=self,
+                event_bus=self._event_bus,
                 sensors=sensors.get(MODBUS),
                 modbus=self._modbus,
                 config_helper=self._config_helper,
@@ -390,6 +399,7 @@ class Manager:
         if topic.startswith(f"{self._config_helper.ha_discovery_prefix}/status"):
             if message == ONLINE:
                 self.resend_autodiscovery()
+                self._event_bus.signal_ha_online()
             return
         assert topic.startswith(self._config_helper.cmd_topic_prefix)
         topic_parts_raw = topic[len(self._config_helper.cmd_topic_prefix) :].split("/")

{boneio-0.3.0.dev7 → boneio-0.3.0.dev9}/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.dev7 → boneio-0.3.0.dev9}/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.dev7 → boneio-0.3.0.dev9}/boneio/sensor/modbus/__init__.py

@@ -1,4 +1,3 @@
-from distutils.command.config import config
 import logging
 import asyncio
 from datetime import datetime
@@ -23,7 +22,7 @@ from boneio.helper.ha_discovery import modbus_sensor_availabilty_message
 from boneio.helper.timeperiod import TimePeriod
 from boneio.helper.config import ConfigHelper
 from boneio.modbus import Modbus
-
+from boneio.helper.events import EventBus
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -98,6 +97,7 @@ class ModbusSensor(BasicMqtt):
         address: str,
         model: str,
         config_helper: ConfigHelper,
+        event_bus: EventBus,
         id: str = DefaultName,
         update_interval: TimePeriod = TimePeriod(seconds=60),
         **kwargs,
@@ -116,6 +116,11 @@ class ModbusSensor(BasicMqtt):
         self._address = address
         self._discovery_sent = False
         self._update_interval = update_interval
+        self._payload_online = OFFLINE
+        event_bus.add_haonline_listener(target=self.set_payload_offline)
+
+    def set_payload_offline(self):
+        self._payload_online = OFFLINE
 
     def _send_ha_autodiscovery(
         self, id: str, sdm_name: str, sensor_id: str, **kwargs
@@ -190,7 +195,7 @@ class ModbusSensor(BasicMqtt):
     async def send_state(self) -> None:
         """Fetch state periodically and send to MQTT."""
         update_interval = self._update_interval.total_seconds
-        payload_online = OFFLINE
+        self.set_payload_offline()
         while True:
             await self.check_availability()
             for data in self._db[REGISTERS_BASE]:
@@ -200,12 +205,12 @@ class ModbusSensor(BasicMqtt):
                     count=data[LENGTH],
                     method=data.get("register_type", "input"),
                 )
-                if payload_online == OFFLINE and values:
+                if self._payload_online == OFFLINE and values:
                     _LOGGER.info("Sending online payload about device.")
-                    payload_online = ONLINE
+                    self._payload_online = ONLINE
                     self._send_message(
                         topic=f"{self._config_helper.topic_prefix}/{self._id}{STATE}",
-                        payload=payload_online,
+                        payload=self._payload_online,
                     )
                 if not values:
                     if update_interval < 600:
@@ -213,10 +218,10 @@ class ModbusSensor(BasicMqtt):
                         update_interval = update_interval * 1.5
                     else:
                         # Let's assume device is offline.
-                        payload_online = OFFLINE
+                        self.set_payload_offline()
                         self._send_message(
                             topic=f"{self._config_helper.topic_prefix}/{self._id}{STATE}",
-                            payload=payload_online,
+                            payload=self._payload_online,
                         )
                     _LOGGER.warn(
                         "Can't fetch data from modbus device. Will sleep for %s seconds",

boneio-0.3.0.dev9/boneio/version.py

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

{boneio-0.3.0.dev7 → boneio-0.3.0.dev9/boneio.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: boneio
-Version: 0.3.0.dev7
+Version: 0.3.0.dev9
 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.dev7.zip
+Download-URL: https://github.com/boneIO-eu/app_bbb/archive/0.3.0.dev9.zip
 License: GNU General Public License v3.0
 Platform: UNKNOWN
 Classifier: Programming Language :: Python

boneio-0.3.0.dev7/boneio/version.py

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