Automatic test#17802

sentio_prober_control/Sentio/CommandGroups/LoaderCommandGroup.py

@@ -88,7 +88,6 @@ def prealign(self, marker: OrientationMarker, angle: int) -> None:
         self.comm.send(f"loader:prealign {marker.toSentioAbbr()}, {angle}")
         Response.check_resp(self.comm.read_line())
 
-
     def query_wafer_status(self, station : LoaderStation, slot : int) -> Tuple[LoaderStation, int, int, int, float] | None:
 
         """Query the status of a wafer in a loader station.
@@ -187,13 +186,11 @@ def start_prepare_station(self, station: LoaderStation, angle: float | None = No
         return Response.check_resp(self.comm.read_line())
 
 
-    @deprecated("duplicate functionality; Use SentioProber.move_chuck_work_area!")
     def switch_work_area(self, area: str):
         self.comm.send("move_chuck_work_area {0}".format(area))
         resp = Response.check_resp(self.comm.read_line())
         return resp.message()
 
-
     def transfer_wafer(
         self,
         src_station: LoaderStation,

sentio_prober_control/Sentio/CommandGroups/QAlibriaCommandGroup.py

@@ -1,6 +1,13 @@
 from deprecated import deprecated
 from sentio_prober_control.Sentio.Response import Response
 from sentio_prober_control.Sentio.CommandGroups.CommandGroupBase import CommandGroupBase
+from sentio_prober_control.Sentio.ProberBase import ProberException
+from typing import List
+from enum import Enum
+
+class DriftType(Enum):
+    DriftRef = "DriftRef"
+    Drift = "Drift"
 
 class QAlibriaCommandGroup(CommandGroupBase):
     """
@@ -81,25 +88,27 @@ def set_calibration_drift_probe12(self):
     # New / Additional Commands
     # -------------------------------------------------------------------------
 
-    def get_calibration_status(self) -> str:
+    def check_calibration_status(self) -> None:
         """
-        Retrieve the status of QAlibria.
+        Checks the calibration status of QAlibria.
 
         Wraps SENTIO's "qal:get_calibration_status" remote command.
 
-        Returns:
-            str: The status string of QAlibria (e.g., "OK"). If "OK" and
-                 the system is in Remote mode, calibration is ready.
+        Raises:
+            ProberException: If the calibration status is not "OK".
         """
         self.comm.send("qal:get_calibration_status")
         resp = Response.check_resp(self.comm.read_line())
-        return resp.message()
+        status = resp.message().strip()
+        if status.upper() != "OK":
+            raise ProberException(f"Calibration status error: {status}")
+
 
 
     def measurement_execute(
         self,
         file_name: str,
-        ports: str = "1,2",
+        ports: List[int] = [1, 2],
         correct_by_vna: bool = True,
         enable_use_ratio: bool = False,
         enable_switch_term: bool = False
@@ -111,14 +120,18 @@ def measurement_execute(
 
         Args:
             file_name: The path to the SNP file.
-            ports: The port(s) used for the measurement, e.g. "1,2".
+            ports: A list of port numbers used for the measurement (e.g. [1, 2]).
             correct_by_vna: Whether to apply VNA correction (True/False).
             enable_use_ratio: Whether to enable 'Use Ratio b/a' (True/False).
             enable_switch_term: Whether to enable switch term (True/False).
+
+        Raises:
+            ProberException: If the remote command returns an error.
         """
+        ports_str = ",".join(str(port) for port in ports)
         cmd = (
             f"qal:measurement_execute "
-            f"{file_name},{ports},"
+            f"{file_name},{ports_str},"
             f"{str(correct_by_vna).lower()},"
             f"{str(enable_use_ratio).lower()},"
             f"{str(enable_switch_term).lower()}"
@@ -135,18 +148,21 @@ def reset_ets(self) -> None:
         self.comm.send("qal:reset_ets")
         Response.check_resp(self.comm.read_line())
 
-
-    def set_ets(self, ports: str, path: str) -> None:
+    def set_ets(self, port: int, path: str, ets_mode: int = 0) -> None:
         """
         Set error terms in the buffer.
 
         Wraps SENTIO's "qal:set_ets" remote command.
 
         Args:
-            ports: Port(s) of error terms (e.g. "12").
+            port: Port of error terms (e.g. 12).
             path: Path to the error terms file in the buffer (e.g. "D:\\temp\\ets.txt").
+            ets_mode: An integer parameter as defined by the remote command spec (default is 0).
+
+        Raises:
+            ProberException: If the remote command returns an error.
         """
-        cmd = f"qal:set_ets {ports},{path}"
+        cmd = f"qal:set_ets {port},{path},{ets_mode}"
         self.comm.send(cmd)
         Response.check_resp(self.comm.read_line())
 
@@ -164,19 +180,21 @@ def send_ets_to_vna(self, cal_set_name: str) -> None:
         self.comm.send(cmd)
         Response.check_resp(self.comm.read_line())
 
-
-    def clear_dut_network(self, dut_name: str, drift_type: str, update_ui: bool) -> None:
+    def clear_dut_network(self, dut_name: str, drift_type: DriftType, update_ui: bool) -> None:
         """
         Clear network data for a DUT.
 
         Wraps SENTIO's "qal:clear_dut_network" remote command.
 
         Args:
             dut_name: The name of the DUT (e.g. "RefDUT").
-            drift_type: The type of drift data to clear ("DriftRef" or "Drift").
+            drift_type: The type of drift data to clear (DriftType.DriftRef or DriftType.Drift).
             update_ui: Whether to update the UI (True/False).
+
+        Raises:
+            ProberException: If the remote command returns an error.
         """
-        cmd = (f"qal:clear_dut_network {dut_name},{drift_type},{str(update_ui).lower()}")
+        cmd = f"qal:clear_dut_network {dut_name},{drift_type.value},{str(update_ui).lower()}"
         self.comm.send(cmd)
         Response.check_resp(self.comm.read_line())
 

sentio_prober_control/Sentio/CommandGroups/SetupCommandGroup.py

@@ -0,0 +1,69 @@
+from typing import Tuple
+
+from sentio_prober_control.Sentio.Enumerations import ThermoChuckState
+from sentio_prober_control.Sentio.Response import Response
+from sentio_prober_control.Sentio.CommandGroups.ModuleCommandGroupBase import (
+    ModuleCommandGroupBase,
+)
+
+
+class SetupCommandGroup(ModuleCommandGroupBase):
+    """A command group for accessing setup module functions."""
+    def __init__(self, comm) -> None:
+        super().__init__(comm, "setup")
+
+    def get_contact_counter(self) -> int:
+        """Retrieves the contact counter value.
+
+        Returns:
+            An integer representing the number of times the chuck moved into contact height,
+            excluding moves on cleaning substrate.
+        """
+        self.comm.send("setup:contact_counter:get")
+        resp = Response.check_resp(self.comm.read_line())
+        return int(resp.message())
+
+    def reset_contact_counter(self) -> None:
+        """Resets the contact counter."""
+        self.comm.send("setup:contact_counter:reset")
+        Response.check_resp(self.comm.read_line())
+
+    def remote_light_off_at_contact(self, status: bool) -> str:
+        """Defines whether light is switched off at contact height in remote mode.
+
+        Args:
+            status (BooleanStatus): True/False, ON/OFF as defined in Enum.
+
+        Returns:
+            Response: Response object for result checking.
+        """
+        self.comm.send(f"setup:remote:light_off_at_contact {status}")
+        resp = Response.check_resp(self.comm.read_line())
+        return resp.message()
+
+    def remote_light_on_at_separation(self, status: bool) -> str:
+        """Defines whether light is switched on at separation height in remote mode.
+
+        Args:
+            status (BooleanStatus): True/False, ON/OFF as defined in Enum.
+
+        Returns:
+            Response: Response object for result checking.
+        """
+        self.comm.send(f"setup:remote:light_on_at_separation {status}")
+        resp = Response.check_resp(self.comm.read_line())
+        return resp.message()
+
+    def remote_scope_follow_off(self, status: bool) -> str:
+        """Defines whether scope follow mode is switched off in remote mode.
+
+        Args:
+            status (BooleanStatus): True/False, ON/OFF as defined in Enum.
+                Note: ON disables scope follow.
+
+        Returns:
+            Response: Response object for result checking.
+        """
+        self.comm.send(f"setup:remote:scope_follow_off {status}")
+        resp = Response.check_resp(self.comm.read_line())
+        return resp.message()

sentio_prober_control/Sentio/CommandGroups/SiPHCommandGroup.py

@@ -137,7 +137,7 @@ def move_origin(self, probe: ProbeSentio) -> None:
             A Response object containing the command execution status.
         """
         self.comm.send(f"siph:move_origin {probe.toSentioAbbr()}")
-        return Response.check_resp(self.comm.read_line())
+        Response.check_resp(self.comm.read_line())
 
     def move_position_uvw(self, probe: ProbeSentio, axis: UvwAxis, degree: float) -> float:
         """Move the SiPH positioner target axis with a relative degree.