conson-xp 1.38.0__py3-none-any.whl → 1.39.0__py3-none-any.whl

{conson_xp-1.38.0.dist-info → conson_xp-1.39.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.38.0
+Version: 1.39.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License

{conson_xp-1.38.0.dist-info → conson_xp-1.39.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-1.38.0.dist-info/METADATA,sha256=BaKGH6wo1T_TGXTUMPeRF-CSqfebxBULEpiM22sCi_w,11330
-conson_xp-1.38.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.38.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.38.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=5fakKUk2esOx8vUfRq1ASPbUSI7FQDe4PEnmW5Z2KOw,181
+conson_xp-1.39.0.dist-info/METADATA,sha256=ZnnTqw5hdtgrYNryR8of7kj7-8cD0Hy5GB4h_syNtok,11330
+conson_xp-1.39.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-1.39.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.39.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=XLd0Ey5N2BokGf5bKHhDEB2BpUIExFL_W41vN72w-Ko,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=G7A1KFRSV0CEeDTqr_khu-K9_sc01CTI2KSfkFcaBRM,4949
@@ -55,14 +55,12 @@ xp/cli/utils/module_type_choice.py,sha256=TPIEDsO0fNDu2HOQQ16WCJ-a7o2f58j3IKd8B0
 xp/cli/utils/serial_number_type.py,sha256=GUs3jtVI6EVulvt6fCDN6H6vxhiJwdMmdIvLjDlGGZ4,1466
 xp/cli/utils/system_function_choice.py,sha256=0J02EMgAQcsrE-9rEkv6YHelBoBkZ73T8VLBSm6YO5k,1623
 xp/cli/utils/xp_module_type.py,sha256=qSFJBRceqPi_cUFPxAWtLUNq37-KwUEjo9ekYOj7kLQ,1471
-xp/connection/__init__.py,sha256=ClJsVWALYZgAGYZK_Jznd3YKLrHDu17kBfwugjuPfu0,209
-xp/connection/exceptions.py,sha256=7CcRUzkyay5zA6Z9-5dIDRzua806v5N7pCcJazP_1dE,365
 xp/models/__init__.py,sha256=lROqr559DGd8WpJJUtfPT95VERCwMZHpBDEc96QSxQ0,1312
 xp/models/actiontable/__init__.py,sha256=6kVq1rTOlpc24sZxGGVWkY48tqR42YWHLQHqakWqlPc,43
 xp/models/actiontable/actiontable.py,sha256=bIeluZhMsvukkSwy2neaewavU8YR6Pso3PIvJ8ENlGg,1251
 xp/models/actiontable/msactiontable.py,sha256=42RdQB3rUzAP_UeH5PS6iADOnkev47rDR77_yttSkBg,192
 xp/models/actiontable/msactiontable_xp20.py,sha256=iMNKrDpLcaynaG1pflfyoQjey-KUsoSjqy4J4XF-YGk,2031
-xp/models/actiontable/msactiontable_xp24.py,sha256=hGi8Ah9LdL1w6bTLR8SUJVS_UA9PoB_Bzudv72A1AiU,9722
+xp/models/actiontable/msactiontable_xp24.py,sha256=yYaWS7VRr2EyLXozfoJWLmgQmMU9dGo81V4VU4q6cUo,9464
 xp/models/actiontable/msactiontable_xp33.py,sha256=K1noQe5TNoTFLWE58r0-ZOB8lYM3oXFqoNL7z7Uob5A,2945
 xp/models/conbus/__init__.py,sha256=VIusMWQdBtlwDgj7oSj06wQkklihTp4oWFShvP_JUgA,35
 xp/models/conbus/conbus.py,sha256=mZQzKPfrdttT-qUnYUSyrEYyc_eHs8z301E5ejeiyvk,2689
@@ -209,4 +207,4 @@ xp/utils/logging.py,sha256=rZDXwlBrYK8A6MPq5StsMNpgsRowzJXM6fvROPwJdGM,3750
 xp/utils/serialization.py,sha256=RWHHk86feaB4ZP7rjE4qOWK0900yg2joUBDkP76gfOY,4618
 xp/utils/state_machine.py,sha256=Oe2sLwCh9z_vr1tF6X0ZRGTeuckRQAGzmef7xc9CNdc,2413
 xp/utils/time_utils.py,sha256=dEyViDlAG9GWU-J3D_YVa-sGma6yiyyMTgN4h2x3PY4,3781
-conson_xp-1.38.0.dist-info/RECORD,,
+conson_xp-1.39.0.dist-info/RECORD,,

xp/__init__.py

@@ -3,7 +3,7 @@
 conson-xp package.
 """
 
-__version__ = "1.38.0"
+__version__ = "1.39.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

xp/models/actiontable/msactiontable_xp24.py

@@ -159,14 +159,11 @@ class Xp24MsActionTable(MsActionTable):
     curtain34: bool = False  # Curtain setting for inputs 3-4
     mutual_deadtime: int = MS300  # Master timing (MS300=12 or MS500=20)
 
-    def to_short_format(self, include_settings: bool = False) -> str:
+    def to_short_format(self) -> str:
         """Convert action table to short format string.
 
-        Args:
-            include_settings: Include settings after pipe separator.
-
         Returns:
-            Short format string (e.g., "XP24 T:1 T:2 T:0 T:0").
+            Short format string with settings (e.g., "XP24 T:1 T:2 T:0 T:0 | M12:0 M34:0 C12:0 C34:0 DT:12").
         """
         # Format input actions
         actions = [
@@ -184,16 +181,15 @@ class Xp24MsActionTable(MsActionTable):
 
         result = f"XP24 {' '.join(action_parts)}"
 
-        # Add settings if requested
-        if include_settings:
-            settings = (
-                f"M12:{1 if self.mutex12 else 0} "
-                f"M34:{1 if self.mutex34 else 0} "
-                f"C12:{1 if self.curtain12 else 0} "
-                f"C34:{1 if self.curtain34 else 0} "
-                f"DT:{self.mutual_deadtime}"
-            )
-            result = f"{result} | {settings}"
+        # Add settings
+        settings = (
+            f"M12:{1 if self.mutex12 else 0} "
+            f"M34:{1 if self.mutex34 else 0} "
+            f"C12:{1 if self.curtain12 else 0} "
+            f"C34:{1 if self.curtain34 else 0} "
+            f"DT:{self.mutual_deadtime}"
+        )
+        result = f"{result} | {settings}"
 
         return result
 
@@ -213,7 +209,7 @@ class Xp24MsActionTable(MsActionTable):
         # Split by pipe to separate actions from settings
         parts = short_str.split("|")
         action_part = parts[0].strip()
-        settings_part = parts[1].strip() if len(parts) > 1 else None
+        settings_part = parts[1].strip()
 
         # Parse action part
         tokens = action_part.split()
@@ -253,23 +249,22 @@ class Xp24MsActionTable(MsActionTable):
             "input4_action": input_actions[3],
         }
 
-        if settings_part:
-            # Parse settings: M12:0 M34:1 C12:0 C34:1 DT:12
-            for setting in settings_part.split():
-                if ":" not in setting:
-                    continue
-
-                key, value = setting.split(":", 1)
-
-                if key == "M12":
-                    kwargs["mutex12"] = value == "1"
-                elif key == "M34":
-                    kwargs["mutex34"] = value == "1"
-                elif key == "C12":
-                    kwargs["curtain12"] = value == "1"
-                elif key == "C34":
-                    kwargs["curtain34"] = value == "1"
-                elif key == "DT":
-                    kwargs["mutual_deadtime"] = int(value)
+        # Parse settings: M12:0 M34:1 C12:0 C34:1 DT:12
+        for setting in settings_part.split():
+            if ":" not in setting:
+                continue
+
+            key, value = setting.split(":", 1)
+
+            if key == "M12":
+                kwargs["mutex12"] = value == "1"
+            elif key == "M34":
+                kwargs["mutex34"] = value == "1"
+            elif key == "C12":
+                kwargs["curtain12"] = value == "1"
+            elif key == "C34":
+                kwargs["curtain34"] = value == "1"
+            elif key == "DT":
+                kwargs["mutual_deadtime"] = int(value)
 
         return cls(**kwargs)

xp/connection/__init__.py

@@ -1,13 +0,0 @@
-"""Connection layer for XP CLI tool."""
-
-from xp.connection.exceptions import (
-    ProtocolError,
-    ValidationError,
-    XPError,
-)
-
-__all__ = [
-    "XPError",
-    "ProtocolError",
-    "ValidationError",
-]

xp/connection/exceptions.py

@@ -1,22 +0,0 @@
-"""Connection-related exceptions for XP CLI tool.
-
-Following the architecture requirement for structured error handling.
-"""
-
-
-class XPError(Exception):
-    """Base exception for XP CLI tool."""
-
-    pass
-
-
-class ProtocolError(XPError):
-    """Console bus protocol errors."""
-
-    pass
-
-
-class ValidationError(XPError):
-    """Input validation errors."""
-
-    pass