Rename kamil_adc to rph_radar and fix its data path

python_app/gui/controllers/config_controller.py

@@ -31,14 +31,14 @@ _SWEEP_FIELDS = (
     ("radar.sweep.power_dbm", "_power_input"),
 )
 _ADC_FIELDS = (
-    ("radar.kamil_adc.project_dir", "_adc_project_dir_input"),
-    ("radar.kamil_adc.executable_path", "_adc_executable_path_input"),
-    ("radar.kamil_adc.tty_path", "_adc_tty_path_input"),
-    ("radar.kamil_adc.args", "_adc_args_input"),
-    ("radar.kamil_adc.env", "_adc_env_input"),
-    ("radar.kamil_adc.startup_timeout_s", "_adc_startup_timeout_s_input"),
-    ("radar.kamil_adc.sweep_timeout_s", "_adc_sweep_timeout_s_input"),
-    ("radar.kamil_adc.stop_timeout_s", "_adc_stop_timeout_s_input"),
+    ("radar.rph_radar.project_dir", "_adc_project_dir_input"),
+    ("radar.rph_radar.executable_path", "_adc_executable_path_input"),
+    ("radar.rph_radar.tty_path", "_adc_tty_path_input"),
+    ("radar.rph_radar.args", "_adc_args_input"),
+    ("radar.rph_radar.env", "_adc_env_input"),
+    ("radar.rph_radar.startup_timeout_s", "_adc_startup_timeout_s_input"),
+    ("radar.rph_radar.sweep_timeout_s", "_adc_sweep_timeout_s_input"),
+    ("radar.rph_radar.stop_timeout_s", "_adc_stop_timeout_s_input"),
     ("radar.laser_control.enabled", "_optical_enabled_checkbox"),
     ("radar.laser_control.port", "_optical_port_input"),
     ("radar.laser_control.mode", "_optical_mode_combo"),
@@ -50,7 +50,6 @@ _ADC_FIELDS = (
     ("radar.laser_control.manual.temp2", "_optical_manual_temp2_input"),
     ("radar.laser_control.manual.current1", "_optical_manual_current1_input"),
     ("radar.laser_control.manual.current2", "_optical_manual_current2_input"),
-    ("radar.laser_control.variation.variation_type", "_optical_variation_type_combo"),
     ("radar.laser_control.variation.static_temp1", "_optical_static_temp1_input"),
     ("radar.laser_control.variation.static_temp2", "_optical_static_temp2_input"),
     ("radar.laser_control.variation.static_current1", "_optical_static_current1_input"),
@@ -137,7 +136,7 @@ class ConfigController:
         return Path(str(self._scalar("_save_path_input"))).expanduser(), str(self._scalar("_save_name_input")), prefix
 
     def _read_radar(self, config: RunConfigModel) -> None:
-        for path, widget_id in (*_SWEEP_FIELDS, *(_ADC_FIELDS if config.is_kamil_adc else ())):
+        for path, widget_id in (*_SWEEP_FIELDS, *(_ADC_FIELDS if config.is_rph_radar else ())):
             owner, name = _model_field(config, path)
             original = getattr(owner, name)
             value = self._scalar(widget_id)

python_app/gui/controllers/pipeline_controller.py

@@ -21,7 +21,7 @@ from python_app.gui.runtime.constraints import validate_processing_mode_constrai
 from python_app.gui.runtime.history import build_processor_run_signature, build_run_history_signature
 from python_app.gui.runtime.pipeline_pause import PipelinePause
 from python_app.gui.settings_defaults import env_enabled
-from python_app.hardware_full.kamil_adc import apply_kamil_adc_laser_control
+from python_app.hardware_full.rph_radar.laser import apply_rph_radar_laser_control
 from python_app.hardware_full.single_radar_service import create_single_radar_service
 from python_app.models.collection_identity import collection_key, index_collections
 from python_app.models.dataset_model import ComboKey, ResultCollection, SweepCollection
@@ -331,7 +331,7 @@ class PipelineController:
                 self._prepare_radar(config)
                 logger.info("Radar settings applied: start=%g Hz, stop=%g Hz, points=%s, ifbw=%g Hz, power=%g dBm",
                             config.radar.sweep.start_hz, config.radar.sweep.stop_hz,
-                            "from Kamil ADC stream" if config.is_kamil_adc else config.radar.sweep.points,
+                            "from RadioPhotonic radar (RPH) stream" if config.is_rph_radar else config.radar.sweep.points,
                             config.radar.sweep.if_bandwidth_hz, config.radar.sweep.power_dbm)
         except InterruptedError:
             self.operation_cancelled()
@@ -344,9 +344,9 @@ class PipelineController:
             logger.info("Radar pre-configuration skipped (mock mode)")
         elif config.is_multi_device:
             logger.info("Multi-device raw producer will configure all LibreVNA devices")
-        elif config.is_kamil_adc:
-            applied = apply_kamil_adc_laser_control(config)
-            logger.info("Kamil ADC laser_control %s", "applied via Apply Radar" if applied else "disabled")
+        elif config.is_rph_radar:
+            applied = apply_rph_radar_laser_control(config)
+            logger.info("RadioPhotonic radar (RPH) laser_control %s", "applied via Apply Radar" if applied else "disabled")
         else:
             service = create_single_radar_service(config)
             try:

python_app/gui/controllers/profile_controller.py

@@ -134,7 +134,7 @@ class ProfileController:
             self.state.gui = profile.gui or default_gui_state_for_config(profile.run_config, self._project_root)
             _remember(self.state, path, self._session, self._log)
             config, sweep = profile.run_config, profile.run_config.radar.sweep
-            points = "from Kamil ADC stream" if config.is_kamil_adc else str(sweep.points)
+            points = "from RadioPhotonic radar (RPH) stream" if config.is_rph_radar else str(sweep.points)
             self._log.info(
                 f"Config profile saved: path={path}, combos={len(config.combos)}, "
                 f"sweep={sweep.start_hz:g}..{sweep.stop_hz:g} Hz, points={points}, "

python_app/gui/controllers/radar_settings_controller.py

@@ -48,7 +48,7 @@ class RadarSettingsController:
 
     def sync_profile(self, combo_mode: str) -> None:
         self.set_combo_mode(combo_mode)
-        adc = self._defaults().is_kamil_adc
+        adc = self._defaults().is_rph_radar
         self._radar.vna_panel.setVisible(not adc)
         self._radar.adc_panel.setVisible(adc)
         self.sync_adc_controls()
@@ -79,7 +79,7 @@ class RadarSettingsController:
 
     def refresh_limits(self) -> bool:
         config = self._defaults()
-        if config.is_kamil_adc:
+        if config.is_rph_radar:
             return self.apply_limits(None)
         service = (LibreVnaService(serial=config.radar.serial or None) if config.is_multi_device
                    else create_single_radar_service(config))
@@ -136,7 +136,10 @@ class RadarSettingsController:
 
     def sync_frequency_limits(self) -> bool:
         try:
-            bounds = sorted(float(widget.text()) / 1e6 for widget in self._radar.sweep_edits[:2])
+            config = self._defaults()
+            band = config.radar.rph_radar.band
+            bounds = ([band.start_hz / 1e6, band.stop_hz / 1e6] if config.is_rph_radar else
+                      sorted(float(widget.text()) / 1e6 for widget in self._radar.sweep_edits[:2]))
         except ValueError:
             return False
         changed = False

python_app/gui/controllers/sections/processing_section.py

@@ -348,6 +348,7 @@ def build_processing_group(config: RunConfigModel, gui: GuiStateModel) -> Proces
     form.addRow(processing_mode_pages)
     form.addRow(gpr_common_page)
 
+    band = config.radar.rph_radar.band if config.is_rph_radar else config.radar.sweep
     for binding in GUI_FIELDS:
         if binding.path[0] == "processing":
             widget = view.fields[binding.spec.widget]
@@ -355,7 +356,7 @@ def build_processing_group(config: RunConfigModel, gui: GuiStateModel) -> Proces
                 raise TypeError("Geometry is not a scalar GUI setting")
             if binding.path[-1] in {"start_freq_mhz", "stop_freq_mhz"}:
                 assert isinstance(widget, QDoubleSpinBox)
-                widget.setRange(config.radar.sweep.start_hz / 1e6, config.radar.sweep.stop_hz / 1e6)
+                widget.setRange(band.start_hz / 1e6, band.stop_hz / 1e6)
             if binding.spec.live in {"gpr_input_positions", "gpr_output_positions"}:
                 assert isinstance(widget, QLineEdit)
                 widget.setValidator(QRegularExpressionValidator(QRegularExpression(POSITION_CSV_PATTERN), widget))

python_app/gui/controllers/sections/radar_section.py

@@ -62,8 +62,8 @@ def build_radar_group(config: RunConfigModel) -> RadarView:
 
     layout.addWidget(vna_radar_settings_panel)
     layout.addWidget(adc_radar_settings_panel)
-    vna_radar_settings_panel.setVisible(not config.is_kamil_adc)
-    adc_radar_settings_panel.setVisible(config.is_kamil_adc)
+    vna_radar_settings_panel.setVisible(not config.is_rph_radar)
+    adc_radar_settings_panel.setVisible(config.is_rph_radar)
     return RadarView(group=group, fields=view.fields,
                      sweep_edits=(start_hz_input, stop_hz_input, points_input, ifbw_input, power_input),
                      sweep_labels=radar_labels,
@@ -80,7 +80,7 @@ def _build_adc_settings_panel(view: SectionView, config: RunConfigModel):
     layout.setContentsMargins(0, 0, 0, 0)
     layout.setSpacing(8)
 
-    adc = config.radar.kamil_adc
+    adc = config.radar.rph_radar
     optical = config.radar.laser_control
     manual = optical.manual
     variation = optical.variation
@@ -110,16 +110,6 @@ def _build_adc_settings_panel(view: SectionView, config: RunConfigModel):
     optical_manual_current1_input = view.add("_optical_manual_current1_input", QLineEdit(f"{manual.current1:g}"))
     optical_manual_current2_input = view.add("_optical_manual_current2_input", QLineEdit(f"{manual.current2:g}"))
 
-    optical_variation_type_combo = view.add("_optical_variation_type_combo", QComboBox())
-    optical_variation_type_combo.addItems(
-        [
-            "CHANGE_CURRENT_LD1",
-            "CHANGE_CURRENT_LD2",
-            "CHANGE_TEMPERATURE_LD1",
-            "CHANGE_TEMPERATURE_LD2",
-        ]
-    )
-    write_setting(optical_variation_type_combo, variation.variation_type)
     optical_static_temp1_input = view.add("_optical_static_temp1_input", QLineEdit(f"{variation.static_temp1:g}"))
     optical_static_temp2_input = view.add("_optical_static_temp2_input", QLineEdit(f"{variation.static_temp2:g}"))
     optical_static_current1_input = view.add("_optical_static_current1_input", QLineEdit(f"{variation.static_current1:g}"))
@@ -166,7 +156,6 @@ def _build_adc_settings_panel(view: SectionView, config: RunConfigModel):
     optical_variation_panel = build_two_column_form_widget(
         panel,
         [
-            ("Variation type", optical_variation_type_combo),
             ("Static temp 1", optical_static_temp1_input),
             ("Static temp 2", optical_static_temp2_input),
             ("Static current 1", optical_static_current1_input),
@@ -186,7 +175,7 @@ def _build_adc_settings_panel(view: SectionView, config: RunConfigModel):
             (optical_port_input, optical_mode_combo, optical_pi_coeff1_p_input, optical_pi_coeff1_i_input,
              optical_pi_coeff2_p_input, optical_pi_coeff2_i_input),
             (optical_manual_temp1_input, optical_manual_temp2_input, optical_manual_current1_input, optical_manual_current2_input),
-            (optical_variation_type_combo, optical_static_temp1_input, optical_static_temp2_input,
+            (optical_static_temp1_input, optical_static_temp2_input,
              optical_static_current1_input, optical_static_current2_input, optical_min_value_input,
              optical_max_value_input, optical_step_input, optical_time_step_input, optical_delay_time_input),
             optical_manual_panel, optical_variation_panel)