pypck 0.8.1__tar.gz → 0.8.2__tar.gz

{pypck-0.8.1/pypck.egg-info → pypck-0.8.2}/PKG-INFO

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

pypck-0.8.2/VERSION

@@ -0,0 +1 @@
+0.8.2

{pypck-0.8.1 → pypck-0.8.2}/pypck/module.py

@@ -468,18 +468,23 @@ class AbstractConnection:
             PckGenerator.var_rel(var, value_ref, value.to_native(), software_serial),
         )
 
-    async def lock_regulator(self, reg_id: int, state: bool) -> bool:
+    async def lock_regulator(
+        self, reg_id: int, state: bool, target_value: float = -1
+    ) -> bool:
         """Send a command to lock a regulator.
 
         :param    int        reg_id:        Regulator id
         :param    bool       state:         Lock state (locked=True,
                                             unlocked=False)
-
+        :param    float        target_value:  Target value in percent (use -1 to ignore)
         :returns:    True if command was sent successfully, False otherwise
         :rtype:      bool
         """
         return await self.send_command(
-            self.wants_ack, PckGenerator.lock_regulator(reg_id, state)
+            self.wants_ack,
+            PckGenerator.lock_regulator(
+                reg_id, state, self.software_serial, target_value
+            ),
         )
 
     async def control_led(

{pypck-0.8.1 → pypck-0.8.2}/pypck/pck_commands.py

@@ -1029,16 +1029,29 @@ class PckGenerator:
         return f"GTDT{row_id + 1}{part_id + 1}".encode() + part
 
     @staticmethod
-    def lock_regulator(reg_id: int, state: bool) -> str:
+    def lock_regulator(
+        reg_id: int,
+        state: bool,
+        software_serial: int,
+        target_value: float = -1,
+    ) -> str:
         """Generate a command to lock a regulator.
 
         :param    int    reg_id:    Regulator id 0..1
         :param    bool   state:     The lock state
+        :param    int    software_serial: The expected firmware version of all
+                                           receiving modules.
+        :param    foat    target_value: The target value in percent (use -1 to ignore)
         :return:  The PCK command (without address header) as text
         :rtype:   str
         """
         if (reg_id < 0) or (reg_id > 1):
             raise ValueError("Wrong reg_id.")
+        if ((target_value < 0) or (target_value > 100)) and (target_value != -1):
+            raise ValueError("Wrong target_value.")
+        if (target_value != -1) and (software_serial >= 0x120301) and state:
+            reg_byte = reg_id * 0x40 + 0x07
+            return f"X2{0x1E:03d}{reg_byte:03d}{int(2*target_value):03d}"
         return f"RE{'A' if reg_id == 0 else 'B'}X{'S' if state else 'A'}"
 
     @staticmethod

{pypck-0.8.1 → pypck-0.8.2/pypck.egg-info}/PKG-INFO

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

{pypck-0.8.1 → pypck-0.8.2}/tests/test_commands.py

@@ -417,11 +417,30 @@ COMMANDS = {
     },
     # Lock regulator
     **{
-        f"RE{('A','B')[reg]:s}XS": (PckGenerator.lock_regulator, reg, True)
+        f"RE{('A','B')[reg]:s}XS": (PckGenerator.lock_regulator, reg, True, -1)
         for reg in range(2)
     },
     **{
-        f"RE{('A','B')[reg]:s}XA": (PckGenerator.lock_regulator, reg, False)
+        f"RE{('A','B')[reg]:s}XA": (PckGenerator.lock_regulator, reg, False, -1)
+        for reg in range(2)
+    },
+    **{
+        f"X2030{0x40*reg + 0x07:03d}{2*value:03d}": (
+            PckGenerator.lock_regulator,
+            reg,
+            True,
+            0x120301,
+            value,
+        )
+        for reg in range(2)
+        for value in (0, 50, 100)
+    },
+    **{
+        f"RE{('A','B')[reg]:s}XS": (PckGenerator.lock_regulator, reg, True, 0x120301)
+        for reg in range(2)
+    },
+    **{
+        f"RE{('A','B')[reg]:s}XA": (PckGenerator.lock_regulator, reg, False, 0x120301)
         for reg in range(2)
     },
     # scenes

pypck-0.8.1/VERSION

@@ -1 +0,0 @@
-0.8.1