boneIO 0.8.0.dev18__tar.gz → 0.8.2__tar.gz

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/PKG-INFO

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

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/boneio/helper/filter.py

@@ -1,6 +1,7 @@
 """Filter class to adjust sensor values."""
 
 from __future__ import annotations
+from typing import Optional
 import logging
 
 _LOGGER = logging.getLogger(__name__)
@@ -9,7 +10,7 @@ _LOGGER = logging.getLogger(__name__)
 FILTERS = {
     "offset": lambda x, y: x + y,
     "round": lambda x, y: round(x, y),
-    "multiply": lambda x, y: x * y,
+    "multiply": lambda x, y: x * y if x else x,
     "filter_out": lambda x, y: None if x == y else x,
     "filter_out_greater": lambda x, y: None if x > y else x,
     "filter_out_lower": lambda x, y: None if x < y else x,
@@ -19,8 +20,10 @@ FILTERS = {
 class Filter:
     _filters = []
 
-    def _apply_filters(self, value: float, filters: list = []) -> float | None:
-        filters = filters if filters else self._filters
+    def _apply_filters(
+        self, value: float | None, filters: Optional[list] = None
+    ) -> float | None:
+        filters = filters if filters is not None else self._filters
         for filter in filters:
             for k, v in filter.items():
                 if k not in FILTERS:

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/boneio/helper/gpio.py

@@ -157,7 +157,6 @@ class GpioBaseClass:
         actions: List = [],
     ) -> None:
 
-        _LOGGER.warning("press callback %s", datetime.now())
         await self._press_callback(
             click_type,
             self._pin,

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/boneio/helper/stats.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 import asyncio
+import logging
 from datetime import datetime
 import socket
 import time
@@ -37,6 +38,7 @@ from boneio.helper.timeperiod import TimePeriod
 from boneio.sensor import LM75Sensor, MCP9808Sensor, INA219 as INA219Class
 from boneio.version import __version__
 
+_LOGGER = logging.getLogger(__name__)
 intervals = (("d", 86400), ("h", 3600), ("m", 60))
 
 
@@ -259,6 +261,11 @@ class HostData:
                             single_sensor = _modbus_sensors.get_sensor_by_name(
                                 sensor_id
                             )
+                            if not single_sensor:
+                                _LOGGER.warning(
+                                    "Sensor %s not found", sensor_id
+                                )
+                                continue
                             short_name = "".join(
                                 [x[:3] for x in single_sensor.name.split()]
                             )

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/boneio/modbus/sensor.py

@@ -94,13 +94,25 @@ class ModbusSensor(BasicMqtt, AsyncUpdater, Filter):
                 self._modbus_sensors[index][
                     single_sensor.decoded_name
                 ] = single_sensor
+        _LOGGER.info(
+            "Available single sensors for %s: %s",
+            self._name,
+            ", ".join(
+                [
+                    s.name
+                    for sensors in self._modbus_sensors
+                    for s in sensors.values()
+                ]
+            ),
+        )
         event_bus.add_haonline_listener(target=self.set_payload_offline)
         AsyncUpdater.__init__(self, **kwargs)
 
     def get_sensor_by_name(self, name: str) -> Optional[SingleSensor]:
         """Return sensor by name."""
         for sensors in self._modbus_sensors:
-            return sensors.get(name)
+            if name in sensors:
+                return sensors.get(name)
         return None
 
     def set_payload_offline(self):

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/boneio/modbus/single_sensor.py

@@ -71,11 +71,7 @@ class SingleSensor(Filter):
         self._user_filters = user_filters
 
     def set_value(self, value):
-        for filter in self._filters:
-            for key, _v in filter.items():
-                if key in allowed_operations:
-                    lamda_function = allowed_operations[key]
-                    value = lamda_function(value, _v)
+        value = self._apply_filters(value=value)
         value = self._apply_filters(
             value=value,
             filters=self._user_filters,

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/boneio/modbus/socomec_e03.json

@@ -71,7 +71,7 @@
           "unit_of_measurement": "W",
           "state_class": "measurement",
           "value_type": "S_DWORD",
-          "filters": [{ "multiply": 0.001 }]
+          "filters": [{ "multiply": 10 }]
         }
       ]
     },

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/boneio/relay/pcf.py

@@ -4,7 +4,7 @@ import logging
 
 from adafruit_pcf8575 import DigitalInOut
 
-from boneio.const import NONE, SWITCH, PCF
+from boneio.const import NONE, SWITCH, PCF, ON, OFF
 from boneio.helper.events import async_track_point_in_time, utcnow
 from boneio.helper.pcf8575 import PCF8575
 from boneio.relay.basic import BasicRelay
@@ -66,18 +66,13 @@ class PCFRelay(BasicRelay):
     def turn_on(self) -> None:
         """Call turn on action."""
         self.pin.value = self._active_state
-        self.execute_momentary_turn_on()
+        self._execute_momentary_turn(momentary_type=ON)
         self._loop.call_soon_threadsafe(self.send_state)
         self._loop.call_soon_threadsafe(self._callback)
 
     def turn_off(self) -> None:
         """Call turn off action."""
         self.pin.value = not self._active_state
-        if self._momentary_turn_off:
-            async_track_point_in_time(
-                loop=self._loop,
-                action=lambda x: self._momentary_callback(time=x, action=self.turn_on),
-                point_in_time=utcnow() + self._momentary_turn_off.as_timedelta,
-            )
+        self._execute_momentary_turn(momentary_type=OFF)
         self._loop.call_soon_threadsafe(self.send_state)
         self._loop.call_soon_threadsafe(self._callback)

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/boneio/schema/schema.yaml

@@ -183,7 +183,15 @@ modbus_sensors:
         type: string
         required: True
         allowed:
-          ['sdm630', 'sdm120', 'sofar', 'socomec_e23', 'cwt', 'orno-or-we-517']
+          [
+            'sdm630',
+            'sdm120',
+            'sofar',
+            'socomec_e03',
+            'socomec_e23',
+            'cwt',
+            'orno-or-we-517',
+          ]
         meta:
           label: Model to load from database.
       update_interval:

boneIO-0.8.2/boneio/version.py

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

{boneIO-0.8.0.dev18 → boneIO-0.8.2}/pyproject.toml

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

boneIO-0.8.0.dev18/boneio/version.py

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