Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs

ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf

@@ -43,7 +43,7 @@ gNBs =
 
     pdcch_ConfigSIB1 = (
       {
-        controlResourceSetZero = 10;
+        controlResourceSetZero = 11;
         searchSpaceZero = 0;
       }
     );
@@ -57,14 +57,18 @@ gNBs =
 #  downlinkConfigCommon
     #frequencyInfoDL
       # this is 3301.68 MHz + 22*12*30e-3 MHz = 3309.6
-      absoluteFrequencySSB                                          = 620640;
+      #absoluteFrequencySSB                                          = 620640;
+      # this is 3300.60 MHz + 53*12*30e-3 MHz = 3319.68
+      absoluteFrequencySSB                                          = 621312;
       # this is 3503.28 MHz + 22*12*30e-3 MHz = 3511.2 
       #absoluteFrequencySSB                                          = 634080;
       # this is 3600.48 MHz 
       #absoluteFrequencySSB                                          = 640032;
       #dl_frequencyBand                                                 = 78;
       # this is 3301.68 MHz
-      dl_absoluteFrequencyPointA                                       = 620112;
+      #dl_absoluteFrequencyPointA                                       = 620112;
+      # this is 3300.60 MHz
+      dl_absoluteFrequencyPointA                                       = 620040;
       # this is 3502.56 MHz
       #dl_absoluteFrequencyPointA                                       = 633552;
       # this is 3600.48 MHz
@@ -83,7 +87,7 @@ gNBs =
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120  
         initialDLBWPsubcarrierSpacing                                           = 1;
       #pdcch-ConfigCommon
-        initialDLBWPcontrolResourceSetZero                                      = 10;
+        initialDLBWPcontrolResourceSetZero                                      = 11;
         initialDLBWPsearchSpaceZero                                             = 0;
       #pdsch-ConfigCommon
         #pdschTimeDomainAllocationList (up to 16 entries)
@@ -260,7 +264,8 @@ L1s = (
       tr_n_preference = "local_mac";
       pusch_proc_threads = 2;
       prach_dtx_threshold = 120;
-        }  
+      pucch0_dtx_threshold = 150;
+      }  
 );
 
 RUs = (

openair2/RRC/NR/MESSAGES/asn1_msg.c

@@ -1266,7 +1266,7 @@ void fill_initial_SpCellConfig(rnti_t rnti,
   ss2->monitoringSymbolsWithinSlot->buf[1]=0x0;
   ss2->nrofCandidates=calloc(1,sizeof(*ss2->nrofCandidates));
   ss2->nrofCandidates->aggregationLevel1 = NR_SearchSpace__nrofCandidates__aggregationLevel1_n0;
-  ss2->nrofCandidates->aggregationLevel2 = NR_SearchSpace__nrofCandidates__aggregationLevel2_n0;
+  ss2->nrofCandidates->aggregationLevel2 = NR_SearchSpace__nrofCandidates__aggregationLevel2_n2;
   ss2->nrofCandidates->aggregationLevel4 = NR_SearchSpace__nrofCandidates__aggregationLevel4_n1;
   ss2->nrofCandidates->aggregationLevel8 = NR_SearchSpace__nrofCandidates__aggregationLevel8_n0;
   ss2->nrofCandidates->aggregationLevel16 = NR_SearchSpace__nrofCandidates__aggregationLevel16_n0;