Javier Morgade
dc857e8d76
Merge remote-tracking branch 'origin/develop' into fembms-enb-ue
2020-07-22 07:42:44 +02:00
Javier Morgade
8f8b16a84e
embms: Experimental MBMS Couting support added / 3GPP TS 36.44 (*)
...
(*) The MBMS Counting function allows the MCE to request the eNB(s) to count and
report per MBSFN area for one or more MBMS services the number of connected UEs
receiving the MBMS Service or interested in receiving it.
Signed-off-by: Javier Morgade <javier.morgade@ieee.org >
2020-07-22 07:40:32 +02:00
Raphael Defosseux
d7ffd70bbd
Merge remote-tracking branch 'origin/nr_vcd' into develop_integration_2020_w27
2020-07-10 09:34:16 +02:00
Raphael Defosseux
4ddebabe7f
Merge remote-tracking branch 'origin/gcc-warnings-20200702' into develop_integration_2020_w27
2020-07-10 09:29:47 +02:00
Raphael Defosseux
da4f395a04
Merge remote-tracking branch 'origin/NR_RRC_harq_hacks' into develop_integration_2020_w27
2020-07-10 09:29:18 +02:00
Raphael Defosseux
f6999282f2
DOC: update on the 5G Rf simulator
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-07-09 13:36:47 +02:00
Rakesh
24bdbde2a1
bugfix
2020-07-07 16:53:13 +02:00
Rakesh
e6713b7467
Merge remote-tracking branch 'origin/develop' into nr_vcd
2020-07-07 15:29:30 +02:00
laurent
9205b4d004
fix gaussain noise seed in rfsimulator
2020-07-02 22:29:44 +02:00
Francesco Mani
cd61f38eca
Merge remote-tracking branch 'origin/develop' into NR_RRC_harq_hacks
2020-07-02 10:16:57 +02:00
Raphael Defosseux
dde8ba2d51
Merge remote-tracking branch 'origin/trx_thread_param' into develop_integration_2020_w26
2020-06-30 09:57:51 +02:00
Francesco Mani
f4ccaf0dc0
Merge remote-tracking branch 'origin/develop' into NR_RRC_harq_hacks
2020-06-29 19:27:33 +02:00
WANG Tsu-Han
5884838ad5
Merge branch 'develop' into trx_thread_param
2020-06-29 10:30:55 +02:00
WANG Tsu-Han
3f461d680d
adding parameter in uesoftmodem for uhd trx thread
2020-06-29 10:29:40 +02:00
Thomas Schlichter
72aa2963ea
Merge branch 'develop' into enable_ta_for_phytest
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
2020-06-24 12:16:03 +02:00
Thomas Schlichter
2029cb93c9
update configuration file gnb.band78.tm1.106PRB.usrpx300.conf based on gnb.band78.tm1.106PRB.usrpn300.conf
2020-06-19 11:27:07 +02:00
WANG Tsu-Han
3217b51256
simulation fix
2020-06-18 16:55:02 +02:00
Raphael Defosseux
cc16b290b9
Merge remote-tracking branch 'origin/rework-5G-scope' into develop_integration_2020_w25
2020-06-18 11:33:12 +02:00
Francesco Mani
619f82cbb7
external clock in config files and padding lcid
2020-06-16 10:32:12 +02:00
Francesco Mani
fd1388b61e
power values in testing gnb file
2020-06-16 10:18:36 +02:00
laurent
1f95ec0888
coarse scope cleanup
2020-06-15 14:14:38 +02:00
WANG Tsu-Han
89bb495799
fixes for emulate-rf in lte-softmodem
2020-06-12 15:18:43 +02:00
WANG Tsu-Han
702192148e
fixes for PARALLEL_RU_L1_TRX_SPLIT from Laurent
2020-06-12 14:42:51 +02:00
WANG Tsu-Han
68366cb686
adding executional option for usrp trx thread and adding null device function for device other than usrp
2020-06-11 18:03:05 +02:00
Francesco Mani
bedb295dfd
Merge branch 'develop' into NR_RRC_harq_hacks
2020-06-09 20:32:35 +02:00
Thomas Schlichter
614083f03f
Merge branch 'develop' into NR_RRC_PRACH_procedures
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/GNB_APP/gnb_app.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/RRC/NR/rrc_gNB_nsa.c
2020-06-09 13:03:28 +02:00
laurent
1ff806d519
fix shared lib dependency error
2020-06-05 18:26:47 +02:00
Thomas Schlichter
225a500b3e
Merge branch 'develop' into NR_RRC_PRACH_procedures
...
Conflicts:
executables/nr-ue.c
openair1/PHY/NR_REFSIG/dmrs_nr.c
openair1/PHY/NR_TRANSPORT/nr_prach.c
openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
2020-06-03 19:50:54 +02:00
Raphael Defosseux
768b4e0f24
Merge remote-tracking branch 'origin/cleanup-may-2020' into develop_integration_2020_w22
2020-05-28 12:58:42 +02:00
Raphael Defosseux
a0ab138a5e
Merge remote-tracking branch 'origin/fix-circular-dependency-protection' into develop_integration_2020_w22
2020-05-28 12:56:05 +02:00
WANG Tsu-Han
82bbde7dbb
fix for rf simulation
2020-05-27 10:48:26 +02:00
WANG Tsu-Han
a5cffd8240
device funtion call initalization fix
2020-05-26 16:21:20 +02:00
laurent
bdee45878a
cleanup branch
2020-05-20 15:44:20 +02:00
WANG Tsu-Han
a85a39048d
Merge branch 'develop' into NR_RRCConfiguration_trx_thread
2020-05-20 09:50:05 +02:00
Francesco Mani
d268c320ca
Merge branch 'develop' into NR_RRC_harq_hacks
2020-05-15 16:26:33 +02:00
Raphael Defosseux
11783e755a
Fixing errored/missing circular dependency protection
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-05-15 15:39:11 +02:00
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
Raphael Defosseux
9f09885dbf
Merge remote-tracking branch 'origin/split73' into develop_integration_2020_w17
2020-04-30 10:37:22 +02:00
laurent
9ac5f6015d
update license text
2020-04-29 11:31:00 +02:00
Raphael Defosseux
8007758efe
Merge remote-tracking branch 'origin/split73' into develop_integration_2020_w17
2020-04-29 10:31:14 +02:00
laurent
744fe92859
set back rrc as a separate thread, lead to create back race conditions
2020-04-28 15:39:50 +02:00
Raphael Defosseux
4da101fd7f
Merge remote-tracking branch 'origin/split73' into develop_integration_2020_w17
2020-04-23 11:31:51 +02:00
Javier Morgade
72cba28436
Add UE MCH NFAPI
2020-04-17 18:50:55 +02:00
Francesco Mani
2ae14a66d8
adding conf file to test with phone
2020-04-16 12:54:00 +02:00
laurent
8a58359a1b
rereremerge
2020-04-14 19:51:00 +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
Raphael Defosseux
238c83f400
Merge remote-tracking branch 'origin/feature-4g-sched' into develop
2020-04-13 22:08:41 +02:00
Raphael Defosseux
69869810a1
Merge branch 'develop_integration_2020_w15_bis' into 'develop'
...
See merge request oai/openairinterface5g!804
Develop Integration Branch : 2020 week 15
The following Merge Requests have been included :
* MR 789 : fix sync source configuration for eNB and B200-mini
* MR 795 : dft/fft in shared lib
* MR 795 : NR gNB SCF indication
* MR 798 : Improvements on the "default" LTE-4G scheduler
2020-04-13 22:00:47 +02:00
laurent
861caa735d
merge develop
2020-04-13 18:04:18 +02:00