Commit Graph
4713 Commits
Author SHA1 Message Date
francescomani c4f1812cc9 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-02-14 18:14:19 +01:00
luis_pereira87 bfc34f329e Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements
# Conflicts:
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
2022-02-14 09:50:58 +00:00
francescomani de88c3f45c Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2022-02-14 08:57:52 +01:00
Raymond Knopp 4756c5a167 added configurable "sf_ahead" for NR/LTE in RU section. Tested in NR with sf_ahead=2 (normally 3) 2022-02-13 22:15:48 +01:00
Raymond Knopp 5ba8b83856 Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control
Conflicts:
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB_nsa.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
	targets/ARCH/AW2SORI/oaiori.c
2022-02-13 12:24:45 +01:00
Raymond Knopp da54df5bb2 Merge remote-tracking branch 'origin/develop' into harq_latency_control
Conflicts:
	cmake_targets/phy_simulators
	openair1/PHY/CODING/crc_byte.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/RRC/NR/rrc_gNB.c
2022-02-13 09:55:01 +01:00
Raymond Knopp 74fd3f029a changes for AW2S NR support in ORI library 2022-02-13 09:44:15 +01:00
Raymond Knopp b9b24588af Merge remote-tracking branch 'origin/develop' into aw2s-n41
Conflicts:
	cmake_targets/phy_simulators
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-02-11 12:21:29 +01:00
Raymond Knopp 99f0177b3f Merge branch 'aw2s-n41' of https://gitlab.eurecom.fr/oai/openairinterface5g into aw2s-n41 2022-02-11 08:12:17 +01:00
Raymond Knopp 2b96909960 update to ori.h (with NR extensions) 2022-02-11 08:11:45 +01:00
luis_pereira87 fc783110da Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements
# Conflicts:
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
2022-02-10 23:19:52 +00:00
francescomani 9ff39f0d92 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2022-02-08 16:48:20 +01:00
francescomani 37a517edb7 Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz 2022-02-08 16:18:27 +01:00
luis_pereira87 9c72064883 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
#	openair2/GNB_APP/L1_nr_paramdef.h
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
2022-02-08 15:12:32 +00:00
rmagueta e8657ec854 Merge remote-tracking branch 'origin/develop' into develop-SRS
# Conflicts:
#	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
2022-02-08 09:31:32 +00:00
francescomani 90bc226ac0 Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling 2022-02-08 08:48:04 +01:00
Robert Schmidt c14d9a3c2a Merge remote-tracking branch 'origin/thread_pool_size' into integration_2022_wk05_b 2022-02-04 19:13:48 +01:00
francescomani 434ee15ba0 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2022-02-03 11:38:14 +01:00
Raymond Knopp 7d4bdfb566 Merge remote-tracking branch 'origin/develop' into aw2s-n41 2022-02-01 10:46:13 +01:00
Laurent THOMAS aa47fa4c41 remove F1-U protobuf implementation 2022-01-27 11:57:19 +01:00
Robert Schmidt 8c5059214e Remove log verbosity level from all conf files: it is not used 2022-01-27 10:53:07 +01:00
Robert Schmidt 00e058537d Remove MSC library, it is not used anywhere 2022-01-27 10:53:07 +01:00
Laurent THOMAS 3e7c22e7c6 gtp-u old code delete 2022-01-26 11:27:02 +01:00
sfn 631cd33f15 Adjust ZF Rx fixed point shift 2022-01-25 12:10:08 +01:00
sfn 1d7569b4af clean up and optimize UE 2022-01-25 12:04:17 +01:00
Thomas Schlichter 7d47e98412 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-01-25 11:38:49 +01:00
luis_pereira87 0e159f8b6b Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	openair1/SCHED_NR/fapi_nr_l1.c
2022-01-25 08:49:16 +00:00
luis_pereira87 729c4ef1de Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
#	ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
#	ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
#	openair2/GNB_APP/L1_nr_paramdef.h
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
2022-01-24 11:46:27 +00:00
luis_pereira87 d0bbcaef50 Merge remote-tracking branch 'origin/develop' into thread_pool_size
# Conflicts:
#	ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
#	ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
#	openair2/GNB_APP/L1_nr_paramdef.h
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
2022-01-24 11:13:38 +00:00
Raymond Knopp 90c66bb7b1 Merge remote-tracking branch 'origin/develop' into aw2s-n41
Conflicts:
	executables/nr-softmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-01-24 11:11:46 +01:00
hardy 08c9d4ae4c Merge remote-tracking branch 'origin/tx-thread-update' into integration_2022_wk04_a 2022-01-21 16:39:24 +01:00
luis_pereira87 b4e34d5e6b Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements 2022-01-21 10:53:05 +00:00
luis_pereira87 34409bacc0 Address review comments 2022-01-21 10:52:39 +00:00
luis_pereira87 7355cb454f Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
2022-01-20 11:43:24 +00:00
Laurent Thomas 1eb1c17f0c merge develo 2022-01-19 16:46:46 +01:00
hardy bbe79b5b3a Merge remote-tracking branch 'origin/NR_UE_Capabilities' into integration_2022_wk03_b 2022-01-19 15:40:43 +01:00
luis_pereira87 6f7b434c49 Update config files and fix bwp selection 2022-01-18 17:49:24 +00:00
luis_pereira87 978b4a1728 Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
2022-01-18 17:44:30 +00:00
luis_pereira87 754a39def5 Dedicated BWPs working with COTS UE in SA mode 2022-01-18 15:54:32 +00:00
francescomani 79cc85a265 Merge remote-tracking branch 'origin/clean-shutdown' into bupt-ulmimo-4 2022-01-18 15:48:38 +01:00
luis_pereira87 2a610cfef4 Handle config file without servingcellconfigdedicated 2022-01-18 13:49:22 +00:00
luis_pereira87 2b6c64c98c Backup improvements in servingcellconfigdedicated 2022-01-18 00:12:56 +00:00
rmagueta ef021c23e0 Merge remote-tracking branch 'origin/develop' into develop-SRS
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
2022-01-17 15:46:27 +00:00
luis_pereira87 c9b8bf475b Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
#	openair1/PHY/TOOLS/lte_enb_scope.c
2022-01-17 10:21:22 +00:00
rmagueta 62c2775017 Merge remote-tracking branch 'origin/develop' into develop-SRS
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
2022-01-15 17:29:13 +00:00
Laurent THOMAS a5c5264ef3 merge develop 2022-01-14 21:09:02 +01:00
luis_pereira87 a2755610fa Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
2022-01-14 13:49:16 +00:00
Laurent THOMAS 3f2dd17191 code review comments + re-test 2022-01-13 16:04:16 +01:00
luis_pereira87 d318f09142 Fix L1s indentation in config files 2022-01-13 09:37:53 +00:00
luis_pereira87 07f31c6465 Merge remote-tracking branch 'origin/develop' into thread_pool_size 2022-01-13 09:19:31 +00:00