Merge remote-tracking branch 'origin/develop-nr' into nr_prach

Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	executables/nr-ue.c
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.h
	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/defs.h
	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/pucchsim.c
	openair1/SIMULATION/NR_PHY/ulschsim.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

This commit is contained in:

Raymond Knopp

2019-07-29 15:48:26 +02:00

parent 2850def8b7 590d2af568

commit 56d7f6fcaf

108 changed files with 5189 additions and 1711 deletions

									
										executables/nr-softmodem.c
									
		+1
		
												View File
												
				@@ -139,6 +139,7 @@ unsigned char NB_gNB_INST = 1;

				int UE_scan = 1;

				int UE_scan_carrier = 0;

				runmode_t mode = normal_txrx;

				double snr_dB=20;

				FILE *input_fd=NULL;