Merge remote-tracking branch 'origin/develop' into develop-SRS

# Conflicts: # ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf # ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf # openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c # openair2/RRC/NR/L2_nr_interface.c
2022-01-08 12:11:56 +00:00
parent 3da125fa06 8d1c9894c2
commit cf8f6fdeed
371 changed files with 20828 additions and 11134 deletions
@@ -79,9 +79,10 @@ gNBs =
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
        initialDLBWPsubcarrierSpacing                                           = 1;
      #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 12;
+        initialDLBWPcontrolResourceSetZero                                      = 11;
        initialDLBWPsearchSpaceZero                                             = 0;

+
  #uplinkConfigCommon 
     #frequencyInfoUL
      ul_frequencyBand                                                 = 78;
@@ -135,6 +136,7 @@ gNBs =
 # 0=unrestricted, 1=restricted type A, 2=restricted type B
        restrictedSetConfig                                         = 0,

+
        msg3_DeltaPreamble                                          = 1;
        p0_NominalWithGrant                                         =-90;