pypck 0.8.8__py3-none-any.whl → 0.8.10__py3-none-any.whl

pypck/connection.py

@@ -13,7 +13,7 @@ from pypck import inputs, lcn_defs
 from pypck.helpers import TaskRegistry
 from pypck.lcn_addr import LcnAddr
 from pypck.lcn_defs import LcnEvent
-from pypck.module import AbstractConnection, GroupConnection, ModuleConnection
+from pypck.module import GroupConnection, ModuleConnection
 from pypck.pck_commands import PckGenerator
 
 _LOGGER = logging.getLogger(__name__)
@@ -243,7 +243,7 @@ class PchkConnectionManager:
                     if isinstance(exc, (ConnectionRefusedError, OSError)):
                         raise PchkConnectionRefusedError()
                     else:
-                        raise awaitable.exception()  # type: ignore
+                        raise exc
 
         if pending:
             for awaitable in pending:
@@ -405,8 +405,8 @@ class PchkConnectionManager:
 
     def get_address_conn(
         self, addr: LcnAddr, request_serials: bool = True
-    ) -> AbstractConnection:
-        """Create and/or return an AbstractConnection to the given module or group."""
+    ) -> ModuleConnection | GroupConnection:
+        """Create and/or return a connection to the given module or group."""
         if addr.is_group:
             return self.get_group_conn(addr)
         return self.get_module_conn(addr, request_serials)

pypck/helpers.py

@@ -1,7 +1,7 @@
 """Helper functions for pypck."""
 
 import asyncio
-from collections.abc import Awaitable
+from collections.abc import Coroutine
 from typing import Any
 
 
@@ -30,9 +30,9 @@ class TaskRegistry:
         if task in self.tasks:
             self.tasks.remove(task)
 
-    def create_task(self, coro: Awaitable[Any]) -> "asyncio.Task[None]":
+    def create_task(self, coro: Coroutine[Any, Any, Any]) -> "asyncio.Task[None]":
         """Create a task and store a reference in the task registry."""
-        task = asyncio.create_task(coro)  # type: ignore
+        task: asyncio.Task[Any] = asyncio.create_task(coro)
         task.add_done_callback(self.remove_task)
         self.tasks.append(task)
         return task

pypck/lcn_defs.py

@@ -360,6 +360,44 @@ class Var(Enum):
     S0INPUT3 = auto()
     S0INPUT4 = auto()  # LCN-BU4LJVarValue
 
+    @classmethod
+    def variables(cls) -> list[Var]:
+        """Return a list of all variable types."""
+        return [
+            cls.VAR1ORTVAR,
+            cls.VAR2ORR1VAR,
+            cls.VAR3ORR2VAR,
+            cls.VAR4,
+            cls.VAR5,
+            cls.VAR6,
+            cls.VAR7,
+            cls.VAR8,
+            cls.VAR9,
+            cls.VAR10,
+            cls.VAR11,
+            cls.VAR12,
+        ]
+
+    @classmethod
+    def set_points(cls) -> list[Var]:
+        """Return a list of all set-point variable types."""
+        return [cls.R1VARSETPOINT, cls.R2VARSETPOINT]
+
+    @classmethod
+    def thresholds(cls) -> list[list[Var]]:
+        """Return a list of all threshold variable types."""
+        return [
+            [cls.THRS1, cls.THRS2, cls.THRS3, cls.THRS4, cls.THRS5],
+            [cls.THRS2_1, cls.THRS2_2, cls.THRS2_3, cls.THRS2_4],
+            [cls.THRS3_1, cls.THRS3_2, cls.THRS3_3, cls.THRS3_4],
+            [cls.THRS4_1, cls.THRS4_2, cls.THRS4_3, cls.THRS4_4],
+        ]
+
+    @classmethod
+    def s0s(cls) -> list[Var]:
+        """Return a list of all S0-input variable types."""
+        return [cls.S0INPUT1, cls.S0INPUT2, cls.S0INPUT3, cls.S0INPUT4]
+
     @staticmethod
     def var_id_to_var(var_id: int) -> Var:
         """Translate a given id into a variable type.
@@ -369,9 +407,9 @@ class Var(Enum):
         :returns: The translated variable enum.
         :rtype: Var
         """
-        if (var_id < 0) or (var_id >= len(Var.variables)):  # type: ignore
+        if (var_id < 0) or (var_id >= len(Var.variables())):
             raise ValueError("Bad var_id.")
-        return Var.variables[var_id]  # type: ignore
+        return Var.variables()[var_id]
 
     @staticmethod
     def set_point_id_to_var(set_point_id: int) -> Var:
@@ -382,9 +420,9 @@ class Var(Enum):
         :return: The translated var
         :rtype:  Var
         """
-        if (set_point_id < 0) or (set_point_id >= len(Var.set_points)):  # type: ignore
+        if (set_point_id < 0) or (set_point_id >= len(Var.set_points())):
             raise ValueError("Bad set_point_id.")
-        return Var.set_points[set_point_id]  # type: ignore
+        return Var.set_points()[set_point_id]
 
     @staticmethod
     def thrs_id_to_var(register_id: int, thrs_id: int) -> Var:
@@ -399,12 +437,12 @@ class Var(Enum):
         """
         if (
             (register_id < 0)
-            or (register_id >= len(Var.thresholds))  # type: ignore
+            or (register_id >= len(Var.thresholds()))
             or (thrs_id < 0)
             or (thrs_id >= (5 if (register_id == 0) else 4))
         ):
             raise ValueError("Bad register_id and/or thrs_id.")
-        return Var.thresholds[register_id][thrs_id]  # type: ignore
+        return Var.thresholds()[register_id][thrs_id]
 
     @staticmethod
     def s0_id_to_var(s0_id: int) -> Var:
@@ -415,9 +453,9 @@ class Var(Enum):
         :return:    The translated var
         :rtype:     Var
         """
-        if (s0_id < 0) or (s0_id >= len(Var.s0s)):  # type: ignore
+        if (s0_id < 0) or (s0_id >= len(Var.s0s())):
             raise ValueError("Bad s0_id.")
-        return Var.s0s[s0_id]  # type: ignore
+        return Var.s0s()[s0_id]
 
     @staticmethod
     def to_var_id(var: Var) -> int:
@@ -658,42 +696,6 @@ class Var(Enum):
         return (not lock_state) and (software_serial < 0x170206)
 
 
-# Helper list to get var by numeric id.
-Var.variables = [  # type: ignore
-    Var.VAR1ORTVAR,
-    Var.VAR2ORR1VAR,
-    Var.VAR3ORR2VAR,
-    Var.VAR4,
-    Var.VAR5,
-    Var.VAR6,
-    Var.VAR7,
-    Var.VAR8,
-    Var.VAR9,
-    Var.VAR10,
-    Var.VAR11,
-    Var.VAR12,
-]
-
-# Helper list to get set-point var by numeric id.
-Var.set_points = [Var.R1VARSETPOINT, Var.R2VARSETPOINT]  # type: ignore
-
-# Helper list to get threshold var by numeric id.
-Var.thresholds = [  # type: ignore
-    [Var.THRS1, Var.THRS2, Var.THRS3, Var.THRS4, Var.THRS5],
-    [Var.THRS2_1, Var.THRS2_2, Var.THRS2_3, Var.THRS2_4],
-    [Var.THRS3_1, Var.THRS3_2, Var.THRS3_3, Var.THRS3_4],
-    [Var.THRS4_1, Var.THRS4_2, Var.THRS4_3, Var.THRS4_4],
-]
-
-# Helper list to get S0-input var by numeric id.
-Var.s0s = [  # type: ignore
-    Var.S0INPUT1,
-    Var.S0INPUT2,
-    Var.S0INPUT3,
-    Var.S0INPUT4,
-]
-
-
 class VarUnit(Enum):
     """Measurement units used with LCN variables."""
 

pypck/module.py

@@ -174,19 +174,22 @@ class AbstractConnection:
             self.wants_ack, PckGenerator.rel_output(output_id, percent)
         )
 
-    async def toggle_output(self, output_id: int, ramp: int) -> bool:
+    async def toggle_output(
+        self, output_id: int, ramp: int, to_memory: bool = False
+    ) -> bool:
         """Send a command that toggles a single output-port.
 
         Toggle mode: (on->off, off->on).
 
         :param    int    output_id:    Output id 0..3
         :param    int    ramp:         Ramp time in milliseconds
+        :param    bool   to_memory:    If True, the dimming status is stored
 
         :returns:    True if command was sent successfully, False otherwise
         :rtype:      bool
         """
         return await self.send_command(
-            self.wants_ack, PckGenerator.toggle_output(output_id, ramp)
+            self.wants_ack, PckGenerator.toggle_output(output_id, ramp, to_memory)
         )
 
     async def toggle_all_outputs(self, ramp: int) -> bool:

pypck/pck_commands.py

@@ -471,19 +471,21 @@ class PckGenerator:
         return pck
 
     @staticmethod
-    def toggle_output(output_id: int, ramp: int) -> str:
+    def toggle_output(output_id: int, ramp: int, to_memory: bool = False) -> str:
         """Generate a command that toggles a single output-port.
 
         Toggle mode: (on->off, off->on).
 
         :param    int    output_id:    Output id 0..3
         :param    int    ramp:         Ramp value
+        :param    bool   to_memory:    If True, the dimming status is stored
+
         :return:    The PCK command (without address header) as text
         :rtype:    str
         """
         if (output_id < 0) or (output_id > 3):
             raise ValueError("Invalid output_id.")
-        return f"A{output_id + 1}TA{ramp:03d}"
+        return f"A{output_id + 1}{'MT' if to_memory else 'TA'}{ramp:03d}"
 
     @staticmethod
     def toggle_all_outputs(ramp: int) -> str:

pypck/request_handlers.py

@@ -660,6 +660,7 @@ class StatusRequestsHandler:
     async def activate_all(self, activate_s0: bool = False) -> None:
         """Activate all status requests."""
         await self.addr_conn.conn.segment_scan_completed_event.wait()
+        var_s0s = lcn_defs.Var.s0s()
         for item in (
             list(lcn_defs.OutputPort)
             + list(lcn_defs.RelayPort)
@@ -673,7 +674,7 @@ class StatusRequestsHandler:
             if (
                 (not activate_s0)
                 and isinstance(item, lcn_defs.Var)
-                and (item in lcn_defs.Var.s0s)  # type: ignore
+                and (item in var_s0s)
             ):
                 continue
             await self.activate(item)

{pypck-0.8.8.dist-info → pypck-0.8.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypck
-Version: 0.8.8
+Version: 0.8.10
 Summary: LCN-PCK library
 Home-page: https://github.com/alengwenus/pypck
 Author-email: Andre Lengwenus <alengwenus@gmail.com>

pypck-0.8.10.dist-info/RECORD

@@ -0,0 +1,15 @@
+pypck/__init__.py,sha256=vjI-MSv-ght8Y_tcKPXYMjL-FGlHX6Z2ofrUBrz8g4U,317
+pypck/connection.py,sha256=M9AGdq46UjrOyz0V_tZX1IHqGg5Mb3SKs2tzy4wQQhg,24379
+pypck/helpers.py,sha256=_5doqIsSRpqdQNPIUsjFh813xKGuMuEFY6sNGobJGIk,1280
+pypck/inputs.py,sha256=cjhvYKPr5QHw7Rjfkkg8LPbP8ohq_-z_Tvk51Rkx0aY,45828
+pypck/lcn_addr.py,sha256=N2Od8KuANOglqKjf596hJVH1SRcG7MhESKA5YYlDnbw,1946
+pypck/lcn_defs.py,sha256=e2KqD6r-JUwp20BcTymbpjsX16zjOihGKDqreWDsrwo,41951
+pypck/module.py,sha256=bRXIVQjaBr6Gfs_xYMMDeTZAle86M-nm6YfzyTjs7kA,38476
+pypck/pck_commands.py,sha256=bkb3q49s4PVY6UNR0B6S31oU7aSaEbpPl3rj0eGxTQU,50380
+pypck/request_handlers.py,sha256=Ft9teTysw-tc9gMdXgh1en-e3MxXmIsiqv5ZQDI_b9E,25234
+pypck/timeout_retry.py,sha256=FzeoyhmA4Tj13wR4kGXUwH8HyXnZ1RQOAYY9sSbz6rw,3859
+pypck-0.8.10.dist-info/licenses/LICENSE,sha256=iYB6zyMJvShfAzQE7nhYFgLzzZuBmhasLw5fYP9KRz4,1023
+pypck-0.8.10.dist-info/METADATA,sha256=1Vkcj-dIBNtp_BJiHDJ_WB6hMwkRQTrHzEHm8ecnWTI,5604
+pypck-0.8.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pypck-0.8.10.dist-info/top_level.txt,sha256=59ried49iFueDa5mQ_5BGVZcESjjzi4MZZKLcganvQA,6
+pypck-0.8.10.dist-info/RECORD,,

pypck-0.8.8.dist-info/RECORD

@@ -1,15 +0,0 @@
-pypck/__init__.py,sha256=vjI-MSv-ght8Y_tcKPXYMjL-FGlHX6Z2ofrUBrz8g4U,317
-pypck/connection.py,sha256=MP2150GTdPDJ-xC93doCYEIbv4Xkt8-84ArXoe31LSY,24426
-pypck/helpers.py,sha256=hEGId1pQ4wOJgIwNKDx17qKBlxvNxvspSrI0gSY3wCQ,1267
-pypck/inputs.py,sha256=cjhvYKPr5QHw7Rjfkkg8LPbP8ohq_-z_Tvk51Rkx0aY,45828
-pypck/lcn_addr.py,sha256=N2Od8KuANOglqKjf596hJVH1SRcG7MhESKA5YYlDnbw,1946
-pypck/lcn_defs.py,sha256=UffOX1s2856MXRgc3dv6SzSPGze4IiSk_sT-PpWTva8,41741
-pypck/module.py,sha256=SBKfblaGYvYBp-gzvnn606W6eJy-ICTGzA7KxNvllgk,38349
-pypck/pck_commands.py,sha256=uG57j-Ju9JzKeglYYxk5hiBjFA9aSsSDSzNhZ2b1TWA,50250
-pypck/request_handlers.py,sha256=mGwM4_jpVpTxTQ7kgkEa_PYgliTm-omtzEf3LcIdpD8,25222
-pypck/timeout_retry.py,sha256=FzeoyhmA4Tj13wR4kGXUwH8HyXnZ1RQOAYY9sSbz6rw,3859
-pypck-0.8.8.dist-info/licenses/LICENSE,sha256=iYB6zyMJvShfAzQE7nhYFgLzzZuBmhasLw5fYP9KRz4,1023
-pypck-0.8.8.dist-info/METADATA,sha256=LrK3YHB8d5iIj6wbHj_Kr7cDhgiJyQVsJGRcm_tzPJM,5603
-pypck-0.8.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pypck-0.8.8.dist-info/top_level.txt,sha256=59ried49iFueDa5mQ_5BGVZcESjjzi4MZZKLcganvQA,6
-pypck-0.8.8.dist-info/RECORD,,