boneIO 0.8.0.dev8__py3-none-any.whl → 0.8.0.dev10__py3-none-any.whl

{boneIO-0.8.0.dev8.dist-info → boneIO-0.8.0.dev10.dist-info}/METADATA

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

{boneIO-0.8.0.dev8.dist-info → boneIO-0.8.0.dev10.dist-info}/RECORD

@@ -1,5 +1,5 @@
 boneio/__init__.py,sha256=hoLKnu6h1uEsiCHA9Ql2MMDC7VQS0E-s_2cxBS-CTOg,147
-boneio/bonecli.py,sha256=30NobXHwuCYeDm3jZWcZD99Fx1nj9F4Q_YsgBQL5vbA,8052
+boneio/bonecli.py,sha256=CpqKJxIG8wQGE26r-wXU36aPbqWMtP3oOSQ3HdlJ7a4,9713
 boneio/const.py,sha256=bGvnwS28zFLSrbV3F2nkqV0hklCgcrQKpBys8PC75Ds,5087
 boneio/cover.py,sha256=EfO1DAOGTPQykfgJHzg1WqPs0U8b1AnD2NMI-sLZccM,8444
 boneio/example_config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -25,10 +25,10 @@ boneio/helper/click_timer.py,sha256=Gu8sEi1S8GG42SYbfaMju7WXFhnnil9gYfirLZX7kJk,
 boneio/helper/config.py,sha256=5cDnJ7usJDlUvXv8K2rSWEx30OFcU2k1U1vUEjO69WY,2431
 boneio/helper/events.py,sha256=ttb2_xOgyTXPIZv4ywJ2udCdqYLIVejBo7ATqsm7OQQ,8818
 boneio/helper/exceptions.py,sha256=vyYSUojwB7OttOPUjbxeHFM7C_o5ZQmRUcZ_vYpxYYI,717
-boneio/helper/filter.py,sha256=8jgSbHDaInEVlAPd7nrahnFYsi1y6C2fmI0yn55XzK0,935
-boneio/helper/gpio.py,sha256=q2r2uklPWePuuekPO63kVfoaQdkvNObUJ3ktwsHgOB0,4771
+boneio/helper/filter.py,sha256=XwlaapfTTYXwcvJmKYJBksJD7i1u_xHIm_XrvyiuC6o,1005
+boneio/helper/gpio.py,sha256=QAYusC51Yuxv0jQwYMa0107XdklvI43Mi1lTzKH7VyE,4923
 boneio/helper/ha_discovery.py,sha256=B2t1cfOfKWys4EM1H7OxvOaYL8H_v18CTuHCEVP2w2c,7107
-boneio/helper/loader.py,sha256=3MVgTLp1NlYbQ0nCw-MfF1nSvcwb-VXGUbgXIdg84VM,17496
+boneio/helper/loader.py,sha256=-kOCe0ooYfWJu0EIcn4lzWjNz_4RJkwMQ5XF1NyYfwQ,17563
 boneio/helper/logger.py,sha256=zyF_Vk3o2eSHuXypJhNzK99eZgkWDWybuB5KcJgurDs,1801
 boneio/helper/mqtt.py,sha256=1YgwO0RjkarN5qS5HS5rONf4H3_m3ak7tT_hHm-HeOQ,931
 boneio/helper/oled.py,sha256=f0XYbaFstUbJ6ISmFe1vQCnmNVMctQWtnStNdROrblc,351
@@ -40,7 +40,7 @@ boneio/helper/pcf8575.py,sha256=qeNYLqV5foDEQCyAz1WRQRi1CYYxtbPIha06Z5TyZVQ,311
 boneio/helper/queue.py,sha256=7fE7d344-BEW8sljN40wmqsbBr4kPLvz4ShBjkT04p8,1066
 boneio/helper/sensor/ina_219_smbus.py,sha256=eXp2epjUgsqaXamTSWSn3LMow5X_YxAxdREaWD7N3mk,6170
 boneio/helper/state_manager.py,sha256=6OeqJsLQPCyQhhmFlNxCd80cTYLnKb02L4AZ1ZFFVBE,2616
-boneio/helper/stats.py,sha256=oWxKC3EjuL2hzvLk4qBIN_KskoXIcELQOyOpR02J79w,7850
+boneio/helper/stats.py,sha256=qVqX9AleMDN28Jh73avurovnuPyKF42hxvJA6QYlbUA,7897
 boneio/helper/timeperiod.py,sha256=xpg9oe30Z5WiLDQPq3EBKKScejOnN47NhcpeFvDd3bY,5806
 boneio/helper/util.py,sha256=DyppBTE2zTWoxVpl83Kb4SpJLEqOOSEkxXEITCrwnfk,938
 boneio/helper/yaml_util.py,sha256=aaXMwXC2JoDYkBMcZkkB8nic3QOyGOhxPTRxWvMf3G4,11334
@@ -49,17 +49,20 @@ boneio/input/gpio.py,sha256=3Eh_3ko0RkTKqq7pKlgTROJeaSYgt05NkfeGoWudqfY,2674
 boneio/input/gpio_new.py,sha256=gpPfDr39B8FVUyh9XHtLgVQr4glMGFBgQsyIMzXDPaw,2822
 boneio/manager.py,sha256=leMDXrmyHmlndgt_GdlkvKnFRaUDZI8uDzCr8yLvcY8,29869
 boneio/modbus/__init__.py,sha256=yeHIxZ0_u7eCL7CqScvob5Utcru6Iza0LEtTagEtNtw,116
-boneio/modbus/client.py,sha256=-TMFQPVWWTlzS1HG1QVX4QwpfwSIxf0cgFOv3_gu7so,5851
-boneio/modbus/cwt.json,sha256=JwkQuRZFA03C3o9RgryMuCaYoCwM4RkiakEB6dkKgxE,886
+boneio/modbus/client.py,sha256=M8ylJ7t6YvUnuHffK57VYZjHzx7kwUiiKXC4J64I51s,6174
+boneio/modbus/cwt.json,sha256=PCn9t5wQkNCD8AqwXSoJ3cEm50bKAX4FmPw6fWCvLrg,908
 boneio/modbus/dts1964_3f.json,sha256=WABph_2X4OgMidSM28vw4dLd9ZByRoiUP-RqE0UMpR8,8810
-boneio/modbus/modbuscli.py,sha256=VJKI85HRD7Usi0x4pSMS9GzuhYfLCx8qVjNsHuao0Is,6231
-boneio/modbus/orno-or-we-517.json,sha256=w4kPFD8Wtr6Vv5BbGuvCiTHflo71FOxwp3fY8gZN2pQ,842
+boneio/modbus/liquid-sensor.json,sha256=y00XpFFktm2a-ZrF_jujbqy2YAjHYBCBV_Avzlqih4s,737
+boneio/modbus/modbuscli.py,sha256=wvj1QKDSIoXg9_zpoMqRD43CEYLLt6fBkQ0g-IRhs8w,8498
+boneio/modbus/orno-or-we-517.json,sha256=AmFZmsa0Q4gOOUh_7ye6L_U98z-oA4US9jYbsAmP12o,1070
 boneio/modbus/pt100.json,sha256=bzKNYDc3lMto94Ut8gutVIsHytQiMobwFCkonOiMegs,526
-boneio/modbus/r4dcb08.json,sha256=uoQ5EGiFVY_uhYlOWYyFLCXpWxgtEB4SRAAkgON9ii8,2550
+boneio/modbus/r4dcb08.json,sha256=3SeAs_BYEoh12HOfQ-m7HB_UeFYrJLAGF6CV3hzalLo,2623
 boneio/modbus/sdm120.json,sha256=4sueFfSw7G6a77gdIUhbfJvE-MNVJFOeVbRvHDw5Rvk,4145
 boneio/modbus/sdm630.json,sha256=TUiuc060IpF64p_HSDvdxEQcwkWHWUpnd48_xaGU-_o,8255
-boneio/modbus/sensor.py,sha256=TZYMPzgrrNE2gYO9dYeEZ6bSBUvHmubNK3gc-ukVkm8,8429
-boneio/modbus/socomec_e23.json,sha256=Is51YelEd4d6SYmz4Gd_oKx4Qi3bp-VHsl9zxWOFI5s,2882
+boneio/modbus/sensor.py,sha256=JmmG3CcfmKEheOQY0XasVEjygnwxvtD01JpwBGLgpdE,8957
+boneio/modbus/sht20.json,sha256=KV7TAvYo3oIQPM65SKyJYEugo6D8Ubz34hg6AGMwq3Y,907
+boneio/modbus/socomec_e03.json,sha256=4nuFHTAzKX-7LOfUDsCf3C-WaGQNqqmzX-HT4Ed0aiU,2878
+boneio/modbus/socomec_e23.json,sha256=oQUFW7dWfps0o6FMixtH02jGe9bLf051cpFpRZNtaNU,4772
 boneio/modbus/sofar.json,sha256=A_YztQN_ctyItIm2LH1tfcs-pSyG18I530qleLd2tOw,5592
 boneio/modbus/utils.py,sha256=cG75mmKTGaw_qrCG_D1qw-jl9XybUXa03i1ap5oBxGE,1753
 boneio/mqtt_client.py,sha256=hzGT3IyftPHNrQXSKbWUXGYZBpP-VdRBkOrILkXDNHs,8665
@@ -70,28 +73,28 @@ boneio/relay/gpio.py,sha256=s64FBf6zlxciF57xJ6nrvy0t5Rie0uiXlwos0HL3RKM,1163
 boneio/relay/mcp.py,sha256=m1-AtmgFiIzy00uns3gGGCTwr-ppfAiN_zeIdZXVtQE,2000
 boneio/relay/pca.py,sha256=qiO5YWaywbtkbjVlqKi0y9VomsWuMHsfdQiGG6b_yug,2951
 boneio/relay/pcf.py,sha256=TU5yCqUVMFj_-W1rRqweRtCQWOu24Z6kFnBKGZHjptk,2498
-boneio/runner.py,sha256=PC1rbgsURBbtXe3xIX1zk0bDgSGNKwxTdgX1eq68vfc,2855
+boneio/runner.py,sha256=Zsm4F5Hb3IBl-4aWpD5VvPSpg5tDAEnWF81j-_oFIMg,2855
 boneio/schema/actions.yaml,sha256=kaJZ9B6SOl4Wbujtnr5k-g5JcAi2NSC1oGc0wZy8fnQ,1039
 boneio/schema/actions_sensor.yaml,sha256=rWd8pfsN7KvmvVvW6VedelFayRVehNQt6x4ou6yN9BY,91
 boneio/schema/actions_switch.yaml,sha256=cDgSi12k4S-TWADQ20Fy9NvYKOXnm7YkyMaWpPyXVoc,96
 boneio/schema/filters.yaml,sha256=WopX1SmCZsSZXNiGccLoi7uMCsUpdbs0eVfsAjmbay4,286
 boneio/schema/filters_adc.yaml,sha256=3e0ts92MoFKOnfGOOn6WYIHxu0-tnZe9OjAjN9m7hiI,304
 boneio/schema/id.yaml,sha256=vHI_6dxkJwoiGp5ien_pPpyaWA1F06eirTgfWMyWa1E,75
-boneio/schema/schema.yaml,sha256=Chcsh1kHMxhE_cx-T3GWpfXWmSZANhzyNQa-Qw4PKoY,18658
+boneio/schema/schema.yaml,sha256=j15G2tWUqb6jupuZDMJGKMzsNnpIqoiVaZ4jQ-UVi1Q,19166
 boneio/schema/temp_unit.yaml,sha256=m32VGz9RTW92Lz08l9n6RftkcVNZquOGPPr5mc3eZVc,65
 boneio/schema/update_interval.yaml,sha256=L_YLddAZdybcdO-T57Qhlv1GaWIVDwhvH-GadD1oOIo,133
 boneio/sensor/__init__.py,sha256=Ztj-xzey-SWrEdVEozcwFsZSuEmJW8STVaf_vPMWiVc,619
 boneio/sensor/adc.py,sha256=tCUdr3KN5uSbgXiwhNXbMjeNkO2CzPYhIOncHR5_LD0,1328
 boneio/sensor/gpio.py,sha256=8m07tW1xDsrhBM2dZ9_VvmvYRn-5hLQVTTUhPlKg1rg,1199
-boneio/sensor/gpio_new.py,sha256=m54agOF2gUh3aoC6f8WpCPAmBRADvqlKeWLqwlon9fg,1223
-boneio/sensor/ina219.py,sha256=mIvu-nIfpfrSi_sn7FBYS8n3y2AkGsXBO_OLAy3tQ48,3518
+boneio/sensor/gpio_new.py,sha256=_9ai1P_ex-_DUaa2j_VrQSipcCFdlhG8FxY4SmCeGtU,1698
+boneio/sensor/ina219.py,sha256=5oto2k9ThKTKWuGwOESlNPFB2c2keULm68OvU4vEJi0,3290
 boneio/sensor/temp/__init__.py,sha256=JLNH6Nc78ezleftnIYylIcNtKIm0rdqetbPZLsuCgDc,1844
 boneio/sensor/temp/dallas.py,sha256=xrvd1LNBh1fRcjz_yd_9S29Lv26ItVtLCmhZgVQWJos,2485
 boneio/sensor/temp/lm75.py,sha256=-mpOv78429plRPBp9s09Ljz1x2Bdxuagalqz40vlAKE,243
 boneio/sensor/temp/mcp9808.py,sha256=yAh5yJzZLGTqa39xV4fyqsruj7oy3niOZAUV2W6eyCM,271
-boneio/version.py,sha256=kohMs-Riwj-UAibQEHZq5p9eZISaEAIlNcuJ0QrkGFg,41
-boneIO-0.8.0.dev8.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
-boneIO-0.8.0.dev8.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-boneIO-0.8.0.dev8.dist-info/METADATA,sha256=ooHB3DwTlfrhH1xux3m_XC-puIs6nVCLX00ZW7Gff0I,1801
-boneIO-0.8.0.dev8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneIO-0.8.0.dev8.dist-info/RECORD,,
+boneio/version.py,sha256=c8uyaJeQfqGrdwmR0AHXgRhne9emuj2DCS7KRQ-4wHQ,42
+boneIO-0.8.0.dev10.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
+boneIO-0.8.0.dev10.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+boneIO-0.8.0.dev10.dist-info/METADATA,sha256=o3N1aXTfUEr2WtDC9UB4D2khOOHAZWN2hijJb0oc7C0,1802
+boneIO-0.8.0.dev10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneIO-0.8.0.dev10.dist-info/RECORD,,

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/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/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/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/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/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/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/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/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/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/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/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/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/modbus/socomec_e03.json

@@ -0,0 +1,103 @@
+{
+  "model": "Socomec E03",
+  "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": "Frequency",
+          "address": 50526,
+          "unit_of_measurement": "Hz",
+          "state_class": "measurement",
+          "device_class": "voltage",
+          "value_type": "U_DWORD",
+          "filters": [{ "multiply": 0.01 }]
+        },
+        {
+          "name": "Current",
+          "address": 50528,
+          "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_Phase",
+          "address": 50544,
+          "unit_of_measurement": "W",
+          "state_class": "measurement",
+          "value_type": "S_DWORD",
+          "filters": [{ "multiply": 0.001 }]
+        }
+      ]
+    },
+    {
+      "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/modbus/socomec_e23.json

@@ -15,6 +15,24 @@
           "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,
@@ -22,10 +40,10 @@
           "state_class": "measurement",
           "device_class": "voltage",
           "value_type": "U_DWORD",
-          "filters": [{ "multiply": 0.01 }]
+          "filters": [{ "multiply": 0.001 }]
         },
         {
-          "name": "Current",
+          "name": "Current_Phase1",
           "address": 50528,
           "unit_of_measurement": "A",
           "state_class": "measurement",
@@ -33,6 +51,33 @@
           "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,
@@ -66,12 +111,28 @@
           "filters": [{ "multiply": 0.001 }]
         },
         {
-          "name": "Active_Power_Phase",
+          "name": "Active_Power_Phase1",
           "address": 50544,
           "unit_of_measurement": "W",
           "state_class": "measurement",
           "value_type": "S_DWORD",
-          "filters": [{ "multiply": 0.001 }]
+          "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 }]
         }
       ]
     },

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,

boneio/schema/schema.yaml

@@ -170,6 +170,14 @@ modbus_sensors:
         default: 30s
         meta:
           label: Update interval.
+      sensors_filters:
+        type: dict
+        required: False
+        meta:
+          label: List of sub sensors to use to filter. Available values are temperature or humidity.
+        schema:
+          temperature: !include filters.yaml
+          humidity: !include filters.yaml
 lm75:
   type: list
   required: False
@@ -506,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/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/sensor/ina219.py

@@ -15,7 +15,7 @@ unit_converter = {"current": "A", "power": "W", "voltage": "V"}
 
 
 class INA219Sensor(BasicMqtt, Filter):
-    """Represent singel value from INA219 as sensor."""
+    """Represent single value from INA219 as sensor."""
 
     def __init__(
         self, device_class: str, filters: list, state: float | None, **kwargs
@@ -52,7 +52,7 @@ class INA219Sensor(BasicMqtt, Filter):
         return self._unit_of_measurement
 
     def update(self, time: datetime) -> None:
-        """Fetch temperature periodically and send to MQTT."""
+        """Fetch sensor data periodically and send to MQTT."""
         _state = (
             self._apply_filters(value=self._raw_state)
             if self._raw_state
@@ -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(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/version.py

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