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

Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
This commit is contained in:
Raymond Knopp
2022-04-09 19:44:26 +02:00
248 changed files with 10675 additions and 5291 deletions
+1 -1
View File
@@ -70,7 +70,7 @@
<eNB_Trace>yes</eNB_Trace>
<eNB_Stats>yes</eNB_Stats>
<rt_stats_cfg>datalog_rt_stats.2x2.yaml</rt_stats_cfg>
<USRP_IPAddress>192.168.18.240</USRP_IPAddress>
<USRP_IPAddress>192.168.18.252</USRP_IPAddress>
</testCase>
<testCase id="000001">