Merge origin/main: reconcile ConfigWindow consolidation with Debug window + protocol updates

origin/main (23 commits) added a Debug window/log system on top of the old
separate Devices/Channels/Plot windows, plus protocol fixes (cml, mark10,
modbus_rtu, scpi) and device/profile changes. Local main (3 commits)
replaced the separate windows with a unified ConfigWindow + dock panel.

Kept local's ConfigWindow/dock architecture and ported the Debug window
onto it: new toolbar button + _open_debug(), gated by developer_mode same
as origin's version. Deduped the two independent "developer mode" toggles
that had collided in SettingsWindow (origin's General-tab checkbox gating
Debug window + device sim-mode visibility, local's Advanced-tab checkbox
setting verbose logging) into one General-tab checkbox that does both.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/api_layers/protocols/scpi.py b/api_layers/protocols/scpi.py
index 730f8e0..fca5ba4 100644
--- a/api_layers/protocols/scpi.py
+++ b/api_layers/protocols/scpi.py
@@ -54,8 +54,9 @@ class SCPILayer(BaseProtocol):
             if not ch.query.strip():
                 continue
             try:
-                self._ser.write(f"{ch.query.strip()}\n".encode())
-                resp = self._ser.readline().decode(errors="replace").strip()
+                with self._io_lock:
+                    self._ser.write(f"{ch.query.strip()}\n".encode())
+                    resp = self._ser.readline().decode(errors="replace").strip()
                 val  = _parse_numeric(resp)
                 if val is not None:
                     result[ch.channel_id] = val * ch.scale
@@ -73,9 +74,12 @@ class SCPILayer(BaseProtocol):
         ch = next((c for c in self.channels if c.channel_id == channel_id), None)
         if ch is None or not ch.write_cmd:
             return False
+        if self.simulate:
+            return True
         try:
             cmd = ch.write_cmd.format(value=value)
-            self._ser.write(f"{cmd}\n".encode())
+            with self._io_lock:
+                self._ser.write(f"{cmd}\n".encode())
             return True
         except Exception:
             return False
@@ -85,8 +89,9 @@ class SCPILayer(BaseProtocol):
         if not self._ser:
             return "(not connected)"
         try:
-            self._ser.write(b"*IDN?\n")
-            return self._ser.readline().decode(errors="replace").strip()
+            with self._io_lock:
+                self._ser.write(b"*IDN?\n")
+                return self._ser.readline().decode(errors="replace").strip()
         except Exception as e:
             return f"(error: {e})"