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
|
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 |
|
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 |
|
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 |
|
francescomani
|
2daa9144c4
|
Merge remote-tracking branch 'origin/NR_SA_tempfix_coreset' into NR_UE_SA
|
2021-08-06 09:26:17 +02:00 |
|
Sakthivel Velumani
|
6050776f55
|
Merge branch 'develop' into prb_based_dl_channel_estimation
|
2021-08-02 12:17:03 +02:00 |
|
francescomani
|
ef84130e7c
|
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
|
2021-07-23 16:01:43 +02:00 |
|
luis_pereira87
|
7c61f6d969
|
Fix pusch_TargetSNRx10 and pucch_TargetSNRx10 in configuration files
|
2021-07-22 11:13:14 +01:00 |
|
luis_pereira87
|
ff7cc7ec1b
|
Add ulsch_max_slots_inactivity to SA config files
|
2021-07-15 12:59:15 +01:00 |
|
francescomani
|
2fe8dd7657
|
Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into NR_UE_SA
|
2021-07-14 10:35:09 +02:00 |
|
luispereira87
|
8743f58d23
|
Improve schedule msg3 and fix tda for mixed slots
|
2021-07-07 18:25:31 +01:00 |
|
rmagueta
|
160cb0b930
|
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
# Conflicts:
# cmake_targets/CMakeLists.txt
# cmake_targets/build_oai
# cmake_targets/tools/build_helper
# executables/nr-gnb.c
# openair1/PHY/INIT/nr_init_ru.c
# openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.h
# openair2/F1AP/f1ap_du_task.c
# openair2/GNB_APP/gnb_app.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/config.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_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
# openair2/RRC/LTE/rrc_eNB_GTPV1U.c
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_NGAP.c
# openair2/RRC/NR_UE/rrc_UE.c
# openair3/NAS/NR_UE/nr_nas_msg_sim.c
# openair3/ocp-gtpu/gtp_itf.cpp
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
|
2021-06-30 17:00:30 +01:00 |
|
Raymond Knopp
|
1c4fef02dd
|
Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
Conflicts:
cmake_targets/autotests/test_case_list.xml
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/SIMULATION/NR_PHY/ulsim.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
|
2021-05-22 16:33:44 +02:00 |
|
luis_pereira87
|
a7cb146dce
|
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
# ci-scripts/cls_oaicitest.py
|
2021-05-21 10:41:34 +01:00 |
|
francescomani
|
f84d6767c3
|
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA
|
2021-05-20 16:13:46 +02:00 |
|
Laurent THOMAS
|
9130197657
|
add wireshark header files
|
2021-05-19 10:26:26 +02:00 |
|
rmagueta
|
d2ddfa1fbd
|
Update SA config files
|
2021-05-06 18:41:26 +01:00 |
|
francescomani
|
ad10ef0dfe
|
to remove unused PUCCH resources and extend PUSCH tda allocation to 13 symbols
|
2021-05-03 17:59:08 +02:00 |
|
francescomani
|
d6c70f85d2
|
sib1 tda from config file
|
2021-05-03 14:30:58 +02:00 |
|
Thomas Schlichter
|
da799243d5
|
Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
|
2021-04-27 16:55:29 +02:00 |
|
rmagueta
|
0a3f128e27
|
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.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
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
# openair2/RRC/LTE/rrc_eNB_GTPV1U.c
|
2021-04-27 15:46:18 +01:00 |
|
Sakthivel Velumani
|
33021bd826
|
Adding offset divisor parameter to all config files
|
2021-04-26 13:32:02 +02:00 |
|
Robert Schmidt
|
089246c693
|
Fix Msg.2 TDA to be 1, revert DL TDA configs to two entries
|
2021-04-25 14:44:46 +02:00 |
|
rmagueta
|
8613aeb9e6
|
Fixes after merge
- No warning in RRC
- Ethernet lib fix: correct include
- fixes Msg.4
- fixes conf: the UE cannot handle mixed slots
|
2021-04-18 12:42:34 +02:00 |
|
Robert Schmidt
|
c3796c044f
|
Merge branch 'develop' into integration_2021_wk13_b
|
2021-04-16 07:23:46 +02:00 |
|
Raymond Knopp
|
2473a25ca1
|
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
|
2021-04-06 16:38:37 +02:00 |
|
rmagueta
|
d86566d366
|
gNB: update ssPBCH_BlockPower to -25 dBm/RE in all USRP conf files
|
2021-03-31 15:52:51 +01:00 |
|
rmagueta
|
53f77219d4
|
Rework default PDSCH time domain resource allocation tables
|
2021-03-31 14:31:19 +01:00 |
|
Raymond Knopp
|
9be7c35f68
|
changing config file for SA to connect to AMF
also enabling connection to AMF only when --sa option is used.
|
2021-03-31 11:44:56 +02:00 |
|
Robert Schmidt
|
576df55450
|
Merge remote-tracking branch 'origin/fix_NR_DLUL_PF' into integration_2021_wk12
|
2021-03-30 10:48:57 +02:00 |
|
Raymond Knopp
|
4d0d4fcb29
|
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
|
2021-03-27 15:31:22 +01:00 |
|
Luis Pereira
|
e82915c4b1
|
Revert "Fix msg1-FrequencyStart in config files for SA"
This reverts commit b067406097
|
2021-03-22 15:28:15 +01:00 |
|