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

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

# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
parents a772400f baa76323
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 126 additions and 619 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