maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix rfsim CI tests not in sync raster

Browse Source
This commit is contained in:
francescomani
2023-06-08 14:56:14 +02:00
parent 3e7a082034
commit 57be6ee2ef
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+1 -1
View File
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block # this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
absoluteFrequencySSB = 430504; absoluteFrequencySSB = 430600;
dl_frequencyBand = 66; dl_frequencyBand = 66;
# this is 2150 MHz # this is 2150 MHz
dl_absoluteFrequencyPointA = 430000; dl_absoluteFrequencyPointA = 430000;
ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
+2 -2
View File
@@ -29,10 +29,10 @@ gNBs =
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# this is 3600 MHz + 12 PRBs@30kHz SCS (same as initial BWP) # this is 3600 MHz + 12 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 640288; absoluteFrequencySSB = 640320;
dl_frequencyBand = 78; dl_frequencyBand = 78;
# this is 3600 MHz # this is 3600 MHz
dl_absoluteFrequencyPointA = 640000; dl_absoluteFrequencyPointA = 640032;
#scs-SpecificCarrierList #scs-SpecificCarrierList
dl_offstToCarrier = 0; dl_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+1 -1
View File
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP) # this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 433096; absoluteFrequencySSB = 433000;
dl_frequencyBand = 66; dl_frequencyBand = 66;
# this is 3600 MHz # this is 3600 MHz
dl_absoluteFrequencyPointA = 430000; dl_absoluteFrequencyPointA = 430000;
ci-scripts/yaml_files/5g_fdd_rfsimulator/docker-compose.yaml
+1 -1
View File
@@ -187,7 +187,7 @@ services:
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
RFSIMULATOR: 192.168.71.140 RFSIMULATOR: 192.168.71.140
USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 396 --log_config.global_log_options level,nocolor,time USE_ADDITIONAL_OPTIONS: -E --sa --rfsim -r 106 --numerology 1 --uicc0.imsi 208990100001100 --band 66 -C 2169080000 --CO -400000000 --ssb 380 --log_config.global_log_options level,nocolor,time
depends_on: depends_on:
- oai-gnb - oai-gnb
networks: networks:
ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+1 -1
View File
@@ -187,7 +187,7 @@ services:
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
RFSIMULATOR: 192.168.71.140 RFSIMULATOR: 192.168.71.140
USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604320000 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604800000 --uicc0.imsi 208990100001100 --log_config.global_log_options level,nocolor,time
depends_on: depends_on:
- oai-gnb - oai-gnb
networks: networks:
ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+1 -1
View File
@@ -188,7 +188,7 @@ services:
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
RFSIMULATOR: 192.168.71.140 RFSIMULATOR: 192.168.71.140
USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb 48 --log_config.global_log_options level,nocolor,time USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb 80 --log_config.global_log_options level,nocolor,time
depends_on: depends_on:
- oai-gnb - oai-gnb
networks: networks:
openair2/GNB_APP/gnb_config.c
+3 -3
View File
@@ -1142,19 +1142,19 @@ void check_ssb_raster(long absolutefreqssb, int band, int scs)
break; break;
} }
} }
AssertFatal(N != 0, "absoluteFrequencySSB %ld (%lu) not on the synchronization raster (N * 1200kHz + M * 50 kHz)\n", AssertFatal(N != 0, "absoluteFrequencySSB %ld (%lu Hz) not on the synchronization raster (N * 1200kHz + M * 50 kHz)\n",
absolutefreqssb, freq); absolutefreqssb, freq);
GSCN = (3 * N) + (M - 3) / 2; GSCN = (3 * N) + (M - 3) / 2;
} }
else if (freq <= 24250000000) { else if (freq <= 24250000000) {
AssertFatal((freq - 3000000000) % 1440000 == 0, AssertFatal((freq - 3000000000) % 1440000 == 0,
"absoluteFrequencySSB %ld (%lu) not on the synchronization raster (3000 MHz + N * 1.44 MHz)\n", "absoluteFrequencySSB %ld (%lu Hz) not on the synchronization raster (3000 MHz + N * 1.44 MHz)\n",
absolutefreqssb, freq); absolutefreqssb, freq);
GSCN = ((freq - 3000000000) / 1440000) + 7499; GSCN = ((freq - 3000000000) / 1440000) + 7499;
} }
else { else {
AssertFatal((freq - 24250080000) % 17280000 == 0, AssertFatal((freq - 24250080000) % 17280000 == 0,
"absoluteFrequencySSB %ld (%lu) not on the synchronization raster (24250.08 MHz + N * 17.28 MHz)\n", "absoluteFrequencySSB %ld (%lu Hz) not on the synchronization raster (24250.08 MHz + N * 17.28 MHz)\n",
absolutefreqssb, freq); absolutefreqssb, freq);
GSCN = ((freq - 24250080000) / 17280000) + 22256; GSCN = ((freq - 24250080000) / 17280000) + 22256;
} }