new kamil adc

python_app/scripts/kamil_adc_raw_producer.py

@@ -12,10 +12,10 @@ import time
 
 import numpy as np
 
-from python_app.hardware_full.kamil_adc_service import KamilAdcService
+from python_app.hardware_full.kamil_adc import KamilAdcService
 from python_app.hardware_full.switch_service import SwitchService
 from python_app.models.dataset_model import ComboKey, SweepCollection, TraceData
-from python_app.models.run_config_model import RunConfigModel, SwitchModel
+from python_app.models.run_config_model import RunConfigModel
 from python_app.orchestration.shm import ShmRingWriter
 from python_app.storage.npz.serialize import RAW_MAGIC, serialize_trace_collection
 
@@ -137,8 +137,8 @@ def main() -> int:
         config.rings.raw.name, config.rings.raw_tap.name,
     )
     radar = KamilAdcService(config)
-    input_switch = _switch_from_model(config.input_switch)
-    output_switch = _switch_from_model(config.output_switch)
+    input_switch = SwitchService.from_model(config.input_switch)
+    output_switch = SwitchService.from_model(config.output_switch)
 
     try:
         if not _open_radar_with_retry(config, radar, input_switch, output_switch, stop_requested):
@@ -226,7 +226,8 @@ def main() -> int:
             output_switch.close()
         with suppress(Exception):
             input_switch.close()
-        radar.close()
+        with suppress(Exception):
+            radar.close()
         raw_tap_writer.close()
         raw_writer.close()
 
@@ -234,19 +235,5 @@ def main() -> int:
     return 0
 
 
-def _switch_from_model(model: SwitchModel) -> SwitchService:
-    return SwitchService(
-        name=model.name,
-        positions=model.positions,
-        mode=model.driver_mode,
-        driver=model.driver,
-        gpio_chip=model.gpio_chip,
-        pin_a=model.pin_a,
-        pin_b=model.pin_b,
-        invert_logic=model.invert_logic,
-        default_position=model.default_position,
-    )
-
-
 if __name__ == "__main__":
     raise SystemExit(main())