From 4d1f1b2e54556ffd63b9ffb708413dfdc29f4621 Mon Sep 17 00:00:00 2001
From: justus237 <62303964+justus237@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:46:51 +0100
Subject: [PATCH] make rf_args configurable

---
 src/logic/ngscope_controller.rs | 6 +++++-
 src/parse.rs                    | 8 ++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/logic/ngscope_controller.rs b/src/logic/ngscope_controller.rs
index 2cc728f..73d7972 100644
--- a/src/logic/ngscope_controller.rs
+++ b/src/logic/ngscope_controller.rs
@@ -15,7 +15,7 @@ use crate::logic::{
     CHANNEL_SYNC_SIZE, DEFAULT_WORKER_SLEEP_MS, DEFAULT_WORKER_SLEEP_US,
 };
 use crate::ngscope;
-use crate::ngscope::config::NgScopeConfig;
+use crate::ngscope::config::{NgScopeConfig, NgScopeConfigRfDev};
 use crate::ngscope::types::{Message, NgScopeCellDci};
 use crate::ngscope::{
     ngscope_validate_server_check, ngscope_validate_server_send_initial, start_ngscope,
@@ -95,6 +95,10 @@ fn run(run_args: &mut RunArgs, run_args_mov: RunArgsMovables) -> Result<()> {
     let ng_args = FlattenedNgScopeArgs::from_unflattened(app_args.clone().ngscope.unwrap())?;
     let mut ng_process_option: Option<Child> = None;
     let ngscope_config = NgScopeConfig {
+        rf_config0: Some(NgScopeConfigRfDev {
+            rf_args: ng_args.ng_rf_args.clone(),
+            ..Default::default()
+        }),
         ..Default::default()
     };
 
diff --git a/src/parse.rs b/src/parse.rs
index 1064487..e3c7c32 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -8,6 +8,7 @@ use crate::{logic::traffic_patterns::RntiMatchingTrafficPatternType, util::print
 
 pub const DEFAULT_SCENARIO: Scenario = Scenario::TrackUeAndEstimateTransportCapacity;
 pub const DEFAULT_LOG_BASE_DIR: &str = "./.logs.ue/";
+pub const DEFAULT_NG_RF_ARGS: &str = "serial=3295B62";
 pub const DEFAULT_DOWNLOAD_BASE_ADDR: &str = "http://some.addr";
 pub const DEFAULT_DOWNLOAD_PATHS: &[&str] = &[
     "/10s/cubic",
@@ -162,6 +163,10 @@ pub struct NgScopeArgs {
     /// Determine the number of DCIs contained in a single log file
     #[arg(long, required = false)]
     pub ng_log_dci_batch_size: Option<u64>,
+
+    /// rf_args such as setting serial (allowing configuration of which SDR to use)
+    #[arg(long, required = false)]
+    pub ng_rf_args: Option<String>,
 }
 
 #[derive(Clone, Debug)]
@@ -173,6 +178,7 @@ pub struct FlattenedNgScopeArgs {
     pub ng_start_process: bool,
     pub ng_log_dci: bool,
     pub ng_log_dci_batch_size: u64,
+    pub ng_rf_args: String,
 }
 
 #[derive(Args, Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -289,6 +295,7 @@ impl default::Default for Arguments {
                 ng_start_process: Some(true),
                 ng_log_dci: Some(true),
                 ng_log_dci_batch_size: Some(60000),
+                ng_rf_args: Some(DEFAULT_NG_RF_ARGS.to_string()),
             }),
             rntimatching: Some(RntiMatchingArgs {
                 matching_local_addr: Some("0.0.0.0:9292".to_string()),
@@ -417,6 +424,7 @@ impl FlattenedNgScopeArgs {
             ng_log_file: ng_args.ng_log_file,
             ng_log_dci: ng_args.ng_log_dci.unwrap(),
             ng_log_dci_batch_size: ng_args.ng_log_dci_batch_size.unwrap(),
+            ng_rf_args: ng_args.ng_rf_args.unwrap(),
         })
     }
 }