Skip to content

[feature] make rf_args configurable #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
justus237 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[feature] make rf_args configurable #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/logic/ngscope_controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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()
};

Expand Down
8 changes: 8 additions & 0 deletions src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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)]
Expand All @@ -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)]
Expand Down Expand Up @@ -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()),
Expand Down Expand Up @@ -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(),
})
}
}
Expand Down