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

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

# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
parents bc2ea375 25614263
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,!1630integration_2022_wk30b,!1528CSI Feedback
Hide whitespace changes
Inline Side-by-side
Showing
with 264 additions and 94 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