Commit Graph
19 Commits
Author SHA1 Message Date
Thomas Schlichter 79471f2f6d Merge branch 'develop' into NR_RRC_PRACH_procedures
Conflicts:
	executables/nr-ue.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
	openair1/PHY/defs_RU.h
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/RRC/NR/rrc_gNB_nsa.c
	openair2/X2AP/x2ap_eNB_handler.c
2020-04-30 18:54:37 +02:00
laurent dfafa90037 big merge with develop 2020-04-14 18:02:45 +02:00
Francesco Mani 3dc9ad0567 Merge branch 'develop' into NR_RRC_PRACH_procedures 2020-04-14 14:17:34 +02:00
laurent 861caa735d merge develop 2020-04-13 18:04:18 +02:00
Francesco Mani 8892d00693 flag do_ra alternative to phy_test to perform RA procedures 2020-04-04 10:32:07 +02:00
Florian Kaltenberger 897ca561f5 adding time_source command line parameter and removing duplications of clock_source
ignoring command line paramters clock_source and time_source in lte-softmodem and harmonizing it with nr-softmodem
time_source and clock_source handled separately in usrp_lib.cpp
2020-03-23 17:45:48 +01:00
Raymond Knopp 914e17b57b Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
Conflicts:
	executables/nr-softmodem.c
	executables/nr-ue.c
	executables/softmodem-common.c
	openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_UE/mac_proto.h
	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/nr_rrc_config.c
	openair2/RRC/NR/nr_rrc_defs.h
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
2020-03-14 12:45:02 +01:00
laurent 756ac05e4d merge develop,fix basic sim and warnings 2020-03-04 13:32:03 +01:00
laurent 53db39b8a0 split 7.3 ready for merge 2020-03-02 15:41:21 +01:00
Sakthivel Velumani f59f8032f5 Removed DEFAULT_DLF from UE 2020-02-26 15:43:47 +01:00
laurent 3d15918c14 merge again with develop, compiles only 2020-02-22 14:19:18 +01:00
Cedric Roux 85176d7203 remove compilation warnings 2020-02-21 11:09:28 +01:00
Sakthivel Velumani 04b64f84a1 set ue dl carrier from cmdline 2020-02-18 12:21:44 +01:00
frtabu 6014ca42ac ENABLE_ITTI macro removal, modified telnet server to support all executables, modified record player to finalize switch to run-time option and allow usage with any device 2020-02-12 19:05:44 +01:00
Florian Kaltenberger a01e93be0c Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration 2020-02-09 21:38:04 +01:00
frtabu 64e4826c81 add softmodem-common.c and common error handler 2020-02-04 17:39:36 +01:00
laurent 8d9d80ee37 very big merge with merged develop, basic test done 2020-01-30 17:10:36 +01:00
yilmazt c348a9eec6 common thread-related minor functions in new .h file 2019-10-04 16:48:13 +02:00
yilmazt 9aa3483235 executables compiling again 2019-10-03 16:00:46 +02:00