Modified PRS FR1 and FR2 configs for gNB and UE with latest

from develop branch, also verified in rfsim

targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr1.106prb.conf

@@ -5,84 +5,84 @@ PRSs =
     prs_config0 = (
     {
       gNB_id = 0;
-      NumPRSResources = 1;
-      PRSResourceSetPeriod = [20, 2];
-      SymbolStart = [7];
-      NumPRSSymbols = [6];
-      NumRB = 106;
-      RBOffset = 0;
-      CombSize = 4;
-      REOffset = [0];
-      PRSResourceOffset = [0];
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [0];
       PRSResourceRepetition = 1;
-      PRSResourceTimeGap = 1;
-      NPRS_ID = [0];
-      MutingPattern1 = [];
-      MutingPattern2 = [];
-      MutingBitRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [0];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
     }
     );
 
     prs_config1 = (
     {
       gNB_id = 1;
-      NumPRSResources = 1;
-      PRSResourceSetPeriod = [20, 2];
-      SymbolStart = [7];
-      NumPRSSymbols = [6];
-      NumRB = 106;
-      RBOffset = 0;
-      CombSize = 4;
-      REOffset = [0];
-      PRSResourceOffset = [1];
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [1];
       PRSResourceRepetition = 1;
-      PRSResourceTimeGap = 1;
-      NPRS_ID = [1];
-      MutingPattern1 = [];
-      MutingPattern2 = [];
-      MutingBitRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [1];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
     }
     );
 
     prs_config2 = (
     {
       gNB_id = 2;
-      NumPRSResources = 1;
-      PRSResourceSetPeriod = [20, 2];
-      SymbolStart = [7];
-      NumPRSSymbols = [6];
-      NumRB = 106;
-      RBOffset = 0;
-      CombSize = 4;
-      REOffset = [0];
-      PRSResourceOffset = [2];
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [2];
       PRSResourceRepetition = 1;
-      PRSResourceTimeGap = 1;
-      NPRS_ID = [2];
-      MutingPattern1 = [];
-      MutingPattern2 = [];
-      MutingBitRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [2];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
     }
     );
 
     prs_config3 = (
     {
       gNB_id = 3;
-      NumPRSResources = 1;
-      PRSResourceSetPeriod = [20, 2];
-      SymbolStart = [7];
-      NumPRSSymbols = [6];
-      NumRB = 106;
-      RBOffset = 0;
-      CombSize = 4;
-      REOffset = [0];
-      PRSResourceOffset = [3];
+      NumPRSResources       = 1;
+      PRSResourceSetPeriod  = [20, 2];
+      SymbolStart           = [7];
+      NumPRSSymbols         = [6];
+      NumRB                 = 106;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0];
+      PRSResourceOffset     = [3];
       PRSResourceRepetition = 1;
-      PRSResourceTimeGap = 1;
-      NPRS_ID = [3];
-      MutingPattern1 = [];
-      MutingPattern2 = [];
-      MutingBitRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [3];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
     }
     );
   }

targets/PROJECTS/GENERIC-NR-5GC/CONF/ue.nr.prs.fr2.64prb.conf

@@ -5,42 +5,42 @@ PRSs =
     prs_config0 = (
     {
       gNB_id = 0;
-      NumPRSResources = 8;
-      PRSResourceSetPeriod = [80, 1];
-      SymbolStart = [8,8,8,8,8,8,8,8];
-      NumPRSSymbols = [6,6,6,6,6,6,6,6];
-      NumRB = 64;
-      RBOffset = 0;
-      CombSize = 4;
-      REOffset = [0,0,0,0,0,0,0,0];
-      PRSResourceOffset = [0,10,20,30,40,50,60,70];
+      NumPRSResources       = 8;
+      PRSResourceSetPeriod  = [80, 2];
+      SymbolStart           = [8,8,8,8,8,8,8,8];
+      NumPRSSymbols         = [6,6,6,6,6,6,6,6];
+      NumRB                 = 64;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [0,0,0,0,0,0,0,0];
+      PRSResourceOffset     = [0,10,20,30,40,50,60,70];
       PRSResourceRepetition = 1;
-      PRSResourceTimeGap = 1;
-      NPRS_ID = [0,1,2,3,4,5,6,7];
-      MutingPattern1 = [];
-      MutingPattern2 = [];
-      MutingBitRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [0,1,2,3,4,5,6,7];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
     }
     );
 
     prs_config1 = (
     {
       gNB_id = 1;
-      NumPRSResources = 8;
-      PRSResourceSetPeriod = [80, 1];
-      SymbolStart = [0,0,0,0,0,0,0,0];
-      NumPRSSymbols = [6,6,6,6,6,6,6,6];
-      NumRB = 64;
-      RBOffset = 0;
-      CombSize = 4;
-      REOffset = [1,1,1,1,1,1,1,1];
-      PRSResourceOffset = [0,10,20,30,40,50,60,70];
+      NumPRSResources       = 8;
+      PRSResourceSetPeriod  = [80, 2];
+      SymbolStart           = [8,8,8,8,8,8,8,8];
+      NumPRSSymbols         = [6,6,6,6,6,6,6,6];
+      NumRB                 = 64;
+      RBOffset              = 0;
+      CombSize              = 4;
+      REOffset              = [1,1,1,1,1,1,1,1];
+      PRSResourceOffset     = [0,10,20,30,40,50,60,70];
       PRSResourceRepetition = 1;
-      PRSResourceTimeGap = 1;
-      NPRS_ID = [10,11,12,13,14,15,16,17];
-      MutingPattern1 = [];
-      MutingPattern2 = [];
-      MutingBitRepetition = 1;
+      PRSResourceTimeGap    = 1;
+      NPRS_ID               = [10,11,12,13,14,15,16,17];
+      MutingPattern1        = [];
+      MutingPattern2        = [];
+      MutingBitRepetition   = 1;
     }
     );
   }