Skip to content
Snippets Groups Projects
Commit 8ac68929 authored by Roberto Louro Magueta's avatar Roberto Louro Magueta
Browse files

Merge remote-tracking branch 'origin/develop' into develop-CSI 

# Conflicts:
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
parents 5c754f23 5bf454c7
No related branches found
No related tags found
3 merge requests!1757Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c,!1576integration_2022_wk22,!1496PHY procedures at UE for CSI-RS
Hide whitespace changes
Inline Side-by-side
Showing
with 166 additions and 33 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment