From 7405eec0f159c31394713684accf04cd9ea26ced Mon Sep 17 00:00:00 2001 From: Raymond Knopp Date: Wed, 23 Jan 2019 11:40:52 +0100 Subject: [PATCH] USRP now takes ffo estimation into account --- openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c | 4 ++-- targets/RT/USER/nr-ue.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c index c7c66bc7b5..5999bab5bb 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c @@ -330,13 +330,13 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode) printf("[UE %d] Frame %d Measured Carrier Frequency %.0f Hz (offset %d Hz)\n", ue->Mod_id, ue->proc.proc_rxtx[0].frame_rx, - openair0_cfg[0].rx_freq[0]-ue->common_vars.freq_offset, + openair0_cfg[0].rx_freq[0]+ue->common_vars.freq_offset, ue->common_vars.freq_offset); # else LOG_I(PHY, "[UE %d] Frame %d Measured Carrier Frequency %.0f Hz (offset %d Hz)\n", ue->Mod_id, ue->proc.proc_rxtx[0].frame_rx, - openair0_cfg[0].rx_freq[0]-ue->common_vars.freq_offset, + openair0_cfg[0].rx_freq[0]+ue->common_vars.freq_offset, ue->common_vars.freq_offset); # endif #endif diff --git a/targets/RT/USER/nr-ue.c b/targets/RT/USER/nr-ue.c index a81d428992..034098a6ca 100644 --- a/targets/RT/USER/nr-ue.c +++ b/targets/RT/USER/nr-ue.c @@ -458,7 +458,6 @@ static void *UE_thread_synch(void *arg) { // rerun with new cell parameters and frequency-offset for (i=0; irf_map.card].rx_num_channels; i++) { openair0_cfg[UE->rf_map.card].rx_gain[UE->rf_map.chain+i] = UE->rx_total_gain_dB;//-USRP_GAIN_OFFSET; - if (UE->UE_scan_carrier == 1) { if (freq_offset >= 0) openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i] += abs(freq_offset); else @@ -466,8 +465,6 @@ static void *UE_thread_synch(void *arg) { openair0_cfg[UE->rf_map.card].tx_freq[UE->rf_map.chain+i] = openair0_cfg[UE->rf_map.card].rx_freq[UE->rf_map.chain+i]+uplink_frequency_offset[CC_id][i]; downlink_frequency[CC_id][i] = openair0_cfg[CC_id].rx_freq[i]; - //freq_offset=0; - } } // reconfigure for potentially different bandwidth