Adding PRS multiple gNB and UE configs

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.128PRB.prs.usrpx310.conf

@@ -143,7 +143,7 @@ gNBs =
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
+      ssb_periodicityServingCell                                    = 1;
 
 # dmrs_TypeA_position
 # 0 = pos2, 1 = pos3
@@ -216,18 +216,18 @@ MACRLCs = (
 
 prs_config = (
 {
-  NumPRSResources = 1;
-  PRSResourceSetPeriod = [40, 0];
-  SymbolStart = [7];
-  NumPRSSymbols = [7];
+  NumPRSResources = 8;
+  PRSResourceSetPeriod = [80, 0];
+  SymbolStart = [7,7,7,7,7,7,7,7];
+  NumPRSSymbols = [6,6,6,6,6,6,6,6];
   NumRB = 128;
   RBOffset = 0;
   CombSize = 4;
-  REOffset = [0];
-  PRSResourceOffset = [0];
+  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];
+  NPRS_ID = [0,1,2,3,4,5,6,7];
   MutingPattern1 = [];
   MutingPattern2 = [];
   MutingBitRepetition = 1;
@@ -260,7 +260,7 @@ RUs = (
   ##beamforming 1x2 matrix: 1 layer x 2 antennas
   bf_weights = [0x00007fff, 0x0000];
   #clock_src = "internal";
-  sdr_addrs = "addr=192.168.50.2,second_addr=192.168.60.2,clock_source=internal,time_source=internal"
+  sdr_addrs = "addr=192.168.50.2,clock_source=gpsdo,time_source=gpsdo"
   if_freq = 50000000L;
 }
 );

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band257.fr2.64PRB.prs.usrpx310.conf

@@ -143,7 +143,7 @@ gNBs =
 
 # ssb_periodicityServingCell
 # 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
-      ssb_periodicityServingCell                                    = 2;
+      ssb_periodicityServingCell                                    = 1;
 
 # dmrs_TypeA_position
 # 0 = pos2, 1 = pos3
@@ -216,18 +216,18 @@ MACRLCs = (
 
 prs_config = (
 {
-  NumPRSResources = 1;
-  PRSResourceSetPeriod = [40, 0];
-  SymbolStart = [7];
-  NumPRSSymbols = [7];
+  NumPRSResources = 8;
+  PRSResourceSetPeriod = [80, 0];
+  SymbolStart = [7,7,7,7,7,7,7,7];
+  NumPRSSymbols = [6,6,6,6,6,6,6,6];
   NumRB = 64;
   RBOffset = 0;
   CombSize = 4;
-  REOffset = [0];
-  PRSResourceOffset = [0];
+  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];
+  NPRS_ID = [0,1,2,3,4,5,6,7];
   MutingPattern1 = [];
   MutingPattern2 = [];
   MutingBitRepetition = 1;
@@ -259,7 +259,9 @@ RUs = (
   eNB_instances  = [0];
   #beamforming 1x4 matrix:
   bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
-  clock_src = "internal";
+  #clock_src = "internal";
+  sdr_addrs = "addr=192.168.10.2,clock_source=gpsdo,time_source=gpsdo"
+  if_freq = 50000000L;
 }
 );
 

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

@@ -212,17 +212,17 @@ MACRLCs = (
 prs_config = (
 {
    NumPRSResources = 2;
-   PRSResourceSetPeriod = [20, 5];
-   SymbolStart = [7, 8];
-   NumPRSSymbols = [5, 5];
+   PRSResourceSetPeriod = [20, 2];
+   SymbolStart = [7, 7];
+   NumPRSSymbols = [6, 6];
    NumRB = 106;
    RBOffset = 0;
    CombSize = 4;
    REOffset = [0, 1];
-   PRSResourceOffset = [0, 1];
-   PRSResourceRepetition = 1;
+   PRSResourceOffset = [0, 0];
+   PRSResourceRepetition = 2;
    PRSResourceTimeGap = 1;
-   NPRS_ID = [0, 5];
+   NPRS_ID = [10, 5];
    MutingPattern1 = [];
    MutingPattern2 = [];
    MutingBitRepetition = 1;

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.217PRB.prs.usrpx310.conf

@@ -218,9 +218,9 @@ MACRLCs = (
 prs_config = (
 {
   NumPRSResources = 1;
-  PRSResourceSetPeriod = [40, 0];
+  PRSResourceSetPeriod = [20, 2];
   SymbolStart = [7];
-  NumPRSSymbols = [7];
+  NumPRSSymbols = [6];
   NumRB = 216;
   RBOffset = 0;
   CombSize = 4;
@@ -261,7 +261,7 @@ RUs = (
   #beamforming 1x4 matrix:
   bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000];
   #clock_src = "internal";
-  sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2,clock_source=external,time_source=external"
+  sdr_addrs = "addr=192.168.10.2,clock_source=gpsdo,time_source=gpsdo"
 }
 );
 

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

@@ -218,10 +218,10 @@ MACRLCs = (
 prs_config = (
 {
   NumPRSResources = 1;
-  PRSResourceSetPeriod = [40, 0];
+  PRSResourceSetPeriod = [20, 2];
   SymbolStart = [7];
-  NumPRSSymbols = [7];
-  NumRB = 240;
+  NumPRSSymbols = [6];
+  NumRB = 272;
   RBOffset = 0;
   CombSize = 4;
   REOffset = [0];

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.273PRB.prs.usrpn310.conf2

@@ -49,7 +49,7 @@ gNBs =
     {
  #spCellConfigCommon
 
-      physCellId                                                    = 1;
+      physCellId                                                    = 0;
 
 #  downlinkConfigCommon
     #frequencyInfoDL
@@ -218,17 +218,17 @@ MACRLCs = (
 prs_config = (
 {
   NumPRSResources = 1;
-  PRSResourceSetPeriod = [40, 0];
+  PRSResourceSetPeriod = [20, 2];
   SymbolStart = [7];
-  NumPRSSymbols = [7];
-  NumRB = 240;
+  NumPRSSymbols = [6];
+  NumRB = 272;
   RBOffset = 0;
   CombSize = 4;
-  REOffset = [1];
-  PRSResourceOffset = [0];
+  REOffset = [0];
+  PRSResourceOffset = [1];
   PRSResourceRepetition = 1;
   PRSResourceTimeGap = 1;
-  NPRS_ID = [1];
+  NPRS_ID = [5];
   MutingPattern1 = [];
   MutingPattern2 = [];
   MutingBitRepetition = 1;

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

@@ -6,9 +6,9 @@ PRSs =
     {
       gNB_id = 0;
       NumPRSResources = 1;
-      PRSResourceSetPeriod = [40, 0];
+      PRSResourceSetPeriod = [20, 2];
       SymbolStart = [7];
-      NumPRSSymbols = [7];
+      NumPRSSymbols = [6];
       NumRB = 216;
       RBOffset = 0;
       CombSize = 4;
@@ -27,14 +27,14 @@ PRSs =
     {
       gNB_id = 1;
       NumPRSResources = 1;
-      PRSResourceSetPeriod = [40, 0];
+      PRSResourceSetPeriod = [20, 2];
       SymbolStart = [7];
-      NumPRSSymbols = [4];
+      NumPRSSymbols = [6];
       NumRB = 216;
       RBOffset = 0;
       CombSize = 4;
-      REOffset = [1];
-      PRSResourceOffset = [0];
+      REOffset = [0];
+      PRSResourceOffset = [1];
       PRSResourceRepetition = 1;
       PRSResourceTimeGap = 1;
       NPRS_ID = [5];

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

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

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

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

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

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