boneIO 0.8.0.dev7__py3-none-any.whl → 0.8.0.dev9__py3-none-any.whl

{boneIO-0.8.0.dev7.dist-info → boneIO-0.8.0.dev9.dist-info}/METADATA

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

{boneIO-0.8.0.dev7.dist-info → boneIO-0.8.0.dev9.dist-info}/RECORD

@@ -1,17 +1,20 @@
 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
 boneio/example_config/adc.yaml,sha256=GKNpl2t7ebsH57UhJlJioXNuBflsL6eO4JMnyYwZrFs,168
 boneio/example_config/binary_sensor.yaml,sha256=4oErCX-5t6e9e0KVo5GkkFplKkgKs0st-wTmyiCZNzM,286
+boneio/example_config/binary_sensor_v_0_7.yaml,sha256=uaIDVV7t4drhlBDu_IK-ZK1DiMqqCP9tCi_HfS7KP5I,185
 boneio/example_config/config.yaml,sha256=7QOFD5P8wJYJrpA2qOwNM975ZKgeO7oKZphgJCP589k,397
 boneio/example_config/cover.yaml,sha256=rs7lv3vIEgAb3q96RKsJL7VMRsEvSNHG848dzZzSKsI,150
 boneio/example_config/event.yaml,sha256=9TMKXGLTAz4umSJCiMs53ReFmhY84LtmEPnanIIw-uY,2692
 boneio/example_config/event_all.yaml,sha256=9TMKXGLTAz4umSJCiMs53ReFmhY84LtmEPnanIIw-uY,2692
+boneio/example_config/event_v_0_7.yaml,sha256=n78Hsdq03zNSKICZ9muL5p3ZJQLCKU1juDVC1oCRNXw,4819
 boneio/example_config/led32x4A.yaml,sha256=YkcZ5XH2JF9Oa3pAmrYM5wsE8qQODCHcjYH47AEQpUI,3392
 boneio/example_config/output24x16A.yaml,sha256=BTtHToRgz-U_rMMDbmHkM4wQxHakdzInb3zKMkOkj4w,1691
 boneio/example_config/output24x16A_v0.3.yaml,sha256=XkI4rHn_XdX37xG02-wHieZzSHKiKN5mtnyfRE24NII,1713
+boneio/example_config/output32x10A.yaml,sha256=A4uzkZLSkC66Ck6bWkdMbnT0gQUByU8qi0muAgpOn40,2318
 boneio/example_config/output32x5A.yaml,sha256=G2Pb6qL8mXs6MliIM1roAanPag9ozRe3McYYuFsiBc0,2403
 boneio/fonts/danube__.ttf,sha256=KBRPUcGvmroCjrWC8zK4MulUb9lV8R0lXkOY7lNnQWc,19372
 boneio/group/__init__.py,sha256=eUN51J6nU1MdQfcl6JQ2AQwkP6K91mR9caDZyZ18rig,80
@@ -22,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/filter.py,sha256=XwlaapfTTYXwcvJmKYJBksJD7i1u_xHIm_XrvyiuC6o,1005
 boneio/helper/gpio.py,sha256=q2r2uklPWePuuekPO63kVfoaQdkvNObUJ3ktwsHgOB0,4771
 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
@@ -46,16 +49,18 @@ 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=0bc8T7DIvbyD2vkfI_bJmMTxIQTMtdJxyGE8Z0J5iZY,5912
+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/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=w4kPFD8Wtr6Vv5BbGuvCiTHflo71FOxwp3fY8gZN2pQ,842
 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/sensor.py,sha256=JmmG3CcfmKEheOQY0XasVEjygnwxvtD01JpwBGLgpdE,8957
+boneio/modbus/sht20.json,sha256=KV7TAvYo3oIQPM65SKyJYEugo6D8Ubz34hg6AGMwq3Y,907
 boneio/modbus/socomec_e23.json,sha256=Is51YelEd4d6SYmz4Gd_oKx4Qi3bp-VHsl9zxWOFI5s,2882
 boneio/modbus/sofar.json,sha256=A_YztQN_ctyItIm2LH1tfcs-pSyG18I530qleLd2tOw,5592
 boneio/modbus/utils.py,sha256=cG75mmKTGaw_qrCG_D1qw-jl9XybUXa03i1ap5oBxGE,1753
@@ -74,21 +79,21 @@ boneio/schema/actions_switch.yaml,sha256=cDgSi12k4S-TWADQ20Fy9NvYKOXnm7YkyMaWpPy
 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=DTgAbtgAhLuNf1llj7pmEJd3D9Z9QIUU_OmslOH7XL0,18942
 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/ina219.py,sha256=4APsSUI1L_FmsDb1T1kmyYyMUZveGpCjsOevqd_SHjg,3529
 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=RFQ1JEqV7cWikzWZr2EAD060ikkbEdYQD3TfyHPLTxQ,41
-boneIO-0.8.0.dev7.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
-boneIO-0.8.0.dev7.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
-boneIO-0.8.0.dev7.dist-info/METADATA,sha256=N3sdSQeUm6182kxusgS8Zt4KWz9qKjHBHVe2-d1zXyA,1801
-boneIO-0.8.0.dev7.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneIO-0.8.0.dev7.dist-info/RECORD,,
+boneio/version.py,sha256=vxdmMbd3NYDLNsRFB8-mOyjJajj0gvw80S3LgODVhfU,41
+boneIO-0.8.0.dev9.dist-info/entry_points.txt,sha256=Igl1SMDEWwMg144bwRz28UOCb80hdxomC99QJ3u6qC0,46
+boneIO-0.8.0.dev9.dist-info/WHEEL,sha256=B19PGBCYhWaz2p_UjAoRVh767nYQfk14Sn4TpIZ-nfU,87
+boneIO-0.8.0.dev9.dist-info/METADATA,sha256=mPoc_48R7ndLtTCZVEx1mDtB6yhQkxICYE_NRDvoSnY,1801
+boneIO-0.8.0.dev9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneIO-0.8.0.dev9.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/example_config/binary_sensor_v_0_7.yaml

@@ -0,0 +1,11 @@
+#- id: IN_02
+#  pin: P8_38
+#  gpio_mode: gpio_pu
+#  detection_type: new
+- id: IN_26
+  detection_type: new
+  pin: P8_7
+  actions:
+    pressed:
+      - action: output
+        pin: OUT_26

boneio/example_config/event_v_0_7.yaml

@@ -0,0 +1,292 @@
+- id: IN_01
+  pin: P8_37
+  gpio_mode: gpio_pu
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_01
+- id: IN_02
+  pin: P8_38
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_02
+- id: IN_03
+  pin: P8_39
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_03
+- id: IN_04
+  pin: P8_40
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_04
+- id: IN_05
+  pin: P8_41
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_05
+- id: IN_06
+  pin: P8_42
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_06
+- id: IN_07
+  detection_type: new
+  pin: P8_43
+  actions:
+    single:
+      - action: output
+        pin: OUT_07
+- id: IN_08
+  pin: P8_44
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_08
+- id: IN_09
+  pin: P8_45
+  detection_type: new
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_09
+- id: IN_10
+  pin: P8_46
+  gpio_mode: gpio_pu
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_10
+- id: IN_11
+  pin: P9_42
+  detection_type: new
+  actions:
+    single:
+      - action: output
+        pin: OUT_11
+- id: IN_12
+  detection_type: new
+  pin: P9_31
+  actions:
+    single:
+      - action: output
+        pin: OUT_12
+    # double:
+    #   - action: mqtt
+    #     topic: beagle2/cmd/relay/OUT_12/set
+    #     action_mqtt_msg: 'toggle'
+- id: IN_13
+  detection_type: new
+  pin: P9_30
+  actions:
+    single:
+      - action: output
+        pin: OUT_13
+    # long:
+    #   - action: mqtt
+    #     topic: beagle2/cmd/relay/OUT_13/set
+    #     action_mqtt_msg: 'toggle'
+- id: IN_14
+  detection_type: new
+  pin: P9_29
+  actions:
+    single:
+      - action: output
+        pin: OUT_14
+
+- id: IN_15
+  detection_type: new
+  pin: P9_28
+  actions:
+    single:
+      - action: output
+        pin: OUT_15
+- id: IN_16
+  detection_type: new
+  pin: P9_27
+  actions:
+    single:
+      - action: output
+        pin: OUT_16
+- id: IN_17
+  detection_type: new
+  pin: P9_25
+  actions:
+    single:
+      - action: output
+        pin: OUT_17
+- id: IN_18
+  detection_type: new
+  pin: P9_23
+  actions:
+    single:
+      - action: output
+        pin: OUT_18
+- id: IN_19
+  detection_type: new
+  pin: P9_22
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_19
+- id: IN_20
+  detection_type: new
+  pin: P9_21
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_20
+- id: IN_21
+  detection_type: new
+  pin: P9_18
+  actions:
+    single:
+      - action: output
+        pin: OUT_21
+- id: IN_22
+  detection_type: new
+  pin: P9_17
+  actions:
+    single:
+      - action: output
+        pin: OUT_22
+- id: IN_23
+  detection_type: new
+  pin: P9_16
+  actions:
+    single:
+      - action: output
+        pin: OUT_23
+- id: IN_24
+  detection_type: new
+  pin: P9_15
+  actions:
+    single:
+      - action: output
+        pin: OUT_24
+- id: IN_25
+  detection_type: new
+  pin: P9_14
+  actions:
+    single:
+      - action: output
+        pin: OUT_25
+
+  #- id: IN_26_binary_sensor!
+  #  detection_type: new
+  #  pin: P8_07
+
+- id: IN_27
+  detection_type: new
+  pin: P8_8
+  actions:
+    single:
+      - action: output
+        pin: OUT_27
+- id: IN_28
+  detection_type: new
+  pin: P8_9
+  actions:
+    single:
+      - action: output
+        pin: OUT_28
+- id: IN_29
+  detection_type: new
+  pin: P8_36
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_29
+- id: IN_30
+  detection_type: new
+  pin: P8_35
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_30
+- id: IN_31
+  detection_type: new
+  pin: P8_34
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_31
+- id: IN_32
+  detection_type: new
+  pin: P8_33
+  gpio_mode: gpio_pu
+  actions:
+    single:
+      - action: output
+        pin: OUT_32
+- id: IN_33
+  detection_type: new
+  pin: P8_32
+  gpio_mode: gpio_pu
+- id: IN_34
+  detection_type: new
+  pin: P8_31
+- id: IN_35
+  detection_type: new
+  pin: P8_30
+- id: IN_36
+  detection_type: new
+  pin: P8_29
+- id: IN_37
+  detection_type: new
+  pin: P8_28
+- id: IN_38
+  detection_type: new
+  pin: P8_27
+- id: IN_39
+  detection_type: new
+  pin: P8_26
+- id: IN_40
+  detection_type: new
+  pin: P8_19
+- id: IN_41
+  detection_type: new
+  pin: P8_18
+- id: IN_42
+  detection_type: new
+  pin: P8_17
+- id: IN_43
+  detection_type: new
+  pin: P8_16
+- id: IN_44
+  detection_type: new
+  pin: P8_15
+- id: IN_45
+  detection_type: new
+  pin: P8_14
+- id: IN_46
+  detection_type: new
+  pin: P8_13
+- id: IN_47
+  detection_type: new
+  pin: P8_12
+- id: IN_48
+  detection_type: new
+  pin: P8_11
+- id: IN_49
+  detection_type: new
+  pin: P8_10

boneio/example_config/output32x10A.yaml

@@ -0,0 +1,192 @@
+# config to Relay board 32x10 v0.4
+- id: OUT_01
+  kind: mcp
+  mcp_id: mcp2
+  pin: 7
+  output_type: light
+
+- id: OUT_02
+  kind: mcp
+  mcp_id: mcp2
+  pin: 6
+  output_type: light
+
+- id: OUT_03
+  kind: mcp
+  mcp_id: mcp2
+  pin: 5
+  output_type: light
+
+- id: OUT_04
+  kind: mcp
+  mcp_id: mcp2
+  pin: 4
+  output_type: light
+
+- id: OUT_05
+  kind: mcp
+  mcp_id: mcp2
+  pin: 3
+  output_type: light
+
+- id: OUT_06
+  kind: mcp
+  mcp_id: mcp2
+  pin: 2
+  output_type: light
+
+- id: OUT_07
+  kind: mcp
+  mcp_id: mcp2
+  pin: 1
+  output_type: light
+
+- id: OUT_08
+  kind: mcp
+  mcp_id: mcp2
+  pin: 0
+  output_type: light
+
+- id: OUT_09
+  kind: mcp
+  mcp_id: mcp1
+  pin: 7
+  output_type: light
+
+- id: OUT_10
+  kind: mcp
+  mcp_id: mcp1
+  pin: 6
+  output_type: light
+
+- id: OUT_11
+  kind: mcp
+  mcp_id: mcp1
+  pin: 5
+  output_type: light
+
+- id: OUT_12
+  kind: mcp
+  mcp_id: mcp1
+  pin: 4
+  output_type: light
+
+- id: OUT_13
+  kind: mcp
+  mcp_id: mcp1
+  pin: 3
+  output_type: light
+
+- id: OUT_14
+  kind: mcp
+  mcp_id: mcp1
+  pin: 2
+  output_type: light
+
+- id: OUT_15
+  kind: mcp
+  mcp_id: mcp1
+  pin: 1
+  output_type: light
+
+- id: OUT_16
+  kind: mcp
+  mcp_id: mcp1
+  pin: 0
+  output_type: light
+
+- id: OUT_17
+  kind: mcp
+  mcp_id: mcp2
+  pin: 8
+  output_type: light
+
+- id: OUT_18
+  kind: mcp
+  mcp_id: mcp2
+  pin: 9
+  output_type: light
+
+- id: OUT_19
+  kind: mcp
+  mcp_id: mcp2
+  pin: 10
+  output_type: light
+
+- id: OUT_20
+  kind: mcp
+  mcp_id: mcp2
+  pin: 11
+  output_type: light
+
+- id: OUT_21
+  kind: mcp
+  mcp_id: mcp2
+  pin: 12
+  output_type: light
+
+- id: OUT_22
+  kind: mcp
+  mcp_id: mcp2
+  pin: 13
+  output_type: light
+
+- id: OUT_23
+  kind: mcp
+  mcp_id: mcp2
+  pin: 14
+  output_type: light
+
+- id: OUT_24
+  kind: mcp
+  mcp_id: mcp2
+  pin: 15
+  output_type: light
+
+- id: OUT_25
+  kind: mcp
+  mcp_id: mcp1
+  pin: 8
+  output_type: light
+
+- id: OUT_26
+  kind: mcp
+  mcp_id: mcp1
+  pin: 9
+  output_type: light
+
+- id: OUT_27
+  kind: mcp
+  mcp_id: mcp1
+  pin: 10
+  output_type: light
+
+- id: OUT_28
+  kind: mcp
+  mcp_id: mcp1
+  pin: 11
+  output_type: light
+
+- id: OUT_29
+  kind: mcp
+  mcp_id: mcp1
+  pin: 12
+  output_type: light
+
+- id: OUT_30
+  kind: mcp
+  mcp_id: mcp1
+  pin: 13
+  output_type: light
+
+- id: OUT_31
+  kind: mcp
+  mcp_id: mcp1
+  pin: 14
+  output_type: light
+
+- id: OUT_32
+  kind: mcp
+  mcp_id: mcp1
+  pin: 15
+  output_type: light

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/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/modbus/client.py

@@ -43,6 +43,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 +69,7 @@ class Modbus:
                 stopbits=stopbits,
                 bytesize=bytesize,
                 parity=parity,
+                timeout=timeout,
             )
             self._read_methods = {
                 "input": self._client.read_input_registers,

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/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/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

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
@@ -111,4 +111,4 @@ class INA219(AsyncUpdater, Filter):
         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)
+                self._loop.call_soon_threadsafe(sensor.update, time)

boneio/version.py

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