rmagueta
c5ab33ffd9
Merge remote-tracking branch 'origin/develop' into develop-SA-RA
...
# Conflicts:
# openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-02-11 12:27:06 +00:00
rmagueta
e2f749d8b2
Fix nr_dlsim, nr_ulsim and nr_prachsim
2021-02-11 10:56:08 +00:00
Parminder Singh
9202c583f5
Spaces are corrected, tabs replaced with spaces
2021-02-10 11:10:19 +01:00
Thomas Schlichter
14e84f8782
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-02-09 10:02:54 +01:00
Raymond Knopp
199ce8ac55
fixed segfault in ulsim when trials > 1000
2021-02-08 20:58:48 +01:00
rmagueta
03b52cec84
Merge remote-tracking branch 'origin/develop' into develop-SA-RA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/RRC/NR_UE/rrc_UE.c
2021-02-08 15:17:12 +00:00
Thomas Schlichter
3743ead91a
Merge remote-tracking branch 'develop' into NR_10MHz
2021-02-08 14:20:20 +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
francescomani
58ad2bf06f
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-08 12:05:06 +01:00
Laurent Thomas
fa63d9a4e6
merge develop
2021-02-08 11:56:42 +01:00
Raymond Knopp
846c67b9bd
Merge remote-tracking branch 'origin/develop' into oairu
...
Conflicts:
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
2021-02-07 18:23:46 +01:00
Raymond Knopp
d06018d1e3
Merge branch 'four_antenna_eNB' into oairu
2021-02-07 17:46:23 +01:00
Raymond Knopp
008f9060a1
unitary simulators tested
2021-02-07 14:14:28 +01:00
Robert Schmidt
77203ee989
Fix nr_dlschsim unitary simulator
2021-02-07 10:45:57 +01:00
Robert Schmidt
4ddd45f813
Implement DL HARQ using NR_list_t
2021-02-07 10:39:39 +01:00
Raymond Knopp
a3867df5f3
cleanup after removing harq state in L0
2021-02-07 10:39:39 +01:00
Robert Schmidt
7879e6ad32
Remove (unnecessary) num_slots_per_tdd in DLSCH sched
2021-02-07 10:39:39 +01:00
Raymond Knopp
edff477050
reduced 5G memory limits for CI
2021-02-07 09:40:22 +01:00
Robert Schmidt
171f7842bc
Rewrite PUCCH allocation (simplified, restricted)
...
- No dynamic allocation of PUCCH structures
- Use first PUCCH for HARQ (can only allocate for up to two slots in
single PUCCH, simplistic nr_acknack_scheduling!)
- Use second PUCCH for CSI, do not multiplex!
2021-02-06 20:50:28 +01:00
hardy
663dd1251c
Merge remote-tracking branch 'origin/NR_RA_cleanup' into integration_2021_wk05
2021-02-05 12:00:38 +01:00
francescomani
4d2c80e418
fix dlsim compilation
2021-02-04 09:59:09 +01:00
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
rmagueta
9b24e1fbfa
Merge branch 'develop' into develop-SA-RA
2021-02-02 17:40:22 +00:00
Raymond Knopp
4e9afb30b0
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-02 12:09:56 +01: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
Khodr Saaifan
fd8cf7769c
Modify and fix nr_dlsim to support 4*4 MIMO with 1 layer
2021-02-01 14:59:56 +01:00
Parminder Singh
58b36aa222
Added PTRS RRC config validation for DL/UL-SIM uni tests
2021-02-01 13:02:25 +01:00
Khodr Saaifan
e72d0483b4
Add PDSCH precoder functions, fix pusch_rx for 2 rx antennas, fix nr_dlsim for 2x1 MIMO simulation
2021-02-01 10:06:08 +01:00
Laurent Thomas
6b37681854
merge develop, minor code addition
2021-02-01 09:02:57 +01:00
Raymond Knopp
579a573b90
unitary simulations build
2021-01-30 22:34:16 +01:00
Raymond Knopp
d56a50609c
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
2021-01-30 15:54:59 +01:00
Thomas Schlichter
bca9f74e66
Merge remote-tracking branch 'develop' into NR_RA_cleanup
2021-01-29 18:52:37 +01:00
francescomani
8af407250d
Merge remote-tracking branch 'origin/develop' into NR_10MHz
2021-01-29 12:16:43 +01:00
hardy
6e12f8f8d3
Merge remote-tracking branch 'origin/nr_ul_scfdma' into integration_2021_wk04_b
2021-01-29 07:40:42 +01:00
hardy
9c810b311d
Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b
2021-01-29 07:40:07 +01:00
Raymond Knopp
78f14bc9a4
fixed build for oairu executable. tested with sirius/phoenix
2021-01-28 21:53:24 +01:00
Raymond Knopp
f04846cf4f
2 and 4 antenna testing with ulsim functional. >=3 dB gains from 2 to 4 antennas on SCM channels
2021-01-26 13:25:07 +01:00
Raymond Knopp
5294bc4fe3
warnings and unitary simulation bulding
2021-01-23 15:04:11 +01:00
Raymond Knopp
ef1fb827b5
Merge remote-tracking branch 'origin/develop' into oairu
2021-01-23 09:17:37 +01:00
Thomas Schlichter
c107b9b756
Merge remote-tracking branch 'develop'
2021-01-21 18:28:33 +01:00
Laurent Thomas
06366787ae
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into new-gtpu
2021-01-21 15:51:34 +01:00
Laurent Thomas
75ad3da9d9
start new gtpu
2021-01-21 15:51:30 +01:00
Laurent Thomas
eddebae1e4
fix after code review
2021-01-21 13:47:18 +01:00
rmagueta
ee3f939692
Fill msg3 for the RA
2021-01-20 23:57:31 +00:00
Thomas Schlichter
f1653c5f73
fix build of phy_simulators
2021-01-20 18:04:28 +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
Thomas Schlichter
691ad0bba0
Merge remote-tracking branch 'develop' into nr_ul_scfdma
...
Conflicts:
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-01-15 14:54:37 +01:00
rmagueta