Skip to content
Snippets Groups Projects
Commit da54df5b authored by knopp's avatar knopp
Browse files

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

Conflicts:
	cmake_targets/phy_simulators
	openair1/PHY/CODING/crc_byte.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/RRC/NR/rrc_gNB.c
parents 99e006f7 141b9d2c
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,!1545integration_2022_wk18,!1484NR 20 MHz with LTE raster on AW2S Jaguar.
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1482 additions and 280 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