pypck 0.8.7__tar.gz → 0.8.9__tar.gz

{pypck-0.8.7/pypck.egg-info → pypck-0.8.9}/PKG-INFO

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

pypck-0.8.9/VERSION

@@ -0,0 +1 @@
+0.8.9

{pypck-0.8.7 → pypck-0.8.9}/pypck/inputs.py

@@ -1173,7 +1173,7 @@ class ModStatusMotorPositionModule(ModInput):
                 ModStatusMotorPositionModule(
                     addr,
                     int(motor) - 1,
-                    float(position),
+                    100 - float(position),
                 )
             ]
 

{pypck-0.8.7 → pypck-0.8.9}/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-0.8.7 → pypck-0.8.9}/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:
@@ -645,7 +647,7 @@ class PckGenerator:
             return f"R8M{new_motor_id}{action}"
         elif mode == lcn_defs.MotorPositioningMode.MODULE:
             new_motor_id = 1 << motor_id
-            return f"JH{position:03d}{new_motor_id:03d}"
+            return f"JH{100 - position:03d}{new_motor_id:03d}"
 
         return ""
 

{pypck-0.8.7 → pypck-0.8.9/pypck.egg-info}/PKG-INFO

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

{pypck-0.8.7 → pypck-0.8.9}/tests/test_commands.py

@@ -165,6 +165,10 @@ COMMANDS = {
         f"A{output + 1:d}TA123": (PckGenerator.toggle_output, output, 123)
         for output in range(4)
     },
+    **{
+        f"A{output + 1:d}MT123": (PckGenerator.toggle_output, output, 123, True)
+        for output in range(4)
+    },
     "AU123": (PckGenerator.toggle_all_outputs, 123),
     # Relay state manipulation
     "R80-1U1-U0": (
@@ -254,10 +258,10 @@ COMMANDS = {
         50,
         MotorPositioningMode.MODULE,
     ),
-    "JH100004": (
+    "JH030004": (
         PckGenerator.control_motor_relays_position,
         2,
-        100,
+        70,
         MotorPositioningMode.MODULE,
     ),
     "X2001228000": (

{pypck-0.8.7 → pypck-0.8.9}/tests/test_messages.py

@@ -261,11 +261,11 @@ MESSAGES = {
         ),
     ],
     # Status motor position via module
-    ":M000010P1050": [
+    ":M000010P1070": [
         (
             ModStatusMotorPositionModule,
             0,
-            50,
+            30,
         )
     ],
     # SKH

pypck-0.8.7/VERSION

@@ -1 +0,0 @@
-0.8.7