diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c b/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c index 02290f7b49..f1a3ef42ab 100644 --- a/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c +++ b/openair1/PHY/NR_UE_ESTIMATION/nr_adjust_synch_ue.c @@ -80,7 +80,7 @@ void nr_adjust_synch_ue(NR_DL_FRAME_PARMS *frame_parms, max_pos_fil = ((max_pos_fil * coef) + (max_pos * ncoef)) >> 15; // do not filter to have proactive timing adjustment - max_pos_fil = max_pos; + //max_pos_fil = max_pos; if(subframe == 1) { @@ -96,7 +96,7 @@ void nr_adjust_synch_ue(NR_DL_FRAME_PARMS *frame_parms, else count_max_pos_ok = 0; - printf("adjust sync count_max_pos_ok = %d\n",count_max_pos_ok); + //printf("adjust sync count_max_pos_ok = %d\n",count_max_pos_ok); if(count_max_pos_ok > 10 && first_time == 1) { @@ -122,7 +122,7 @@ void nr_adjust_synch_ue(NR_DL_FRAME_PARMS *frame_parms, #ifdef DEBUG_PHY - LOG_I(PHY,"AbsSubframe %d.%d: ThreadId %d diff =%i rx_offset (final) = %i : clear %d,max_pos = %d,max_pos_fil = %d (peak %d) max_val %d target_pos %d \n", + LOG_D(PHY,"AbsSubframe %d.%d: ThreadId %d diff =%i rx_offset (final) = %i : clear %d,max_pos = %d,max_pos_fil = %d (peak %d) max_val %d target_pos %d \n", ue->proc.proc_rxtx[ue->current_thread_id[subframe]].frame_rx, subframe, ue->current_thread_id[subframe], diff --git a/openair1/PHY/TOOLS/nr_phy_scope.c b/openair1/PHY/TOOLS/nr_phy_scope.c index a96b9ab59b..0100dd44c4 100644 --- a/openair1/PHY/TOOLS/nr_phy_scope.c +++ b/openair1/PHY/TOOLS/nr_phy_scope.c @@ -518,6 +518,7 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form, int Qm = 2; int coded_bits_per_codeword = num_re*Qm; int symbol, first_symbol,nb_re; + int nb_rb_pdsch =50; /* float Re,Im,ymax=1; float **chest_t_abs, *chest_f_abs; @@ -756,8 +757,8 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form, // PDCCH LLRs if (pdcch_llr != NULL) { - for (i=0; i<12*frame_parms->N_RB_DL*2*num_pdcch_symbols; i++) { - llr_pdcch[i] = (float) pdcch_llr[i]; + for (i=0; i<100; i++) { //12*frame_parms->N_RB_DL*2*num_pdcch_symbols + llr_pdcch[i] = (float) pdcch_llr[2*24*9 +i]; bit_pdcch[i] = (float) i; } @@ -766,9 +767,9 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form, // PDCCH I/Q of MF Output if (pdcch_comp!=NULL) { - for (i=0; i<12*frame_parms->N_RB_DL*num_pdcch_symbols; i++) { - I[i] = pdcch_comp[2*i]; - Q[i] = pdcch_comp[2*i+1]; + for (i=0; i<100; i++) { + I[i] = pdcch_comp[2*50*12+2*i]; + Q[i] = pdcch_comp[2*50*12+2*i+1]; } fl_set_xyplot_data(form->pdcch_comp,I,Q,12*frame_parms->N_RB_DL*num_pdcch_symbols,"","",""); } @@ -786,12 +787,12 @@ void phy_scope_UE(FD_lte_phy_scope_ue *form, // PDSCH I/Q of MF Output if (pdsch_comp!=NULL) { - for (i=0; ipdsch_comp,I,Q,num_re,"","",""); + fl_set_xyplot_data(form->pdsch_comp,I,Q,nb_rb_pdsch*12,"","",""); } /* diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c index 3e581fdfa3..590d314ab7 100644 --- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c +++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c @@ -56,7 +56,7 @@ //#define DEBUG_PHY_PROC #define NR_PDCCH_SCHED -#define NR_PDCCH_SCHED_DEBUG +//#define NR_PDCCH_SCHED_DEBUG //#define NR_PUCCH_SCHED //#define NR_PUCCH_SCHED_DEBUG @@ -3584,7 +3584,7 @@ void nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int eNB } } - if ((m==s0) && (m<4)) + if ((m==s0) && (m<3)) first_symbol_flag = 1; else first_symbol_flag = 0; @@ -4104,7 +4104,7 @@ void nr_ue_dlsch_procedures(PHY_VARS_NR_UE *ue, } //#ifdef DEBUG_PHY_PROC - LOG_I(PHY,"[UE %d][PDSCH %x/%d] Frame %d nr_tti_rx %d: PDSCH/DLSCH decoding iter %d/%d (mcs %d, rv %d, TBS %d)\n", + LOG_D(PHY,"[UE %d][PDSCH %x/%d] Frame %d nr_tti_rx %d: PDSCH/DLSCH decoding iter %d/%d (mcs %d, rv %d, TBS %d)\n", ue->Mod_id, dlsch0->rnti,harq_pid, frame_rx,nr_tti_rx,ret,dlsch0->max_ldpc_iterations, @@ -4964,7 +4964,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN //proc->decoder_switch = 0; //int counter_decoder = 0; - LOG_I(PHY," ****** start RX-Chain for AbsSubframe %d.%d ****** \n", frame_rx%1024, nr_tti_rx); + LOG_D(PHY," ****** start RX-Chain for AbsSubframe %d.%d ****** \n", frame_rx%1024, nr_tti_rx); uint8_t next1_thread_id = ue->current_thread_id[nr_tti_rx]== (RX_NB_TH-1) ? 0:(ue->current_thread_id[nr_tti_rx]+1); uint8_t next2_thread_id = next1_thread_id== (RX_NB_TH-1) ? 0:(next1_thread_id+1); @@ -5444,7 +5444,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN //#endif //pdsch - LOG_I(PHY," ****** end RX-Chain for AbsSubframe %d.%d ****** \n", frame_rx%1024, nr_tti_rx); + LOG_D(PHY," ****** end RX-Chain for AbsSubframe %d.%d ****** \n", frame_rx%1024, nr_tti_rx); return (0); }