Commit 28cd6b78 authored by Thomas Schlichter's avatar Thomas Schlichter

disable doppler and time drift simulation and compensation by default

parent 8fdccc7b
...@@ -197,7 +197,6 @@ extern int RFsim_DriftPerFrame; //the timing offset/drift per frame in the RF si ...@@ -197,7 +197,6 @@ extern int RFsim_DriftPerFrame; //the timing offset/drift per frame in the RF si
extern uint16_t pathStartingTime; // time [sec] at which satellite is becoming visible to the UE. extern uint16_t pathStartingTime; // time [sec] at which satellite is becoming visible to the UE.
extern uint16_t pathEndingTime; // time [sec] at which satellite is no more visible to the UE extern uint16_t pathEndingTime; // time [sec] at which satellite is no more visible to the UE
extern int uePosY; // y-axis coordinate [m] of UE position extern int uePosY; // y-axis coordinate [m] of UE position
extern int tdriftComp; // flag to activate/deactivate continous timing drift compensation
extern double FO_PScaling; // P scaling factor of the PID controller for the Doppler compensation at UE side extern double FO_PScaling; // P scaling factor of the PID controller for the Doppler compensation at UE side
extern double FO_IScaling; // I scaling factor of the PID controller for the Doppler compensation at UE side extern double FO_IScaling; // I scaling factor of the PID controller for the Doppler compensation at UE side
extern int TO_IScalingInit; // initializing the accumulative part (I part) of the PI controller for the timing offset compensation extern int TO_IScalingInit; // initializing the accumulative part (I part) of the PI controller for the timing offset compensation
......
...@@ -579,14 +579,13 @@ void init_pdcp(void) { ...@@ -579,14 +579,13 @@ void init_pdcp(void) {
uint64_t RFsim_PropDelay = 0; uint64_t RFsim_PropDelay = 0;
uint16_t NTN_gNB_k2 = 0; uint16_t NTN_gNB_k2 = 0;
int fdoppler = 1; // flag to simulate frequency offset at the RF-Simulator (default active = 1, 0 = de-activate) int fdoppler = 0; // flag to simulate frequency offset at the RF-Simulator (default de-active = 0, 1 = activate)
int tshift = 0; // flag to simulate timing offset at the RF-Simulator (default de-activate = 0, 0 = activate) int tshift = 0; // flag to simulate timing offset at the RF-Simulator (default de-activate = 0, 1 = activate)
int fdopplerComp = 1; int fdopplerComp = 0;
int RFsim_DriftPerFrame = 0; int RFsim_DriftPerFrame = 0;
uint16_t pathStartingTime = 1050; uint16_t pathStartingTime = 1050;
uint16_t pathEndingTime = 1280; uint16_t pathEndingTime = 1280;
int uePosY = 0; int uePosY = 0;
int tdriftComp = 1;
int TO_IScalingInit = 0; int TO_IScalingInit = 0;
int commonDoppler = 0; // common doppler to be compensated at UE, but set here to avoid linking error int commonDoppler = 0; // common doppler to be compensated at UE, but set here to avoid linking error
int TO_init_rate = 0; int TO_init_rate = 0;
......
...@@ -34,13 +34,12 @@ ...@@ -34,13 +34,12 @@
{"s" , CONFIG_HLP_SNR, 0, .dblptr=&snr_dB, .defdblval=25, TYPE_DOUBLE, 0}, \ {"s" , CONFIG_HLP_SNR, 0, .dblptr=&snr_dB, .defdblval=25, TYPE_DOUBLE, 0}, \
{"P" , CONFIG_HLP_PROPD, 0, .u64ptr=&RFsim_PropDelay, .defintval=0, TYPE_UINT64, 0}, \ {"P" , CONFIG_HLP_PROPD, 0, .u64ptr=&RFsim_PropDelay, .defintval=0, TYPE_UINT64, 0}, \
{"gnb_k2" , CONFIG_HLP_GNBK2, 0, .u16ptr=&NTN_gNB_k2, .defintval=0, TYPE_UINT16, 0}, \ {"gnb_k2" , CONFIG_HLP_GNBK2, 0, .u16ptr=&NTN_gNB_k2, .defintval=0, TYPE_UINT16, 0}, \
{"FD" , CONFIG_HLP_FDoppler, 0, .iptr=&fdoppler, .defintval=1, TYPE_INT, 0}, \ {"FD" , CONFIG_HLP_FDoppler, 0, .iptr=&fdoppler, .defintval=0, TYPE_INT, 0}, \
{"TS" , CONFIG_HLP_TShift, 0, .iptr=&tshift, .defintval=0, TYPE_INT, 0}, \ {"TS" , CONFIG_HLP_TShift, 0, .iptr=&tshift, .defintval=0, TYPE_INT, 0}, \
{"TD" , CONFIG_HLP_TDRIFT, 0, .iptr=&RFsim_DriftPerFrame, .defintval=0, TYPE_INT, 0}, \ {"TD" , CONFIG_HLP_TDRIFT, 0, .iptr=&RFsim_DriftPerFrame, .defintval=0, TYPE_INT, 0}, \
{"PST" , CONFIG_HLP_PathStart, 0, .u16ptr=&pathStartingTime, .defintval=1050, TYPE_UINT16, 0}, \ {"PST" , CONFIG_HLP_PathStart, 0, .u16ptr=&pathStartingTime, .defintval=1050, TYPE_UINT16, 0}, \
{"PET" , CONFIG_HLP_PathEnd, 0, .u16ptr=&pathEndingTime, .defintval=1280, TYPE_UINT16, 0}, \ {"PET" , CONFIG_HLP_PathEnd, 0, .u16ptr=&pathEndingTime, .defintval=1280, TYPE_UINT16, 0}, \
{"ue_PosY" , CONFIG_HLP_uePosY, 0, .iptr=&uePosY, .defintval=0, TYPE_INT, 0}, \ {"ue_PosY" , CONFIG_HLP_uePosY, 0, .iptr=&uePosY, .defintval=0, TYPE_INT, 0}, \
{"FC" , CONFIG_HLP_FDopplerComp, 0, .iptr=&fdopplerComp, .defintval=0, TYPE_INT32, 0}, \
{"amc" , CONFIG_HLP_AMC, 0, .u8ptr=&amc_flag, .defdblval=0, TYPE_UINT8, 0}, \ {"amc" , CONFIG_HLP_AMC, 0, .u8ptr=&amc_flag, .defdblval=0, TYPE_UINT8, 0}, \
{"sinr-offset-dl" , CONFIG_HLP_SINR_OSET_DL, 0, .dblptr=&sinr_offset_dl, .defdblval=0, TYPE_DOUBLE, 0}, \ {"sinr-offset-dl" , CONFIG_HLP_SINR_OSET_DL, 0, .dblptr=&sinr_offset_dl, .defdblval=0, TYPE_DOUBLE, 0}, \
{"sinr-offset-ul" , CONFIG_HLP_SINR_OSET_UL, 0, .dblptr=&sinr_offset_ul, .defdblval=0, TYPE_DOUBLE, 0} \ {"sinr-offset-ul" , CONFIG_HLP_SINR_OSET_UL, 0, .dblptr=&sinr_offset_ul, .defdblval=0, TYPE_DOUBLE, 0} \
......
...@@ -930,7 +930,6 @@ void *UE_thread(void *arg) ...@@ -930,7 +930,6 @@ void *UE_thread(void *arg)
int readBlockSize, writeBlockSize; int readBlockSize, writeBlockSize;
extern int tdriftComp;
if (tdriftComp == 1) if (tdriftComp == 1)
{ {
rx_offset_slot = UE->rx_offset_TO * UE->rx_offset_slot / nb_slot_frame - UE->rx_offset_comp; rx_offset_slot = UE->rx_offset_TO * UE->rx_offset_slot / nb_slot_frame - UE->rx_offset_comp;
......
...@@ -433,13 +433,13 @@ uint64_t RFsim_PropDelay = 0; ...@@ -433,13 +433,13 @@ uint64_t RFsim_PropDelay = 0;
uint16_t NTN_UE_k2 = 0; uint16_t NTN_UE_k2 = 0;
uint16_t NTN_UE_slot_Rx_to_Tx = 0; uint16_t NTN_UE_slot_Rx_to_Tx = 0;
int RFsim_DriftPerFrame = 0; int RFsim_DriftPerFrame = 0;
int32_t fdoppler = 1; // flag to simulate frequency offset at the RF-Simulator (default active = 1, 0 = de-activate) int32_t fdoppler = 0; // flag to simulate frequency offset at the RF-Simulator (default de-active = 0, 1 = activate)
int32_t tshift = 0; // flag to simulate timing offset at the RF-Simulator (default de-activate = 0, 1 = activate) int32_t tshift = 0; // flag to simulate timing offset at the RF-Simulator (default de-activate = 0, 1 = activate)
uint16_t pathStartingTime = 1050; uint16_t pathStartingTime = 1050;
uint16_t pathEndingTime = 1280; uint16_t pathEndingTime = 1280;
int uePosY = 0; int uePosY = 0;
int fdopplerComp = 1; // flag to activate continous frequency offset compensation (=0 deacticated, =1 activated (default case)) int fdopplerComp = 0; // flag to activate continous frequency offset compensation (=0 deacticated, =1 activated (default case))
int tdriftComp = 1; int tdriftComp = 0;
double FO_PScaling = 0; // P scaling factor of the PID controller for the Doppler compensation at UE side double FO_PScaling = 0; // P scaling factor of the PID controller for the Doppler compensation at UE side
double FO_IScaling = 0; // I scaling factor of the PID controller for the Doppler compensation at UE side double FO_IScaling = 0; // I scaling factor of the PID controller for the Doppler compensation at UE side
......
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
{"P" , CONFIG_HLP_PROPD, 0, .u64ptr=&RFsim_PropDelay, .defintval=0, TYPE_UINT64, 0}, \ {"P" , CONFIG_HLP_PROPD, 0, .u64ptr=&RFsim_PropDelay, .defintval=0, TYPE_UINT64, 0}, \
{"ue_slot_Rx_Tx" , CONFIG_HLP_UESLOTRXTX, 0, .u16ptr=&NTN_UE_slot_Rx_to_Tx, .defintval=0, TYPE_UINT16, 0}, \ {"ue_slot_Rx_Tx" , CONFIG_HLP_UESLOTRXTX, 0, .u16ptr=&NTN_UE_slot_Rx_to_Tx, .defintval=0, TYPE_UINT16, 0}, \
{"ue_k2" , CONFIG_HLP_UEK2, 0, .u16ptr=&NTN_UE_k2, .defintval=0, TYPE_UINT16, 0}, \ {"ue_k2" , CONFIG_HLP_UEK2, 0, .u16ptr=&NTN_UE_k2, .defintval=0, TYPE_UINT16, 0}, \
{"FD" , CONFIG_HLP_FDoppler, 0, .iptr=&fdoppler, .defintval=1, TYPE_INT, 0}, \ {"FD" , CONFIG_HLP_FDoppler, 0, .iptr=&fdoppler, .defintval=0, TYPE_INT, 0}, \
{"TS" , CONFIG_HLP_TShift, 0, .iptr=&tshift, .defintval=0, TYPE_INT, 0}, \ {"TS" , CONFIG_HLP_TShift, 0, .iptr=&tshift, .defintval=0, TYPE_INT, 0}, \
{"FC" , CONFIG_HLP_FDopplerComp, 0, .iptr=&fdopplerComp, .defintval=1, TYPE_INT, 0}, \ {"FC" , CONFIG_HLP_FDopplerComp, 0, .iptr=&fdopplerComp, .defintval=0, TYPE_INT, 0}, \
{"TD" , CONFIG_HLP_TDRIFT, 0, .iptr=&RFsim_DriftPerFrame, .defintval=0, TYPE_INT, 0}, \ {"TD" , CONFIG_HLP_TDRIFT, 0, .iptr=&RFsim_DriftPerFrame, .defintval=0, TYPE_INT, 0}, \
{"PST" , CONFIG_HLP_PathStart, 0, .u16ptr=&pathStartingTime, .defintval=1050, TYPE_UINT16, 0}, \ {"PST" , CONFIG_HLP_PathStart, 0, .u16ptr=&pathStartingTime, .defintval=1050, TYPE_UINT16, 0}, \
{"PET" , CONFIG_HLP_PathEnd, 0, .u16ptr=&pathEndingTime, .defintval=1280, TYPE_UINT16, 0}, \ {"PET" , CONFIG_HLP_PathEnd, 0, .u16ptr=&pathEndingTime, .defintval=1280, TYPE_UINT16, 0}, \
...@@ -86,6 +86,8 @@ ...@@ -86,6 +86,8 @@
} }
// clang-format on // clang-format on
extern int tdriftComp; // flag to activate/deactivate continous timing drift compensation
typedef struct { typedef struct {
uint64_t optmask; //mask to store boolean config options uint64_t optmask; //mask to store boolean config options
uint32_t ofdm_offset_divisor; // Divisor for sample offset computation for each OFDM symbol uint32_t ofdm_offset_divisor; // Divisor for sample offset computation for each OFDM symbol
......
...@@ -85,8 +85,8 @@ uint16_t NTN_UE_k2 = 0; ...@@ -85,8 +85,8 @@ uint16_t NTN_UE_k2 = 0;
uint16_t NTN_UE_slot_Rx_to_Tx = 0; uint16_t NTN_UE_slot_Rx_to_Tx = 0;
uint16_t NTN_gNB_k2 = 0; uint16_t NTN_gNB_k2 = 0;
int fdopplerComp = 1; // flag to activate continous frequency offset compensation (=0 deacticated, =1 activated (default case)) int fdopplerComp = 0; // flag to activate continous frequency offset compensation (=0 deacticated (default case), =1 activated)
int tdriftComp = 1; int tdriftComp = 0;
double FO_PScaling = 0.33; // P scaling factor of the PID controller for the Doppler compensation at UE side double FO_PScaling = 0.33; // P scaling factor of the PID controller for the Doppler compensation at UE side
double FO_IScaling = 0.5; // I scaling factor of the PID controller for the Doppler compensation at UE side double FO_IScaling = 0.5; // I scaling factor of the PID controller for the Doppler compensation at UE side
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include "nfapi/oai_integration/vendor_ext.h" #include "nfapi/oai_integration/vendor_ext.h"
//#define DEBUG_NR_PBCHSIM //#define DEBUG_NR_PBCHSIM
int fdopplerComp = 1; int fdopplerComp = 0;
double FO_PScaling = 0.33; // P scaling factor of the PID controller for the Doppler compensation at UE side double FO_PScaling = 0.33; // P scaling factor of the PID controller for the Doppler compensation at UE side
double FO_IScaling = 0.5; // I scaling factor of the PID controller for the Doppler compensation at UE side double FO_IScaling = 0.5; // I scaling factor of the PID controller for the Doppler compensation at UE side
int commonDoppler = 0; // common doppler to be compensated at UE int commonDoppler = 0; // common doppler to be compensated at UE
......
...@@ -66,7 +66,7 @@ uint16_t NTN_UE_k2 = 0; ...@@ -66,7 +66,7 @@ uint16_t NTN_UE_k2 = 0;
uint16_t NTN_UE_slot_Rx_to_Tx = 0; uint16_t NTN_UE_slot_Rx_to_Tx = 0;
uint16_t NTN_gNB_k2 = 0; uint16_t NTN_gNB_k2 = 0;
int fdopplerComp = 1; int fdopplerComp = 0;
int commonDoppler = 0; // common doppler to be compensated at UE int commonDoppler = 0; // common doppler to be compensated at UE
PHY_VARS_gNB *gNB; PHY_VARS_gNB *gNB;
......
...@@ -79,8 +79,8 @@ uint16_t NTN_UE_k2 = 0; ...@@ -79,8 +79,8 @@ uint16_t NTN_UE_k2 = 0;
uint16_t NTN_UE_slot_Rx_to_Tx = 0; uint16_t NTN_UE_slot_Rx_to_Tx = 0;
uint16_t NTN_gNB_k2 = 0; uint16_t NTN_gNB_k2 = 0;
int fdopplerComp = 1; // flag to activate continous frequency offset compensation (=0 deacticated, =1 activated (default case)) int fdopplerComp = 0; // flag to activate continous frequency offset compensation (=0 deacticated (default case), =1 activated)
int tdriftComp = 1; int tdriftComp = 0;
double FO_PScaling = 0.33; // P scaling factor of the PID controller for the Doppler compensation at UE side double FO_PScaling = 0.33; // P scaling factor of the PID controller for the Doppler compensation at UE side
double FO_IScaling = 0.5; // I scaling factor of the PID controller for the Doppler compensation at UE side double FO_IScaling = 0.5; // I scaling factor of the PID controller for the Doppler compensation at UE side
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment