Commit Graph
4713 Commits
Author SHA1 Message Date
Melissa Elkadi b56c8ac3ce Merge remote-tracking branch 'eurecom/develop' into origin-episys-merge-nsa 2021-10-25 10:27:11 -07:00
Laurent THOMAS e3f9fd6b01 code cleanup, no feature 2021-10-24 14:47:24 +02:00
francescomani 2db3e842fd Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-10-22 11:09:51 +02:00
Laurent THOMAS 71d2414ced merge develop 2021-10-21 18:31:52 +02:00
francescomani 0e0be91aa3 Merge remote-tracking branch 'origin/develop' into scs_60_iisc 2021-10-21 15:07:38 +02:00
Mario Joa-Ng d483410e2a Merge develop. 2021-10-20 21:06:16 -04:00
Mario Joa-Ng b84ef41159 Merge remote-tracking branch 'origin/develop' into nr_ue_mac_pdu_fixes_sr_bsr 2021-10-20 20:13:59 -04:00
francescomani 2bff9862f3 Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities 2021-10-20 14:01:57 +02:00
francescomani a6d9d8a2d1 ue capabilities xml file in SA conf files 2021-10-19 16:56:25 +02:00
Deokseong "David" Kim a30e27cb11 Adding NSA mode for calling rlc_module_init and SCTP_TASK 2021-10-19 01:36:07 +00:00
Michael Cook 69fc902b52 Set alarm 2021-10-18 22:04:19 +00:00
Eurecom f83c02d981 Merge branch 'NR_2port_CSIRS' into CSI-SA
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.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/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-10-17 02:13:11 +02:00
Eurecom 52af089e2d Merge remote-tracking branch 'origin/integration_2021_wk41' into CSI-SA
Conflicts:
	ci-scripts/xml_files/fr1_sa_quectel.xml
	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2021-10-16 16:04:54 +02:00
Eurecom 8b441a19d6 Merge remote-tracking branch 'origin/integration_2021_wk41' into NR_2port_CSIRS 2021-10-16 15:55:59 +02:00
rmagueta b1a8b06547 Merge remote-tracking branch 'origin/integration_2021_wk41' into integration_2021_wk41_bwt-abs
# Conflicts:
#	ci-scripts/xml_files/fr1_sa_quectel.xml
#	openair1/SCHED_NR/fapi_nr_l1.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/GNB_APP/gnb_paramdef.h
2021-10-14 14:22:23 +01:00
Melissa Elkadi 28391dad6a Updating pdcp init functions to maintain SA behavior 2021-10-13 06:52:15 -07:00
Eurecom 71d933d2f4 Merge remote-tracking branch 'origin/bandwidth-testing-abs' into bandwidth-testing
Conflicts:
	executables/nr-ru.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
2021-10-11 13:46:15 +02:00
Raymond Knopp 7d7dd29514 blacklisting of PRBs in configuration file 2021-10-08 15:44:57 +02:00
rmagueta 0438d64ddb Minor update in security section in conf files 2021-10-08 10:34:35 +01:00
Raymond Knopp 3549168347 removal of mean signal level 2021-10-06 22:43:06 +02:00
David Kim eef6ca5037 updated configuration file location for ci test. 2021-10-01 10:21:42 -07:00
David Kim bab9c42e59 Added some config files after restoring original config files. 2021-09-30 17:07:44 -07:00
Melissa 3eafdff63a Syncing our OAI merge branch with our internal NSA master branch 2021-09-30 23:16:46 +00:00
francescomani 36c321a785 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-09-29 14:11:27 +02:00
Laurent Thomas b0b7101641 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into phy-asan-fixes 2021-09-28 16:52:09 +02:00
rmagueta 345ee2fd88 Revert min_rb to 5 2021-09-27 11:21:55 +01:00
rmagueta 280249bb2a Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-09-27 11:05:30 +01:00
rmagueta c0b260673d Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs 2021-09-27 10:08:14 +01:00
Laurent THOMAS d460a3a8b3 merge develop 2021-09-27 09:18:45 +02:00
mjoang 626e3a7015 merge develop 2021-09-23 10:44:43 -04:00
Raymond Knopp 87310ec55c Merge remote-tracking branch 'origin/bandwith_testing_debug' into bandwidth-testing
Conflicts:
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
2021-09-22 15:05:27 +02:00
Raymond Knopp 0270bf0321 commit before merge 2021-09-22 14:08:06 +02:00
Laurent THOMAS 9b691b3ecf fix old code errors, add CU to DU, 4G F1-U 2021-09-21 20:33:35 +02:00
rmagueta f2abff7745 Add prach_dtx_threshold and pucch0_dtx_threshold in some conf files 2021-09-21 19:20:11 +01:00
Roberto Louro Magueta 99f53ea942 Revert "Update pucch0_dtx_threshold"
This reverts commit e13ef657f3
2021-09-21 18:15:17 +00:00
Roberto Louro Magueta 2ef4ab6d54 Revert "Set initialULBWPstartSymbolAndLength_0 = 54"
This reverts commit a53b260987
2021-09-21 16:57:24 +00:00
rmagueta a53b260987 Set initialULBWPstartSymbolAndLength_0 = 54 2021-09-21 13:14:23 +01:00
rmagueta 993974c4b4 Set pusch_TargetSNRx10 = 150 2021-09-21 13:04:39 +01:00
rmagueta e13ef657f3 Update pucch0_dtx_threshold 2021-09-21 12:41:38 +01:00
rmagueta e5f677aa2b Change LOG levels 2021-09-21 12:13:32 +01:00
matzakos 1b1a2c8411 Merge with develop, resolve conflicts in CU/DU conf files 2021-09-21 11:00:29 +02:00
Laurent THOMAS 686e585666 replace protobuf in 4G F1 split, first step: UL packets 2021-09-21 10:30:46 +02:00
Raymond Knopp 7ceef76ba5 switchpoint advance for X300 2021-09-20 23:28:13 +02:00
luis_pereira87 85a03cd3c1 Intermediate backup commit 2021-09-20 13:03:44 +01:00
Raymond Knopp f21211c23d removed logging 2021-09-20 00:24:43 +02:00
rmagueta 693804c163 Fix bands in some conf files 2021-09-15 18:43:32 +01:00
Melissa Elkadi 6a8e4e2883 Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_develop_cfra_working 2021-09-14 07:34:58 -07:00
matzakos c258229873 Bring back sib1 tda from config file in du conf. file 2021-09-14 16:30:22 +02:00
matzakos 982c087b92 Fix conflicts in CU/DU config files 2021-09-14 16:30:05 +02:00
matzakos 222419ddbf Bring back sib1 tda from config file in du conf. file 2021-09-14 13:22:59 +02:00