diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c index fe254ed035..3e581fdfa3 100644 --- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c +++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c @@ -2717,7 +2717,7 @@ void nr_ue_measurement_procedures( } #endif // accumulate and filter timing offset estimation every nr_tti_rx (instead of every frame) - if (( (slot%2) == 0) && (l==(1-frame_parms->Ncp))) { + if (( slot == 2) && (l==(1-frame_parms->Ncp))) { // AGC /* @@ -5058,7 +5058,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eN VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP, VCD_FUNCTION_IN); nr_slot_fep(ue, l, - nr_tti_rx, + nr_tti_rx<<1, 0, 0, 1, diff --git a/targets/RT/USER/nr-uesoftmodem.c b/targets/RT/USER/nr-uesoftmodem.c index 84f4429b76..60f81a0653 100644 --- a/targets/RT/USER/nr-uesoftmodem.c +++ b/targets/RT/USER/nr-uesoftmodem.c @@ -85,10 +85,10 @@ unsigned short config_frames[4] = {2,9,11,13}; // current status is that every UE has a DL scope for a SINGLE eNB (eNB_id=0) // at eNB 0, an UL scope for every UE FD_lte_phy_scope_ue *form_ue[NUMBER_OF_UE_MAX]; -FD_lte_phy_scope_enb *form_enb[MAX_NUM_CCs][NUMBER_OF_UE_MAX]; -FD_stats_form *form_stats=NULL,*form_stats_l2=NULL; +//FD_lte_phy_scope_enb *form_enb[MAX_NUM_CCs][NUMBER_OF_UE_MAX]; +//FD_stats_form *form_stats=NULL,*form_stats_l2=NULL; char title[255]; -unsigned char scope_enb_num_ue = 2; +//unsigned char scope_enb_num_ue = 2; static pthread_t forms_thread; //xforms #endif //XFORMS #include "nr-uesoftmodem.h" @@ -440,8 +440,8 @@ static void *scope_thread(void *arg) { while (!oai_exit) { //len = dump_ue_stats (PHY_vars_UE_g[0][0], &PHY_vars_UE_g[0][0]->proc.proc_rxtx[0],stats_buffer, 0, mode,rx_input_level_dBm); //fl_set_object_label(form_stats->stats_text, stats_buffer); - fl_clear_browser(form_stats->stats_text); - fl_add_browser_line(form_stats->stats_text, stats_buffer); + //fl_clear_browser(form_stats->stats_text); + //fl_add_browser_line(form_stats->stats_text, stats_buffer); //if (PHY_vars_UE_g[0][0]->is_synchronized == 1) phy_scope_UE(form_ue[0], @@ -451,7 +451,7 @@ static void *scope_thread(void *arg) { //printf("doing forms\n"); //usleep(100000); // 100 ms - sleep(1); + sleep(0.1); } // printf("%s",stats_buffer); @@ -1127,8 +1127,8 @@ int main( int argc, char **argv ) { fl_initialize (&fl_argc, argv, NULL, 0, 0); // restore the original command line args // argv = fl_get_cmdline_args( &argc ); - form_stats = create_form_stats_form(); - fl_show_form (form_stats->stats_form, FL_PLACE_HOTSPOT, FL_FULLBORDER, "stats"); + //form_stats = create_form_stats_form(); + //fl_show_form (form_stats->stats_form, FL_PLACE_HOTSPOT, FL_FULLBORDER, "stats"); UE_id = 0; form_ue[UE_id] = create_lte_phy_scope_ue(); sprintf (title, "NR DL SCOPE UE"); @@ -1218,8 +1218,8 @@ int main( int argc, char **argv ) { if (do_forms==1) { pthread_join(forms_thread,&status); - fl_hide_form(form_stats->stats_form); - fl_free_form(form_stats->stats_form); + //fl_hide_form(form_stats->stats_form); + //fl_free_form(form_stats->stats_form); fl_hide_form(form_ue[0]->lte_phy_scope_ue); fl_free_form(form_ue[0]->lte_phy_scope_ue); }