pypck 0.9.6__tar.gz → 0.9.7__tar.gz

{pypck-0.9.6/pypck.egg-info → pypck-0.9.7}/PKG-INFO

@@ -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.7/VERSION

@@ -0,0 +1 @@
+0.9.7

{pypck-0.9.6 → pypck-0.9.7}/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 → pypck-0.9.7/pypck.egg-info}/PKG-INFO

@@ -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 → pypck-0.9.7}/tests/test_module.py

@@ -140,17 +140,17 @@ async def test_request_status_binary_sensors(module10: MockDeviceConnection) ->
 
 
 @pytest.mark.parametrize(
-    "variable, response_variable, software_serial",
+    "variable, software_serial",
     [
         *[
-            (variable, variable, 0x170206)
+            (variable, 0x170206)
             for variable in lcn_defs.Var.variables_new()
             + lcn_defs.Var.set_points()
             + list(chain(*lcn_defs.Var.thresholds_new()))
             + lcn_defs.Var.s0s()
         ],
         *[
-            (variable, lcn_defs.Var.UNKNOWN, 0x170000)
+            (variable, 0x170000)
             for variable in lcn_defs.Var.variables_old()
             + lcn_defs.Var.set_points()
             + list(chain(*lcn_defs.Var.thresholds_old()))
@@ -158,10 +158,7 @@ async def test_request_status_binary_sensors(module10: MockDeviceConnection) ->
     ],
 )
 async def test_request_status_variable(
-    module10: MockDeviceConnection,
-    variable: lcn_defs.Var,
-    response_variable: lcn_defs.Var,
-    software_serial: int,
+    module10: MockDeviceConnection, variable: lcn_defs.Var, software_serial: int
 ) -> None:
     """Test requesting the variable status of a module."""
     module10.serials.software_serial = software_serial
@@ -169,9 +166,7 @@ async def test_request_status_variable(
 
     await wait_until_called(module10.send_command)
     await module10.async_process_input(
-        inputs.ModStatusVar(
-            module10.addr, response_variable, lcn_defs.VarValue.from_native(50)
-        )
+        inputs.ModStatusVar(module10.addr, variable, lcn_defs.VarValue.from_native(50))
     )
 
     result = await request_task

pypck-0.9.6/VERSION

@@ -1 +0,0 @@
-0.9.6