conson-xp 1.45.0__py3-none-any.whl → 1.47.0__py3-none-any.whl

xp/services/conbus/actiontable/actiontable_download_service.py

@@ -1,104 +1,58 @@
 """Service for downloading ActionTable via Conbus protocol."""
 
 import logging
-from dataclasses import asdict
-from enum import Enum
 from typing import Any, Optional
 
-from psygnal import SignalInstance
-from statemachine import State, StateMachine
+from psygnal import Signal
 
-from xp.models.actiontable.actiontable import ActionTable
+from xp.models.actiontable.actiontable_type import ActionTableType
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
 from xp.models.telegram.datapoint_type import DataPointType
 from xp.models.telegram.reply_telegram import ReplyTelegram
-from xp.models.telegram.system_function import SystemFunction
-from xp.models.telegram.telegram_type import TelegramType
 from xp.services.actiontable.actiontable_serializer import ActionTableSerializer
-from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
-from xp.services.telegram.telegram_service import TelegramService
-
-# Constants
-NO_ERROR_CODE = "00"
-CHUNK_HEADER_LENGTH = 2  # data_value format: 2-char counter + actiontable chunk
-MAX_ERROR_RETRIES = 3  # Max retries for error_status_received before giving up
-
-
-class Phase(Enum):
-    """Download workflow phases.
-
-    The download workflow consists of three sequential phases:
-    - INIT: Drain pending telegrams, query error status → proceed to DOWNLOAD
-    - DOWNLOAD: Request actiontable, receive chunks with ACK, until EOF
-    - CLEANUP: Drain pending telegrams, query error status → proceed to COMPLETED
-
-    Attributes:
-        INIT: Initial phase - drain pending telegrams and query error status.
-        DOWNLOAD: Download phase - request actiontable and receive chunks.
-        CLEANUP: Cleanup phase - drain remaining telegrams and verify status.
+from xp.services.actiontable.download_state_machine import (
+    MAX_ERROR_RETRIES,
+    DownloadStateMachine,
+)
+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.actiontable.serializer_protocol import ActionTableSerializerProtocol
+from xp.services.protocol.conbus_event_protocol import (
+    NO_ERROR_CODE,
+    ConbusEventProtocol,
+)
+
+
+class ActionTableDownloadService(DownloadStateMachine):
     """
+    Service for downloading action tables from Conbus modules via TCP.
 
-    INIT = "init"
-    DOWNLOAD = "download"
-    CLEANUP = "cleanup"
-
-
-class ActionTableDownloadService(StateMachine):
-    """Service for downloading action tables from Conbus modules via TCP.
-
-    Inherits from StateMachine - the service IS the state machine. Uses guard
-    conditions to share states between INIT and CLEANUP phases.
-    see: Download-ActionTable-Workflow.dot
+    Inherits from ActionTableDownloadStateMachine and overrides on_enter_*
+    methods to add protocol-specific behavior.
 
-    States (9 total):
-        idle -> receiving -> resetting -> waiting_ok -> requesting
-             -> waiting_data <-> receiving_chunk -> processing_eof -> completed
-
-    Phases - INIT and CLEANUP share the same states (receiving, resetting, waiting_ok):
+    The workflow consists of three phases:
 
     INIT phase (drain → reset → wait_ok):
-        idle -> receiving -> resetting -> waiting_ok --(guard: is_init_phase)--> requesting
+        Connection established, drain pending telegrams, query error status.
 
     DOWNLOAD phase (request → receive chunks → EOF):
-        requesting -> waiting_data <-> receiving_chunk -> processing_eof
+        Request actiontable, receive and ACK chunks until EOF.
 
     CLEANUP phase (drain → reset → wait_ok):
-        processing_eof -> receiving -> resetting -> waiting_ok --(guard: is_cleanup_phase)--> completed
-
-    The drain/reset/wait_ok cycle:
-    1. Drain pending telegrams (receiving state discards telegram without reading them).
-       There may be a lot of telegram. We are listening and receiving until no more
-       telegram arrive and timeout occurs.
-    2. Timeout triggers error status query (resetting)
-    3. Wait for response (waiting_ok)
-    4. On no error: guard determines target (requesting or completed)
-       On error: retry from drain step
+        After EOF, drain remaining telegrams and verify final status.
 
     Attributes:
         on_progress: Signal emitted with "." for each chunk received.
         on_error: Signal emitted with error message string.
         on_actiontable_received: Signal emitted with (ActionTable, dict, list).
         on_finish: Signal emitted when download and cleanup completed.
-        idle: Initial state - waiting for connection.
-        receiving: Drain telegrams state (INIT or CLEANUP phase).
-        resetting: Query error status state.
-        waiting_ok: Await error status response state.
-        requesting: DOWNLOAD phase - send download request state.
-        waiting_data: DOWNLOAD phase - await chunks state.
-        receiving_chunk: DOWNLOAD phase - process chunk state.
-        processing_eof: DOWNLOAD phase - deserialize result state.
-        completed: Final state - download finished.
-        do_connect: Transition from idle to receiving.
-        filter_telegram: Self-transition in receiving to drain telegrams.
-        do_timeout: Transition on timeout events.
-        send_error_status: Transition from resetting to waiting_ok.
-        error_status_received: Transition when error status is received.
-        no_error_status_received: Transition when no error status received.
-        send_download: Transition from requesting to waiting_data.
-        receive_chunk: Transition from waiting_data to receiving_chunk.
-        send_ack: Transition from receiving_chunk to waiting_data.
-        receive_eof: Transition from waiting_data to processing_eof.
-        do_finish: Transition from processing_eof to receiving (cleanup).
 
     Example:
         >>> with download_service as service:
@@ -107,141 +61,72 @@ class ActionTableDownloadService(StateMachine):
         ...     service.start_reactor()
     """
 
-    # States - unified for INIT and CLEANUP phases using guards
-    idle = State(initial=True)
-    receiving = State()  # Drain telegrams (INIT or CLEANUP phase)
-    resetting = State()  # Query error status
-    waiting_ok = State()  # Await error status response
-
-    requesting = State()  # DOWNLOAD phase: send download request
-    waiting_data = State()  # DOWNLOAD phase: await chunks
-    receiving_chunk = State()  # DOWNLOAD phase: process chunk
-    processing_eof = State()  # DOWNLOAD phase: deserialize result
-
-    completed = State(final=True)
-
-    # Phase transitions - shared states with guards for phase-dependent routing
-    do_connect = idle.to(receiving)
-    filter_telegram = receiving.to(receiving)  # Self-transition: drain to /dev/null
-    do_timeout = receiving.to(resetting) | waiting_ok.to(receiving)
-    send_error_status = resetting.to(waiting_ok)
-    error_status_received = waiting_ok.to(
-        receiving, cond="can_retry"
-    )  # Retry if under limit
-
-    # Conditional transitions based on phase
-    no_error_status_received = waiting_ok.to(
-        requesting, cond="is_init_phase"
-    ) | waiting_ok.to(completed, cond="is_cleanup_phase")
-
-    # DOWNLOAD phase transitions
-    send_download = requesting.to(waiting_data)
-    receive_chunk = waiting_data.to(receiving_chunk)
-    send_ack = receiving_chunk.to(waiting_data)
-    receive_eof = waiting_data.to(processing_eof)
-
-    # Return to drain/reset cycle for CLEANUP phase
-    do_finish = processing_eof.to(receiving)
+    # Service signals
+    on_progress: Signal = Signal(str)
+    on_error: Signal = Signal(str)
+    on_finish: Signal = Signal()
+    on_actiontable_received: Signal = Signal(Any, dict[str, Any], list[str])
 
     def __init__(
         self,
         conbus_protocol: ConbusEventProtocol,
         actiontable_serializer: ActionTableSerializer,
-        telegram_service: TelegramService,
+        msactiontable_serializer_xp20: Xp20MsActionTableSerializer,
+        msactiontable_serializer_xp24: Xp24MsActionTableSerializer,
+        msactiontable_serializer_xp33: Xp33MsActionTableSerializer,
     ) -> None:
-        """Initialize the action table download service.
+        """
+        Initialize the action table download service.
 
         Args:
             conbus_protocol: ConbusEventProtocol instance.
             actiontable_serializer: Action table serializer.
-            telegram_service: Telegram service for parsing.
+            msactiontable_serializer_xp20: XP20 master station action table serializer.
+            msactiontable_serializer_xp24: XP24 master station action table serializer.
+            msactiontable_serializer_xp33: XP33 master station action table serializer.
         """
         self.conbus_protocol = conbus_protocol
-        self.serializer = actiontable_serializer
-        self.telegram_service = telegram_service
+        self.actiontable_serializer = actiontable_serializer
+        self.msactiontable_serializer_xp20 = msactiontable_serializer_xp20
+        self.msactiontable_serializer_xp24 = msactiontable_serializer_xp24
+        self.msactiontable_serializer_xp33 = msactiontable_serializer_xp33
+        self.serializer: ActionTableSerializerProtocol = actiontable_serializer
+
         self.serial_number: str = ""
         self.actiontable_data: list[str] = []
-        self.logger = logging.getLogger(__name__)
-        self._phase: Phase = Phase.INIT
-        self._error_retry_count: int = 0
         self._signals_connected: bool = False
 
-        # Signals (instance attributes to avoid conflict with statemachine)
-        self.on_progress: SignalInstance = SignalInstance((str,))
-        self.on_error: SignalInstance = SignalInstance((str,))
-        self.on_finish: SignalInstance = SignalInstance()
-        self.on_actiontable_received: SignalInstance = SignalInstance(
-            (ActionTable, dict[str, Any], list[str])
-        )
+        # Initialize state machine (must be last - triggers introspection)
+        super().__init__()
 
-        # Initialize state machine first (before connecting signals)
-        super().__init__(allow_event_without_transition=True)
+        # Override logger for service-specific logging
+        self.logger = logging.getLogger(__name__)
 
         # Connect protocol signals
         self._connect_signals()
 
-    # Guard conditions for phase-dependent transitions
-
-    def is_init_phase(self) -> bool:
-        """Guard: check if currently in INIT phase.
-
-        Returns:
-            True if in INIT phase, False otherwise.
-        """
-        return self._phase == Phase.INIT
-
-    def is_cleanup_phase(self) -> bool:
-        """Guard: check if currently in CLEANUP phase.
-
-        Returns:
-            True if in CLEANUP phase, False otherwise.
-        """
-        return self._phase == Phase.CLEANUP
-
-    def can_retry(self) -> bool:
-        """Guard: check if retry is allowed (under max limit).
-
-        Returns:
-            True if retry count is below MAX_ERROR_RETRIES, False otherwise.
-        """
-        return self._error_retry_count < MAX_ERROR_RETRIES
-
-    # State machine lifecycle hooks
-    # Note: receiving state is used to drain pending telegrams from the connection
-    # pipe. Any telegram received in this state is intentionally discarded (sent
-    # to /dev/null) to ensure a clean state before processing.
+    # Override state entry hooks with protocol behavior
 
     def on_enter_receiving(self) -> None:
-        """Enter receiving state - drain pending telegrams."""
-        self.logger.debug(f"Entering RECEIVING state (phase={self._phase.value})")
+        """Enter receiving state - wait for telegrams to drain."""
+        self.logger.debug(f"Entering RECEIVING state (phase={self.phase.value})")
         self.conbus_protocol.wait()
 
     def on_enter_resetting(self) -> None:
-        """Enter resetting state - query error status."""
-        self.logger.debug(f"Entering RESETTING state (phase={self._phase.value})")
-        self.conbus_protocol.send_telegram(
-            telegram_type=TelegramType.SYSTEM,
-            serial_number=self.serial_number,
-            system_function=SystemFunction.READ_DATAPOINT,
-            data_value=DataPointType.MODULE_ERROR_CODE.value,
-        )
+        """Enter resetting state - send error status query."""
+        self.logger.debug(f"Entering RESETTING state (phase={self.phase.value})")
+        self.conbus_protocol.send_error_status_query(serial_number=self.serial_number)
         self.send_error_status()
 
     def on_enter_waiting_ok(self) -> None:
-        """Enter waiting_ok state - awaiting error status response."""
-        self.logger.debug(f"Entering WAITING_OK state (phase={self._phase.value})")
+        """Enter waiting_ok state - wait for error status response."""
+        self.logger.debug(f"Entering WAITING_OK state (phase={self.phase.value})")
         self.conbus_protocol.wait()
 
     def on_enter_requesting(self) -> None:
         """Enter requesting state - send download request."""
-        self._phase = Phase.DOWNLOAD
-        self.logger.debug("Entering REQUESTING state - sending download request")
-        self.conbus_protocol.send_telegram(
-            telegram_type=TelegramType.SYSTEM,
-            serial_number=self.serial_number,
-            system_function=SystemFunction.DOWNLOAD_ACTIONTABLE,
-            data_value=NO_ERROR_CODE,
-        )
+        self.enter_download_phase()  # Sets phase to DOWNLOAD
+        self.conbus_protocol.send_download_request(serial_number=self.serial_number)
         self.send_download()
 
     def on_enter_waiting_data(self) -> None:
@@ -252,33 +137,29 @@ class ActionTableDownloadService(StateMachine):
     def on_enter_receiving_chunk(self) -> None:
         """Enter receiving_chunk state - send ACK."""
         self.logger.debug("Entering RECEIVING_CHUNK state - sending ACK")
-        self.conbus_protocol.send_telegram(
-            telegram_type=TelegramType.SYSTEM,
-            serial_number=self.serial_number,
-            system_function=SystemFunction.ACK,
-            data_value=NO_ERROR_CODE,
-        )
+        self.conbus_protocol.send_ack(serial_number=self.serial_number)
         self.send_ack()
 
     def on_enter_processing_eof(self) -> None:
-        """Enter processing_eof state - deserialize and emit result, then cleanup."""
+        """Enter processing_eof state - deserialize and emit result."""
         self.logger.debug("Entering PROCESSING_EOF state - deserializing")
         all_data = "".join(self.actiontable_data)
         actiontable = self.serializer.from_encoded_string(all_data)
-        actiontable_dict = asdict(actiontable)
-        actiontable_short = self.serializer.format_decoded_output(actiontable)
-        self.on_actiontable_received.emit(
-            actiontable, actiontable_dict, actiontable_short
-        )
-        # Switch to CLEANUP phase before returning to receiving state
-        self._phase = Phase.CLEANUP
-        self.do_finish()
+        actiontable_short = self.serializer.to_short_string(actiontable)
+        self.on_actiontable_received.emit(actiontable, actiontable_short)
+        # Switch to CLEANUP phase
+        self.start_cleanup_phase()
 
     def on_enter_completed(self) -> None:
-        """Enter completed state - download finished."""
+        """Enter completed state - emit finish signal."""
         self.logger.debug("Entering COMPLETED state - download finished")
         self.on_finish.emit()
 
+    def on_max_retries_exceeded(self) -> None:
+        """Handle max retries exceeded - emit error signal."""
+        self.logger.error(f"Max error retries ({MAX_ERROR_RETRIES}) exceeded")
+        self.on_error.emit(f"Module error persists after {MAX_ERROR_RETRIES} retries")
+
     # Protocol event handlers
 
     def _on_connection_made(self) -> None:
@@ -287,26 +168,18 @@ class ActionTableDownloadService(StateMachine):
         if self.idle.is_active:
             self.do_connect()
 
-    def _on_telegram_sent(self, telegram_sent: str) -> None:
-        """Handle telegram sent event.
-
-        Args:
-            telegram_sent: The telegram that was sent.
-        """
-        self.logger.debug(f"Telegram sent: {telegram_sent}")
-
     def _on_read_datapoint_received(self, reply_telegram: ReplyTelegram) -> None:
-        """Handle READ_DATAPOINT response for error status check.
+        """
+        Handle READ_DATAPOINT response for error status check.
 
         Args:
             reply_telegram: The parsed reply telegram.
         """
         self.logger.debug(f"Received READ_DATAPOINT in {self.current_state}")
+        if reply_telegram.serial_number != self.serial_number:
+            return
 
         if reply_telegram.datapoint_type != DataPointType.MODULE_ERROR_CODE:
-            self.logger.debug(
-                f"Filtered: not a MODULE_ERROR_CODE (got {reply_telegram.datapoint_type})"
-            )
             return
 
         if not self.waiting_ok.is_active:
@@ -314,49 +187,46 @@ class ActionTableDownloadService(StateMachine):
 
         is_no_error = reply_telegram.data_value == NO_ERROR_CODE
         if is_no_error:
-            self._error_retry_count = 0  # Reset on success
-            self.no_error_status_received()  # Guards determine target state
+            self.handle_no_error_received()
         else:
-            self._error_retry_count += 1
-            self.logger.debug(
-                f"Error status received, retry {self._error_retry_count}/{MAX_ERROR_RETRIES}"
-            )
-            # Guard can_retry blocks transition if max retries exceeded
-            self.error_status_received()
-            # Check if guard blocked the transition (still in waiting_ok)
-            if self.waiting_ok.is_active:
-                self.logger.error(
-                    f"Max error retries ({MAX_ERROR_RETRIES}) exceeded, giving up"
-                )
-                self.on_error.emit(
-                    f"Module error persists after {MAX_ERROR_RETRIES} retries"
-                )
-
-    def _on_actiontable_chunk_received(self, reply_telegram: ReplyTelegram) -> None:
-        """Handle actiontable chunk telegram received.
+            self.handle_error_received()
+
+    def _on_actiontable_chunk_received(
+        self, reply_telegram: ReplyTelegram, actiontable_chunk: str
+    ) -> None:
+        """
+        Handle actiontable chunk telegram received.
 
         Args:
             reply_telegram: The parsed reply telegram containing chunk data.
+            actiontable_chunk: The chunk data.
         """
         self.logger.debug(f"Received actiontable chunk in {self.current_state}")
+        if reply_telegram.serial_number != self.serial_number:
+            return
+
         if self.waiting_data.is_active:
-            data_part = reply_telegram.data_value[CHUNK_HEADER_LENGTH:]
-            self.actiontable_data.append(data_part)
+            self.actiontable_data.append(actiontable_chunk)
             self.on_progress.emit(".")
             self.receive_chunk()
 
-    def _on_eof_received(self, _reply_telegram: ReplyTelegram) -> None:
-        """Handle EOF telegram received.
+    def _on_eof_received(self, reply_telegram: ReplyTelegram) -> None:
+        """
+        Handle EOF telegram received.
 
         Args:
-            _reply_telegram: The parsed reply telegram (unused).
+            reply_telegram: The parsed reply telegram (unused).
         """
         self.logger.debug(f"Received EOF in {self.current_state}")
+        if reply_telegram.serial_number != self.serial_number:
+            return
+
         if self.waiting_data.is_active:
             self.receive_eof()
 
     def _on_telegram_received(self, telegram_received: TelegramReceivedEvent) -> None:
-        """Handle telegram received event.
+        """
+        Handle telegram received event.
 
         Args:
             telegram_received: The telegram received event.
@@ -369,42 +239,9 @@ class ActionTableDownloadService(StateMachine):
             self.filter_telegram()
             return
 
-        # Filter invalid telegrams
-        if not telegram_received.checksum_valid:
-            self.logger.debug("Filtered: invalid checksum")
-            return
-
-        if telegram_received.telegram_type != TelegramType.REPLY.value:
-            self.logger.debug(
-                f"Filtered: not a reply (got {telegram_received.telegram_type})"
-            )
-            return
-
-        if telegram_received.serial_number != self.serial_number:
-            self.logger.debug(
-                f"Filtered: wrong serial {telegram_received.serial_number} != {self.serial_number}"
-            )
-            return
-
-        reply_telegram = self.telegram_service.parse_reply_telegram(
-            telegram_received.frame
-        )
-
-        if reply_telegram.system_function == SystemFunction.READ_DATAPOINT:
-            self._on_read_datapoint_received(reply_telegram)
-            return
-
-        if reply_telegram.system_function == SystemFunction.ACTIONTABLE:
-            self._on_actiontable_chunk_received(reply_telegram)
-            return
-
-        if reply_telegram.system_function == SystemFunction.EOF:
-            self._on_eof_received(reply_telegram)
-            return
-
     def _on_timeout(self) -> None:
         """Handle timeout event."""
-        self.logger.debug(f"Timeout occurred (phase={self._phase.value})")
+        self.logger.debug(f"Timeout occurred (phase={self.phase.value})")
         if self.receiving.is_active:
             self.do_timeout()  # receiving -> resetting
         elif self.waiting_ok.is_active:
@@ -417,7 +254,8 @@ class ActionTableDownloadService(StateMachine):
             self.on_error.emit("Timeout")
 
     def _on_failed(self, message: str) -> None:
-        """Handle failed connection event.
+        """
+        Handle failed connection event.
 
         Args:
             message: Failure message.
@@ -430,15 +268,18 @@ class ActionTableDownloadService(StateMachine):
     def configure(
         self,
         serial_number: str,
+        actiontable_type: ActionTableType,
         timeout_seconds: Optional[float] = 2.0,
     ) -> None:
-        """Configure download parameters before starting.
+        """
+        Configure download parameters before starting.
 
         Sets the target module serial number and timeout. Call this before
         start_reactor() to configure the download target.
 
         Args:
             serial_number: Module serial number to download from.
+            actiontable_type: Type of action table to download.
             timeout_seconds: Timeout in seconds for each operation (default 2.0).
 
         Raises:
@@ -448,11 +289,20 @@ class ActionTableDownloadService(StateMachine):
             raise RuntimeError("Cannot configure while download in progress")
         self.logger.info("Configuring actiontable download")
         self.serial_number = serial_number
+        if actiontable_type == ActionTableType.ACTIONTABLE:
+            self.serializer = self.actiontable_serializer
+        elif actiontable_type == ActionTableType.MSACTIONTABLE_XP20:
+            self.serializer = self.msactiontable_serializer_xp20
+        elif actiontable_type == ActionTableType.MSACTIONTABLE_XP24:
+            self.serializer = self.msactiontable_serializer_xp24
+        elif actiontable_type == ActionTableType.MSACTIONTABLE_XP33:
+            self.serializer = self.msactiontable_serializer_xp33
         if timeout_seconds:
             self.conbus_protocol.timeout_seconds = timeout_seconds
 
     def set_timeout(self, timeout_seconds: float) -> None:
-        """Set operation timeout.
+        """
+        Set operation timeout.
 
         Args:
             timeout_seconds: Timeout in seconds.
@@ -472,8 +322,14 @@ class ActionTableDownloadService(StateMachine):
         if self._signals_connected:
             return
         self.conbus_protocol.on_connection_made.connect(self._on_connection_made)
-        self.conbus_protocol.on_telegram_sent.connect(self._on_telegram_sent)
         self.conbus_protocol.on_telegram_received.connect(self._on_telegram_received)
+        self.conbus_protocol.on_read_datapoint_received.connect(
+            self._on_read_datapoint_received
+        )
+        self.conbus_protocol.on_actiontable_chunk_received.connect(
+            self._on_actiontable_chunk_received
+        )
+        self.conbus_protocol.on_eof_received.connect(self._on_eof_received)
         self.conbus_protocol.on_timeout.connect(self._on_timeout)
         self.conbus_protocol.on_failed.connect(self._on_failed)
         self._signals_connected = True
@@ -483,8 +339,14 @@ class ActionTableDownloadService(StateMachine):
         if not self._signals_connected:
             return
         self.conbus_protocol.on_connection_made.disconnect(self._on_connection_made)
-        self.conbus_protocol.on_telegram_sent.disconnect(self._on_telegram_sent)
         self.conbus_protocol.on_telegram_received.disconnect(self._on_telegram_received)
+        self.conbus_protocol.on_read_datapoint_received.disconnect(
+            self._on_read_datapoint_received
+        )
+        self.conbus_protocol.on_actiontable_chunk_received.disconnect(
+            self._on_actiontable_chunk_received
+        )
+        self.conbus_protocol.on_eof_received.disconnect(self._on_eof_received)
         self.conbus_protocol.on_timeout.disconnect(self._on_timeout)
         self.conbus_protocol.on_failed.disconnect(self._on_failed)
         self._signals_connected = False
@@ -497,20 +359,12 @@ class ActionTableDownloadService(StateMachine):
         """
         # Reset state for singleton reuse
         self.actiontable_data = []
-        self._phase = Phase.INIT
-        self._error_retry_count = 0
-        # Reset state machine to idle
-        self._reset_state()
+        # Reset state machine
+        self.reset()
         # Reconnect signals (in case previously disconnected)
         self._connect_signals()
         return self
 
-    def _reset_state(self) -> None:
-        """Reset state machine to initial state."""
-        # python-statemachine uses model.state to track current state
-        # Set it directly to the initial state id
-        self.model.state = self.idle.id
-
     def __exit__(
         self, _exc_type: Optional[type], _exc_val: Optional[Exception], _exc_tb: Any
     ) -> None:

xp/services/conbus/actiontable/actiontable_list_service.py

@@ -8,7 +8,8 @@ from psygnal import Signal
 
 
 class ActionTableListService:
-    """Service for listing modules with action table configurations.
+    """
+    Service for listing modules with action table configurations.
 
     Reads conson.yml and returns a list of all modules that have action table
     configurations defined.
@@ -26,7 +27,8 @@ class ActionTableListService:
         self.logger = logging.getLogger(__name__)
 
     def __enter__(self) -> "ActionTableListService":
-        """Context manager entry.
+        """
+        Context manager entry.
 
         Returns:
             Self for context manager use.
@@ -43,7 +45,8 @@ class ActionTableListService:
         self,
         config_path: Optional[Path] = None,
     ) -> None:
-        """List all modules with action table configurations.
+        """
+        List all modules with action table configurations.
 
         Args:
             config_path: Optional path to conson.yml. Defaults to current directory.
@@ -73,6 +76,15 @@ class ActionTableListService:
                 "serial_number": module.serial_number,
                 "module_type": module.module_type,
                 "action_table": len(module.action_table) if module.action_table else 0,
+                "msaction_table": (
+                    1
+                    if (
+                        module.xp20_msaction_table
+                        or module.xp24_msaction_table
+                        or module.xp33_msaction_table
+                    )
+                    else 0
+                ),
             }
             for module in config.root
         ]
@@ -84,7 +96,8 @@ class ActionTableListService:
         self.on_finish.emit(result)
 
     def _handle_error(self, message: str) -> None:
-        """Handle error and emit error signal.
+        """
+        Handle error and emit error signal.
 
         Args:
             message: Error message.