boneIO 0.8.0.dev9__tar.gz → 0.8.0.dev10__tar.gz

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/PKG-INFO

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

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/boneio/helper/gpio.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 import asyncio
 import logging
 from datetime import datetime
+
 try:
     from Adafruit_BBIO import GPIO
 except ModuleNotFoundError:
@@ -21,7 +22,14 @@ from typing import Callable, Awaitable, List
 
 from boneio.const import CONFIG_PIN, FALLING
 from boneio.const import GPIO as GPIO_STR
-from boneio.const import GPIO_MODE, LOW, ClickTypes, Gpio_Edges, Gpio_States, InputTypes
+from boneio.const import (
+    GPIO_MODE,
+    LOW,
+    ClickTypes,
+    Gpio_Edges,
+    Gpio_States,
+    InputTypes,
+)
 from boneio.helper.exceptions import GPIOInputException
 from boneio.helper.timeperiod import TimePeriod
 from concurrent.futures import ThreadPoolExecutor
@@ -79,7 +87,9 @@ def edge_detect(
 ) -> None:
     """Add detection for RISING and FALLING events."""
     try:
-        GPIO.add_event_detect(gpio=pin, edge=edge, callback=callback, bouncetime=bounce)
+        GPIO.add_event_detect(
+            gpio=pin, edge=edge, callback=callback, bouncetime=bounce
+        )
     except RuntimeError as err:
         raise GPIOInputException(err)
 
@@ -107,7 +117,8 @@ class GpioBaseClass:
         self,
         pin: str,
         press_callback: Callable[
-            [ClickTypes, str, List, InputTypes, bool, float | None], Awaitable[None]
+            [ClickTypes, str, List, InputTypes, bool, float | None],
+            Awaitable[None],
         ],
         name: str,
         actions: dict,
@@ -118,7 +129,9 @@ class GpioBaseClass:
         """Setup GPIO Input Button"""
         self._pin = pin
         gpio_mode = kwargs.get(GPIO_MODE, GPIO_STR)
-        bounce_time: TimePeriod = kwargs.get("bounce_time", TimePeriod(milliseconds=50))
+        bounce_time: TimePeriod = kwargs.get(
+            "bounce_time", TimePeriod(milliseconds=50)
+        )
         self._bounce_time = bounce_time.total_in_seconds
         self._loop = asyncio.get_running_loop()
         self._press_callback = press_callback
@@ -129,14 +142,22 @@ class GpioBaseClass:
         self._input_type = input_type
         self._empty_message_after = empty_message_after
 
-    def press_callback(self, click_type: ClickTypes, duration: float | None = None) -> None:
+    def press_callback(
+        self, click_type: ClickTypes, duration: float | None = None
+    ) -> None:
         actions = self._actions.get(click_type, [])
-        self._loop.create_task(self.async_press_callback(click_type, duration, actions))
+        self._loop.create_task(
+            self.async_press_callback(click_type, duration, actions)
+        )
 
     async def async_press_callback(
-        self, click_type: ClickTypes, duration: float | None = None, actions: List = []
+        self,
+        click_type: ClickTypes,
+        duration: float | None = None,
+        actions: List = [],
     ) -> None:
-        _LOGGER.warn("press callback %s", datetime.now())
+
+        _LOGGER.warning("press callback %s", datetime.now())
         await self._press_callback(
             click_type,
             self._pin,

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/boneio/helper/stats.py

@@ -233,13 +233,15 @@ class HostData:
             },
         }
         if ina219 is not None:
+
+            def get_ina_values():
+                return {
+                    sensor.device_class: f"{sensor.state} {sensor.unit_of_measurement}"
+                    for sensor in ina219.sensors.values()
+                }
+
             host_stats[INA219] = {
-                "f": lambda: {
-                    *{
-                        sensor.device_class: sensor.state
-                        for sensor in ina219.sensors.values()
-                    }
-                },
+                "f": get_ina_values,
                 "update_interval": TimePeriod(seconds=60),
             }
         self._data = {}

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/boneio/modbus/client.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import logging
 import struct
+import time
 from typing import Any
 
 from pymodbus.client.sync import BaseModbusClient, ModbusSerialClient
@@ -131,6 +132,7 @@ class Modbus:
     ) -> ModbusResponse:
         """Call async pymodbus."""
         async with self._lock:
+            start_time = time.perf_counter()
             if not self._pymodbus_connect():
                 _LOGGER.error("Can't connect to Modbus.")
                 return None
@@ -153,6 +155,11 @@ class Modbus:
             if not hasattr(result, REGISTERS):
                 _LOGGER.error(str(result))
                 return None
+            end_time = time.perf_counter()
+            _LOGGER.debug(
+                "Time of execution of read_registers: %s ms.",
+                round((end_time - start_time) * 1000, 3),
+            )
             return result
 
     def decode_value(self, payload, value_type):

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/boneio/modbus/orno-or-we-517.json

@@ -29,6 +29,14 @@
           "state_class": "measurement",
           "device_class": "voltage",
           "value_type": "FP32"
+        },
+        {
+          "name": "Grid Frequency",
+          "address": 18,
+          "unit_of_measurement": "V",
+          "state_class": "measurement",
+          "device_class": "voltage",
+          "value_type": "FP32"
         }
       ]
     }

boneIO-0.8.0.dev9/boneio/modbus/socomec_e23.json → boneIO-0.8.0.dev10/boneio/modbus/socomec_e03.json

@@ -1,5 +1,5 @@
 {
-  "model": "Socomec E23/E24",
+  "model": "Socomec E03",
   "registers_base": [
     {
       "base": 50520,

boneIO-0.8.0.dev10/boneio/modbus/socomec_e23.json

@@ -0,0 +1,164 @@
+{
+  "model": "Socomec E23/E24",
+  "registers_base": [
+    {
+      "base": 50520,
+      "length": 26,
+      "register_type": "holding",
+      "registers": [
+        {
+          "name": "Voltage_Phase1",
+          "address": 50520,
+          "unit_of_measurement": "V",
+          "state_class": "measurement",
+          "device_class": "voltage",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 0.01 }]
+        },
+        {
+          "name": "Voltage_Phase2",
+          "address": 50522,
+          "unit_of_measurement": "V",
+          "state_class": "measurement",
+          "device_class": "voltage",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 0.01 }]
+        },
+        {
+          "name": "Voltage_Phase3",
+          "address": 50524,
+          "unit_of_measurement": "V",
+          "state_class": "measurement",
+          "device_class": "voltage",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 0.01 }]
+        },
+        {
+          "name": "Frequency",
+          "address": 50526,
+          "unit_of_measurement": "Hz",
+          "state_class": "measurement",
+          "device_class": "voltage",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 0.001 }]
+        },
+        {
+          "name": "Current_Phase1",
+          "address": 50528,
+          "unit_of_measurement": "A",
+          "state_class": "measurement",
+          "device_class": "current",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 0.001 }]
+        },
+        {
+          "name": "Current_Phase2",
+          "address": 50530,
+          "unit_of_measurement": "A",
+          "state_class": "measurement",
+          "device_class": "current",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 0.001 }]
+        },
+        {
+          "name": "Current_Phase3",
+          "address": 50532,
+          "unit_of_measurement": "A",
+          "state_class": "measurement",
+          "device_class": "current",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 0.001 }]
+        },
+        {
+          "name": "Current_In",
+          "address": 50534,
+          "unit_of_measurement": "A",
+          "state_class": "measurement",
+          "device_class": "current",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 0.001 }]
+        },
+        {
+          "name": "Sum_Active_Power",
+          "address": 50536,
+          "unit_of_measurement": "W",
+          "state_class": "measurement",
+          "value_type": "S_DWORD",
+          "filters": [{ "multiply": 10 }]
+        },
+        {
+          "name": "Sum_Reactive_Power",
+          "address": 50538,
+          "unit_of_measurement": "var",
+          "state_class": "measurement",
+          "value_type": "S_DWORD",
+          "filters": [{ "multiply": 10 }]
+        },
+        {
+          "name": "Sum_Apparent_Power",
+          "address": 50540,
+          "unit_of_measurement": "VA",
+          "state_class": "measurement",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 10 }]
+        },
+        {
+          "name": "Sum_Power_Factor",
+          "address": 50542,
+          "unit_of_measurement": "",
+          "state_class": "measurement",
+          "value_type": "S_DWORD",
+          "filters": [{ "multiply": 0.001 }]
+        },
+        {
+          "name": "Active_Power_Phase1",
+          "address": 50544,
+          "unit_of_measurement": "W",
+          "state_class": "measurement",
+          "value_type": "S_DWORD",
+          "filters": [{ "multiply": 10 }]
+        },
+        {
+          "name": "Active_Power_Phase2",
+          "address": 50546,
+          "unit_of_measurement": "W",
+          "state_class": "measurement",
+          "value_type": "S_DWORD",
+          "filters": [{ "multiply": 10 }]
+        },
+        {
+          "name": "Active_Power_Phase3",
+          "address": 50548,
+          "unit_of_measurement": "W",
+          "state_class": "measurement",
+          "value_type": "S_DWORD",
+          "filters": [{ "multiply": 10 }]
+        }
+      ]
+    },
+    {
+      "base": 50946,
+      "length": 8,
+      "register_type": "holding",
+      "registers": [
+        {
+          "name": "Total_Positive_Active_Energy",
+          "address": 50946,
+          "unit_of_measurement": "kWh",
+          "value_type": "U_DWORD",
+          "state_class": "total",
+          "device_class": "energy",
+          "filters": [{ "multiply": 0.01 }]
+        },
+        {
+          "name": "Total_Negative_Active_Energy",
+          "address": 50952,
+          "unit_of_measurement": "kWh",
+          "state_class": "total",
+          "device_class": "energy",
+          "filters": [{ "multiply": 0.01 }]
+        }
+      ]
+    }
+  ]
+}

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/boneio/schema/schema.yaml

@@ -514,6 +514,12 @@ binary_sensor:
         required: True
         meta:
           label: Check if sensor type is inverted. Only aplicable for sensor kind.
+      initial_send:
+        type: boolean
+        default: False
+        required: True
+        meta:
+          label: If set to true, then on startup of application initial status of the binary sensor will be send to MQTT.
       device_class:
         type: string
         required: False

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/boneio/sensor/gpio_new.py

@@ -1,12 +1,14 @@
 """GpioInputBinarySensorNew to receive signals."""
+
 import logging
 from boneio.const import PRESSED, RELEASED, BOTH
 from boneio.helper import GpioBaseClass
+import time
 from boneio.helper.gpio import add_event_callback, add_event_detect
 
 _LOGGER = logging.getLogger(__name__)
 
-
+soc
 class GpioInputBinarySensorNew(GpioBaseClass):
     """Represent Gpio sensor on input boards."""
 
@@ -14,20 +16,32 @@ class GpioInputBinarySensorNew(GpioBaseClass):
         """Setup GPIO Input Button"""
         super().__init__(**kwargs)
         self._state = self.is_pressed
+        self.button_pressed_time = 0.0
         self._click_type = (
             (RELEASED, PRESSED)
             if kwargs.get("inverted", False)
             else (PRESSED, RELEASED)
         )
+        self._initial_send = kwargs.get("initial_send", False)
         _LOGGER.debug("Configured sensor pin %s", self._pin)
         add_event_detect(pin=self._pin, edge=BOTH)
         add_event_callback(pin=self._pin, callback=self.check_state)
+        self._loop.call_soon_threadsafe(self.check_state, self._initial_send)
 
-    def check_state(self, _) -> None:
+    def check_state(self, initial_send: bool = False) -> None:
+        """Check if state has changed."""
+        time_now = time.time()
         state = self.is_pressed
-        if state == self._state:
+        if (time_now - self.button_pressed_time <= self._bounce_time) or (
+            not initial_send and state == self._state
+        ):
             return
         self._state = state
         click_type = self._click_type[0] if state else self._click_type[1]
-        _LOGGER.debug("%s event on pin %s - %s", click_type, self._pin, self.name)
+        _LOGGER.debug(
+            "Binary sensor: %s event on pin %s - %s",
+            click_type,
+            self._pin,
+            self.name,
+        )
         self.press_callback(click_type=click_type, duration=None)

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/boneio/sensor/ina219.py

@@ -67,7 +67,7 @@ class INA219Sensor(BasicMqtt, Filter):
         )
 
 
-class INA219(AsyncUpdater, Filter):
+class INA219(AsyncUpdater):
     """Represent INA219 sensors."""
 
     def __init__(
@@ -77,16 +77,14 @@ class INA219(AsyncUpdater, Filter):
         self._loop = asyncio.get_event_loop()
         self._ina_219 = INA219_I2C(address=address)
         self._sensors = {}
-        self._states = {}
         self._id = id
         for sensor in sensors:
             _name = sensor["id"]
             _id = f"{id}{_name.replace(' ', '')}"
-            self._states[sensor["device_class"]] = None
             self._sensors[sensor["device_class"]] = INA219Sensor(
                 device_class=sensor["device_class"],
                 filters=sensor.get("filters", []),
-                state=self._states[sensor["device_class"]],
+                state=None,
                 name=_name,
                 id=_id,
                 **kwargs,
@@ -104,11 +102,9 @@ class INA219(AsyncUpdater, Filter):
 
     async def async_update(self, time: datetime) -> None:
         """Fetch temperature periodically and send to MQTT."""
-        for k in self._states.keys():
-            value = getattr(self._ina_219, k)
-            self._states[k] = value
-            _LOGGER.debug("Read %s with value: %s", k, value)
         for k, sensor in self._sensors.items():
-            if sensor.raw_state != self._states[k]:
-                sensor.raw_state = self._states[k]
-                self._loop.call_soon_threadsafe(sensor.update, time)
+            value = getattr(self._ina_219, k)
+            _LOGGER.debug("Fetched INA219 value: %s %s", k, value)
+            if sensor.raw_state != value:
+                sensor.raw_state = value
+                sensor.update(time=time)

boneIO-0.8.0.dev10/boneio/version.py

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

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/pyproject.toml

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

boneIO-0.8.0.dev9/boneio/version.py

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

{boneIO-0.8.0.dev9 → boneIO-0.8.0.dev10}/boneio/runner.py

@@ -1,4 +1,5 @@
 """Runner code for boneIO. Based on HA runner."""
+
 from __future__ import annotations
 
 import asyncio
@@ -80,7 +81,6 @@ async def async_run(
         for item in config_modules
     }
 
-
     manager = Manager(
         send_message=client.send_message,
         stop_client=client.stop_client,