Commit ed748b72 authored by Haruki NAOI's avatar Haruki NAOI

Temporary: change tpc filter.

(cherry picked from commit d82fc4805ef9032c9bfd9705fef702a6e130f7b2)

# Conflicts:
#	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
parent 77f395c3
...@@ -3912,7 +3912,7 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP, ...@@ -3912,7 +3912,7 @@ void schedule_ulsch_rnti_fairRR(module_id_t module_idP,
// this assumes accumulated tpc // this assumes accumulated tpc
// make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out // make sure that we are only sending a tpc update once a frame, otherwise the control loop will freak out
int32_t framex10psubframe = UE_template->pusch_tpc_tx_frame*10+UE_template->pusch_tpc_tx_subframe; int32_t framex10psubframe = UE_template->pusch_tpc_tx_frame*10+UE_template->pusch_tpc_tx_subframe;
int pusch_tpc_interval=10; int pusch_tpc_interval=500;
if (((framex10psubframe+pusch_tpc_interval)<=(frameP*10+subframeP)) || //normal case if (((framex10psubframe+pusch_tpc_interval)<=(frameP*10+subframeP)) || //normal case
((framex10psubframe>(frameP*10+subframeP)) && (((10240-framex10psubframe+frameP*10+subframeP)>=pusch_tpc_interval)))) { //frame wrap-around ((framex10psubframe>(frameP*10+subframeP)) && (((10240-framex10psubframe+frameP*10+subframeP)>=pusch_tpc_interval)))) { //frame wrap-around
......
...@@ -177,7 +177,7 @@ rx_sdu(const module_id_t enb_mod_idP, ...@@ -177,7 +177,7 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_scheduling_control->pusch_snr[CC_idP] = (5 * ul_cqi - 640) / 10; UE_scheduling_control->pusch_snr[CC_idP] = (5 * ul_cqi - 640) / 10;
if(UE_scheduling_control->pusch_snr[CC_idP] > 0 || UE_scheduling_control->pusch_snr[CC_idP] < 63) { if(UE_scheduling_control->pusch_snr[CC_idP] > 0 || UE_scheduling_control->pusch_snr[CC_idP] < 63) {
double snr_filter_tpc=0.9; double snr_filter_tpc=0.7;
int snr_thres_tpc=30; int snr_thres_tpc=30;
int diff = UE_scheduling_control->pusch_snr_avg[CC_idP] - UE_scheduling_control->pusch_snr[CC_idP]; int diff = UE_scheduling_control->pusch_snr_avg[CC_idP] - UE_scheduling_control->pusch_snr[CC_idP];
if(abs(diff) < snr_thres_tpc) { if(abs(diff) < snr_thres_tpc) {
......
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