maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,599 Commits 5 Branches 0 Tags
102a76fd56adfb96ed9774a3772c1f7ef2e912d2
Commit Graph
309 Commits
Author SHA1 Message Date
rmagueta 102a76fd56 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 
# Conflicts:
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/MACRLC_nr_paramdef.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
 2021-05-04 11:23:21 +01:00
rmagueta 948df0e034 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 
# Conflicts:
#	executables/softmodem-common.h
#	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/prachsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
 2021-05-03 19:50:30 +01:00
hardy 010d39c9ab Merge remote-tracking branch 'origin/NR_scheduling_request' into integration_2021_wk18_a 2021-05-03 15:44:31 +02:00
rmagueta e924caa677 Fix phy-simulators 2021-05-01 18:39:30 +01:00
hardy 273c6ff39f Merge remote-tracking branch 'origin/ue-pdsch-pusch-parallel' into integration_2021_wk17_b 2021-04-29 11:55:17 +02:00
Robert Schmidt c2d16eb8d5 Configure secondaryCellGroup: dedicated PUCCH, CSI, Preamble 
- Configure PUCCH Format 0 to be in separate RBs (each UE has dedicated
  resources)
- Configure RA preamble to be different per UE
- Configure CSI offset such that no two UEs have their report in the
  same frame
 2021-04-27 08:30:31 +02:00
Sakthivel Velumani e956c372df Fixed physim build issues 2021-04-22 13:42:59 +02:00
Sakthivel Velumani dc65173b69 Fixed RX proc perf stat 2021-04-16 17:07:56 +02:00
hardy b5ffe11bd8 Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15 
Conflicts:
	openair1/PHY/TOOLS/nr_phy_scope.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
 2021-04-14 15:14:03 +02:00
hardy 246afc7ccb Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15 2021-04-14 14:37:09 +02:00
Laurent OpenCells c0ef3e6f88 fix gcc reported issues 2021-04-03 23:37:58 +02:00
Sakthivel Velumani 76273a2aa0 Merge branch 'ue-dci-false-detection' into ue-pdsch-pusch-parallel 2021-03-30 13:43:28 +02:00
rmagueta b43c054f02 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
 2021-03-29 15:51:37 +01:00
Laurent THOMAS 68a81f65b2 merge develop 2021-03-29 11:24:34 +02:00
rmagueta d37552db4c Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 
# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
 2021-03-19 15:07:08 +00:00
Laurent THOMAS 0009fefce2 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-19 11:19:58 +01:00
Thomas Schlichter dade64ea43 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-03-19 11:18:02 +01:00
Sakthivel Velumani 874cefb924 Fixed build errors 
Also added warning messages for gNB number of threads required
 2021-03-18 20:17:41 +01:00
rmagueta 9456542678 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 
# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
 2021-03-16 16:04:23 +00:00
hardy 9abc8a6425 Merge remote-tracking branch 'origin/ptrs_rrc_config' into integration_2021_wk11 2021-03-16 16:28:31 +01:00
Thomas Schlichter 8768deaf74 Merge remote-tracking branch 'develop' into ptrs_rrc_config 2021-03-16 14:01:32 +01:00
Thomas Schlichter 3152df445e Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-03-16 13:37:07 +01:00
Laurent THOMAS a97bf1da6e fix phy simulators, merge develop 2021-03-15 12:40:15 +01:00
hardy de32d6d555 Merge remote-tracking branch 'origin/rohan_ulsim2RxFix' into integration_2021_wk11 2021-03-15 09:31:57 +01:00
Remi Hardy c12dd11d6e Merge remote-tracking branch 'origin/develop-SA-RA' into integration_2021_wk10 2021-03-12 11:07:25 +01:00
Shweta Shrivastava a0fa146e04 Merge branch 'ptrs_rrc_config' of https://gitlab.eurecom.fr/oai/openairinterface5g into ptrs_rrc_config 2021-03-10 22:58:06 -06:00
Shweta Shrivastava 7eec3e3bcc Merge branch 'develop' into ptrs_rrc_config 2021-03-10 22:37:44 -06:00
Thomas Schlichter 82cd7c44da nr_ulsim: whitespace cleanup 2021-03-09 13:11:16 +01:00
rohan 7da57e7608 Update ulsim.c, whitespace error corrected. 2021-03-09 12:04:42 +01:00
Laurent THOMAS a0922cef2f merge develop 2021-03-04 14:49:38 +01:00
rohan bae3bebdeb Update ulsim.c, build issue resolved. 2021-03-04 08:02:48 +01:00
Rohan Patil 429a5d4187 Support added for 2 RX Antenna case in ulsim and fixed indexing issue in gNB RX chain 2021-03-03 17:10:02 +05:30
luis_pereira87 d0b9146cd0 Msg4 transmitted from MAC to RRC through ITTI (TASK_RRC_NRUE created) 2021-03-03 01:27:50 +00:00
rmagueta 5f66269a8b Merge remote-tracking branch 'origin/develop' into develop-SA-RA 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
 2021-03-02 12:01:11 +00:00
rmagueta cf70265ba6 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
 2021-02-25 13:03:06 +00:00
rmagueta 48811d0f34 Merge branch 'develop' into develop-SA-CBRA 
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
 2021-02-23 13:29:53 +00:00
rmagueta 910154c7af Merge branch 'develop' into develop-SA-RA 
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
 2021-02-23 13:04:01 +00:00
hardy accae67113 Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08 2021-02-23 09:31:05 +01:00
Cedric Roux 778e487323 hack: fix NR ulsim compilation 
Dirty.
 2021-02-15 15:25:52 +01:00
luis_pereira87 9a55e64e54 Fix build errors in physical unitary tests simulators, minor update in the documentation 2021-02-12 12:28:17 +00:00
rmagueta e2f749d8b2 Fix nr_dlsim, nr_ulsim and nr_prachsim 2021-02-11 10:56:08 +00:00
Thomas Schlichter 14e84f8782 Merge remote-tracking branch 'develop' into NR_DL_MIMO 2021-02-09 10:02:54 +01:00
Parminder Singh 222b37ff13 Merge remote-tracking branch 'origin/develop' into ptrs_rrc_config 2021-02-08 14:16:36 +01:00
Mahesh 0e6f1e6ad6 Merge conflicts resolved 2021-02-08 18:05:29 +05:30
Xue Song 6a3b7b40a5 Merge branch 'master' into develop_SA_L3 
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
 2021-02-03 14:58:07 +09:00
Khodr Saaifan 283a060497 Allow gNB to read pusch_AntennPorts from config file 2021-02-02 09:02:19 +01:00
Mahesh ae422aca1f Merge conficts resolved 2021-02-02 09:36:49 +05:30
Parminder Singh 58b36aa222 Added PTRS RRC config validation for DL/UL-SIM uni tests 2021-02-01 13:02:25 +01:00
He Shanyun e4ff0d5b31 Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3 2021-01-20 01:51:32 +00:00
Thomas Schlichter e3ac0404a7 fix printf() formats for unsigned integers in nr_ulsim 2021-01-15 17:09:28 +01:00