some fixes

python_app/hardware_full/kamil_adc_service.py

@@ -320,14 +320,18 @@ class KamilAdcService:
         executable_path = str(Path(adc.executable_path).expanduser())
         return [executable_path, *adc.args, f"tty:{adc.tty_path}"]
 
-    def open(self) -> None:
-        """Launch the collector and start the TTY reader thread."""
+    def open(self, *, stop_event: threading.Event | None = None) -> None:
+        """Launch the collector and start the TTY reader thread.
+
+        An optional `stop_event` lets a caller abort the TTY-wait loop promptly
+        (e.g. on shutdown) instead of blocking for the full startup timeout.
+        """
         if self._reader is not None:
             return
         previous_tty_identity = _prepare_tty_path_for_collector(self.config.radar.kamil_adc.tty_path)
         try:
             self._start_process()
-            self._wait_for_tty(previous_tty_identity)
+            self._wait_for_tty(previous_tty_identity, stop_event=stop_event)
             reader = KamilAdcTtyReader(self.config.radar.kamil_adc.tty_path)
             reader.open()
             self._reader = reader
@@ -416,15 +420,28 @@ class KamilAdcService:
             os.killpg(process.pid, signal.SIGKILL)
         process.wait(timeout=1.0)
 
-    def _wait_for_tty(self, previous_identity: tuple[object, ...] | None) -> None:
+    def _wait_for_tty(
+        self,
+        previous_identity: tuple[object, ...] | None,
+        *,
+        stop_event: threading.Event | None = None,
+    ) -> None:
         adc = self.config.radar.kamil_adc
         deadline = time.monotonic() + adc.startup_timeout_s
         while time.monotonic() < deadline:
+            # Abort promptly if a stop was requested mid-wait.
+            if stop_event is not None and stop_event.is_set():
+                raise RuntimeError("Kamil ADC startup aborted before TTY became available")
             KamilAdcTtyReader._raise_if_process_exited(self._process)
             identity = _tty_identity(adc.tty_path)
             if identity is not None and identity != previous_identity:
                 return
-            time.sleep(0.05)
+            # Use the stop event's wait() so a set() breaks the poll immediately.
+            if stop_event is not None:
+                if stop_event.wait(0.05):
+                    raise RuntimeError("Kamil ADC startup aborted before TTY became available")
+            else:
+                time.sleep(0.05)
         raise TimeoutError(
             f"Timed out waiting for Kamil ADC TTY `{adc.tty_path}` to be created by the collector"
         )