maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,140 Commits 5 Branches 0 Tags
28ad0eaacbbdbe7e245db8460a278252eb81ee76
Commit Graph
1215 Commits
Author SHA1 Message Date
Robert Schmidt 28ad0eaacb Merge remote-tracking branch 'origin/NR_fix_msg3_rtx' into integration_2022_wk23 2022-06-09 17:46:45 +02:00
francescomani 85b48193d4 fix msg3 retransmissions with OAI UE 2022-06-08 16:45:30 +02:00
Roberto Louro Magueta 2c3eb996a4 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
 2022-06-01 11:06:49 +01:00
Laurent THOMAS 9ba33d4dec Correctly format code to avoid warnings/ambiguities 2022-05-28 16:44:49 +02:00
rmagueta 6bca31c7e3 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
 2022-05-27 10:18:13 +01:00
Roberto Louro Magueta e5c4e0f3d3 Address review comments 2022-05-18 12:59:24 +01:00
Roberto Louro Magueta f94a479829 Fix warning after merge 2022-05-18 12:51:18 +01:00
francescomani 1f49b73eac Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv 2022-05-18 08:55:40 +02:00
Roberto Louro Magueta 8ac68929bc Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
 2022-05-17 19:13:38 +01:00
luis_pereira87 486e9e2381 Merge remote-tracking branch 'origin/Dedicated-BWPs' into integration_2022_wk19b 
# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-05-13 15:58:56 +01:00
luis_pereira87 54f49fd253 Remove duplicated code for bwp common validation 2022-05-12 17:33:35 +01:00
luis_pereira87 af377945c3 Fix hardcoded coreset and assignment from wrong array position 2022-05-12 13:12:45 +01:00
francescomani c4c93cc498 Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv 2022-05-12 08:56:45 +02:00
luis_pereira87 3c4ba50281 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-05-11 14:49:59 +01:00
Roberto Louro Magueta 5c754f2300 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-05-11 14:19:33 +01:00
Roberto Louro Magueta 4c1b432718 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 
# Conflicts:
#	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
 2022-05-11 13:45:56 +01:00
rmagueta b8cd9ef167 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2022-05-06 15:41:10 +01:00
francescomani 020c4c52ec Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM 2022-05-06 15:27:20 +02:00
Roberto Louro Magueta 87e79e5eb8 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
 2022-05-06 11:32:36 +01:00
luis_pereira87 a8e6bf9bd5 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/GNB_APP/gnb_config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/nr_rrc_defs.h
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-05-06 11:29:55 +01:00
Roberto Louro Magueta f2974b431b Revert transformPrecoder to transform_precoding 2022-05-03 19:25:14 +01:00
francescomani cfa37e7213 cosmetic changes 2022-05-03 12:21:47 +02:00
francescomani 299642344a fix for ssb offset scaling issue 2022-05-02 19:08:10 +02:00
rmagueta d01cd03ad3 Merge branch 'NR_RRC_processing_timer' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-04-30 16:40:58 +01:00
rmagueta 4b3aa7233e Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
 2022-04-30 15:14:20 +01:00
francescomani 3547940e3f Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM 2022-04-28 14:26:24 +02:00
francescomani b6016cfc49 Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv 2022-04-28 14:12:11 +02:00
francescomani d05f2b3add Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-28 11:54:51 +02:00
Roberto Louro Magueta ac5444afd9 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-26 19:18:08 +01:00
Robert Schmidt 5dc87bdcad Merge remote-tracking branch 'origin/rename_frame_type' into integration_2022_wk17 2022-04-26 15:16:24 +02:00
luis_pereira87 efd99acacc Fix read SSpace array index at -1 2022-04-20 15:51:02 +01:00
francescomani 33663e68b0 rename frame_type 2022-04-19 18:37:14 +02:00
luis_pereira87 a39c310bd4 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-04-19 10:21:57 +01:00
Laurent THOMAS b2560daa3d merge develop and fix one double free bug in nr_dlschsim 2022-04-13 15:15:11 +02:00
rmagueta a81640a6df Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
 2022-04-13 10:21:09 +01:00
Mario Hudon 06b637c1cf Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UE_thread_improvement_IDCC 2022-04-12 12:59:27 -04:00
rmagueta d5421a9c87 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/NR_REFSIG/nr_refsig.h
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
 2022-04-12 14:02:43 +01:00
francescomani e6913e5d33 Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv 2022-04-12 10:41:20 +02:00
francescomani 02b66061b1 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-12 10:14:21 +02:00
francescomani 8927c648d4 Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM 2022-04-12 09:55:57 +02:00
Laurent THOMAS 4ad71064b8 review comments 2022-04-11 19:29:45 +02:00
luis_pereira87 940abc3587 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 2022-04-11 13:49:40 +01:00
Laurent Thomas 95a58d646a merge develop, no test 2022-04-10 22:22:52 +02:00
Robert Schmidt 9151666960 Merge remote-tracking branch 'origin/nr_gold_init_improv' into integration_2022_wk15 2022-04-09 13:09:50 +02:00
rmagueta 8c056ceefc Merge remote-tracking branch 'origin/develop' into develop-CSI 2022-04-08 18:19:06 +01:00
francescomani 680c605e32 Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM 2022-04-08 17:02:35 +02:00
francescomani 1ab64d26aa Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-08 16:50:02 +02:00
Laurent THOMAS 2cdc7304f1 merge develop 2022-04-07 10:00:41 +02:00
Robert Schmidt d8d3106baf Merge remote-tracking branch 'origin/episys-throughput-updates-and-downlink-siso-cm' into integration_2022_wk14 2022-04-06 23:44:59 +02:00
rmagueta 345f3056ff Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
 2022-04-06 10:51:43 +01:00