conson-xp 1.5.0__tar.gz → 1.7.0__tar.gz

{conson_xp-1.5.0 → conson_xp-1.7.0}/PKG-INFO

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

{conson_xp-1.5.0 → conson_xp-1.7.0}/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.5.0"
+version = "1.7.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.5.0 → conson_xp-1.7.0}/src/xp/__init__.py

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

{conson_xp-1.5.0 → conson_xp-1.7.0}/src/xp/cli/commands/conbus/conbus_msactiontable_commands.py

@@ -49,13 +49,22 @@ def conbus_download_msactiontable(
         click.echo(progress, nl=False)
 
     def on_finish(
-        action_table: Union[Xp20MsActionTable | Xp24MsActionTable | Xp33MsActionTable],
+        action_table: Union[
+            Xp20MsActionTable, Xp24MsActionTable, Xp33MsActionTable, None
+        ],
     ) -> None:
         """Handle successful completion of MS action table download.
 
         Args:
-            action_table: Downloaded MS action table object.
+            action_table: Downloaded MS action table object or None if failed.
+
+        Raises:
+            Abort: If action table download failed.
         """
+        if action_table is None:
+            click.echo("Error: Failed to download MS action table")
+            raise click.Abort()
+
         output = {
             "serial_number": serial_number,
             "xpmoduletype": xpmoduletype,

conson_xp-1.7.0/src/xp/services/actiontable/__init__.py

@@ -0,0 +1 @@
+"""Action table utils."""

conson_xp-1.7.0/src/xp/services/actiontable/msactiontable_serializer.py

@@ -0,0 +1,7 @@
+"""Generic MsActionTable serializer base class for type hints."""
+
+
+class MsActionTableSerializer:
+    """Serializer for ActionTable telegram encoding/decoding."""
+
+    pass

{conson_xp-1.5.0/src/xp/services/conbus → conson_xp-1.7.0/src/xp/services}/actiontable/msactiontable_xp20_serializer.py

@@ -46,8 +46,9 @@ class Xp20MsActionTableSerializer:
                 input_channel, input_index, raw_bytes
             )
 
+        encoded_data = nibbles(raw_bytes)
         # Convert raw bytes to hex string with A-P encoding
-        return nibbles(raw_bytes)
+        return "AAAA" + encoded_data
 
     @staticmethod
     def from_data(msactiontable_rawdata: str) -> Xp20MsActionTable:
@@ -62,13 +63,20 @@ class Xp20MsActionTableSerializer:
         Raises:
             ValueError: If input length is not 64 characters
         """
-        if len(msactiontable_rawdata) != 64:
+        raw_length = len(msactiontable_rawdata)
+        if raw_length < 68:  # Minimum: 4 char prefix + 64 chars data
             raise ValueError(
-                f"XP20 action table data must be 64 characters long, got {len(msactiontable_rawdata)}"
+                f"XP20 action table data must be 68 characters long, got {len(msactiontable_rawdata)}"
             )
 
-        # Convert hex string to bytes using de_nibble (A-P encoding)
-        raw_bytes = de_nibbles(msactiontable_rawdata)
+        # Remove action table count prefix (first 4 characters: AAAA, AAAB, etc.)
+        data = msactiontable_rawdata[4:]
+
+        # Take first 64 chars (32 bytes) as per pseudocode
+        hex_data = data[:64]
+
+        # Convert hex string to bytes using deNibble (A-P encoding)
+        raw_bytes = de_nibbles(hex_data)
 
         # Decode input channels
         input_channels = []
@@ -159,23 +167,3 @@ class Xp20MsActionTableSerializer:
                 and_functions_byte |= 1 << bit_index
 
         raw_bytes[AND_FUNCTIONS_INDEX + input_index] = and_functions_byte
-
-    @staticmethod
-    def from_telegrams(ms_telegrams: str) -> Xp20MsActionTable:
-        """Legacy method for backward compatibility. Use from_data() instead.
-
-        Args:
-            ms_telegrams: Full telegram string
-
-        Returns:
-            Decoded XP20 action table
-        """
-        # Extract data portion from telegram (skip header, take action table data)
-        # Based on XP24 pattern: telegram[16:84] gives us the 68-char data portion
-        # For XP20, we need 64 chars, so we take the first 64 chars after removing count
-        data_parts = ms_telegrams[16:84]
-
-        # Remove action table count (first 4 chars: AAAA, AAAB, etc.)
-        hex_data = data_parts[4:68]  # Take 64 chars after count
-
-        return Xp20MsActionTableSerializer.from_data(hex_data)

{conson_xp-1.5.0/src/xp/services/conbus → conson_xp-1.7.0/src/xp/services}/actiontable/msactiontable_xp24_serializer.py

@@ -3,7 +3,7 @@
 from xp.models.actiontable.msactiontable_xp24 import InputAction, Xp24MsActionTable
 from xp.models.telegram.input_action_type import InputActionType
 from xp.models.telegram.timeparam_type import TimeParam
-from xp.utils.serialization import de_nibbles
+from xp.utils.serialization import de_nibbles, nibbles
 
 
 class Xp24MsActionTableSerializer:
@@ -17,11 +17,12 @@ class Xp24MsActionTableSerializer:
             action_table: XP24 MS action table to serialize.
 
         Returns:
-            Serialized action table data string.
+            Serialized action table data string (68 characters).
         """
-        data_parts: list[str] = []
+        # Build byte array for the action table (32 bytes total)
+        raw_bytes = bytearray()
 
-        # Encode all 4 input actions
+        # Encode all 4 input actions (2 bytes each = 8 bytes total)
         input_actions = [
             action_table.input1_action,
             action_table.input2_action,
@@ -30,26 +31,24 @@ class Xp24MsActionTableSerializer:
         ]
 
         for action in input_actions:
-            # Use enum value directly as function ID
-            function_id = action.type.value
-            # Convert parameter to int (None becomes 0)
-            param_id = action.param.value
-            data_parts.append(f"{function_id:02X}{param_id:02X}")
-
-        # Add settings as hex values
-        data_parts.extend(
-            [
-                "AB" if action_table.mutex12 else "AA",
-                "AB" if action_table.mutex34 else "AA",
-                f"{action_table.mutual_deadtime:02X}",
-                "AB" if action_table.curtain12 else "AA",
-                "AB" if action_table.curtain34 else "AA",
-                "A" * 38,  # padding
-            ]
-        )
+            raw_bytes.append(action.type.value)
+            raw_bytes.append(action.param.value)
+
+        # Add settings (5 bytes)
+        raw_bytes.append(0x01 if action_table.mutex12 else 0x00)
+        raw_bytes.append(0x01 if action_table.mutex34 else 0x00)
+        raw_bytes.append(action_table.mutual_deadtime)
+        raw_bytes.append(0x01 if action_table.curtain12 else 0x00)
+        raw_bytes.append(0x01 if action_table.curtain34 else 0x00)
+
+        # Add padding to reach 32 bytes (19 more bytes needed)
+        raw_bytes.extend([0x00] * 19)
+
+        # Encode to A-P nibbles (32 bytes -> 64 chars)
+        encoded_data = nibbles(bytes(raw_bytes))
 
-        data = "AAAA".join(data_parts)
-        return data
+        # Prepend action table count "AAAA" (4 chars) -> total 68 chars
+        return "AAAA" + encoded_data
 
     @staticmethod
     def from_data(msactiontable_rawdata: str) -> Xp24MsActionTable:
@@ -66,7 +65,9 @@ class Xp24MsActionTableSerializer:
         """
         raw_length = len(msactiontable_rawdata)
         if raw_length != 68:
-            raise ValueError(f"Msactiontable is not 68 bytes long ({raw_length})")
+            raise ValueError(
+                f"Msactiontable is not 68 bytes long ({raw_length}): {msactiontable_rawdata}"
+            )
 
         # Remove action table count AAAA, AAAB .
         data = msactiontable_rawdata[4:]
@@ -117,18 +118,3 @@ class Xp24MsActionTableSerializer:
         param_type = TimeParam(param_id)
 
         return InputAction(action_type, param_type)
-
-    @staticmethod
-    def from_telegrams(ms_telegrams: str) -> Xp24MsActionTable:
-        """Legacy method for backward compatibility. Use from_data() instead.
-
-        Args:
-            ms_telegrams: Telegram data string.
-
-        Returns:
-            Deserialized XP24 MS action table.
-        """
-        # For backward compatibility, assume full telegrams and extract data
-        data_parts = ms_telegrams[16:84]
-
-        return Xp24MsActionTableSerializer.from_data(data_parts)

{conson_xp-1.5.0/src/xp/services/conbus → conson_xp-1.7.0/src/xp/services}/actiontable/msactiontable_xp33_serializer.py

@@ -6,7 +6,7 @@ from xp.models.actiontable.msactiontable_xp33 import (
     Xp33Scene,
 )
 from xp.models.telegram.timeparam_type import TimeParam
-from xp.utils.serialization import bits_to_byte, byte_to_bits, de_nibbles, nibble
+from xp.utils.serialization import bits_to_byte, byte_to_bits, de_nibbles, nibbles
 
 
 class Xp33MsActionTableSerializer:
@@ -96,13 +96,11 @@ class Xp33MsActionTableSerializer:
         raw_bytes[24] = bits_to_byte(leading_edge_bits)
 
         # Bytes 25-31 are padding (already 0)
-
         # Convert to hex string using nibble encoding
-        hex_data = "AAAA"
-        for byte_val in raw_bytes:
-            hex_data += nibble(byte_val)
+        encoded_data = nibbles(raw_bytes)
 
-        return hex_data
+        # Convert raw bytes to hex string with A-P encoding
+        return "AAAA" + encoded_data
 
     @staticmethod
     def from_data(msactiontable_rawdata: str) -> Xp33MsActionTable:
@@ -239,18 +237,3 @@ class Xp33MsActionTableSerializer:
             output3_level=output3_level,
             time=time_param,
         )
-
-    @staticmethod
-    def from_telegrams(ms_telegrams: str) -> Xp33MsActionTable:
-        """Legacy method for backward compatibility. Use from_data() instead.
-
-        Args:
-            ms_telegrams: Telegram data string.
-
-        Returns:
-            Deserialized XP33 MS action table.
-        """
-        # For backward compatibility, assume full telegrams and extract data
-        data_parts = ms_telegrams[16:152]  # Adjusted for XP33 length
-
-        return Xp33MsActionTableSerializer.from_data(data_parts)

{conson_xp-1.5.0 → conson_xp-1.7.0}/src/xp/services/conbus/actiontable/actiontable_service.py

@@ -10,7 +10,7 @@ from xp.models.actiontable.actiontable import ActionTable
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
 from xp.models.telegram.system_function import SystemFunction
 from xp.models.telegram.telegram_type import TelegramType
-from xp.services.conbus.actiontable.actiontable_serializer import ActionTableSerializer
+from xp.services.actiontable.actiontable_serializer import ActionTableSerializer
 from xp.services.protocol import ConbusProtocol
 from xp.services.telegram.telegram_service import TelegramService
 

{conson_xp-1.5.0 → conson_xp-1.7.0}/src/xp/services/conbus/actiontable/msactiontable_service.py

@@ -12,13 +12,13 @@ from xp.models.actiontable.msactiontable_xp33 import Xp33MsActionTable
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
 from xp.models.telegram.system_function import SystemFunction
 from xp.models.telegram.telegram_type import TelegramType
-from xp.services.conbus.actiontable.msactiontable_xp20_serializer import (
+from xp.services.actiontable.msactiontable_xp20_serializer import (
     Xp20MsActionTableSerializer,
 )
-from xp.services.conbus.actiontable.msactiontable_xp24_serializer import (
+from xp.services.actiontable.msactiontable_xp24_serializer import (
     Xp24MsActionTableSerializer,
 )
-from xp.services.conbus.actiontable.msactiontable_xp33_serializer import (
+from xp.services.actiontable.msactiontable_xp33_serializer import (
     Xp33MsActionTableSerializer,
 )
 from xp.services.protocol import ConbusProtocol
@@ -74,7 +74,8 @@ class MsActionTableService(ConbusProtocol):
         self.error_callback: Optional[Callable[[str], None]] = None
         self.finish_callback: Optional[
             Callable[
-                [Union[Xp20MsActionTable, Xp24MsActionTable, Xp33MsActionTable]], None
+                [Union[Xp20MsActionTable, Xp24MsActionTable, Xp33MsActionTable, None]],
+                None,
             ]
         ] = None
         self.msactiontable_data: list[str] = []
@@ -114,17 +115,32 @@ class MsActionTableService(ConbusProtocol):
             self.logger.debug("Not a reply response")
             return
 
-        reply_telegram = self.telegram_service.parse_reply_telegram(telegram_received)
+        reply_telegram = self.telegram_service.parse_reply_telegram(
+            telegram_received.frame
+        )
         if reply_telegram.system_function not in (
             SystemFunction.MSACTIONTABLE,
+            SystemFunction.ACK,
+            SystemFunction.NAK,
             SystemFunction.EOF,
         ):
             self.logger.debug("Not a msactiontable response")
             return
 
-        if reply_telegram.system_function == SystemFunction.ACTIONTABLE:
-            self.logger.debug("Saving msactiontable response")
-            self.msactiontable_data.append(reply_telegram.data_value)
+        if reply_telegram.system_function == SystemFunction.ACK:
+            self.logger.debug("Received ACK")
+            return
+
+        if reply_telegram.system_function == SystemFunction.NAK:
+            self.logger.debug("Received NAK")
+            self.failed("Received NAK")
+            return
+
+        if reply_telegram.system_function == SystemFunction.MSACTIONTABLE:
+            self.logger.debug("Received MSACTIONTABLE")
+            self.msactiontable_data.extend(
+                (reply_telegram.data, reply_telegram.data_value)
+            )
             if self.progress_callback:
                 self.progress_callback(".")
 
@@ -137,11 +153,14 @@ class MsActionTableService(ConbusProtocol):
             return
 
         if reply_telegram.system_function == SystemFunction.EOF:
+            self.logger.debug("Received EOF")
             all_data = "".join(self.msactiontable_data)
             # Deserialize from received data
             msactiontable = self.serializer.from_data(all_data)
-            if self.finish_callback:
-                self.finish_callback(msactiontable)
+            self.succeed(msactiontable)
+            return
+
+        self.logger.debug("Invalid msactiontable response")
 
     def failed(self, message: str) -> None:
         """Handle failed connection event.
@@ -152,6 +171,20 @@ class MsActionTableService(ConbusProtocol):
         self.logger.debug(f"Failed: {message}")
         if self.error_callback:
             self.error_callback(message)
+        self._stop_reactor()
+
+    def succeed(
+        self,
+        msactiontable: Union[Xp20MsActionTable, Xp24MsActionTable, Xp33MsActionTable],
+    ) -> None:
+        """Handle succeed connection event.
+
+        Args:
+            msactiontable: result.
+        """
+        if self.finish_callback:
+            self.finish_callback(msactiontable)
+        self._stop_reactor()
 
     def start(
         self,
@@ -160,7 +193,7 @@ class MsActionTableService(ConbusProtocol):
         progress_callback: Callable[[str], None],
         error_callback: Callable[[str], None],
         finish_callback: Callable[
-            [Union[Xp20MsActionTable, Xp24MsActionTable, Xp33MsActionTable]], None
+            [Union[Xp20MsActionTable, Xp24MsActionTable, Xp33MsActionTable, None]], None
         ],
         timeout_seconds: Optional[float] = None,
     ) -> None:

{conson_xp-1.5.0 → conson_xp-1.7.0}/src/xp/services/protocol/conbus_protocol.py

@@ -230,13 +230,11 @@ class ConbusProtocol(protocol.Protocol, protocol.ClientFactory):
         self.timeout_call = self.reactor.callLater(
             self.timeout_seconds, self._on_timeout
         )
-        self.logger.debug(f"Timeout set for {self.timeout_seconds} seconds")
 
     def _cancel_timeout(self) -> None:
         """Cancel the inactivity timeout."""
         if self.timeout_call and self.timeout_call.active():
             self.timeout_call.cancel()
-            self.logger.debug("Timeout cancelled")
 
     def _on_timeout(self) -> None:
         """Handle inactivity timeout expiration."""

{conson_xp-1.5.0 → conson_xp-1.7.0}/src/xp/services/server/base_server_service.py

@@ -7,7 +7,7 @@ containing common functionality like module type response generation.
 import logging
 import threading
 from abc import ABC
-from typing import Optional
+from typing import Any, Optional
 
 from xp.models import ModuleTypeCode
 from xp.models.telegram.datapoint_type import DataPointType
@@ -46,6 +46,9 @@ class BaseServerService(ABC):
         self.telegram_buffer: list[str] = []
         self.telegram_buffer_lock = threading.Lock()  # Lock for socket set
 
+        # MsActionTable download state (None, "ack_sent", "data_sent")
+        self.msactiontable_download_state: Optional[str] = None
+
     def generate_datapoint_type_response(
         self, datapoint_type: DataPointType
     ) -> Optional[str]:
@@ -151,6 +154,76 @@ class BaseServerService(ABC):
 
         return None
 
+    def _get_msactiontable_serializer(self) -> Optional[Any]:
+        """Get the MsActionTable serializer for this device.
+
+        Subclasses should override this to return their specific serializer.
+
+        Returns:
+            The serializer instance, or None if not supported.
+        """
+        return None
+
+    def _get_msactiontable(self) -> Optional[Any]:
+        """Get the MsActionTable for this device.
+
+        Subclasses should override this to return their msactiontable instance.
+
+        Returns:
+            The msactiontable instance, or None if not supported.
+        """
+        return None
+
+    def _handle_download_msactiontable_request(
+        self, request: SystemTelegram
+    ) -> Optional[str]:
+        """Handle F13D - DOWNLOAD_MSACTIONTABLE request.
+
+        Args:
+            request: The system telegram request to process.
+
+        Returns:
+            ACK telegram if request is valid, NAK otherwise.
+        """
+        serializer = self._get_msactiontable_serializer()
+        msactiontable = self._get_msactiontable()
+
+        # Only handle if serializer and msactiontable are available
+        if not serializer or msactiontable is None:
+            return None
+
+        # Send ACK and queue data telegram
+        ack_data = self._build_response_telegram(f"R{self.serial_number}F18D")  # ACK
+
+        # Send MsActionTable data
+        encoded_data = serializer.to_data(msactiontable)
+        data_telegram = self._build_response_telegram(
+            f"R{self.serial_number}F17D{encoded_data}"
+        )
+        self.msactiontable_download_state = "data_sent"
+
+        # Return ACK and TABLE
+        return ack_data + data_telegram
+
+    def _handle_download_msactiontable_ack_request(
+        self, _request: SystemTelegram
+    ) -> Optional[str]:
+        """Handle MsActionTable download ACK protocol.
+
+        Args:
+            _request: The system telegram request (unused, kept for signature consistency).
+
+        Returns:
+            Data telegram, EOF telegram, or NAK if state is invalid.
+        """
+        if self.msactiontable_download_state == "data_sent":
+            # Send EOF
+            eof_telegram = self._build_response_telegram(f"R{self.serial_number}F16D")
+            self.msactiontable_download_state = None
+            return eof_telegram
+
+        return self._build_response_telegram(f"R{self.serial_number}F19D")  # NAK
+
     def process_system_telegram(self, request: SystemTelegram) -> Optional[str]:
         """Template method for processing system telegrams.
 
@@ -177,6 +250,15 @@ class BaseServerService(ABC):
         elif request.system_function == SystemFunction.ACTION:
             return self._handle_action_request(request)
 
+        elif request.system_function == SystemFunction.DOWNLOAD_MSACTIONTABLE:
+            return self._handle_download_msactiontable_request(request)
+
+        elif (
+            request.system_function == SystemFunction.ACK
+            and self.msactiontable_download_state
+        ):
+            return self._handle_download_msactiontable_ack_request(request)
+
         self.logger.warning(f"Unhandled {self.device_type} request: {request}")
         return None
 
@@ -278,11 +360,7 @@ class BaseServerService(ABC):
         Returns:
             List of telegram strings from the buffer. The buffer is cleared after collection.
         """
-        self.logger.debug(
-            f"Collecting {self.serial_number} telegrams from buffer: {len(self.telegram_buffer)}"
-        )
         with self.telegram_buffer_lock:
             result = self.telegram_buffer.copy()
-            self.logger.debug(f"Resetting {self.serial_number} buffer")
             self.telegram_buffer.clear()
             return result

{conson_xp-1.5.0 → conson_xp-1.7.0}/src/xp/services/server/cp20_server_service.py

@@ -8,6 +8,7 @@ from typing import Dict, Optional
 
 from xp.models import ModuleTypeCode
 from xp.models.telegram.system_telegram import SystemTelegram
+from xp.services.actiontable.msactiontable_serializer import MsActionTableSerializer
 from xp.services.server.base_server_service import BaseServerService
 
 
@@ -25,11 +26,18 @@ class CP20ServerService(BaseServerService):
     and implements CP20 telegram format.
     """
 
-    def __init__(self, serial_number: str):
+    def __init__(
+        self,
+        serial_number: str,
+        _variant: str = "",
+        _msactiontable_serializer: Optional[MsActionTableSerializer] = None,
+    ):
         """Initialize CP20 server service.
 
         Args:
             serial_number: The device serial number.
+            _variant: Reserved parameter for consistency (unused).
+            _msactiontable_serializer: Generic MsActionTable serializer (unused).
         """
         super().__init__(serial_number)
         self.device_type = "CP20"

conson_xp-1.7.0/src/xp/services/server/device_service_factory.py

@@ -0,0 +1,94 @@
+"""Device Service Factory for creating device instances.
+
+This module provides a factory for creating device service instances
+with proper dependency injection of serializers.
+"""
+
+from xp.services.actiontable.msactiontable_serializer import MsActionTableSerializer
+from xp.services.actiontable.msactiontable_xp20_serializer import (
+    Xp20MsActionTableSerializer,
+)
+from xp.services.actiontable.msactiontable_xp24_serializer import (
+    Xp24MsActionTableSerializer,
+)
+from xp.services.actiontable.msactiontable_xp33_serializer import (
+    Xp33MsActionTableSerializer,
+)
+from xp.services.server.base_server_service import BaseServerService
+from xp.services.server.cp20_server_service import CP20ServerService
+from xp.services.server.xp20_server_service import XP20ServerService
+from xp.services.server.xp24_server_service import XP24ServerService
+from xp.services.server.xp33_server_service import XP33ServerService
+from xp.services.server.xp130_server_service import XP130ServerService
+from xp.services.server.xp230_server_service import XP230ServerService
+
+
+class DeviceServiceFactory:
+    """Factory for creating device service instances.
+
+    Encapsulates device creation logic and handles serializer injection
+    for different device types.
+    """
+
+    def __init__(
+        self,
+        xp20ms_serializer: Xp20MsActionTableSerializer,
+        xp24ms_serializer: Xp24MsActionTableSerializer,
+        xp33ms_serializer: Xp33MsActionTableSerializer,
+        ms_serializer: MsActionTableSerializer,
+    ):
+        """Initialize device service factory.
+
+        Args:
+            xp20ms_serializer: XP20 MsActionTable serializer (injected via DI).
+            xp24ms_serializer: XP24 MsActionTable serializer (injected via DI).
+            xp33ms_serializer: XP33 MsActionTable serializer (injected via DI).
+            ms_serializer: Generic MsActionTable serializer (injected via DI).
+        """
+        self.xp20ms_serializer = xp20ms_serializer
+        self.xp24ms_serializer = xp24ms_serializer
+        self.xp33ms_serializer = xp33ms_serializer
+        self.ms_serializer = ms_serializer
+
+    def create_device(self, module_type: str, serial_number: str) -> BaseServerService:
+        """Create device instance for given module type.
+
+        Args:
+            module_type: Module type code (e.g., "XP20", "XP33LR").
+            serial_number: Device serial number.
+
+        Returns:
+            Device service instance configured with appropriate serializer.
+
+        Raises:
+            ValueError: If module_type is unknown or unsupported.
+        """
+        # Map module types to their constructors and parameters
+        if module_type == "CP20":
+            return CP20ServerService(serial_number, "CP20", self.ms_serializer)
+
+        elif module_type == "XP24":
+            return XP24ServerService(serial_number, "XP24", self.xp24ms_serializer)
+
+        elif module_type == "XP33":
+            return XP33ServerService(serial_number, "XP33", self.xp33ms_serializer)
+
+        elif module_type == "XP33LR":
+            return XP33ServerService(serial_number, "XP33LR", self.xp33ms_serializer)
+
+        elif module_type == "XP33LED":
+            return XP33ServerService(serial_number, "XP33LED", self.xp33ms_serializer)
+
+        elif module_type == "XP20":
+            return XP20ServerService(serial_number, "XP20", self.xp20ms_serializer)
+
+        elif module_type == "XP130":
+            return XP130ServerService(serial_number, "XP130", self.ms_serializer)
+
+        elif module_type == "XP230":
+            return XP230ServerService(serial_number, "XP230", self.ms_serializer)
+
+        else:
+            raise ValueError(
+                f"Unknown device type '{module_type}' for serial {serial_number}"
+            )