diff --git a/.gitignore b/.gitignore index ac9c31b..2be5523 100644 --- a/.gitignore +++ b/.gitignore @@ -222,3 +222,4 @@ __marimo__/ # Streamlit .streamlit/secrets.toml +python_app/runtime \ No newline at end of file diff --git a/device_firmware/combined.vnafw b/device_firmware/combined.vnafw new file mode 100644 index 0000000..f1d1100 Binary files /dev/null and b/device_firmware/combined.vnafw differ diff --git a/device_firmware/combined_external_lo_slave.vnafw b/device_firmware/combined_external_lo_slave.vnafw new file mode 100644 index 0000000..00f07b4 Binary files /dev/null and b/device_firmware/combined_external_lo_slave.vnafw differ diff --git a/python_app/runtime/calibration_bundle.bin b/python_app/runtime/calibration_bundle.bin deleted file mode 100644 index acba53e..0000000 Binary files a/python_app/runtime/calibration_bundle.bin and /dev/null differ diff --git a/python_app/runtime/gui_session_state.json b/python_app/runtime/gui_session_state.json deleted file mode 100644 index 3d3fea6..0000000 --- a/python_app/runtime/gui_session_state.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "last_profile_path": "/home/europa/Documents/radar_system/run_config.json" -} \ No newline at end of file diff --git a/python_app/runtime/processing_live.json b/python_app/runtime/processing_live.json deleted file mode 100644 index d4a4800..0000000 --- a/python_app/runtime/processing_live.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "processor_mode": "gpr", - "pass_through_channel": "s21", - "pass_through_fixed_y_enabled": false, - "pass_through_y_min_db": -100.0, - "pass_through_y_max_db": 0.0, - "bscan_axis": "abs", - "bscan_channel": "s21", - "bscan_cut_m": 0.824, - "bscan_max_depth_m": 1.0, - "bscan_gain": 1.0, - "bscan_start_freq_mhz": 100.0, - "bscan_stop_freq_mhz": 6000.0, - "gpr_input_positions": [ - 0, - 1, - 2, - 3 - ], - "gpr_output_positions": [ - 0, - 3 - ], - "gpr_min_depth_m": 2.0, - "gpr_max_depth_m": 14.0, - "gpr_comp_power": 0.2, - "gpr_start_freq_mhz": 3000.0, - "gpr_stop_freq_mhz": 6000.0, - "gpr_speed_m_s": 0.0, - "gpr_look_angle_deg": 0.0, - "gpr_background_subtract_enabled": false, - "gpr_background_mean_count": 10, - "history_command_seq": 0, - "history_command": "none" -} diff --git a/python_app/runtime/reference_bundle.bin b/python_app/runtime/reference_bundle.bin deleted file mode 100644 index daf4028..0000000 Binary files a/python_app/runtime/reference_bundle.bin and /dev/null differ diff --git a/python_app/runtime/run_config.json b/python_app/runtime/run_config.json deleted file mode 100644 index 4fb94ad..0000000 --- a/python_app/runtime/run_config.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "radar": { - "model": "librevna", - "serial": "", - "driver_mode": "native", - "mock_signal_hz": 5000000.0, - "sweep": { - "start_hz": 1000000.0, - "stop_hz": 6000000000.0, - "points": 201, - "if_bandwidth_hz": 50000.0, - "stimulus_power_dbm": -10.0 - } - }, - "switches": { - "port1": { - "name": "port1", - "driver_mode": "native", - "driver": "h7992", - "radar_port": 1, - "positions": 4, - "default_position": 0, - "gpio_chip": "/dev/gpiochip0", - "pin_a": 17, - "pin_b": 27, - "invert_logic": false - }, - "port2": { - "name": "port2", - "driver_mode": "native", - "driver": "h7992", - "radar_port": 2, - "positions": 4, - "default_position": 0, - "gpio_chip": "/dev/gpiochip0", - "pin_a": 22, - "pin_b": 23, - "invert_logic": false - } - }, - "run": { - "settling_ms": 0, - "idle_sleep_ms": 2, - "continuous": false, - "processing_live_config_path": "/home/europa/Documents/radar_system/python_app/runtime/processing_live.json", - "combos": [ - { - "input": 0, - "output": 0 - }, - { - "input": 1, - "output": 0 - }, - { - "input": 2, - "output": 0 - }, - { - "input": 3, - "output": 0 - }, - { - "input": 0, - "output": 3 - }, - { - "input": 1, - "output": 3 - }, - { - "input": 2, - "output": 3 - }, - { - "input": 3, - "output": 3 - } - ] - }, - "preprocess": { - "s21": { - "calibration": { - "set_name": "smoke_cal", - "bundle_path": "/home/europa/Documents/radar_system/python_app/runtime/s21_calibration_bundle.bin" - }, - "reference": { - "set_name": "smoke_ref", - "bundle_path": "/home/europa/Documents/radar_system/python_app/runtime/s21_reference_bundle.bin" - } - }, - "s11": { - "calibration": { - "open": { - "set_name": "", - "bundle_path": "" - }, - "short": { - "set_name": "", - "bundle_path": "" - }, - "load": { - "set_name": "", - "bundle_path": "" - } - }, - "reference": { - "set_name": "", - "bundle_path": "" - } - }, - "notch": { - "enabled": true, - "bands_hz": [ - [790000000.0, 850000000.0], - [1790000000.0, 1890000000.0], - [1970000000.0, 2050000000.0], - [2080000000.0, 2560000000.0], - [2650000000.0, 2700000000.0] - ], - "taper_width_hz": 40000000.0, - "taper_type": "cosine" - } - }, - "gpr": { - "mode": "point", - "relative_permittivity": 1.0, - "tx_geometry": [ - { - "output_pos": 0, - "x_m": 0.905 - }, - { - "output_pos": 3, - "x_m": -0.905 - } - ], - "rx_geometry": [ - { - "input_pos": 0, - "x_m": -0.18 - }, - { - "input_pos": 1, - "x_m": 0.485 - }, - { - "input_pos": 2, - "x_m": -0.49 - }, - { - "input_pos": 3, - "x_m": 0.185 - } - ] - }, - "rings": { - "raw": { - "name": "/radar_raw", - "capacity": 50, - "slot_size_bytes": 2097152 - }, - "raw_tap": { - "name": "/radar_raw_tap", - "capacity": 50, - "slot_size_bytes": 2097152 - }, - "preprocessed": { - "name": "/radar_preprocessed", - "capacity": 50, - "slot_size_bytes": 2097152 - }, - "preprocessed_tap": { - "name": "/radar_preprocessed_tap", - "capacity": 50, - "slot_size_bytes": 2097152 - }, - "results": { - "name": "/radar_results", - "capacity": 50, - "slot_size_bytes": 2097152 - } - } -} diff --git a/python_app/runtime/run_config_smoke.json b/python_app/runtime/run_config_smoke.json deleted file mode 100644 index b7d3116..0000000 --- a/python_app/runtime/run_config_smoke.json +++ /dev/null @@ -1,204 +0,0 @@ -{ - "radar": { - "model": "librevna", - "serial": "", - "driver_mode": "mock", - "mock_signal_hz": 5000000.0, - "sweep": { - "start_hz": 1000000.0, - "stop_hz": 6000000000.0, - "points": 201, - "if_bandwidth_hz": 50000.0, - "stimulus_power_dbm": -10.0 - } - }, - "switches": { - "port1": { - "name": "port1", - "driver_mode": "mock", - "driver": "h7992", - "radar_port": 1, - "positions": 4, - "default_position": 0, - "gpio_chip": "/dev/gpiochip0", - "pin_a": 17, - "pin_b": 27, - "invert_logic": false - }, - "port2": { - "name": "port2", - "driver_mode": "mock", - "driver": "h7992", - "radar_port": 2, - "positions": 4, - "default_position": 0, - "gpio_chip": "/dev/gpiochip0", - "pin_a": 22, - "pin_b": 23, - "invert_logic": false - } - }, - "run": { - "settling_ms": 0, - "idle_sleep_ms": 2, - "continuous": true, - "processing_live_config_path": "python_app/runtime/processing_live.json", - "combos": [ - { - "input": 0, - "output": 0 - }, - { - "input": 1, - "output": 0 - }, - { - "input": 2, - "output": 0 - }, - { - "input": 3, - "output": 0 - }, - { - "input": 0, - "output": 1 - }, - { - "input": 1, - "output": 1 - }, - { - "input": 2, - "output": 1 - }, - { - "input": 3, - "output": 1 - }, - { - "input": 0, - "output": 2 - }, - { - "input": 1, - "output": 2 - }, - { - "input": 2, - "output": 2 - }, - { - "input": 3, - "output": 2 - }, - { - "input": 0, - "output": 3 - }, - { - "input": 1, - "output": 3 - }, - { - "input": 2, - "output": 3 - }, - { - "input": 3, - "output": 3 - } - ] - }, - "preprocess": { - "s21": { - "calibration": { - "set_name": "smoke_cal", - "bundle_path": "/home/europa/Documents/radar_system/python_app/runtime/s21_calibration_bundle.bin" - }, - "reference": { - "set_name": "smoke_ref", - "bundle_path": "/home/europa/Documents/radar_system/python_app/runtime/s21_reference_bundle.bin" - } - }, - "s11": { - "calibration": { - "open": { - "set_name": "smoke_open", - "bundle_path": "/home/europa/Documents/radar_system/python_app/runtime/s11_open_calibration_bundle.bin" - }, - "short": { - "set_name": "smoke_short", - "bundle_path": "/home/europa/Documents/radar_system/python_app/runtime/s11_short_calibration_bundle.bin" - }, - "load": { - "set_name": "smoke_load", - "bundle_path": "/home/europa/Documents/radar_system/python_app/runtime/s11_load_calibration_bundle.bin" - } - }, - "reference": { - "set_name": "smoke_s11_ref", - "bundle_path": "/home/europa/Documents/radar_system/python_app/runtime/s11_reference_bundle.bin" - } - } - }, - "gpr": { - "mode": "point", - "relative_permittivity": 1.0, - "tx_geometry": [ - { - "output_pos": 0, - "x_m": 0.905 - }, - { - "output_pos": 3, - "x_m": -0.905 - } - ], - "rx_geometry": [ - { - "input_pos": 0, - "x_m": -0.18 - }, - { - "input_pos": 1, - "x_m": 0.485 - }, - { - "input_pos": 2, - "x_m": -0.49 - }, - { - "input_pos": 3, - "x_m": 0.185 - } - ] - }, - "rings": { - "raw": { - "name": "/radar_raw_smoke_2_20242576200473", - "capacity": 50, - "slot_size_bytes": 2097152 - }, - "raw_tap": { - "name": "/radar_raw_tap_smoke_2_20242576209903", - "capacity": 50, - "slot_size_bytes": 2097152 - }, - "preprocessed": { - "name": "/radar_preprocessed_smoke_2_20242576212225", - "capacity": 50, - "slot_size_bytes": 2097152 - }, - "preprocessed_tap": { - "name": "/radar_preprocessed_tap_smoke_2_20242576213549", - "capacity": 50, - "slot_size_bytes": 2097152 - }, - "results": { - "name": "/radar_results_smoke_2_20242576214682", - "capacity": 50, - "slot_size_bytes": 2097152 - } - } -} \ No newline at end of file diff --git a/python_app/runtime/s11_load_calibration_bundle.bin b/python_app/runtime/s11_load_calibration_bundle.bin deleted file mode 100644 index 1fa318e..0000000 Binary files a/python_app/runtime/s11_load_calibration_bundle.bin and /dev/null differ diff --git a/python_app/runtime/s11_open_calibration_bundle.bin b/python_app/runtime/s11_open_calibration_bundle.bin deleted file mode 100644 index 3484277..0000000 Binary files a/python_app/runtime/s11_open_calibration_bundle.bin and /dev/null differ diff --git a/python_app/runtime/s11_reference_bundle.bin b/python_app/runtime/s11_reference_bundle.bin deleted file mode 100644 index 5722cae..0000000 Binary files a/python_app/runtime/s11_reference_bundle.bin and /dev/null differ diff --git a/python_app/runtime/s11_short_calibration_bundle.bin b/python_app/runtime/s11_short_calibration_bundle.bin deleted file mode 100644 index 0a5c029..0000000 Binary files a/python_app/runtime/s11_short_calibration_bundle.bin and /dev/null differ diff --git a/python_app/runtime/s21_calibration_bundle.bin b/python_app/runtime/s21_calibration_bundle.bin deleted file mode 100644 index 5aebe29..0000000 Binary files a/python_app/runtime/s21_calibration_bundle.bin and /dev/null differ diff --git a/python_app/runtime/s21_reference_bundle.bin b/python_app/runtime/s21_reference_bundle.bin deleted file mode 100644 index 8363998..0000000 Binary files a/python_app/runtime/s21_reference_bundle.bin and /dev/null differ