csi cap finish

cmake_targets/test_csi_data.m

@@ -35,8 +35,6 @@ ch_csi_data = aa_s(3,:);
 temp_data = params(1:num_perrb);
 pos_port = (reshape(temp_data,num_per_rb_port*2,[])).';
 
-
-
 tx_csi_data_s = reshape(tx_csi_data,num_per_rb,[]);
 rx_csi_data_s = reshape(rx_csi_data,num_per_rb,[]);
 ch_csi_data_s = reshape(ch_csi_data,num_per_rb,[]);
@@ -44,6 +42,8 @@ ch_csi_data_s = reshape(ch_csi_data,num_per_rb,[]);
 tx_csi_data_port =zeros(port_num, len_aa/3/port_num);
 rx_csi_data_port =zeros(port_num, len_aa/3/port_num);
 ch_csi_data_port =zeros(port_num, len_aa/3/port_num);
+
+
 for p = 1:port_num
   temp_data = tx_csi_data_s((p-1)*num_per_rb_port+1:p*num_per_rb_port,:);
   tx_csi_data_port(p,:) = temp_data(:).';

openair1/PHY/NR_TRANSPORT/nr_csi_rs.c

@@ -159,7 +159,6 @@ void nr_generate_csi_rs(const NR_DL_FRAME_PARMS *frame_parms,
       j[i] = 0;
       loverline[i] = csi_params->symb_l0;
       koverline[i] = k_n[0];
-      LOG_I(PHY,"loverline %d, koverline %d\n", loverline[i], koverline[i]);
     }
     break;
 

openair1/PHY/NR_UE_TRANSPORT/csi_rx.c

@@ -316,9 +316,7 @@ int nr_csi_rs_channel_estimation(const PHY_VARS_NR_UE *ue,
   int tmp_id = 0;
   int tmp_id_rb = 0;
 
-  LOG_I(NR_PHY, "frame %d %d, ch est ant_rx %d, ports %d, rbs %d groups %d, ingroups %d, kprime %d, lprime %d,g_output_period %d\n", proc->frame_rx, proc->nr_slot_rx,
-      frame_parms->nb_antennas_rx, N_ports, csirs_config_pdu->nr_of_rbs, N_cdm_groups, CDM_group_size, k_prime, l_prime ,g_output_period);
-  for (int ant_rx = 0; ant_rx < frame_parms->nb_antennas_rx; ant_rx++) {
+    for (int ant_rx = 0; ant_rx < frame_parms->nb_antennas_rx; ant_rx++) {
 
     /// LS channel estimation
 
@@ -362,14 +360,12 @@ int nr_csi_rs_channel_estimation(const PHY_VARS_NR_UE *ue,
 
               if ((g_output_period!=0) && ((s_log_cnt%g_output_period)==0) && (g_output_type == 2))
               {
-                #if 1
                 g_csi_data[tmp_id] = tx_csi_rs_signal[k].r;
                 g_csi_data[tmp_id+1] = tx_csi_rs_signal[k].i;
                 g_csi_data[tmp_id+2] = rx_csi_rs_signal[k].r;
                 g_csi_data[tmp_id+3] = rx_csi_rs_signal[k].i;
                 g_csi_data[tmp_id+4] = csi_rs_ls_estimated_channel_re;
                 g_csi_data[tmp_id+5] = csi_rs_ls_estimated_channel_im;
-                #endif
                 if ((ant_rx == 0) && (rb == csirs_config_pdu->start_rb) && (s_log_cnt == 0))
                 {
 
@@ -408,7 +404,10 @@ int nr_csi_rs_channel_estimation(const PHY_VARS_NR_UE *ue,
             g_csi_data_num = tmp_id;
             #endif
           }
-          sem_post(&ric_send_sem);  
+          sem_post(&ric_send_sem); 
+          LOG_I(NR_PHY, "frame %d %d, ch est ant_rx %d, ports %d, rbs %d groups %d, ingroups %d, kprime %d, lprime %d,g_output_period %d\n", proc->frame_rx, proc->nr_slot_rx,
+      frame_parms->nb_antennas_rx, N_ports, csirs_config_pdu->nr_of_rbs, N_cdm_groups, CDM_group_size, k_prime, l_prime ,g_output_period);
+ 
           LOG_I(PHY, "frame %d %d, csi output period %d, send cnt %d, num %d %d\n", 
           proc->frame_rx, proc->nr_slot_rx, g_output_period, s_log_cnt, g_csi_params_num, g_csi_data_num);
         }
@@ -924,8 +923,10 @@ void nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, c16_t
   }
 
   const fapi_nr_dl_config_csirs_pdu_rel15_t *csirs_config_pdu = &ue->csirs_vars[gNB_id]->csirs_config_pdu;
-
+  static int log_first = 0;
 //#ifdef NR_CSIRS_DEBUG
+  if (log_first == 0)
+  {
   LOG_I(NR_PHY, "csirs_config_pdu->subcarrier_spacing = %i\n", csirs_config_pdu->subcarrier_spacing);
   LOG_I(NR_PHY, "csirs_config_pdu->cyclic_prefix = %i\n", csirs_config_pdu->cyclic_prefix);
   LOG_I(NR_PHY, "csirs_config_pdu->start_rb = %i\n", csirs_config_pdu->start_rb);
@@ -940,6 +941,8 @@ void nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, c16_t
   LOG_I(NR_PHY, "csirs_config_pdu->scramb_id = %i\n", csirs_config_pdu->scramb_id);
   LOG_I(NR_PHY, "csirs_config_pdu->power_control_offset = %i\n", csirs_config_pdu->power_control_offset);
   LOG_I(NR_PHY, "csirs_config_pdu->power_control_offset_ss = %i\n", csirs_config_pdu->power_control_offset_ss);
+  log_first = 1;
+  }
 //#endif
 
   if(csirs_config_pdu->measurement_bitmap == 0) {
@@ -947,7 +950,7 @@ void nr_ue_csi_rs_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, c16_t
     return;
   }
 
-  LOG_I(NR_PHY, "csirs_config_pdu->measurement_bitmap %d\n", csirs_config_pdu->measurement_bitmap);
+  LOG_D(NR_PHY, "csirs_config_pdu->measurement_bitmap %d\n", csirs_config_pdu->measurement_bitmap);
 
   const NR_DL_FRAME_PARMS *frame_parms = &ue->frame_parms;
   int32_t csi_rs_received_signal[frame_parms->nb_antennas_rx][frame_parms->samples_per_slot_wCP];

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.273PRB.oxgrf.conf

@@ -19,7 +19,7 @@ gNBs =
 
     #ssb_SubcarrierOffset  = 0;
     min_rxtxtime = 6;
-    pdsch_AntennaPorts_XP = 1;
+    pdsch_AntennaPorts_XP = 2
     pusch_AntennaPorts    = 1;
     do_CSIRS              = 1;
     ul_prbblacklist       = "135,136,137,138"
@@ -208,7 +208,7 @@ L1s = (
 RUs = (
 {
   local_rf       = "yes"
-  nb_tx          = 1;
+  nb_tx          = 2;
   nb_rx          = 1;
   att_tx         = 0;
   att_rx         = 0;