Commit Graph
20 Commits
Author SHA1 Message Date
Raphael Defosseux 8f68d596f1 Merge remote-tracking branch 'origin/develop-entv' into develop_integration_2019_w25 2019-06-18 13:42:50 +02:00
Raphael Defosseux 79016d3c3b Fixes to pass basic-sim in TDD and OAI-UE + USRP test
-- cell synchronization was successful on the 1st try (in OAI UE + USRP) test
2019-06-13 19:14:26 +02:00
Wang Tsu-Han 7ed11406f0 fixes for error in if4p5 2019-05-29 15:48:33 +02:00
Wang Tsu-Han 9125074562 fixed bug created while merge conflict remove 2019-05-24 13:17:51 +02:00
Wang Tsu-Han 6b2e064216 Merge branch 'develop' into ru_rau_enhancement_L1_renaming
Conflicts:
	ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
	targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c
2019-05-23 18:29:01 +02:00
Javier Morgade b1c1c4545a Merge remote-tracking branch 'origin/develop' into develop-entv 2019-05-23 16:51:30 +02:00
frtabu e19c0ab851 Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER 2019-05-15 16:22:15 +02:00
frtabu 28a4f53356 Fix basic simu problem, due to remaining #if OAI_USRP... macros in UE 2019-05-06 19:17:40 +02:00
frtabu 0bf3d8f6bc Remove deprecated build options, now available as config options: noS1, basic_simulator. Remove DISABLE_LOG_X macros, disabling logs now available via disabling the T_TRACER 2019-04-29 18:46:55 +02:00
Raymond Knopp 9fb2f7365c fronthaul bugfixes for IF4p5 2x2 antenna configuration, testing with TM2 2019-04-28 20:27:10 +02:00
Javier Morgade db42be5db9 FeMBMS PBCH Initial Scan Procedures 2019-04-12 10:59:50 +02:00
Raymond Knopp f7dfb6c6b2 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h
2018-08-07 19:44:53 +02:00
Raymond Knopp 494348e2f0 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim 2018-07-06 06:24:31 +02:00
Raymond Knopp 27892e0935 Merge remote-tracking branch 'origin/develop' into enhancement-rfsim
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-uesoftmodem.c
2018-06-28 14:44:47 -07:00
bruno mongazon 94611edefe fix issue #322 2018-06-28 14:15:15 +02:00
Raymond Knopp 45dc7ed608 Merge branch 'enhancement-rfsim' into ru_rau_enhancement
Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/SIMU/USER/channel_sim.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_config.c
	targets/SIMU/USER/oaisim_functions.c
2018-06-10 15:14:09 -07:00
Raymond Knopp 897de9f8e2 testing of rf simulation in UE 2018-06-02 10:10:35 -07:00
Raymond Knopp e4c44dd0a9 checked compilation/execution of dlsim/ulsim. removal of most warnings. 2018-04-29 11:08:32 -07:00
Raymond Knopp 8b1416b862 debugging of new directory structure, file renaming, and eNB/UE splitting. dlsim/ulsim functional. 2018-04-09 15:32:49 -07:00
Raymond Knopp 551f32cc20 more splitting eNB/UE files/directories 2018-04-08 13:00:08 -07:00