Xue Song
e1a92eadba
Merge branch 'master' into develop_SA_rfsim_for_F1
...
Conflicts:
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-10 15:56:50 +09:00
Thomas Schlichter
14e84f8782
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-02-09 10:02:54 +01:00
Mahesh
2d58536c52
Phy simulators build error fixed
2021-02-09 02:11:54 +05:30
rmagueta
5b7ae1228f
Fix develop merge conflicts
2021-02-08 19:18:00 +00:00
Mahesh
0e6f1e6ad6
Merge conflicts resolved
2021-02-08 18:05:29 +05:30
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
hardy
663dd1251c
Merge remote-tracking branch 'origin/NR_RA_cleanup' into integration_2021_wk05
2021-02-05 12:00:38 +01:00
Xue Song
52edf0c123
Merge branch 'master' into develop_SA_rfsim_for_F1
...
Conflicts:
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair2/F1AP/f1ap_cu_interface_management.c
openair2/F1AP/f1ap_cu_rrc_message_transfer.c
openair2/F1AP/f1ap_cu_task.c
openair2/F1AP/f1ap_du_interface_management.c
openair2/F1AP/f1ap_du_task.c
openair2/GNB_APP/gnb_app.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
openair2/RRC/NR/L2_nr_interface.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/L2_interface_ue.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
2021-02-04 18:16:37 +09: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
Raymond Knopp
4e9afb30b0
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-02 12:09:56 +01:00
Mahesh
ae422aca1f
Merge conficts resolved
2021-02-02 09:36:49 +05:30
Laurent Thomas
7eda2b7409
remainign bug after merge develop
2021-02-01 15:35:17 +01:00
Khodr Saaifan
4b541b444d
Extend the UE side to support 4 Rx antennas
2021-02-01 14:46:51 +01:00
Laurent Thomas
6b37681854
merge develop, minor code addition
2021-02-01 09:02:57 +01:00
Raymond Knopp
9a71d5550e
build of eNB/gNB/UE/nrUE
2021-01-30 23:27:25 +01:00
Thomas Schlichter
bca9f74e66
Merge remote-tracking branch 'develop' into NR_RA_cleanup
2021-01-29 18:52:37 +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
Xue Song
36487515c4
fix double definition in rrc_gNB_NGAP.c and nr_ngap_gnb.c
2021-01-28 14:20:35 +09:00
Mahesh
ca74163cdd
OCP build errors resolved.
2021-01-27 11:34:52 +05:30
Raphael Defosseux
e16f769174
CI: try to optimize the file system usage when building in the CI VM env. Increased the VM memory of one to allow linking
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2021-01-26 15:33:22 +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
Laurent Thomas
954b0f559d
new gtp before tests
2021-01-25 12:59:38 +01:00
Raymond Knopp
e82ef88e72
builds are succesful (eNB,UE,gNB,nrUE,physim)
2021-01-24 13:27:10 +01:00
Raymond Knopp
ef1fb827b5
Merge remote-tracking branch 'origin/develop' into oairu
2021-01-23 09:17:37 +01:00
Xue Song
76cb132f2d
u-plane is ok
2021-01-22 15:44:18 +09: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
Raymond Knopp
f8aa85644f
bugfix in UCI statistics
2021-01-21 11:51:40 +01:00
Xue Song
4c1e47405f
update F1AP to R16.3.1
2021-01-21 14:56:22 +09:00
cig
e8989b2015
Moved UE UL scheduling functions to new MAC file
...
- this commit was necessary because the location of the MAC UE
functions does not reflect the context in which they are used
- therefore all UL scheduling-related functions have been moved
to a new nr_ue_scheduler.c file
- and the irrelevant file rar_tools_nrUE.c has been deleted
(nr_ue_process_rar moved to nr_ue_procedures)
- the new locations are supposed to make the file and functions
organisations more structured and cleaner
2021-01-20 14:59:52 +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
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
Mahesh
185fcbf7fe
Merged latest commit(MR957)
2021-01-15 18:53:02 +05:30
Xue Song
e0419baeb3
Merge branch 'ngap-wf-1120-srb' into develop_SA_rfsim_for_F1
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
2021-01-12 05:37:09 +00:00
Thomas Schlichter
41f319b02a
add test cases for UL transform precoding (SC-FDMA)
2021-01-08 17:26:38 +01:00
Xue Song
bc2b462ea4
fix eNB compile error
2021-01-07 18:48:53 +09:00
Wu.Jing
e2d26d2a44
Merge branch 'master' into develop_SA_F1
2021-01-07 13:56:32 +09:00
Wu.Jing
f22a779881
Merge branch 'master' into develop_SA_L3
2021-01-07 13:55:40 +09:00
Raymond Knopp
1b95baaf4c
update F1AP to R16.3.1. testing with OTA eNB
2021-01-01 21:45:23 +01:00
Raymond Knopp
d00b966d14
finishing mere with constant_power branch. Testing OTA.
2020-12-29 08:15:36 +01:00
Raymond Knopp
49efcebeec
Merge remote-tracking branch 'origin/constant_power' into oairu
2020-12-26 13:11:20 +01:00
Raymond Knopp
7620fe9b2d
minor changes for oairu executabl
2020-12-25 16:19:41 +01:00
Raymond Knopp
7185b95591
debugging with AW2S RRU. Added statistics for ULSCH/UCI in PHY and MAC.
2020-12-24 16:10:03 +01:00
Raymond Knopp
9edd67b216
Merge remote-tracking branch 'origin/develop' into oairu
2020-12-24 14:53:58 +01:00
Laurent
42a110338c
itti dynamic queue creation, and 64 bits instance id
2020-12-23 13:56:01 +01:00