pypck 0.8.6__tar.gz → 0.8.8__tar.gz

{pypck-0.8.6/pypck.egg-info → pypck-0.8.8}/PKG-INFO

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

pypck-0.8.8/VERSION

@@ -0,0 +1 @@
+0.8.8

{pypck-0.8.6 → pypck-0.8.8}/pypck/inputs.py

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

{pypck-0.8.6 → pypck-0.8.8}/pypck/pck_commands.py

@@ -571,16 +571,18 @@ class PckGenerator:
             raise ValueError("Wrong motor position mode")
 
         if mode == lcn_defs.MotorPositioningMode.BS4:
-            if state not in [
-                lcn_defs.MotorStateModifier.UP,
-                lcn_defs.MotorStateModifier.DOWN,
-            ]:
+            new_motor_id = [1, 2, 5, 6][motor_id]
+            if state == lcn_defs.MotorStateModifier.DOWN:
+                # AU=window open / cover down
+                action = "AU"
+            elif state == lcn_defs.MotorStateModifier.UP:
+                # ZU=window close / cover up
+                action = "ZU"
+            elif state == lcn_defs.MotorStateModifier.STOP:
+                action = "ST"
+            else:
                 raise ValueError("Invalid motor state for BS4 mode")
 
-            new_motor_id = [1, 2, 5, 6][motor_id]
-            # AU=window open / cover down
-            # ZU=window close / cover up
-            action = "AU" if state == lcn_defs.MotorStateModifier.DOWN else "ZU"
             return f"R8M{new_motor_id}{action}"
 
         # lcn_defs.MotorPositioningMode.NONE
@@ -643,7 +645,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.6 → pypck-0.8.8/pypck.egg-info}/PKG-INFO

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

{pypck-0.8.6 → pypck-0.8.8}/tests/test_commands.py

@@ -210,6 +210,24 @@ COMMANDS = {
         0,
         MotorStateModifier.CYCLE,
     ),
+    "R8M1ZU": (
+        PckGenerator.control_motor_relays,
+        0,
+        MotorStateModifier.UP,
+        MotorPositioningMode.BS4,
+    ),
+    "R8M2AU": (
+        PckGenerator.control_motor_relays,
+        1,
+        MotorStateModifier.DOWN,
+        MotorPositioningMode.BS4,
+    ),
+    "R8M5ST": (
+        PckGenerator.control_motor_relays,
+        2,
+        MotorStateModifier.STOP,
+        MotorPositioningMode.BS4,
+    ),
     "R8M1GP200": (
         PckGenerator.control_motor_relays_position,
         0,
@@ -236,10 +254,10 @@ COMMANDS = {
         50,
         MotorPositioningMode.MODULE,
     ),
-    "JH100004": (
+    "JH030004": (
         PckGenerator.control_motor_relays_position,
         2,
-        100,
+        70,
         MotorPositioningMode.MODULE,
     ),
     "X2001228000": (

{pypck-0.8.6 → pypck-0.8.8}/tests/test_messages.py

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

pypck-0.8.6/VERSION

@@ -1 +0,0 @@
-0.8.6