tinytoolslib 0.4.0__tar.gz → 0.5.0__tar.gz

{tinytoolslib-0.4.0 → tinytoolslib-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinytoolslib
-Version: 0.4.0
+Version: 0.5.0
 Summary: Set of tools for use with Tinycontrol devices like LK2.X, LK3.X, LK4.X or tcPDU.
 Author-email: Bartek Barszczewski <tinycontrol.software@gmail.com>
 License-Expression: Apache-2.0

{tinytoolslib-0.4.0 → tinytoolslib-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tinytoolslib"
-version = "0.4.0"
+version = "0.5.0"
 authors = [
     { name="Bartek Barszczewski", email="tinycontrol.software@gmail.com" },
 ]

tinytoolslib-0.5.0/tinytoolslib/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.5.0'

{tinytoolslib-0.4.0 → tinytoolslib-0.5.0}/tinytoolslib/models.py

@@ -1,5 +1,6 @@
 """Device definitions along with methods for communicating with them."""
 
+import operator
 import re
 import warnings
 from abc import ABC, abstractmethod
@@ -8,27 +9,18 @@ from typing import Any, ClassVar, Dict, List, Tuple, Union
 
 from aiohttp import ClientSession
 
-from tinytoolslib.constants import FW_URL_TEMPLATE, DeviceFamily, FWUpdateMethod
-from tinytoolslib.exceptions import (
-    TinyToolsRequestConnectionError,
-    TinyToolsRequestError,
-    TinyToolsRequestInternalServerError,
-    TinyToolsRequestNotFound,
-    TinyToolsRequestSSLError,
-    TinyToolsRequestTimeout,
-    TinyToolsUnsupported,
-)
-from tinytoolslib.parsers import (
-    float_div10,
-    float_div100,
-    float_div1000,
-    int_inverted,
-    list_map,
-    name_list,
-    parse_version,
-    strint_to_int_list,
-    up_to_int,
-)
+from tinytoolslib.constants import (FW_URL_TEMPLATE, DeviceFamily,
+                                    FWUpdateMethod)
+from tinytoolslib.exceptions import (TinyToolsRequestConnectionError,
+                                     TinyToolsRequestError,
+                                     TinyToolsRequestInternalServerError,
+                                     TinyToolsRequestNotFound,
+                                     TinyToolsRequestSSLError,
+                                     TinyToolsRequestTimeout,
+                                     TinyToolsUnsupported)
+from tinytoolslib.parsers import (float_div10, float_div100, float_div1000,
+                                  int_inverted, list_map, name_list,
+                                  parse_version, strint_to_int_list, up_to_int)
 from tinytoolslib.requests import async_get, get
 
 
@@ -108,7 +100,11 @@ class DeviceModel(ABC):
             if remove_mapped_keys:
                 # Remove keys that were parsed/mapped
                 for key, val in self.mapping.items():
-                    if isinstance(val["name"], str) and key != val["name"]:
+                    if (
+                        isinstance(val["name"], str)
+                        and key != val["name"]
+                        and (skip_keys is None or key not in skip_keys)
+                    ):
                         data.pop(key, None)
         # Run extra parsers, that need to work on whole response.
         for parser in self.parsers:
@@ -183,12 +179,12 @@ class DeviceModel(ABC):
             f"{self.__class__.__name__} does not support setting DSs"
         )
 
-    def get_all(self) -> Dict[str, Any]:
+    def get_all(self, remove_mapped_keys: bool = False) -> Dict[str, Any]:
         """Get set of all sensor/readings."""
         if callable(getattr(self, "_get_all", None)):
             data = {}
             for url in self._get_all():
-                data.update(self.get(url))
+                data.update(self.get(url, remove_mapped_keys=remove_mapped_keys))
             return data
         raise TinyToolsUnsupported(
             f"{self.__class__.__name__} does not support get_all command"
@@ -258,12 +254,12 @@ class DeviceModel(ABC):
             f"{self.__class__.__name__} does not support controlling VARs"
         )
 
-    async def async_get_all(self) -> Dict[str, Any]:
+    async def async_get_all(self, remove_mapped_keys: bool = False) -> Dict[str, Any]:
         """Async get_all."""
         if callable(getattr(self, "_get_all", None)):
             data = {}
             for url in self._get_all():
-                data.update(await self.async_get(url))
+                data.update(await self.async_get(url, remove_mapped_keys=remove_mapped_keys))
             return data
         raise TinyToolsUnsupported(
             f"{self.__class__.__name__} does not support get_all command"
@@ -296,6 +292,82 @@ class DeviceModel(ABC):
     # endregion
 
 
+def set_cmd_helper(
+    caller: DeviceModel,
+    cmd_prefix: str,
+    cmd_param: str,
+    index: Union[int, List[int]],
+    value: Union[int, List[int], None],
+    negation=False,
+    toggle_available=True,
+    cmd_set_format="{cmd_param}{index}={value}",
+    cmd_toggle_format="{cmd_param}={cmd_param}{index}",
+):
+    """Helper for building GET query for setting, eg OUTs, PWMs, VARs.
+
+    It handles negation (or forced inversion of state, eg. when device
+    uses 0 for on and 1 for off), toggle commands (only chainable mode,
+    eg. out=out1&out=out2), and also mixed combination of index+value.
+
+    Example output (for single index and single value, set command):
+    `{cmd_prefix}{cmd_param}{index}={value}`
+    """
+    cmd = cmd_prefix
+    # Invert states for negation or forced inversion.
+    if negation and value is not None:
+        if isinstance(value, list):
+            value = [int_inverted(val) for val in value]
+        else:
+            value = int_inverted(value)
+    # Handle case when value is missing but toggle is not available.
+    if toggle_available is False and value is None:
+        raise TinyToolsUnsupported(
+            f"{caller.__class__.__name__} does not support toggle for command {cmd_param}"
+        )
+    # Handle combinations of index + value: int + int/None, [int] + int/[int]/None.
+    if isinstance(index, list):
+        if toggle_available and value is None:
+            cmd += "&".join(
+                [
+                    cmd_toggle_format.format(cmd_param=cmd_param, index=ix)
+                    for ix in index
+                ]
+            )
+        elif isinstance(value, list):
+            cmd += "&".join(
+                [
+                    cmd_set_format.format(cmd_param=cmd_param, index=ix, value=val)
+                    for ix, val in zip(index, value)
+                ]
+            )
+        else:
+            cmd += "&".join(
+                [
+                    cmd_set_format.format(cmd_param=cmd_param, index=ix, value=value)
+                    for ix in index
+                ]
+            )
+    else:
+        if toggle_available and value is None:
+            cmd += cmd_toggle_format.format(cmd_param=cmd_param, index=index)
+        else:
+            cmd += cmd_set_format.format(cmd_param=cmd_param, index=index, value=value)
+    return cmd
+
+
+def apply_index_offset(
+    index: Union[int, List[int]], offset: int = 0, func=operator.add
+) -> Union[int, List[int]]:
+    """Apply an integer offset to a single index or list of indices.
+
+    Use offset=-1 to convert 1-based → 0-based, offset=+1 to convert 0-based → 1-based.
+    Might change how it processes by providing func, which will be given 2 params: index and offset.
+    """
+    if isinstance(index, list):
+        return [func(i, offset) for i in index]
+    return func(index, offset)
+
+
 @dataclass
 class LK_HW_20_PS(DeviceModel):
     """Methods for working with Power Socket on LK2.0.
@@ -307,6 +379,7 @@ class LK_HW_20_PS(DeviceModel):
         "IP Power Socket v1 (LK2.0)",  # 5G10A/6G10A
         DeviceFamily.PS,
         fw_update_method=FWUpdateMethod.TFTP,
+        extras={"number_of_outputs": 6, "outputs_inverted": True}, # or 5 for SW 6.12a
     )
     mapping: ClassVar[Dict[str, Dict]] = {
         # --- st0.xml
@@ -396,6 +469,9 @@ class LK_HW_20_PS(DeviceModel):
         "b28": {"name": "snmp_trap_active", "format": bool},  # 'true' or ''
         # r0, r1, r2 - remote control
     }
+    parsers: ClassVar[List[str]] = [
+        "_parse_outs",
+    ]
 
     @classmethod
     def check_version(
@@ -409,6 +485,27 @@ class LK_HW_20_PS(DeviceModel):
             "6.12",
         ]
 
+    def is_5_socket_ps(self):
+        """Helper check whether it's version of LK 2.0 PS with 5 sockets."""
+        return type(self) == LK_HW_20_PS and self.software_version == "6.12a"
+
+    # region Parser methods that modifies data in _get()
+    def _parse_outs(self, data: Dict[str, Any], path: str) -> None:
+        """Parse outputs OUT with including negation."""
+        # Parser is called post mapping so original keys might be missing already.
+        if "out_negation" in data:
+            self._context["out_negation"] = int(data.get("out_negation"))
+        if "out0" in data:
+            out_negation = self._context.get("out_negation")
+            number_of_outputs = self.info.extras["number_of_outputs"]
+            if self.is_5_socket_ps():
+                number_of_outputs = 5
+            for name in name_list("out", number_of_outputs, 0):
+                data[name] = (
+                    int_inverted(data[name]) if out_negation else int(data[name])
+                )
+    # endregion
+
     def _get(
         self,
         data: Dict[str, Any],
@@ -416,13 +513,38 @@ class LK_HW_20_PS(DeviceModel):
         skip_keys: Union[List[str], None] = None,
         remove_mapped_keys: bool = False,
     ) -> Dict[str, Any]:
-        if path == "/board.xml":
+        """Manage properties depending on path.
+
+        Remove problematic keys, or do extra mapping for some keys.
+        """
+        if self.is_5_socket_ps() and path == "/st2.xml":
+            # For PS HW 2.0 SW 6.12a (5 socket)
             if skip_keys is None:
                 skip_keys = set()
+            # Ignore r5-r11 from normal mapping - process that post _get()
+            skip_keys.update(["r5", "r6", "r7", "r8", "r9", "r10", "r11"])
+        elif path == "/board.xml":
             # Ignore few variables for /board.xml as they overlap in /st2.xml and /board.xml,
             # but with different meaning (out reset time instead of remote control).
+            if skip_keys is None:
+                skip_keys = set()
             skip_keys.update({"r0", "r1", "r2", "r3", "r4"})
-        return super()._get(data, path, skip_keys, remove_mapped_keys)
+        get_result = super()._get(data, path, skip_keys, remove_mapped_keys)
+        if self.is_5_socket_ps() and path == "/st2.xml":
+            # For PS HW 2.0 SW 6.12a (5 socket) apply parsing for r5-r9
+            mapping = {
+                "r5": {"name": "out0_name", "format": str},
+                "r6": {"name": "out1_name", "format": str},
+                "r7": {"name": "out2_name", "format": str},
+                "r8": {"name": "out3_name", "format": str},
+                "r9": {"name": "out4_name", "format": str},
+            }
+            for key, mapper in mapping.items():
+                get_result[mapper["name"]] = mapper["format"](get_result[key])
+            if remove_mapped_keys:
+                for key in mapping:
+                    get_result.pop(key)
+        return get_result
 
     def _set_out(
         self, index: Union[int, List[int]], value: Union[int, List[int], None]
@@ -434,28 +556,27 @@ class LK_HW_20_PS(DeviceModel):
             value: 0-1 (single or list)
         """
         cmd = "/outs.cgi?"
-        if isinstance(index, list):
-            if value is None:
+        if value is None:
+            # Handle different toggle command
+            if isinstance(index, list):
                 cmd += "out=" + "".join(map(str, index))
-            elif isinstance(value, list):
-                cmd += "&".join(
-                    [
-                        "out{}={}".format(ix, int_inverted(val))
-                        for ix, val in zip(index, value)
-                    ]
-                )
             else:
-                cmd += "&".join(
-                    ["out{}={}".format(ix, int_inverted(value)) for ix in index]
-                )
+                cmd += f"out={index}"
         else:
-            if value is None:
-                cmd += "out={}".format(index)
-            else:
-                cmd += "out{}={}".format(index, int_inverted(value))
-        # Fix for HW2.0 - HW2.0 uses NON inverted for out5=Y,
-        # so Y=1 to turn on and Y=0 to turn off.
-        if self.hardware_version == "2.0":
+            cmd = set_cmd_helper(
+                self,
+                cmd,
+                "out",
+                index,
+                value,
+                operator.xor(
+                    self._context["out_negation"], self.info.extras["outputs_inverted"]
+                ),
+                False,
+            )
+        # Fix command for OUT5 (non-inverted) is only for LK HW 2.0 PS 6G (HW=2.0, SW=6.12),
+        # but PS 5G simply doesn't have OUT5, so for simplicity checks for LK_HW_20_PS.
+        if type(self) == LK_HW_20_PS:
             if "out5=0" in cmd:
                 cmd = cmd.replace("out5=0", "out5=1")
             elif "out5=1" in cmd:
@@ -480,6 +601,7 @@ class LK_HW_20(LK_HW_20_PS):
         "lc20",
         "https://tinycontrol.pl/en/archives/lan-controller-20/#firmware",
         fw_update_method=FWUpdateMethod.TFTP,
+        extras={"number_of_outputs": 6, "outputs_inverted": True},
     )
     mapping: ClassVar[Dict[str, Dict]] = {
         # Overwrite PS mapping (there will be extra b30, b31)
@@ -532,7 +654,7 @@ class LK_HW_20(LK_HW_20_PS):
         "dz": {"name": "power2_iD4_divisor", "format": int},
         "mm": {"name": "power2_iD4_unit", "format": str},
         "mh": {"name": "power2_iD4_divisor2", "format": int},
-        # Negation of iD (int with bin 0000)
+        # Negation of iD (int with bin 0000) - it does not change visual state of inputs.
         "db": {"name": "iD_negation", "format": str},
         # --- board.xml
         "ds": {"name": "ds_read_id", "format": str},
@@ -542,62 +664,30 @@ class LK_HW_20(LK_HW_20_PS):
     def check_version(
         cls, hardware_version: Union[str, None], software_version: str
     ) -> bool:
-        return hardware_version == "2.0" and software_version not in [
-            "6.00",
-            "6.09",
-            "6.10",
-            "6.12a",
-            "6.12",
-        ]
+        return (
+            hardware_version == "2.0"
+            and LK_HW_20_PS.check_version(hardware_version, software_version) is False
+        )
 
-    def _set_pwm(
-        self, index: Union[int, List[int]], value: Union[int, List[int]]
-    ) -> str:
-        """Prepare command for setting PWM.
+    def _set_pwm(self, index: int, value: int) -> str:
+        """Prepare command for setting PWM(0).
 
         Arguments:
-            index: 0-3 (single or list)
-            value: 0-1 (single or list)
-        NOTE: 1-3 can be only set, not read
+            index: 0 (single int)
+            value: 0-1 (single int)
         """
-        cmd = "/ind.cgi?"
-        if isinstance(index, list):
-            if isinstance(value, list):
-                cmd += "&".join(
-                    ["pwm{}={}".format(ix, val) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["pwm{}={}".format(ix, value) for ix in index])
-        else:
-            cmd += "pwm{}={}".format(index, value)
+        cmd = set_cmd_helper(self, "/ind.cgi?", "pwm", index, value, False, False)
         cmd = cmd.replace("pwm0", "pwm")
         return cmd
 
-    def _set_pwm_duty(
-        self, index: Union[int, List[int]], value: Union[int, List[int]]
-    ) -> str:
-        """Prepare command for setting PWM duty.
+    def _set_pwm_duty(self, index: int, value: int) -> str:
+        """Prepare command for setting PWM(0) duty.
 
         Arguments:
-            index: 0-3 (single or list)
-            value: 0-100 (single or list)
-        NOTE: 1-3 can be only set, not read
+            index: 0 (single int)
+            value: 0-100 (single int)
         """
-        cmd = "/ind.cgi?"
-        if isinstance(index, list):
-            if isinstance(value, list):
-                cmd += "&".join(
-                    [
-                        "pwmd{}={}".format(ix, int(val * 10))
-                        for ix, val in zip(index, value)
-                    ]
-                )
-            else:
-                cmd += "&".join(
-                    ["pwmd{}={}".format(ix, int(value * 10)) for ix in index]
-                )
-        else:
-            cmd += "pwmd{}={}".format(index, int(value * 10))
+        cmd = set_cmd_helper(self, "/ind.cgi?", "pwmd", index, value*10, False, False)
         cmd = cmd.replace("pwmd0", "pwmd")
         return cmd
 
@@ -617,7 +707,7 @@ class LK_HW_20(LK_HW_20_PS):
             index - 1-6
             value - not used for LK2.X
         """
-        cmd = "/ind.cgi?ds={}".format(index)
+        cmd = f"/ind.cgi?ds={index}"
         return cmd
 
     def get_ds_id(self) -> str:
@@ -628,10 +718,7 @@ class LK_HW_20(LK_HW_20_PS):
 
 @dataclass
 class LK_HW_25(LK_HW_20):
-    """Methods for working with LK2.5.
-
-    Note: for outputs it uses unified values 0 - off, 1 - on.
-    """
+    """Methods for working with LK2.5."""
 
     info: ClassVar[Union[DeviceInfo, None]] = DeviceInfo(
         "LK HW 2.5",
@@ -639,13 +726,43 @@ class LK_HW_25(LK_HW_20):
         "lc25",
         "https://tinycontrol.pl/en/lan-controller-25/firmware-docs/#firmware",
         fw_update_method=FWUpdateMethod.TFTP,
+        extras={"number_of_outputs": 6, "outputs_inverted": True},
     )
 
     @classmethod
     def check_version(
         cls, hardware_version: Union[str, None], software_version: str
     ) -> bool:
-        return hardware_version == "2.5" and software_version != "6.15"
+        return (
+            hardware_version == "2.5"
+            and LK_HW_25_PS.check_version(hardware_version, software_version) is False
+        )
+
+    # pylint: disable=useless-super-delegation, useless-parent-delegation
+    def _set_pwm(
+        self, index: Union[int, List[int]], value: Union[int, List[int]]
+    ) -> str:
+        """Prepare command for setting PWM.
+
+        Arguments:
+            index: 0-3 (single or list)
+            value: 0-1 (single or list)
+        NOTE: 1-3 can be only set, not read
+        """
+        return super()._set_pwm(index, value)
+
+    # pylint: disable=useless-super-delegation, useless-parent-delegation
+    def _set_pwm_duty(
+        self, index: Union[int, List[int]], value: Union[int, List[int]]
+    ) -> str:
+        """Prepare command for setting PWM duty.
+
+        Arguments:
+            index: 0-3 (single or list)
+            value: 0-100 (single or list)
+        NOTE: 1-3 can be only set, not read
+        """
+        return super()._set_pwm_duty(index, value)
 
 
 @dataclass
@@ -654,13 +771,31 @@ class LK_HW_25_PS(LK_HW_20_PS):
         "IP Power Socket v2 (LK2.5)",
         DeviceFamily.PS,
         fw_update_method=FWUpdateMethod.TFTP,
+        extras={"number_of_outputs": 6, "outputs_inverted": False},
     )
+    mapping: ClassVar[Dict[str, Dict]] = {
+        **LK_HW_20_PS.mapping,
+        "out0": {"name": "out0", "format": int},
+        "out1": {"name": "out1", "format": int},
+        "out2": {"name": "out2", "format": int},
+        "out3": {"name": "out3", "format": int},
+        "out4": {"name": "out4", "format": int},
+        "out5": {"name": "out5", "format": int},
+        # There are 6 DS instead of 4
+        "ia5": {"name": "ds5", "format": float_div10},
+        "ia6": {"name": "ds6", "format": float_div10},
+        "ia7": {"name": "iAValue1", "format": float_div100},  # Voltage input
+        "ia8": {"name": "boardVoltage", "format": float_div10},
+        # Names divided with *
+        "d": {"name": "dsName1-6_iAName1_iDName1-2", "format": str},
+    }
 
     @classmethod
     def check_version(
         cls, hardware_version: Union[str, None], software_version: str
     ) -> bool:
-        return hardware_version == "2.5" and software_version == "6.15"
+        # Tested FW 6.15 on LK2.5 and it returns HW 2.0, so include it.
+        return hardware_version in ["2.0", "2.5"] and software_version == "6.15"
 
 
 @dataclass
@@ -677,7 +812,7 @@ class LK_HW_30(DeviceModel):
         "lc30",
         "https://tinycontrol.pl/en/archives/lan-controller-30/#firmware",
         fw_update_method=FWUpdateMethod.TFTP,
-        extras={"number_of_outputs": 6},
+        extras={"number_of_outputs": 6, "number_of_digital_inputs": 4},
     )
     mapping: ClassVar[Dict[str, Dict]] = {
         # OUTs - further parsed with _parse_outs
@@ -779,6 +914,7 @@ class LK_HW_30(DeviceModel):
         "_parse_outs",
         "_parse_diffs",
         "_parse_custom_readings",
+        "_parse_inpd",
     ]
 
     @classmethod
@@ -915,6 +1051,21 @@ class LK_HW_30(DeviceModel):
                     int_inverted(data[name]) if out_negation else int(data[name])
                 )
 
+    def _parse_inpd(self, data: Dict[str, Any], path: str):
+        """Parse digital inputs and include negation in returned values."""
+        if "iDNegation1" in data:
+            for name in name_list(
+                "iDNegation", self.info.extras["number_of_digital_inputs"]
+            ):
+                self._context[name] = data[name]
+        if "iDValue1" in data and "iDNegation1" in self._context:
+            for name1, name2 in zip(
+                name_list("iDValue", self.info.extras["number_of_digital_inputs"]),
+                name_list("iDNegation", self.info.extras["number_of_digital_inputs"]),
+            ):
+                if self._context.get(name2):
+                    data[name1] = int_inverted(data[name1])
+
     # endregion
 
     def _set_out(
@@ -928,26 +1079,9 @@ class LK_HW_30(DeviceModel):
         NOTE: When out is negated it will negate passed value,
         so value=1 will actually set 0 and value=0 set 1.
         """
-        cmd = "/outs.cgi?"
-        if value is not None and self._context.get("out_negation"):
-            if isinstance(value, list):
-                value = [int_inverted(val) for val in value]
-            else:
-                value = int_inverted(value)
-        if isinstance(index, list):
-            if value is None:
-                cmd += "&".join(["out=out{}".format(ix) for ix in index])
-            elif isinstance(value, list):
-                cmd += "&".join(
-                    ["out{}={}".format(ix, val) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["out{}={}".format(ix, value) for ix in index])
-        else:
-            if value is None:
-                cmd += "out=out{}".format(index)
-            else:
-                cmd += "out{}={}".format(index, value)
+        cmd = set_cmd_helper(
+            self, "/outs.cgi?", "out", index, value, self._context["out_negation"], True
+        )
         return cmd
 
     def _set_pwm(
@@ -959,21 +1093,7 @@ class LK_HW_30(DeviceModel):
             index: 0-3 (single or list)
             value: 0-1 (single or list)
         """
-        cmd = "/outs.cgi?"
-        if isinstance(index, list):
-            if value is None:
-                cmd += "&".join(["pwm=pwm{}".format(ix) for ix in index])
-            elif isinstance(value, list):
-                cmd += "&".join(
-                    ["pwm{}={}".format(ix, val) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["pwm{}={}".format(ix, value) for ix in index])
-        else:
-            if value is None:
-                cmd += "pwm=pwm{}".format(index)
-            else:
-                cmd += "pwm{}={}".format(index, value)
+        cmd = set_cmd_helper(self, "/outs.cgi?", "pwm", index, value, False, True)
         return cmd
 
     def _set_pwm_duty(
@@ -985,16 +1105,16 @@ class LK_HW_30(DeviceModel):
             index: 0-3 (single or list)
             value: 0-100 (single or list)
         """
-        cmd = "/stm.cgi?"
-        if isinstance(index, list):
-            if isinstance(value, list):
-                cmd += "&".join(
-                    ["pwmd={}{}".format(ix, int(val)) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["pwmd={}{}".format(ix, int(value)) for ix in index])
-        else:
-            cmd += "pwmd={}{}".format(index, int(value))
+        cmd = set_cmd_helper(
+            self,
+            "/stm.cgi?",
+            "pwmd",
+            index,
+            value,
+            False,
+            False,
+            "{cmd_param}={index}{value}",
+        )
         return cmd
 
     def _set_pwm_freq(
@@ -1006,16 +1126,16 @@ class LK_HW_30(DeviceModel):
             index: 0-1 (single or list; 0 - pwm0, 1 - pwm1-3 shared)
             value: 1-1_000_000
         """
-        cmd = "/stm.cgi?"
-        if isinstance(index, list):
-            if isinstance(value, list):
-                cmd += "&".join(
-                    ["pwmf={}{}".format(ix, int(val)) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["pwmf={}{}".format(ix, int(value)) for ix in index])
-        else:
-            cmd += "pwmf={}{}".format(index, int(value))
+        cmd = set_cmd_helper(
+            self,
+            "/stm.cgi?",
+            "pwmf",
+            index,
+            value,
+            False,
+            False,
+            "{cmd_param}={index}{value}",
+        )
         return cmd
 
     def _set_ds(
@@ -1027,16 +1147,16 @@ class LK_HW_30(DeviceModel):
             index: 1-8
             value: DS ID
         """
-        cmd = "/stm.cgi?"
-        if isinstance(index, list):
-            if isinstance(value, list):
-                cmd += "&".join(
-                    ["dswrite={}:{}".format(ix, val) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["dswrite={}:{}".format(ix, value) for ix in index])
-        else:
-            cmd += "dswrite={}:{}".format(index, value)
+        cmd = set_cmd_helper(
+            self,
+            "/stm.cgi?",
+            "dswrite",
+            index,
+            value,
+            False,
+            False,
+            "{cmd_param}={index}:{value}",
+        )
         return cmd
 
     def get_ds_id(self) -> str:
@@ -1047,8 +1167,10 @@ class LK_HW_30(DeviceModel):
     def _get_all(self) -> List[str]:
         """Prepare list of URLs to fetch data from."""
         urls = ["/json/all.json", "/json/pwmpid.json"]
-        if self.hardware_version >= "3.5" and "1.50" > self.software_version >= "1.22b":
-            urls.append("/json/events_per.json")
+        # For LK3.0 add few extra paths, as all.json is incomplete there.
+        if LK_HW_30.check_version(self.hardware_version, self.software_version):
+            urls.insert(0, "/json/inputs.json")
+            urls.insert(0, "/json/outputs.json")
         return urls
 
     def _reset_to_defaults(self):
@@ -1074,48 +1196,40 @@ class LK_HW_30(DeviceModel):
             calibration: -32768 - 32767 (calibration offset)
             multiplier: 0.01 - 327.67 (before sending it will be int(X*100)
         """
-        cmd = "/inpa.cgi?"
-        if isinstance(index, list):
-            if isinstance(sensor, list):
-                cmd += "&".join(
-                    [
-                        "sensor={}{}".format(ix - 1, val)
-                        for ix, val in zip(index, sensor)
-                    ]
-                )
-            else:
-                cmd += "&".join(["sensor={}{}".format(ix - 1, sensor) for ix in index])
-            if isinstance(calibration, list):
-                cmd += "&".join(
-                    [
-                        "calibration={}{}".format(ix - 1, val)
-                        for ix, val in zip(index, calibration)
-                    ]
-                )
-            elif calibration is not None:
-                cmd += "&".join(
-                    ["calibration={}{}".format(ix - 1, calibration) for ix in index]
-                )
-            if isinstance(multiplier, list):
-                cmd += "&".join(
-                    [
-                        "multiplier={}{}".format(ix - 1, int(val * 100))
-                        for ix, val in zip(index, multiplier)
-                    ]
-                )
-            elif multiplier is not None:
-                cmd += "&".join(
-                    [
-                        "multiplier={}{}".format(ix - 1, int(multiplier * 100))
-                        for ix in index
-                    ]
-                )
-        else:
-            cmd += "sensor={}{}".format(index - 1, sensor)
-            if calibration is not None:
-                cmd += "&calibration={}{}".format(index - 1, calibration)
-            if multiplier is not None:
-                cmd += "&multiplier={}{}".format(index - 1, int(multiplier * 100))
+        index = apply_index_offset(index, -1)  # -1 each index
+        cmd = set_cmd_helper(
+            self,
+            "/inpa.cgi?",
+            "sensor",
+            index,
+            sensor,
+            False,
+            False,
+            "{cmd_param}={index}{value}",
+        )
+        if calibration is not None:
+            cmd = set_cmd_helper(
+                self,
+                cmd,
+                "calibration",
+                index,
+                calibration,
+                False,
+                False,
+                "{cmd_param}={index}{value}",
+            )
+        if multiplier is not None:
+            multiplier = apply_index_offset(multiplier, 100, lambda a, b: int(a * b))
+            cmd = set_cmd_helper(
+                self,
+                cmd,
+                "multiplier",
+                index,
+                multiplier,
+                False,
+                False,
+                "{cmd_param}={index}{value}",
+            )
         return self.get(cmd)
 
 
@@ -1129,7 +1243,7 @@ class LK_HW_35(LK_HW_30):
         "lc35",
         "https://tinycontrol.pl/en/lan-controller-35/firmware/#firmware",
         fw_update_method=FWUpdateMethod.TFTP,
-        extras={"number_of_outputs": 6},
+        extras={"number_of_outputs": 6, "number_of_digital_inputs": 4},
     )
 
     @classmethod
@@ -1142,6 +1256,20 @@ class LK_HW_35(LK_HW_30):
             and not software_version.endswith("dcdc")
         )
 
+    # region Parser methods that modifies data in _get()
+    def _parse_inpd(self, data: Dict[str, Any], path: str):
+        """Apply fix for negation of digital inputs for earlier SW.
+
+        Since SW 1.49, LK 3.5 automatically applies negation to readings,
+        but older SWs works like LK3.0, so for those use inherited parsing.
+        """
+        if (
+            LK_HW_35.check_version(self.hardware_version, self.software_version)
+            and self.software_version < "1.49"
+        ):
+            super()._parse_inpd(data, path)
+    # endregion
+
     def _set_var(
         self, index: Union[int, List[int]], value: Union[int, List[int]]
     ) -> str:
@@ -1151,18 +1279,19 @@ class LK_HW_35(LK_HW_30):
             index: 1-8 (single or list)
             value: 0-1 (single or list)
         """
-        cmd = "/outs.cgi?"
-        if isinstance(index, list):
-            if isinstance(value, list):
-                cmd += "&".join(
-                    ["vout{}={}".format(ix - 1, val) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["vout{}={}".format(ix - 1, value) for ix in index])
-        else:
-            cmd += "vout{}={}".format(index - 1, value)
+        # Fix indexes to be 0-based, as outside we use 1-based indexes/names for VARs.
+        index = apply_index_offset(index, -1)
+        cmd = set_cmd_helper(self, "/outs.cgi?", "vout", index, value, False, False)
         return cmd
 
+    def _get_all(self) -> List[str]:
+        """Prepare list of URLs to fetch data from."""
+        urls = super()._get_all()
+        # Early SWs for LK3.5 require extra path to get state of EVENT.
+        if LK_HW_35.check_version(self.hardware_version, self.software_version) and "1.50" > self.software_version >= "1.22b":
+            urls.append("/json/events_per.json")
+        return urls
+
 
 @dataclass
 class LK_HW_39(LK_HW_35):
@@ -1242,6 +1371,10 @@ class LK_HW_40(DeviceModel):
         "netMac": {"name": "mac", "format": str},
         "softwareVersion": {"name": "software_version", "format": str},
         "hardwareVersion": {"name": "hardware_version", "format": str},
+        "pm1": {"name": "pm1.0", "format": float},
+        "pm2": {"name": "pm2.5", "format": float},
+        "pm4": {"name": "pm4.0", "format": float},
+        "pm10": {"name": "pm10.0", "format": float},
     }
     parsers: ClassVar[List[str]] = ["_parse_outs"]
 
@@ -1273,26 +1406,15 @@ class LK_HW_40(DeviceModel):
         NOTE: When out is negated it will negate passed value,
         so value=1 will actually set 0 and value=0 set 1.
         """
-        cmd = "/api/v1/save/?"
-        if value is not None and self._context.get("out_negation"):
-            if isinstance(value, list):
-                value = [int_inverted(val) for val in value]
-            else:
-                value = int_inverted(value)
-        if isinstance(index, list):
-            if value is None:
-                cmd += "&".join(["out=out{}".format(ix) for ix in index])
-            elif isinstance(value, list):
-                cmd += "&".join(
-                    ["out{}={}".format(ix, val) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["out{}={}".format(ix, value) for ix in index])
-        else:
-            if value is None:
-                cmd += "out=out{}".format(index)
-            else:
-                cmd += "out{}={}".format(index, value)
+        cmd = set_cmd_helper(
+            self,
+            "/api/v1/save/?",
+            "out",
+            index,
+            value,
+            self._context["out_negation"],
+            True,
+        )
         return cmd
 
     def _set_pwm(
@@ -1304,21 +1426,7 @@ class LK_HW_40(DeviceModel):
             index: 1-3 (single or list)
             value: 0-1 (single or list)
         """
-        cmd = "/api/v1/save/?"
-        if isinstance(index, list):
-            if value is None:
-                cmd += "&".join(["pwm=pwm{}".format(ix) for ix in index])
-            elif isinstance(value, list):
-                cmd += "&".join(
-                    ["pwm{}={}".format(ix, val) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["pwm{}={}".format(ix, value) for ix in index])
-        else:
-            if value is None:
-                cmd += "pwm=pwm{}".format(index)
-            else:
-                cmd += "pwm{}={}".format(index, value)
+        cmd = set_cmd_helper(self, "/api/v1/save/?", "pwm", index, value, False, True)
         return cmd
 
     def _set_pwm_duty(
@@ -1330,19 +1438,7 @@ class LK_HW_40(DeviceModel):
             index: 1-3 (single or list)
             value: 0-100 (single or list)
         """
-        cmd = "/api/v1/save/?"
-        if isinstance(index, list):
-            if isinstance(value, list):
-                cmd += "&".join(
-                    [
-                        "pwmDuty{}={}".format(ix, int(val))
-                        for ix, val in zip(index, value)
-                    ]
-                )
-            else:
-                cmd += "&".join(["pwmDuty{}={}".format(ix, int(value)) for ix in index])
-        else:
-            cmd += "pwmDuty{}={}".format(index, int(value))
+        cmd = set_cmd_helper(self, "/api/v1/save/?", "pwmDuty", index, value, False, False)
         return cmd
 
     def _set_pwm_freq(self, index: Any, value: int) -> str:
@@ -1364,16 +1460,7 @@ class LK_HW_40(DeviceModel):
             index: 1-8 (single or list)
             value: 0-1 (single or list)
         """
-        cmd = "/api/v1/save/?"
-        if isinstance(index, list):
-            if isinstance(value, list):
-                cmd += "&".join(
-                    ["var{}={}".format(ix, val) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["var{}={}".format(ix, value) for ix in index])
-        else:
-            cmd += "var{}={}".format(index, value)
+        cmd = set_cmd_helper(self, "/api/v1/save/?", "var", index, value, False, False)
         return cmd
 
     def _set_ds(
@@ -1385,16 +1472,7 @@ class LK_HW_40(DeviceModel):
             index: 1-8
             value: DS ID
         """
-        cmd = "/api/v1/save/?"
-        if isinstance(index, list):
-            if isinstance(value, list):
-                cmd += "&".join(
-                    ["dsID{}={}".format(ix, val) for ix, val in zip(index, value)]
-                )
-            else:
-                cmd += "&".join(["dsID{}={}".format(ix, value) for ix in index])
-        else:
-            cmd += "dsID{}={}".format(index, value)
+        cmd = set_cmd_helper(self, "/api/v1/save/?", "dsID", index, value, False, False)
         return cmd
 
     def get_ds_id(self) -> str:

{tinytoolslib-0.4.0 → tinytoolslib-0.5.0}/tinytoolslib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinytoolslib
-Version: 0.4.0
+Version: 0.5.0
 Summary: Set of tools for use with Tinycontrol devices like LK2.X, LK3.X, LK4.X or tcPDU.
 Author-email: Bartek Barszczewski <tinycontrol.software@gmail.com>
 License-Expression: Apache-2.0

tinytoolslib-0.4.0/tinytoolslib/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.4.0'