boneIO 0.8.0.dev8__tar.gz → 0.8.0.dev10__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boneIO
-Version: 0.8.0.dev8
+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.dev8 → boneIO-0.8.0.dev10}/boneio/bonecli.py

@@ -13,7 +13,11 @@ import sys
 from colorlog import ColoredFormatter
 from yaml import MarkedYAMLError
 
-from boneio.modbus.modbuscli import async_run_modbus_set, async_run_modbus_get
+from boneio.modbus.modbuscli import (
+    async_run_modbus_set,
+    async_run_modbus_get,
+    async_run_modbus_search,
+)
 from boneio.modbus.client import VALUE_TYPES
 
 
@@ -99,13 +103,14 @@ def get_arguments() -> argparse.Namespace:
     modbus_parser.add_argument(
         "--address",
         type=lambda x: int(x, 0),
-        required=True,
+        required=False,
+        default=1,
         help="Current device address (hex or integer)",
     )
     modbus_parser.add_argument(
         "--baudrate",
         type=int,
-        choices=[2400, 4800, 9600, 19200],
+        choices=[2400, 4800, 9600, 14400, 19200],
         required=True,
         help="Current baudrate",
     )
@@ -139,11 +144,21 @@ def get_arguments() -> argparse.Namespace:
         dest="modbus_action", required=True
     )
     set_modbus_parser = modbus_sub_parser.add_parser("set")
+    set_modbus_parser.add_argument(
+        "--custom-value",
+        type=int,
+        help="Set Custom value",
+    )
+    set_modbus_parser.add_argument(
+        "--custom-register-address",
+        type=int,
+        help="Register address for custom value",
+    )
     set_modbus_parser.add_argument(
         "--device",
         type=str,
-        choices=["cwt", "r4dcb08"],
-        help="Choose device to set modbus address/baudrate",
+        choices=["cwt", "r4dcb08", "liquid-sensor", "sht20", "custom"],
+        help="Choose device to set modbus address/baudrate. For custom you must provide --custom-value and --custom-register-address",
         required=True,
     )
     set_modbus_parser_group = set_modbus_parser.add_mutually_exclusive_group()
@@ -182,6 +197,23 @@ def get_arguments() -> argparse.Namespace:
         required=True,
     )
     parser.add_argument("--version", action="version", version=__version__)
+    search_modbus_parser = modbus_sub_parser.add_parser(
+        name="search",
+        help="Search for device. Iterate over every address 1-253 with provided register address",
+    )
+    search_modbus_parser.add_argument(
+        "--register-address",
+        type=int,
+        help="Register address",
+        required=True,
+    )
+    search_modbus_parser.add_argument(
+        "--register-type",
+        type=str,
+        choices=["input", "holding"],
+        help="Register type",
+        required=True,
+    )
     arguments = parser.parse_args()
 
     return arguments
@@ -223,6 +255,7 @@ def run_modbus_command(
     _LOGGER.info("BoneIO %s starting.", __version__)
     try:
         configure_logger(log_config={}, debug=args.debug)
+        ret = 0
         if args.modbus_action == "set":
             ret = asyncio.run(
                 async_run_modbus_set(
@@ -235,9 +268,11 @@ def run_modbus_command(
                     stopbits=args.stopbits,
                     new_baudrate=args.new_baudrate,
                     new_address=args.new_address,
+                    custom_address=args.custom_register_address,
+                    custom_value=args.custom_value,
                 ),
             )
-        else:
+        elif args.modbus_action == "get":
             ret = asyncio.run(
                 async_run_modbus_get(
                     uart=args.uart,
@@ -251,6 +286,18 @@ def run_modbus_command(
                     value_type=args.value_type,
                 ),
             )
+        else:
+            ret = asyncio.run(
+                async_run_modbus_search(
+                    uart=args.uart,
+                    baudrate=args.baudrate,
+                    register_address=args.register_address,
+                    register_type=args.register_type,
+                    parity=args.parity,
+                    bytesize=args.bytesize,
+                    stopbits=args.stopbits,
+                ),
+            )
         return ret
     except (RestartRequestException, GracefulExit) as err:
         if err is not None:
@@ -281,7 +328,10 @@ def main() -> int:
             args=args,
         )
 
-    _LOGGER.info("Exiting with exit code %s", exit_code)
+    if exit_code == 0:
+        _LOGGER.info("Exiting with exit code %s", exit_code)
+    else:
+        _LOGGER.error("Exiting with exit code %s", exit_code)
     return exit_code
 
 

{boneIO-0.8.0.dev8 → boneIO-0.8.0.dev10}/boneio/helper/filter.py

@@ -19,8 +19,9 @@ FILTERS = {
 class Filter:
     _filters = []
 
-    def _apply_filters(self, value: float) -> float | None:
-        for filter in self._filters:
+    def _apply_filters(self, value: float, filters: list = []) -> float | None:
+        filters = filters if filters else self._filters
+        for filter in filters:
             for k, v in filter.items():
                 if k not in FILTERS:
                     _LOGGER.warning(

{boneIO-0.8.0.dev8 → 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.dev8 → boneIO-0.8.0.dev10}/boneio/helper/loader.py

@@ -211,6 +211,7 @@ def create_modbus_sensors(manager: Manager, sensors, **kwargs) -> None:
                 update_interval=sensor.get(
                     UPDATE_INTERVAL, TimePeriod(seconds=60)
                 ),
+                sensors_filters=sensor.get("sensors_filters", {}),
                 **kwargs,
             )
         except FileNotFoundError as err:

{boneIO-0.8.0.dev8 → 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.dev8 → 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
@@ -43,6 +44,7 @@ class Modbus:
         stopbits: int = 1,
         bytesize: int = 8,
         parity: str = "N",
+        timeout: float = 3,
     ) -> None:
         """Initialize the Modbus hub."""
         rx = uart.get(RX)
@@ -68,6 +70,7 @@ class Modbus:
                 stopbits=stopbits,
                 bytesize=bytesize,
                 parity=parity,
+                timeout=timeout,
             )
             self._read_methods = {
                 "input": self._client.read_input_registers,
@@ -129,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
@@ -151,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.dev8 → boneIO-0.8.0.dev10}/boneio/modbus/cwt.json

@@ -4,7 +4,7 @@
     "set_address_address": 2000,
     "set_baudrate": {
       "address": 2001,
-      "possible_baudrates": [2400, 4800, 9600, 19200]
+      "possible_baudrates": { "2400": 0, "4800": 1, "9600": 2, "19200": 3 }
     }
   },
   "registers_base": [

boneIO-0.8.0.dev10/boneio/modbus/liquid-sensor.json

@@ -0,0 +1,37 @@
+{
+  "model": "Liquid sensor",
+  "set_base": {
+    "set_address_address": 0,
+    "set_baudrate": {
+      "address": 1,
+      "possible_baudrates": {
+        "1200": 0,
+        "2400": 1,
+        "4800": 2,
+        "9600": 3,
+        "19200": 4,
+        "38400": 5,
+        "57600": 6,
+        "115200": 7
+      }
+    }
+  },
+  "registers_base": [
+    {
+      "base": 0,
+      "length": 2,
+      "register_type": "holding",
+      "registers": [
+        {
+          "name": "Immersion depth",
+          "address": 0,
+          "unit_of_measurement": "mm",
+          "state_class": "measurement",
+          "device_class": "humidity",
+          "value_type": "S_WORD",
+          "filters": [{ "multiply": 0.1 }]
+        }
+      ]
+    }
+  ]
+}

{boneIO-0.8.0.dev8 → boneIO-0.8.0.dev10}/boneio/modbus/modbuscli.py

@@ -78,7 +78,7 @@ class ModbusHelper:
 
     def set_connection_speed(self, new_baudrate: int) -> int:
         baudrate_model = self._model[SET_BAUDRATE]
-        ind = baudrate_model["possible_baudrates"].index(new_baudrate)
+        ind = baudrate_model["possible_baudrates"].get(str(new_baudrate))
         if ind:
             result = self._modbus.client.write_register(
                 address=baudrate_model["address"],
@@ -110,6 +110,19 @@ class ModbusHelper:
         else:
             _LOGGER.error("Invalid new address.")
 
+    def set_custom_command(self, register_address: int, value: int | float):
+        result = self._modbus.client.write_register(
+            address=register_address,
+            value=value,
+            unit=self._device_address,
+        )
+        if result.isError():
+            _LOGGER.error("Operation failed.")
+        else:
+            _LOGGER.info(
+                "Operation succeeded. Now restart device by disconnecting it."
+            )
+
 
 async def async_run_modbus_set(
     device: str,
@@ -118,6 +131,8 @@ async def async_run_modbus_set(
     baudrate: int,
     new_baudrate: int,
     new_address: int,
+    custom_address: int,
+    custom_value: int,
     stopbits: int = 1,
     bytesize: int = 8,
     parity: str = "N",
@@ -125,15 +140,21 @@ async def async_run_modbus_set(
     """Run Modbus Set Function."""
     if new_address and new_baudrate:
         _LOGGER.error("Can't set both methods new_address and new_baudrate.")
-    _db = open_json(path=os.path.dirname(__file__), model=device)
-    set_base = _db.get(SET_BASE, {})
-    first_reg_base = _db.get(REGISTERS_BASE, [])[0]
-    if not first_reg_base:
-        return False
-    first_record = first_reg_base.get(REGISTERS, [])[0]
-    _LOGGER.debug(
-        f"Connecting with params uart: {uart}, baudrate: {baudrate}, stopbits: {stopbits}, bytesize: {bytesize}, parity: {parity}."
-    )
+    custom_cmd = True if device == "custom" else False
+    set_base = {}
+    if not custom_cmd:
+        _db = open_json(path=os.path.dirname(__file__), model=device)
+        set_base = _db.get(SET_BASE, {})
+        first_reg_base = _db.get(REGISTERS_BASE, [])[0]
+        if not first_reg_base:
+            return False
+        first_record = first_reg_base.get(REGISTERS, [])[0]
+        _LOGGER.debug(
+            f"Connecting with params uart: {uart}, baudrate: {baudrate}, stopbits: {stopbits}, bytesize: {bytesize}, parity: {parity}."
+        )
+    else:
+        first_record = {}
+        first_reg_base = {}
     modbus_helper = ModbusHelper(
         device=device,
         uart=uart,
@@ -146,17 +167,69 @@ async def async_run_modbus_set(
         bytesize=bytesize,
         parity=parity,
     )
-    if not await modbus_helper.check_connection():
-        _LOGGER.error("Can't connect with sensor. Exiting")
-        return 1
-    if new_baudrate:
-        return modbus_helper.set_connection_speed(new_baudrate=new_baudrate)
-    if new_address:
-        modbus_helper.set_new_address(new_address=new_address)
-        return 0
+
+    async def default_action():
+        if not await modbus_helper.check_connection():
+            _LOGGER.error("Can't connect with sensor. Exiting")
+            return 1
+        if new_baudrate:
+            return modbus_helper.set_connection_speed(new_baudrate=new_baudrate)
+        if new_address:
+            modbus_helper.set_new_address(new_address=new_address)
+            return 0
+
+    if not custom_cmd:
+        _LOGGER.debug("Invoking default action.")
+        return await default_action()
+    elif custom_address is not None and custom_value is not None:
+        _LOGGER.debug("Invoking custom command action.")
+        modbus_helper.set_custom_command(
+            register_address=custom_address, value=custom_value
+        )
     return 1
 
 
+async def async_run_modbus_search(
+    uart: str,
+    baudrate: int,
+    register_address: int,
+    register_type: str = "holding",
+    stopbits: int = 1,
+    bytesize: int = 8,
+    parity: str = "N",
+):
+    """Run Modbus Seach Function."""
+    _modbus = Modbus(
+        uart=UARTS[uart],
+        baudrate=baudrate,
+        stopbits=stopbits,
+        bytesize=bytesize,
+        parity=parity,
+        timeout=0.1,
+    )
+    units_found = []
+    for unit_id in range(1, 248):  # Modbus RTU address range is 1 to 247
+        _LOGGER.debug(f"Searching device at address {unit_id}.")
+        value = await _modbus.read_registers(
+            unit=unit_id,
+            address=register_address,
+            count=2,
+            method=register_type,
+        )
+        if value:
+            units_found.append(unit_id)
+            _LOGGER.info(f"Found device at address {unit_id}.")
+        else:
+            _LOGGER.debug(f"No device found at address {unit_id}.")
+    if units_found:
+        _LOGGER.info(
+            "Found devices: [%s]", ", ".join(str(x) for x in units_found)
+        )
+    else:
+        _LOGGER.info("No devices found.")
+    return 0
+
+
 async def async_run_modbus_get(
     uart: str,
     device_address: int,

{boneIO-0.8.0.dev8 → 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.dev8 → boneIO-0.8.0.dev10}/boneio/modbus/r4dcb08.json

@@ -4,7 +4,13 @@
     "set_address_address": 254,
     "set_baudrate": {
       "address": 255,
-      "possible_baudrates": [1200, 2400, 4800, 9600, 19200]
+      "possible_baudrates": {
+        "1200": 0,
+        "2400": 1,
+        "4800": 2,
+        "9600": 3,
+        "19200": 4
+      }
     }
   },
   "registers_base": [

{boneIO-0.8.0.dev8 → boneIO-0.8.0.dev10}/boneio/modbus/sensor.py

@@ -4,6 +4,8 @@ import logging
 import os
 from datetime import datetime
 from typing import Optional
+
+from boneio.helper.filter import Filter
 from .utils import CONVERT_METHODS, REGISTERS_BASE, allowed_operations
 from boneio.const import (
     ADDRESS,
@@ -26,7 +28,7 @@ from boneio.helper.util import open_json
 _LOGGER = logging.getLogger(__name__)
 
 
-class ModbusSensor(BasicMqtt, AsyncUpdater):
+class ModbusSensor(BasicMqtt, AsyncUpdater, Filter):
     """Represent Modbus sensor in BoneIO."""
 
     SensorClass = None
@@ -37,6 +39,7 @@ class ModbusSensor(BasicMqtt, AsyncUpdater):
         modbus: Modbus,
         address: str,
         model: str,
+        sensors_filters: dict,
         config_helper: ConfigHelper,
         event_bus: EventBus,
         id: str = DefaultName,
@@ -56,6 +59,9 @@ class ModbusSensor(BasicMqtt, AsyncUpdater):
         self._address = address
         self._discovery_sent = False
         self._payload_online = OFFLINE
+        self._sensors_filters = {
+            k.lower(): v for k, v in sensors_filters.items()
+        }
         event_bus.add_haonline_listener(target=self.set_payload_offline)
         AsyncUpdater.__init__(self, **kwargs)
 
@@ -154,7 +160,9 @@ class ModbusSensor(BasicMqtt, AsyncUpdater):
                 method=data.get("register_type", "input"),
             )
             if self._payload_online == OFFLINE and values:
-                _LOGGER.info("Sending online payload about device.")
+                _LOGGER.info(
+                    "Sending online payload about device %s.", self._name
+                )
                 self._payload_online = ONLINE
                 self._send_message(
                     topic=f"{self._config_helper.topic_prefix}/{self._id}{STATE}",
@@ -204,6 +212,12 @@ class ModbusSensor(BasicMqtt, AsyncUpdater):
                         if key in allowed_operations:
                             lamda_function = allowed_operations[key]
                             decoded_value = lamda_function(decoded_value, value)
+                name = register.get("name").replace(" ", "")
+                user_filters = self._sensors_filters.get(name.lower(), [])
+                decoded_value = self._apply_filters(
+                    value=decoded_value,
+                    filters=user_filters,
+                )
                 output[register.get("name").replace(" ", "")] = decoded_value
             self._send_message(
                 topic=f"{self._send_topic}/{data[BASE]}",

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

@@ -0,0 +1,37 @@
+{
+  "model": "SHT20 Temp and Humidity sensor",
+  "set_base": {
+    "set_address_address": 257,
+    "set_baudrate": {
+      "address": 258,
+      "possible_baudrates": { "9600": 9600, "14400": 14400, "19200": 19200 }
+    }
+  },
+  "registers_base": [
+    {
+      "base": 1,
+      "length": 2,
+      "register_type": "input",
+      "registers": [
+        {
+          "name": "Temperature",
+          "address": 1,
+          "unit_of_measurement": "°C",
+          "state_class": "measurement",
+          "device_class": "temperature",
+          "value_type": "S_WORD",
+          "filters": [{ "multiply": 0.1 }]
+        },
+        {
+          "name": "Humidity",
+          "address": 2,
+          "unit_of_measurement": "%",
+          "state_class": "measurement",
+          "device_class": "humidity",
+          "value_type": "S_WORD",
+          "filters": [{ "multiply": 0.1 }]
+        }
+      ]
+    }
+  ]
+}

boneIO-0.8.0.dev8/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,