boneIO 0.8.0.dev13__tar.gz → 0.8.0.dev15__tar.gz

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/PKG-INFO

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

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/cover.py

@@ -1,10 +1,20 @@
 """Cover module."""
+
 from __future__ import annotations
 import asyncio
 import logging
 from typing import Callable
 
-from boneio.const import CLOSE, CLOSED, CLOSING, COVER, IDLE, OPEN, OPENING, STOP
+from boneio.const import (
+    CLOSE,
+    CLOSED,
+    CLOSING,
+    COVER,
+    IDLE,
+    OPEN,
+    OPENING,
+    STOP,
+)
 from boneio.helper.events import EventBus
 from boneio.helper.mqtt import BasicMqtt
 from boneio.helper.timeperiod import TimePeriod
@@ -121,7 +131,9 @@ class Cover(BasicMqtt):
 
     def send_state(self) -> None:
         """Send state of cover to mqtt."""
-        self._send_message(topic=f"{self._send_topic}/state", payload=self.cover_state)
+        self._send_message(
+            topic=f"{self._send_topic}/state", payload=self.cover_state
+        )
         pos = round(self._position, 0)
         self._send_message(topic=f"{self._send_topic}/pos", payload=str(pos))
         self._state_save(position=pos)
@@ -161,7 +173,9 @@ class Cover(BasicMqtt):
         if self._set_position:
             # Set position is only working for every 10%, so round to nearest 10.
             # Except for start moving time
-            if (self._requested_closing and rounded_pos < 95) or rounded_pos > 5:
+            if (
+                self._requested_closing and rounded_pos < 95
+            ) or rounded_pos > 5:
                 rounded_pos = round(self._position, -1)
         else:
             if rounded_pos > 100:
@@ -170,7 +184,8 @@ class Cover(BasicMqtt):
                 rounded_pos = 0
         self._send_message(topic=f"{self._send_topic}/pos", payload=rounded_pos)
         if rounded_pos == self._set_position or (
-            self._set_position is None and (rounded_pos >= 100 or rounded_pos <= 0)
+            self._set_position is None
+            and (rounded_pos >= 100 or rounded_pos <= 0)
         ):
             self._position = rounded_pos
             self._closed = self.current_cover_position <= 0
@@ -222,9 +237,13 @@ class Cover(BasicMqtt):
         self._requested_closing = set_position < self._position
         current_operation = CLOSING if self._requested_closing else OPENING
         _LOGGER.debug(
-            "Requested set position %s. Operation %s", set_position, current_operation
+            "Requested set position %s. Operation %s",
+            set_position,
+            current_operation,
+        )
+        self._send_message(
+            topic=f"{self._send_topic}/state", payload=current_operation
         )
-        self._send_message(topic=f"{self._send_topic}/state", payload=current_operation)
         await self.run_cover(
             current_operation=current_operation,
         )

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/modbus/client.py

@@ -20,17 +20,61 @@ from boneio.helper.exceptions import ModbusUartException
 _LOGGER = logging.getLogger(__name__)
 
 VALUE_TYPES = {
-    "U_WORD": {"f": "decode_16bit_uint", "byteorder": Endian.Big},
-    "S_WORD": {"f": "decode_16bit_int", "byteorder": Endian.Big},
-    "U_DWORD": {"f": "decode_32bit_uint", "byteorder": Endian.Big},
-    "S_DWORD": {"f": "decode_32bit_int", "byteorder": Endian.Big},
-    "U_DWORD_R": {"f": "decode_32bit_uint", "byteorder": Endian.Little},
-    "S_DWORD_R": {"f": "decode_32bit_int", "byteorder": Endian.Little},
-    "U_QWORD": {"f": "decode_64bit_uint", "byteorder": Endian.Big},
-    "S_QWORD": {"f": "decode_64bit_int", "byteorder": Endian.Big},
-    "U_QWORD_R": {"f": "decode_64bit_uint", "byteorder": Endian.Little},
-    "FP32": {"f": "decode_32bit_float", "byteorder": Endian.Big},
-    "FP32_R": {"f": "decode_32bit_float", "byteorder": Endian.Little},
+    "U_WORD": {
+        "f": "decode_16bit_uint",
+        "byteorder": Endian.Big,
+        "count": 1,
+    },
+    "S_WORD": {
+        "f": "decode_16bit_int",
+        "byteorder": Endian.Big,
+        "count": 1,
+    },
+    "U_DWORD": {
+        "f": "decode_32bit_uint",
+        "byteorder": Endian.Big,
+        "count": 2,
+    },
+    "S_DWORD": {
+        "f": "decode_32bit_int",
+        "byteorder": Endian.Big,
+        "count": 2,
+    },
+    "U_DWORD_R": {
+        "f": "decode_32bit_uint",
+        "byteorder": Endian.Little,
+        "count": 2,
+    },
+    "S_DWORD_R": {
+        "f": "decode_32bit_int",
+        "byteorder": Endian.Little,
+        "count": 2,
+    },
+    "U_QWORD": {
+        "f": "decode_64bit_uint",
+        "byteorder": Endian.Big,
+        "count": 4,
+    },
+    "S_QWORD": {
+        "f": "decode_64bit_int",
+        "byteorder": Endian.Big,
+        "count": 4,
+    },
+    "U_QWORD_R": {
+        "f": "decode_64bit_uint",
+        "byteorder": Endian.Little,
+        "count": 4,
+    },
+    "FP32": {
+        "f": "decode_32bit_float",
+        "byteorder": Endian.Big,
+        "count": 2,
+    },
+    "FP32_R": {
+        "f": "decode_32bit_float",
+        "byteorder": Endian.Little,
+        "count": 2,
+    },
 }
 
 
@@ -167,9 +211,5 @@ class Modbus:
         decoder = BinaryPayloadDecoder.fromRegisters(
             registers=payload, byteorder=_payload_type["byteorder"]
         )
-        try:
-            value = getattr(decoder, _payload_type["f"])()
-            return value
-        except Exception as e:
-            _LOGGER.error(e)
-            return None
+        value = getattr(decoder, _payload_type["f"])()
+        return value

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/modbus/liquid-sensor.json

@@ -18,13 +18,13 @@
   },
   "registers_base": [
     {
-      "base": 0,
+      "base": 7,
       "length": 2,
       "register_type": "holding",
       "registers": [
         {
           "name": "Immersion depth",
-          "address": 0,
+          "address": 7,
           "unit_of_measurement": "mm",
           "state_class": "measurement",
           "device_class": "humidity",

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/modbus/modbuscli.py

@@ -63,7 +63,11 @@ class ModbusHelper:
             _LOGGER.error("No returned value.")
             return False
         payload = value.registers[0:count]
-        decoded_value = self._modbus.decode_value(payload, value_type)
+        try:
+            decoded_value = self._modbus.decode_value(payload, value_type)
+        except Exception as e:
+            _LOGGER.error("Decoding error during checking connection %s", e)
+            decoded_value = None
         for filter in self._check_record.get("filters", []):
             for key, value in filter.items():
                 if key in allowed_operations:

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/modbus/orno-or-we-517.json

@@ -1,5 +1,5 @@
 {
-  "model": "orno-or-we-517",
+  "model": "Orno OR-WE-517",
   "registers_base": [
     {
       "base": 14,

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/modbus/sensor.py

@@ -23,7 +23,7 @@ from boneio.const import (
 from boneio.helper import BasicMqtt, AsyncUpdater
 from boneio.helper.config import ConfigHelper
 from boneio.helper.events import EventBus
-from .client import Modbus
+from .client import Modbus, VALUE_TYPES
 from .single_sensor import SingleSensor
 from boneio.helper.util import open_json
 
@@ -194,12 +194,24 @@ class ModbusSensor(BasicMqtt, AsyncUpdater, Filter):
                     )
                 else:
                     start_index = sensor.address - sensor.base_address
+                    count = VALUE_TYPES[sensor.value_type]["count"]
                     payload = values.registers[
-                        start_index : start_index + 2
-                    ]  # fix this in future
-                    decoded_value = self._modbus.decode_value(
-                        payload, sensor.value_type
-                    )
+                        start_index : start_index + count
+                    ]
+                    try:
+                        decoded_value = self._modbus.decode_value(
+                            payload, sensor.value_type
+                        )
+                    except Exception as e:
+                        _LOGGER.error(
+                            "Decoding error for %s at address %s, base: %s, length: %s, error %s",
+                            sensor.name,
+                            sensor.address,
+                            sensor.base_address,
+                            data[LENGTH],
+                            e,
+                        )
+                        decoded_value = None
                 sensor.set_value(value=decoded_value)
                 output[sensor.decoded_name] = sensor.state
             self._send_message(

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/modbus/utils.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 from struct import unpack
 
 
-allowed_operations = {"multiply": lambda x, y: x * y}
+allowed_operations = {"multiply": lambda x, y: x * y if x else x}
 
 
 def float32(result, base, addr):

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/mqtt_client.py

@@ -2,6 +2,7 @@
 Provide an MQTT client for providing BoneIO MQTT broker.
 Code based on cgarwood/python-openzwave-mqtt.
 """
+
 from __future__ import annotations
 import asyncio
 import json
@@ -48,8 +49,18 @@ class MQTTClient:
         self.reconnect_interval = 1
         self._connection_established = False
         self.publish_queue: UniqueQueue = UniqueQueue()
-        self._discovery_topics = [f"{self._config_helper.ha_discovery_prefix}/{ha_type}/{self._config_helper.topic_prefix}/#" for ha_type in self._config_helper.ha_types] if self._config_helper.ha_discovery else []
-        self._topics = [self._config_helper.subscribe_topic, "homeassistant/status"]
+        self._discovery_topics = (
+            [
+                f"{self._config_helper.ha_discovery_prefix}/{ha_type}/{self._config_helper.topic_prefix}/#"
+                for ha_type in self._config_helper.ha_types
+            ]
+            if self._config_helper.ha_discovery
+            else []
+        )
+        self._topics = [
+            self._config_helper.subscribe_topic,
+            "homeassistant/status",
+        ]
 
     def create_client(self) -> None:
         """Create the asyncio client."""
@@ -110,7 +121,9 @@ class MQTTClient:
             params["properties"] = properties
 
         # e.g. subscribe([("my/topic", SubscribeOptions(qos=0), ("another/topic", SubscribeOptions(qos=2)])
-        await self.asyncio_client.subscribe(topic=args, **params, timeout=timeout)
+        await self.asyncio_client.subscribe(
+            topic=args, **params, timeout=timeout
+        )
 
     async def unsubscribe(
         self,
@@ -129,7 +142,10 @@ class MQTTClient:
         await self.asyncio_client.unsubscribe(topic=topics, **params)
 
     def send_message(
-        self, topic: str, payload: Union[str, int, dict, None], retain: bool = False
+        self,
+        topic: str,
+        payload: Union[str, int, dict, None],
+        retain: bool = False,
     ) -> None:
         """Send a message from the manager options."""
         to_publish = (
@@ -154,7 +170,9 @@ class MQTTClient:
                 try:
                     await self._subscribe_manager(manager)
                 except MqttError as err:
-                    self.reconnect_interval = min(self.reconnect_interval * 2, 900)
+                    self.reconnect_interval = min(
+                        self.reconnect_interval * 2, 600
+                    )
                     _LOGGER.error(
                         "MQTT error: %s. Reconnecting in %s seconds",
                         err,
@@ -168,15 +186,13 @@ class MQTTClient:
             pass
 
     async def stop_client(self) -> None:
-        await self.unsubscribe(
-            topics=self._topics
-        )
+        await self.unsubscribe(topics=self._topics)
         raise RestartRequestException("Restart requested.")
-    
+
     def state(self) -> bool:
         """State of MQTT Client."""
         return self._connection_established
-    
+
     async def _subscribe_manager(self, manager: Manager) -> None:
         """Connect and subscribe to manager topics + host stats."""
         async with AsyncExitStack() as stack:
@@ -200,21 +216,21 @@ class MQTTClient:
             )
             if not self._connection_established:
                 self._connection_established = True
-                reconnect_task = asyncio.create_task(manager.reconnect_callback())
+                reconnect_task = asyncio.create_task(
+                    manager.reconnect_callback()
+                )
                 tasks.add(reconnect_task)
             tasks.add(messages_task)
 
-            await self.subscribe(
-                topics=self._topics
-            )
-            await self.subscribe(
-                topics=self._discovery_topics
-            )
+            await self.subscribe(topics=self._topics)
+            await self.subscribe(topics=self._discovery_topics)
 
             # Wait for everything to complete (or fail due to, e.g., network errors).
             await asyncio.gather(*tasks)
 
-    async def handle_messages(self, messages: Any, callback: Callable[[str, str], Awaitable[None]]):
+    async def handle_messages(
+        self, messages: Any, callback: Callable[[str, str], Awaitable[None]]
+    ):
         """Handle messages with callback or remove obsolete HA discovery messages."""
         async for message in messages:
             payload = message.payload.decode()
@@ -223,10 +239,23 @@ class MQTTClient:
                 if message.topic.matches(discovery_topic):
                     callback_start = False
                     topic = str(message.topic)
-                    if message.payload and not self._config_helper.is_topic_in_autodiscovery(topic):
-                        _LOGGER.info("Removing unused discovery entity %s", topic)
-                        self.send_message(topic=topic, payload=None, retain=True)
+                    if (
+                        message.payload
+                        and not self._config_helper.is_topic_in_autodiscovery(
+                            topic
+                        )
+                    ):
+                        _LOGGER.info(
+                            "Removing unused discovery entity %s", topic
+                        )
+                        self.send_message(
+                            topic=topic, payload=None, retain=True
+                        )
                     break
             if callback_start:
-                _LOGGER.debug("Received message topic: %s, payload: %s", message.topic, payload)
+                _LOGGER.debug(
+                    "Received message topic: %s, payload: %s",
+                    message.topic,
+                    payload,
+                )
                 await callback(str(message.topic), payload)

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/sensor/temp/__init__.py

@@ -32,7 +32,8 @@ class TempSensor(BasicMqtt, AsyncUpdater, Filter):
         self._loop = asyncio.get_event_loop()
         self._filters = filters
         try:
-            self._pct = self.SensorClass(i2c_bus=i2c, address=address)
+            if self.SensorClass:
+                self._pct = self.SensorClass(i2c_bus=i2c, address=address)
             self._state: float | None = None
         except ValueError as err:
             raise I2CError(err)
@@ -41,7 +42,7 @@ class TempSensor(BasicMqtt, AsyncUpdater, Filter):
     @property
     def state(self) -> float:
         """Give rounded value of temperature."""
-        return self._state
+        return self._state or -1
 
     def update(self, time: datetime) -> None:
         """Fetch temperature periodically and send to MQTT."""

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/sensor/temp/dallas.py

@@ -10,7 +10,11 @@ from w1thermsensor import SensorNotReadyError, NoSensorFoundError
 from boneio.const import SENSOR, STATE, TEMPERATURE
 from boneio.helper import AsyncUpdater, BasicMqtt
 from boneio.helper.exceptions import OneWireError
-from boneio.helper.onewire import AsyncBoneIOW1ThermSensor, OneWireAddress, OneWireBus
+from boneio.helper.onewire import (
+    AsyncBoneIOW1ThermSensor,
+    OneWireAddress,
+    OneWireBus,
+)
 
 from . import TempSensor
 
@@ -54,6 +58,7 @@ class DallasSensorW1(TempSensor, AsyncUpdater):
         self._loop = asyncio.get_event_loop()
         BasicMqtt.__init__(self, id=id, topic_type=SENSOR, **kwargs)
         self._filters = filters
+        self._state = None
         try:
             self._pct = AsyncBoneIOW1ThermSensor(sensor_id=address)
         except ValueError as err:

boneIO-0.8.0.dev15/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "0.8.0dev15"

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "Adafruit-BBIO>=1.2.0",
 ]
 requires-python = ">=3.7"
-version = "0.8.0.dev13"
+version = "0.8.0.dev15"
 
 [project.license]
 text = "GNU General Public License v3.0"

boneIO-0.8.0.dev13/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "0.8.0dev13"

{boneIO-0.8.0.dev13 → boneIO-0.8.0.dev15}/boneio/helper/filter.py

@@ -28,7 +28,7 @@ class Filter:
                         "Filter %s doesn't exists. Fix it in config.", k
                     )
                     continue
-                value = FILTERS[k](value, v)
                 if value is None:
                     return None
+                value = FILTERS[k](value, v)
         return value