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

Merge remote-tracking branch 'origin/fix_fdd_configs' into integration_2024_w21c

Browse Source
This commit is contained in:
Robert Schmidt
2024-05-27 12:18:32 +02:00
parent 1f6d4a6cfe 2bb632a7fe
commit 1b9ba55843
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+5 -5
View File
@@ -28,11 +28,11 @@ 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.43 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
absoluteFrequencySSB = 430590; absoluteFrequencySSB = 430590;
dl_frequencyBand = 66; dl_frequencyBand = 66;
# this is 2150 MHz # this is 2150.43 MHz
dl_absoluteFrequencyPointA = 430002; dl_absoluteFrequencyPointA = 430086;
#scs-SpecificCarrierList #scs-SpecificCarrierList
dl_offstToCarrier = 0; dl_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
@@ -53,8 +53,8 @@ gNBs =
#uplinkConfigCommon #uplinkConfigCommon
#frequencyInfoUL #frequencyInfoUL
ul_frequencyBand = 66; ul_frequencyBand = 66;
# this is 1750 MHz # this is 1750.43 MHz
ul_absoluteFrequencyPointA = 350002; ul_absoluteFrequencyPointA = 350086;
#scs-SpecificCarrierList #scs-SpecificCarrierList
ul_offstToCarrier = 0; ul_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
ci-scripts/yaml_files/5g_rfsimulator_u0_25prb/docker-compose.yaml
+1 -1
View File
@@ -105,7 +105,7 @@ services:
privileged: true privileged: true
container_name: rfsim5g-oai-nr-ue container_name: rfsim5g-oai-nr-ue
environment: environment:
USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152260000 --CO -400000000 --ssb 76 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152680000 --CO -400000000 --ssb 48 --rfsimulator.serveraddr 192.168.71.140 --log_config.global_log_options level,nocolor,time
depends_on: depends_on:
- oai-gnb - oai-gnb
networks: networks:
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1 -1
View File
@@ -83,7 +83,7 @@ void nr_common_signal_procedures(PHY_VARS_gNB *gNB,int frame,int slot, nfapi_nr_
LOG_A(PHY, LOG_A(PHY,
"Command line parameters for the UE: -C %lu --CO %ld -r %d --numerology %d --ssb %d\n", "Command line parameters for the UE: -C %lu --CO %ld -r %d --numerology %d --ssb %d\n",
fp->dl_CarrierFreq, fp->dl_CarrierFreq,
fp->dl_CarrierFreq - fp->ul_CarrierFreq, fp->ul_CarrierFreq - fp->dl_CarrierFreq,
fp->N_RB_DL, fp->N_RB_DL,
scs, scs,
fp->ssb_start_subcarrier); fp->ssb_start_subcarrier);
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.24PRB.usrpx300.conf
+6 -6
View File
@@ -43,11 +43,11 @@ gNBs =
# downlinkConfigCommon # downlinkConfigCommon
#frequencyInfoDL #frequencyInfoDL
# this is 2150 MHz + 14 PRBs@30kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block # this is 2150.21 MHz + 14 PRBs@30kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
absoluteFrequencySSB = 431008; absoluteFrequencySSB = 431050;
dl_frequencyBand = 66; dl_frequencyBand = 66;
# this is 2150 MHz # this is 2150.21 MHz
dl_absoluteFrequencyPointA = 430000; dl_absoluteFrequencyPointA = 430042;
#scs-SpecificCarrierList #scs-SpecificCarrierList
dl_offstToCarrier = 0; dl_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
@@ -68,8 +68,8 @@ gNBs =
#uplinkConfigCommon #uplinkConfigCommon
#frequencyInfoUL #frequencyInfoUL
ul_frequencyBand = 66; ul_frequencyBand = 66;
# this is 1750 MHz # this is 1750.21 MHz
ul_absoluteFrequencyPointA = 350000; ul_absoluteFrequencyPointA = 350042;
#scs-SpecificCarrierList #scs-SpecificCarrierList
ul_offstToCarrier = 0; ul_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.25PRB.usrpx300.conf
+6 -6
View File
@@ -43,11 +43,11 @@ 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.43 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
absoluteFrequencySSB = 430504; absoluteFrequencySSB = 430590;
dl_frequencyBand = 66; dl_frequencyBand = 66;
# this is 2150 MHz # this is 2150.43 MHz
dl_absoluteFrequencyPointA = 430000; dl_absoluteFrequencyPointA = 430086;
#scs-SpecificCarrierList #scs-SpecificCarrierList
dl_offstToCarrier = 0; dl_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing
@@ -68,8 +68,8 @@ gNBs =
#uplinkConfigCommon #uplinkConfigCommon
#frequencyInfoUL #frequencyInfoUL
ul_frequencyBand = 66; ul_frequencyBand = 66;
# this is 1750 MHz # this is 1750.43 MHz
ul_absoluteFrequencyPointA = 350000; ul_absoluteFrequencyPointA = 350086;
#scs-SpecificCarrierList #scs-SpecificCarrierList
ul_offstToCarrier = 0; ul_offstToCarrier = 0;
# subcarrierSpacing # subcarrierSpacing