From af4cd798d45e3006ddba13f32ea45b3e1ebe7f39 Mon Sep 17 00:00:00 2001
From: appleb_m <martin.appleby@psi.ch>
Date: Tue, 24 Mar 2026 12:44:14 +0100
Subject: [PATCH] Daq_worker - updating error message text for users if devices
 disconnect

---
 src/aare/gui/threads/daq_worker.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/aare/gui/threads/daq_worker.py b/src/aare/gui/threads/daq_worker.py
index c0c68f1d..0787d2c9 100644
--- a/src/aare/gui/threads/daq_worker.py
+++ b/src/aare/gui/threads/daq_worker.py
@@ -226,28 +226,28 @@ class DAQWorker(QObject):
             if len(disconnected) == 3:
                 return (
                     "all-devices-down",
-                    "TELL, Smargon, and Aerotech connection errors, please inform your local contact.",
+                    "TELL, Smargon, and Aerotech disconnected.",
                     True,
                 )
             if len(disconnected) == 2:
                 return (
                     "+".join(sorted(d.lower() for d in disconnected)) + "-down",
-                    f"{disconnected[0]} and {disconnected[1]} connection errors, please inform your local contact.",
+                    f"{disconnected[0]} and {disconnected[1]} disconnected.",
                     True,
                 )
             device = disconnected[0]
             return (
                 f"{device.lower()}-down",
-                f"{device} connection error, please inform your local contact.",
+                f"{device} disconnected.",
                 True,
             )
 
         if restored:
             if len(restored) == 3:
-                return (None, "TELL, Smargon, and Aerotech connections restored.", False)
+                return (None, "TELL, Smargon, and Aerotech reconnected.", False)
             if len(restored) == 2:
-                return (None, f"{restored[0]} and {restored[1]} connections restored.", False)
-            return (None, f"{restored[0]} connection restored.", False)
+                return (None, f"{restored[0]} and {restored[1]} reconnected.", False)
+            return (None, f"{restored[0]} reconnected.", False)
 
         return (None, None, False)
 
@@ -259,7 +259,7 @@ class DAQWorker(QObject):
             self.update.emit(parsed_response)
 
             if self._server_connected is False:
-                self._emit_status_if_changed(None, "Server connection restored.", False)
+                self._emit_status_if_changed(None, "Server reconnected.", False)
             self._server_connected = True
             self._last_server_error = None
 
@@ -320,7 +320,7 @@ class DAQWorker(QObject):
             if self._server_connected is not False:
                 self._emit_status_if_changed(
                     "server-down",
-                    "Server connection lost. Trying to reconnect...",
+                    "Server disconnected. Reconnecting...",
                     True,
                 )