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

fix tests after review and LOG_E to avoid assertion on channel raster

Browse Source
This commit is contained in:
francescomani
2023-06-10 19:22:27 +02:00
parent ce7d6cc3fb
commit cd817930b8
9 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/conf_files/gnb.band66.tm1.106PRB.usrpn300.conf
+1 -1
View File
@@ -32,7 +32,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 2150 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 432880;
absoluteFrequencySSB = 433096;
dl_frequencyBand = 66;
# this is 2150 MHz
dl_absoluteFrequencyPointA = 430000;
ci-scripts/conf_files/gnb.sa.band66.106prb.rfsim.conf
+1 -1
View File
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 433096;
absoluteFrequencySSB = 432990;
dl_frequencyBand = 66;
# this is 3600 MHz
dl_absoluteFrequencyPointA = 430000;
ci-scripts/conf_files/gnb.sa.band66.u0.25prb.rfsim.conf
+1 -1
View File
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 2150 MHz + 14 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
absoluteFrequencySSB = 430600;
absoluteFrequencySSB = 430590;
dl_frequencyBand = 66;
# this is 2150 MHz
dl_absoluteFrequencyPointA = 430000;
ci-scripts/conf_files/untested/gnb.sa.band66.fr1.106PRB.usrpn300.conf
+1 -1
View File
@@ -29,7 +29,7 @@ gNBs =
# downlinkConfigCommon
#frequencyInfoDL
# this is 3600 MHz + 43 PRBs@30kHz SCS (same as initial BWP)
absoluteFrequencySSB = 433000;
absoluteFrequencySSB = 432990;
dl_frequencyBand = 66;
# this is 3600 MHz
dl_absoluteFrequencyPointA = 430000;
ci-scripts/xml_files/container_5g_rfsim_u0_25prb.xml
+2 -2
View File
@@ -21,8 +21,8 @@
-->
<testCaseList>
<htmlTabRef>rfsim-5gnr-tdd-u0-25prb</htmlTabRef>
<htmlTabName>Monolithic SA TDD u0 25PRB gNB</htmlTabName>
<htmlTabRef>rfsim-5gnr-fdd-u0-25prb</htmlTabRef>
<htmlTabName>Monolithic SA FDD u0 25PRB gNB</htmlTabName>
<htmlTabIcon>wrench</htmlTabIcon>
<repeatCount>1</repeatCount>
<TestCaseRequestedList>
ci-scripts/xml_files/container_5g_rfsim_u0_25prb_down.xml
+1 -1
View File
@@ -22,7 +22,7 @@
-->
<testCaseList>
<htmlTabRef>rfsim-5gnr-u0-25prb-down</htmlTabRef>
<htmlTabName>CleanUp SA Monolithic TDD u0 25PRB gNB</htmlTabName>
<htmlTabName>CleanUp SA Monolithic FDD u0 25PRB gNB</htmlTabName>
<htmlTabIcon>trash</htmlTabIcon>
<TestCaseRequestedList>
100002
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
environment:
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 380 --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 378 --log_config.global_log_options level,nocolor,time
depends_on:
- oai-gnb
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
environment:
RFSIMULATOR: 192.168.71.140
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
USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 25 --numerology 0 --uicc0.imsi 208990100001100 --band 66 -C 2152250000 --CO -400000000 --ssb 76 --log_config.global_log_options level,nocolor,time
depends_on:
- oai-gnb
networks:
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+4 -5
View File
@@ -2234,13 +2234,12 @@ static const uint16_t table_7_3_1_1_2_32[3][15] = {
{0, 1, 2, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
};
void get_delta_arfcn(int i, uint32_t nrarfcn, uint64_t N_OFFs){
void get_delta_arfcn(int i, uint32_t nrarfcn, uint64_t N_OFFs)
{
uint32_t delta_arfcn = nrarfcn - N_OFFs;
if(delta_arfcn%(nr_bandtable[i].step_size)!=0)
AssertFatal(1==0, "nrarfcn %u is not on the channel raster for step size %lu", nrarfcn, nr_bandtable[i].step_size);
if(delta_arfcn % (nr_bandtable[i].step_size) != 0)
LOG_E(NR_MAC, "nrarfcn %u is not on the channel raster for step size %lu\n", nrarfcn, nr_bandtable[i].step_size);
}
uint32_t to_nrarfcn(int nr_bandP,