From 9ccc36d4fa0fa4d45a96f72d284f6a7347a39f3e Mon Sep 17 00:00:00 2001 From: David Rupprecht Date: Mon, 25 Jan 2021 13:50:44 +0100 Subject: [PATCH] Make fake measurement frequency depend on measurement config --- srsue/hdr/stack/rrc/rrc_nr.h | 1 + srsue/src/stack/rrc/rrc_nr.cc | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/srsue/hdr/stack/rrc/rrc_nr.h b/srsue/hdr/stack/rrc/rrc_nr.h index b1e1ffece..aaef98453 100644 --- a/srsue/hdr/stack/rrc/rrc_nr.h +++ b/srsue/hdr/stack/rrc/rrc_nr.h @@ -138,6 +138,7 @@ private: srslte::log_ref log_h; + uint32_t fake_measurement_carrier_freq_r15; srslte::timer_handler::unique_timer fake_measurement_timer; /// RRC states (3GPP 38.331 v15.5.1 Sec 4.2.1) diff --git a/srsue/src/stack/rrc/rrc_nr.cc b/srsue/src/stack/rrc/rrc_nr.cc index a2d603d98..f5d2db15d 100644 --- a/srsue/src/stack/rrc/rrc_nr.cc +++ b/srsue/src/stack/rrc/rrc_nr.cc @@ -92,7 +92,7 @@ void rrc_nr::timer_expired(uint32_t timeout_id) fake_meas.rsrp = -60.0; fake_meas.rsrq = -60.0; fake_meas.cfo_hz = 1.0; - fake_meas.arfcn_nr = 632256; + fake_meas.arfcn_nr = fake_measurement_carrier_freq_r15; fake_meas.pci_nr = 500; phy_meas_nr.push_back(fake_meas); rrc_eutra->new_cell_meas_nr(phy_meas_nr); @@ -439,6 +439,7 @@ void rrc_nr::phy_set_cells_to_meas(uint32_t carrier_freq_r15) log_h->debug("[NR] Measuring phy cell %d \n", carrier_freq_r15); // Start timer for fake measurements auto timer_expire_func = [this](uint32_t tid) { timer_expired(tid); }; + fake_measurement_carrier_freq_r15 = carrier_freq_r15; fake_measurement_timer.set(10, timer_expire_func); fake_measurement_timer.run(); }