Merge remote-tracking branch 'origin/Update_configuration_files' into integration_2022_wk35

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

@@ -28,7 +28,6 @@ gNBs =
 
     ////////// Physical parameters:
 
-    min_rxtxtime                                              = 2;
     do_CSIRS                                                  = 1;
     do_SRS                                                    = 1;
 
@@ -283,8 +282,8 @@ RUs = (
   local_rf       = "yes"
   nb_tx          = 1
   nb_rx          = 1
-  att_tx         = 6;
-  att_rx         = 6;
+  att_tx         = 12;
+  att_rx         = 12;
   bands          = [78];
   max_pdschReferenceSignalPower = -27;
   max_rxgain                    = 114;

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf

@@ -27,15 +27,14 @@ gNBs =
 
     ////////// Physical parameters:
 
-    pdsch_AntennaPorts_XP = 1;
+    pdsch_AntennaPorts_XP = 2;
     pusch_AntennaPorts    = 2;
-    do_CSIRS              = 0;
-    ul_prbblacklist       = "79,80,81,82"
+    do_CSIRS              = 1;
 
     pdcch_ConfigSIB1 = (
       {
         controlResourceSetZero = 12;
-        searchSpaceZero = 10;
+        searchSpaceZero = 0;
       }
     );
 
@@ -67,7 +66,7 @@ gNBs =
         initialDLBWPsubcarrierSpacing                                           = 1;
       #pdcch-ConfigCommon
         initialDLBWPcontrolResourceSetZero                                      = 12;
-        initialDLBWPsearchSpaceZero                                             = 10;
+        initialDLBWPsearchSpaceZero                                             = 0;
 
   #uplinkConfigCommon
      #frequencyInfoUL
@@ -203,9 +202,11 @@ MACRLCs = (
   num_cc                      = 1;
   tr_s_preference             = "local_L1";
   tr_n_preference             = "local_RRC";
-  pusch_TargetSNRx10          = 150;
+  pusch_TargetSNRx10          = 300;
   pucch_TargetSNRx10          = 200;
+  pusch_FailureThres          = 1000;
   ulsch_max_frame_inactivity  = 0;
+  ul_max_mcs                  = 28;
 }
 );