some kamil_adc fixes

2026-07-02 17:44:24 +03:00
parent 42532c9868
commit 3efe968dd1
10 changed files with 644 additions and 42 deletions
@@ -36,8 +36,8 @@ _OPEN_RETRY_LOG_EVERY = 30
 def _open_radar_with_retry(
    config: RunConfigModel,
    radar: KamilAdcService,
-    input_switch: SwitchService,
-    output_switch: SwitchService,
+    input_switch: SwitchService | None,
+    output_switch: SwitchService | None,
    stop_requested: threading.Event,
 ) -> bool:
    """Open+configure the radar and both switches, retrying forever until stop.
@@ -48,14 +48,19 @@ def _open_radar_with_retry(
    relaunched collector starts clean. Returns ``True`` once everything is open, or
    ``False`` if a stop was requested before the device became available. Backoff is
    capped and every wait is interruptible by SIGTERM.
+
+    ``input_switch``/``output_switch`` are ``None`` in switch-aware mode, where the
+    collector owns the GPIO lines and the producer must not open them.
    """
    # Tear down any prior open first: open()/switch.open() are idempotent no-ops
    # while still "open", so a mid-run reconnect must close them to force a fresh
    # collector relaunch and TTY re-attach.
-    with suppress(Exception):
-        input_switch.close()
-    with suppress(Exception):
-        output_switch.close()
+    if input_switch is not None:
+        with suppress(Exception):
+            input_switch.close()
+    if output_switch is not None:
+        with suppress(Exception):
+            output_switch.close()
    with suppress(Exception):
        radar.close()

@@ -65,15 +70,19 @@ def _open_radar_with_retry(
        try:
            radar.open(stop_event=stop_requested)
            radar.configure(config.radar.sweep)
-            output_switch.open()
-            input_switch.open()
+            if output_switch is not None:
+                output_switch.open()
+            if input_switch is not None:
+                input_switch.open()
        except Exception as exc:  # noqa: BLE001 — waiting for the device is the point
            # Drop any partial open (collector process, TTY reader, switches)
            # before the next attempt so the relaunch starts from a clean state.
-            with suppress(Exception):
-                input_switch.close()
-            with suppress(Exception):
-                output_switch.close()
+            if input_switch is not None:
+                with suppress(Exception):
+                    input_switch.close()
+            if output_switch is not None:
+                with suppress(Exception):
+                    output_switch.close()
            with suppress(Exception):
                radar.close()
            attempt += 1
@@ -136,9 +145,26 @@ def main() -> int:
        "Opened SHM ring writers: raw=%s, raw_tap=%s",
        config.rings.raw.name, config.rings.raw_tap.name,
    )
-    radar = KamilAdcService(config)
-    input_switch = SwitchService.from_model(config.input_switch)
-    output_switch = SwitchService.from_model(config.output_switch)
+    # Switch-aware mode: with native switches the collector drives the RF switches
+    # itself, in the hardware gap between sweeps, and tags each sweep with its combo
+    # — no sweep lost at a switch boundary. The producer then only reads tagged
+    # sweeps and must not touch the GPIO lines the collector owns. With mock switches
+    # (dev/tests) we keep the Python-driven path, which is fine where speed and the
+    # in-gap timing do not matter.
+    collector_driven = (
+        config.input_switch.driver_mode == "native"
+        and config.output_switch.driver_mode == "native"
+    )
+    radar = KamilAdcService(
+        config,
+        switch_config_path=str(args.config) if collector_driven else None,
+    )
+    input_switch = None if collector_driven else SwitchService.from_model(config.input_switch)
+    output_switch = None if collector_driven else SwitchService.from_model(config.output_switch)
+    logger.info(
+        "Kamil ADC switch control: %s",
+        "collector-driven (in-gap, lossless)" if collector_driven else "producer-driven",
+    )

    try:
        if not _open_radar_with_retry(config, radar, input_switch, output_switch, stop_requested):
@@ -155,12 +181,16 @@ def main() -> int:
                for combo in config.combos:
                    if stop_requested.is_set():
                        break
-                    output_switch.switch_to(combo.output)
-                    input_switch.switch_to(combo.input)
-                    if config.runtime.settling_ms > 0:
-                        time.sleep(config.runtime.settling_ms / 1000.0)
-
-                    sweep = radar.acquire()
+                    if collector_driven:
+                        # The collector already switched and tagged the sweep; just
+                        # read the clean capture for this combination.
+                        sweep = radar.acquire(combo=(combo.input, combo.output))
+                    else:
+                        output_switch.switch_to(combo.output)
+                        input_switch.switch_to(combo.input)
+                        if config.runtime.settling_ms > 0:
+                            time.sleep(config.runtime.settling_ms / 1000.0)
+                        sweep = radar.acquire()
                    traces.append(
                        TraceData(
                            combo=ComboKey(input=combo.input, output=combo.output),
@@ -222,10 +252,12 @@ def main() -> int:
                logger.info("Kamil ADC collection %d acquired in %.3f s", collection_id, collection_duration_s)
            collection_id += 1
    finally:
-        with suppress(Exception):
-            output_switch.close()
-        with suppress(Exception):
-            input_switch.close()
+        if output_switch is not None:
+            with suppress(Exception):
+                output_switch.close()
+        if input_switch is not None:
+            with suppress(Exception):
+                input_switch.close()
        with suppress(Exception):
            radar.close()
        raw_tap_writer.close()