Commit Graph
1429 Commits
Author SHA1 Message Date
rmagueta 4f29c73bb6 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-04-06 10:11:49 +01:00
Robert Schmidt 5d63a756e6 Merge remote-tracking branch 'origin/fix-initialBWP-procedures' into integration_2022_wk13b 2022-04-01 18:40:30 +02:00
rmagueta c83df1b677 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	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
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-04-01 15:56:47 +01:00
Robert Schmidt 69fcab9243 Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into integration_2022_wk13 2022-03-29 22:09:34 +02:00
luis_pereira87 408c9ec7c2 Fix RIV value for 162 PRBs 2022-03-23 22:17:03 +00:00
rmagueta f0f8acb06a Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-03-21 10:10:21 +00:00
francescomani 8ef72fb939 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-17 07:51:35 +01:00
rmagueta b59b84e904 Merge remote-tracking branch 'origin/develop' into develop-CSI 2022-03-17 01:03:35 +00:00
Robert Schmidt ca5f4755ee Merge remote-tracking branch 'origin/F1_sync_configuration' into integration_2022_wk10 2022-03-07 23:08:40 +01:00
francescomani 8dfc5d59b4 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-07 09:26:08 +01:00
rmagueta a634f14f74 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
#	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-03-05 01:58:51 +00:00
luis_pereira87 078dff03b1 Revert do_SRS to develop version in config files (re-enable SRS) 2022-03-04 15:43:52 +00:00
luis_pereira87 0d92901787 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures 2022-03-04 13:09:44 +00:00
matzakos 41635fafd7 Remove redundant BWP conf. parameters in CU/DU configuration files 2022-03-04 13:09:06 +01:00
matzakos 368819310d Synchronize config files of CU/DU with the ones of the CI 2022-02-28 10:14:29 +01:00
francescomani 5c56bb21ce Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz 2022-02-23 15:08:52 +01:00
rmagueta 0e0526e367 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
2022-02-23 13:51:31 +00:00
francescomani 4c8c11d9db Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-02-23 13:53:11 +01:00
luis_pereira87 dc4a82934d Fixes after merge 2022-02-23 11:53:57 +00:00
rmagueta d820051397 Update config files 2022-02-21 17:46:02 +00:00
francescomani 30f6210932 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-02-21 15:16:39 +01:00
francescomani 3b7430a745 Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz 2022-02-21 09:12:21 +01:00
Robert Schmidt 72a4ed80da Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08 2022-02-19 19:43:11 +01:00
Robert Schmidt ff0fb53056 Merge remote-tracking branch 'origin/nr-fdd-scheduling' into integration_2022_wk07_c 2022-02-17 09:32:44 +01:00
francescomani ec4ae32af0 N1 N2 and XP for DL antenna ports in config file 2022-02-14 19:00:55 +01:00
francescomani db257fd5a9 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-02-14 18:29:09 +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
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 37a517edb7 Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz 2022-02-08 16:18:27 +01: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
Robert Schmidt 8c5059214e Remove log verbosity level from all conf files: it is not used 2022-01-27 10:53:07 +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 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
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 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
luis_pereira87 015e360d42 Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
#	openair1/SCHED_NR/fapi_nr_l1.c
2022-01-10 14:03:55 +00:00
Laurent THOMAS b4b457345d merge develop 2022-01-10 12:49:47 +01:00
luis_pereira87 46d629aede Merge remote-tracking branch 'origin/develop' into ue-phy-sync-improvements
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
2022-01-10 10:21:07 +00:00
francescomani 8202180a18 Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling 2022-01-10 10:39:44 +01:00
francescomani 7b490f330c Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities 2022-01-10 10:11:55 +01:00
rmagueta cf8f6fdeed Merge remote-tracking branch 'origin/develop' into develop-SRS
# 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/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/RRC/NR/L2_nr_interface.c
2022-01-08 12:11:56 +00:00
rmagueta 56714b2c82 Fix warnings after merge with develop 2022-01-06 10:17:10 +00:00