Commit Graph
1347 Commits
Author SHA1 Message Date
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 b7a27219ac Fix warnings after merge with develop 2021-12-24 12:24:35 +00:00
rmagueta 97962f4635 Merge remote-tracking branch 'origin/develop' into develop-SRS
# Conflicts:
#	common/utils/nr/nr_common.h
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
2021-12-24 11:53:25 +00: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 9ad38c421a removing tda from other config files 2021-12-14 17:48:09 +01:00
rmagueta 9e2ab1a36a Delete min_rxtxtime_pdsch from config file gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf to get 0 errors in iperf with COTS 2021-12-14 13:57:45 +00:00
rmagueta 6fa17e2d29 Add do_SRS parameter in some config files 2021-12-09 16:59:57 +00:00
rmagueta 39eb4ded16 Add min_rxtxtime_pdsch in some config files 2021-12-09 15:50:57 +00: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
luis_pereira87 dd1f8fbaee Update SA default configuration files 2021-11-15 11:59:21 +00:00
matzakos a8bfb20121 Update du config file after update with develop 2021-11-12 16:16:33 +01:00
rmagueta 4acc0f05ac Update config files for SA 2021-11-10 16:57:36 +00:00
luis_pereira87 72e188935f Minor updates in default SA configuration files 2021-11-02 08:47:20 +00: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
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
Sakthivel Velumani 38d1782f9b minor fixes (review comments) 2021-08-19 13:40:12 +05:30
Sakthivel Velumani 7f5009d7cc fixed SA issues 2021-08-17 17:59:41 +05:30
Sakthivel Velumani cdbdba5631 fixed merge 2021-08-17 16:10:40 +05:30
Rahul Gottipati 78f3bca19a CSI-RS handling in nFAPI 2021-08-09 16:36:27 +05:30