Commit Graph
1351 Commits
Author SHA1 Message Date
matzakos a19f2e3254 Merge remote-tracking branch 'origin/aw2s-n41' into F1_interop_ACC 2022-01-24 15:11:50 +01:00
matzakos e5899e2f74 Merge remote-tracking branch 'origin/develop' into F1C_extensions_develop 2022-01-17 13:19:45 +01:00
francescomani 7b490f330c Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities 2022-01-10 10:11:55 +01:00
francescomani 562013fa32 Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities 2021-12-30 14:59:50 +01:00
Laurent THOMAS 792b6b4e0b merge develop 2021-12-23 22:52:36 +01:00
Laurent THOMAS 0f00e57148 merge develop 2021-12-17 16:29:53 +01:00
francescomani f3bf2cf2e7 Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities 2021-12-16 17:23:55 +01:00
francescomani 220e568c81 xml file that works, thanks to Cedric 2021-12-16 17:18:20 +01:00
francescomani 9ad38c421a removing tda from other config files 2021-12-14 17:48:09 +01:00
francescomani 018ac0616b Merge remote-tracking branch 'origin/develop' into NR_RRC_configuration_functions 2021-12-07 09:27:27 +01:00
francescomani b9dd8d3f28 function for rrc ul tda (removed from config files) 2021-11-25 14:44:22 +01:00
francescomani 83e1b2f850 function for rrc dl tda (removed from config files) 2021-11-24 13:44:18 +01:00
luis_pereira87 1c49bdec1a Update SA default configuration files 2021-11-22 05:22:15 +00:00
luis_pereira87 f81cec7215 Merge remote-tracking branch 'origin/develop' into handling-Msg4-Ack-failure 2021-11-22 04:59:35 +00:00
Raymond Knopp e51cd863fe Merge branch 'bler_txoptim' into F1C_extensions_develop
Conflicts:
	cmake_targets/CMakeLists.txt
	common/utils/nr/nr_common.c
	openair1/PHY/INIT/nr_parms.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.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/rrc_gNB_NGAP.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/ocp-gtpu/gtp_itf.cpp
	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
2021-11-14 21:18:50 +01:00
luis_pereira87 32e7b7b83f Update SA default configuration files 2021-11-12 16:39:16 +00:00
matzakos 40263348f9 Merge with NR_F1C_F1U_extensions and resolve conflicts 2021-11-12 17:01:27 +01:00
matzakos a8bfb20121 Update du config file after update with develop 2021-11-12 16:16:33 +01:00
luis_pereira87 72e188935f Minor updates in default SA configuration files 2021-11-02 08:47:20 +00:00
francescomani 3556423cf0 read uecap file in nr_rrc_ue_process_ueCapabilityEnquiry 2021-10-26 13:55:29 +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
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
rmagueta 0438d64ddb Minor update in security section in conf files 2021-10-08 10:34:35 +01: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 c0b260673d Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs 2021-09-27 10:08:14 +01:00
mjoang 626e3a7015 merge develop 2021-09-23 10:44:43 -04: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
matzakos 1b1a2c8411 Merge with develop, resolve conflicts in CU/DU conf files 2021-09-21 11:00:29 +02:00
rmagueta 693804c163 Fix bands in some conf files 2021-09-15 18:43:32 +01: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
Sakthivel Velumani 0de2a333af Merge branch 'develop' into phy-asan-fixes 2021-09-14 16:47:15 +05:30
rmagueta eb99d98ccf Fix issues after merge 2021-09-10 10:42:02 +01:00
rmagueta 452e2eb812 Fix ulsch_max_slots_inactivity 2021-09-09 09:37:13 +01:00
rmagueta 71cd100335 Merge remote-tracking branch 'origin/nr-pdcp-security-w34' into bandwidth-testing-abs
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-09-08 17:22:28 +01:00
Cedric Roux 4877d56a12 nr: add security section to gnb config files
The configuration files named "gnb*conf" have been modified.
Other configuration files were left unmodified.
2021-09-06 11:06:47 +02:00
rmagueta 5e1065e88f Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
# Conflicts:
#	executables/nr-uesoftmodem.c
#	executables/nr-uesoftmodem.h
#	executables/softmodem-common.h
#	openair1/PHY/MODULATION/slot_fep_nr.c
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
#	openair1/SCHED_NR/fapi_nr_l1.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/LAYER2/NR_MAC_UE/mac_proto.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-02 17:57:48 +01:00
rmagueta e621c3533c Change log levels 2021-08-31 18:27:27 +01:00
francescomani 6a2352f843 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-30 17:55:38 +02:00
hardy b798755347 Merge remote-tracking branch 'origin/prb_based_dl_channel_estimation' into integration_2021_wk34 2021-08-26 14:33:33 +02:00
francescomani b6ef23a395 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-25 15:01:40 +02:00
francescomani a1595c3109 setting ulsch inactivity timer from slots to frames and removing it from config files (default 10 frames) 2021-08-24 18:02:54 +02:00