boneIO 0.8.0.dev7__tar.gz → 0.8.0.dev9__tar.gz

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

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

{boneIO-0.8.0.dev7 → boneIO-0.8.0.dev9}/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.dev9/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-0.8.0.dev9/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-0.8.0.dev9/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-0.8.0.dev7 → boneIO-0.8.0.dev9}/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.dev7 → boneIO-0.8.0.dev9}/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.dev7 → boneIO-0.8.0.dev9}/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-0.8.0.dev7 → boneIO-0.8.0.dev9}/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.dev9/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 }]
+        }
+      ]
+    }
+  ]
+}