yigid/openairinterface5g
1
0
Fork 0
mirror of https://gitlab.eurecom.fr/oai/openairinterface5g.git synced 2026-07-13 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test_aperiodic_srs' into 'develop'

Browse Source 
Activate aperiodic SRS in CI tests

See merge request oai/openairinterface5g!4156
This commit is contained in:
Francesco Mani
2026-07-05 07:55:17 +02:00
parent 0dab3bb6a1 f1651b9162
commit d32e8565f8
6 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci-scripts/conf_files/gnb-vnf.sa.band77.162prb.nfapi.4x4.conf
View File

@@ -24,7 +24,7 @@ gNBs =
pdsch_AntennaPorts_N1 = 2;
maxMIMO_layers = 4;
do_CSIRS = 1;
do_SRS = "periodic";
do_SRS = "aperiodic";
servingCellConfigCommon = (
{

2
ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.conf
View File

@@ -25,7 +25,7 @@ gNBs =
pdsch_AntennaPorts_N1 = 2;
pusch_AntennaPorts = 2;
do_CSIRS = 1;
do_SRS = "periodic";
do_SRS = "aperiodic";
min_rxtxtime = 2;
uess_agg_levels = [0, 4, 2, 1, 0];

2
ci-scripts/conf_files/gnb-vnf.sa.band78.273prb.aerial.ul-heavy.conf
View File

@@ -26,7 +26,7 @@ gNBs =
pdsch_AntennaPorts_N1 = 2;
pusch_AntennaPorts = 2;
do_CSIRS = 1;
do_SRS = "periodic";
do_SRS = "aperiodic";
min_rxtxtime = 2;
force_UL256qam_off = 1;
servingCellConfigCommon = (

3
ci-scripts/conf_files/gnb.sa.band257.u3.66prb.rfsim.conf
View File

@@ -20,7 +20,8 @@ gNBs =
tr_s_preference = "local_mac"
////////// Physical parameters:
min_rxtxtime = 6;
min_rxtxtime = 6;
do_SRS = "aperiodic";
servingCellConfigCommon = (
{

2
ci-scripts/conf_files/gnb.sa.band77.162prb.usrpn310.2x2.conf
View File

@@ -25,7 +25,7 @@ gNBs =
pdsch_AntennaPorts_XP = 2;
pusch_AntennaPorts = 2;
do_CSIRS = 1;
do_SRS = "periodic";
do_SRS = "aperiodic";
uess_agg_levels = [4,2,0,0,0];
servingCellConfigCommon = (

5
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View File

@@ -2367,6 +2367,7 @@ static int collect_ul_candidates(gNB_MAC_INST *mac,
int sched_slot)
{
int numUE = 0;
bool aperiodic_srs = false;
UE_iterator (UE_list, UE) {
if (numUE >= max_candidates)
@@ -2456,7 +2457,9 @@ static int collect_ul_candidates(gNB_MAC_INST *mac,
bool bler_updated = update_bler_stats(&mac->ul_bler, stats, &sched_ctrl->ul_bler_stats, frame);
cand.is_retx = false;
cand.sched_srs = verify_aperiodic_srs(mac, sched_slot, k2, &sched_ctrl->aperiodic_srs_trigger, current_BWP);
if (!aperiodic_srs)
aperiodic_srs = verify_aperiodic_srs(mac, sched_slot, k2, &sched_ctrl->aperiodic_srs_trigger, current_BWP);
cand.sched_srs = aperiodic_srs;
cand.retx_harq_pid = -1;
cand.sched_inactive = (B == 0 && do_sched);
cand.pending_bytes = B;