Rename kamil_adc to rph_radar and fix its data path

This commit is contained in:
Ayzen
2026-10-06 18:15:18 +03:00
parent aef549ea76
commit a185e61495
94 changed files with 2851 additions and 9485 deletions
+10 -21
View File
@@ -286,11 +286,11 @@ EOF
build_cpp_binaries() {
local jobs
jobs="${BUILD_JOBS:-$(nproc)}"
# The Kamil ADC collector is an extra, device-specific binary built only for
# The RadioPhotonic radar (RPH) collector is an extra, device-specific binary built only for
# that model; all models share the core pipeline binaries (`all`).
local targets="all"
if [[ "${RADAR_MODEL}" == "kamil_adc" ]]; then
targets="all kamil_adc_collector"
if [[ "${RADAR_MODEL}" == "rph_radar" ]]; then
targets="all rph_radar_collector"
fi
if make -C "${PROJECT_ROOT}" -q ${targets} >/dev/null 2>&1; then
echo "[start.sh] C++ binaries are up to date; skipping build."
@@ -308,22 +308,14 @@ cleanup_known_shm() {
/dev/shm/radar_preprocessed \
/dev/shm/radar_preprocessed_tap \
/dev/shm/radar_results \
/dev/shm/radar_raw_kamil_adc \
/dev/shm/radar_raw_tap_kamil_adc \
/dev/shm/radar_preprocessed_kamil_adc \
/dev/shm/radar_preprocessed_tap_kamil_adc \
/dev/shm/radar_results_kamil_adc \
/dev/shm/radar_raw_rph_radar \
/dev/shm/radar_raw_tap_rph_radar \
/dev/shm/radar_preprocessed_rph_radar \
/dev/shm/radar_preprocessed_tap_rph_radar \
/dev/shm/radar_results_rph_radar \
|| true
}
kill_stale_adc_collector() {
# Exact executable matching: an argument mentioning the collector is not a process to kill.
PYTHONPATH="${PROJECT_ROOT}${PYTHONPATH:+:${PYTHONPATH}}" "${PYTHON_CMD}" -c '
from python_app.orchestration.process_supervisor import ProcessSupervisor
ProcessSupervisor._kill_kamil_collectors()
'
}
run_gui() {
if [[ -n "${PROFILE_PATH}" ]]; then
export RADAR_SYSTEM_PROFILE="${PROFILE_PATH}"
@@ -393,7 +385,7 @@ import sys
from pathlib import Path
from python_app.orchestration.producer_selection import acquisition_command
command = acquisition_command(Path(sys.argv[1]))
print("kamil_adc_collector" if "python_app.scripts.kamil_adc_raw_producer" in command else "")
print("rph_radar_collector" if "python_app.scripts.rph_radar_raw_producer" in command else "")
' "${PROFILE_PATH:-${PROJECT_ROOT}/run_config.json}")"
required_bins="${required_bins} ${acquisition_binary}"
for bin in ${required_bins}; do
@@ -431,7 +423,7 @@ main() {
# LibreVNA uses Python/libusb; Python/C++ SHM needs libatomic.
if ((HEADLESS == 0)); then
ensure_system_dependencies
if [[ "${RADAR_MODEL}" != "kamil_adc" ]]; then ensure_usb_access_rules; fi
if [[ "${RADAR_MODEL}" != "rph_radar" ]]; then ensure_usb_access_rules; fi
fi
ensure_python_dependencies
@@ -456,9 +448,6 @@ main() {
if ((CLEAN_SHM == 1)); then
cleanup_known_shm
fi
# Clear any ADC collector wedged by a previous run before we launch a new one.
kill_stale_adc_collector
if ((PRODUCER_ONLY == 1)); then
run_producer_only
fi