pypck 0.9.6__py3-none-any.whl → 0.9.7__py3-none-any.whl

pypck/device.py

@@ -50,6 +50,8 @@ class DeviceConnection:
         self._serials_known = asyncio.Event()
 
         self.input_callbacks: set[Callable[[inputs.Input], None]] = set()
+        self.last_requested_var_without_type_in_response = lcn_defs.Var.UNKNOWN
+        self.last_var_lock = asyncio.Lock()
 
         # List of queued acknowledge codes from the LCN modules.
         self.acknowledges: asyncio.Queue[lcn_defs.AcknowledgeErrorCode] = (
@@ -771,9 +773,29 @@ class DeviceConnection:
             await self.on_ack(inp.code)
             return None
 
+        # handle typeless variable responses
+        if isinstance(inp, inputs.ModStatusVar):
+            inp = self.preprocess_modstatusvar(inp)
+
         for input_callback in self.input_callbacks:
             input_callback(inp)
 
+    def preprocess_modstatusvar(self, inp: inputs.ModStatusVar) -> inputs.Input:
+        """Fill typeless response with last requested variable type."""
+        if inp.orig_var == lcn_defs.Var.UNKNOWN:
+            # Response without type (%Msssaaa.wwwww)
+            inp.var = self.last_requested_var_without_type_in_response
+
+            self.last_requested_var_without_type_in_response = lcn_defs.Var.UNKNOWN
+
+            if self.last_var_lock.locked():
+                self.last_var_lock.release()
+        else:
+            # Response with variable type (%Msssaaa.Avvvwww)
+            inp.var = inp.orig_var
+
+        return inp
+
     async def dump_details(self) -> dict[str, Any]:
         """Dump detailed information about this module."""
         is_local_segment = self.addr.seg_id in (0, self.conn.local_seg_id)
@@ -910,10 +932,14 @@ class DeviceConnection:
         # do not use buffered response for old modules
         # (variable response is typeless)
         if self.serials.software_serial < 0x170206:
-            max_age = 0
-            variable_response = lcn_defs.Var.UNKNOWN
-        else:
-            variable_response = variable
+            if not lcn_defs.Var.has_type_in_response(
+                variable, self.serials.software_serial
+            ):
+                try:
+                    await asyncio.wait_for(self.last_var_lock.acquire(), timeout=3.0)
+                except asyncio.TimeoutError:
+                    pass
+                self.last_requested_var_without_type_in_response = variable
 
         result = await self.status_requester.request(
             response_type=inputs.ModStatusVar,
@@ -921,15 +947,10 @@ class DeviceConnection:
                 variable, self.serials.software_serial
             ),
             max_age=max_age,
-            var=variable_response,
+            var=variable,
         )
 
-        result = cast(inputs.ModStatusVar, result)
-        if result:
-            if result.orig_var == lcn_defs.Var.UNKNOWN:
-                # Response without type (%Msssaaa.wwwww)
-                result.var = variable
-        return result
+        return cast(inputs.ModStatusVar, result)
 
     async def request_status_led_and_logic_ops(
         self, max_age: int = 0

{pypck-0.9.6.dist-info → pypck-0.9.7.dist-info}/METADATA

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

{pypck-0.9.6.dist-info → pypck-0.9.7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pypck/__init__.py,sha256=jVx-aBsV_LmBf6jiivMrMcBUofC_AOseywDafgOzAS4,323
 pypck/connection.py,sha256=n3itRe8oQtw64vyWGYhl6j4QJC6wgeeHitBSn-Cl2_4,23330
-pypck/device.py,sha256=LmoqAyvQD98abCOFgMmIC9-gU6HPq3hHB9uY4wzN1ZY,39430
+pypck/device.py,sha256=Ek-Zy4Id63vl43oW1pSafbDqRAfidhgoJI0F4EMWCXY,40375
 pypck/helpers.py,sha256=_5doqIsSRpqdQNPIUsjFh813xKGuMuEFY6sNGobJGIk,1280
 pypck/inputs.py,sha256=F7E8rprIhYzZnHARozt_hguYNgJaiNP3htrZ2E3Qa5I,45951
 pypck/lcn_addr.py,sha256=N2Od8KuANOglqKjf596hJVH1SRcG7MhESKA5YYlDnbw,1946
@@ -8,8 +8,8 @@ pypck/lcn_defs.py,sha256=wSceYBwM46NqPwvff1hi8RluqUECmNY1gNcm1kDKTaI,43356
 pypck/pck_commands.py,sha256=eJxmh2e8EbKGpek97L2961Kr_nVfT8rKgJCN3YgjIQM,50458
 pypck/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypck/status_requester.py,sha256=10N5pbIBe_Ao-9ui_D7mCavk21BYZs9c-kxcTtmi-FI,5721
-pypck-0.9.6.dist-info/licenses/LICENSE,sha256=iYB6zyMJvShfAzQE7nhYFgLzzZuBmhasLw5fYP9KRz4,1023
-pypck-0.9.6.dist-info/METADATA,sha256=D_SIiIwNkfit6m85o_Bc_CIerldSLAZp-qnIiYW5NLQ,2682
-pypck-0.9.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pypck-0.9.6.dist-info/top_level.txt,sha256=59ried49iFueDa5mQ_5BGVZcESjjzi4MZZKLcganvQA,6
-pypck-0.9.6.dist-info/RECORD,,
+pypck-0.9.7.dist-info/licenses/LICENSE,sha256=iYB6zyMJvShfAzQE7nhYFgLzzZuBmhasLw5fYP9KRz4,1023
+pypck-0.9.7.dist-info/METADATA,sha256=gooJ1CbK2mtAKuIEs8v3OKV_sDMHziMbmKHGPcEvsmE,2682
+pypck-0.9.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pypck-0.9.7.dist-info/top_level.txt,sha256=59ried49iFueDa5mQ_5BGVZcESjjzi4MZZKLcganvQA,6
+pypck-0.9.7.dist-info/RECORD,,