Robert Schmidt
2399da33cb
Merge remote-tracking branch 'origin/csi-multi-ues-fix' into integration_2022_wk24
2022-06-16 22:26:00 +02:00
Roberto Louro Magueta
7f21567f83
Merge remote-tracking branch 'origin/develop' into 5g-nr-low-snr-performance
...
# Conflicts:
# cmake_targets/autotests/test_case_list.xml
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2022-06-15 11:17:06 +01:00
Karim Boutiba
079ad360e0
solve the conflict between cri-RSRP and cri-RI-PMI-CQI in the case of multiple UEs
2022-06-14 13:38:12 +00:00
Robert Schmidt
b193ccf6ee
Merge remote-tracking branch 'origin/develop' into 5g-nr-low-snr-performance
2022-06-10 13:50:47 +02:00
francescomani
4ffef42472
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
2022-06-08 13:39:39 +02:00
Robert Schmidt
5f37ab35b4
Merge remote-tracking branch 'origin/develop-CSI' into integration_2022_wk22
2022-06-04 10:08:38 +02:00
Robert Schmidt
4e34462488
Merge remote-tracking branch 'origin/preambleTransMax_CE_rel13-in-configuration' into integration_2022_wk22
2022-06-04 10:08:31 +02:00
Robert Schmidt
6e7160ac03
Merge remote-tracking branch 'origin/multiple_pdu_MR' into integration_2022_wk22
2022-06-04 10:08:10 +02:00
Roberto Louro Magueta
2c3eb996a4
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-06-01 11:06:49 +01:00
francescomani
13ed1200b4
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
2022-06-01 08:45:35 +02:00
Raymond Knopp
83d40a9b7c
Add missing parameter preambleTransMax_CE_rel13
...
To SIB2 and its passing to RRC. Parameter was read but not transfered
before. Basic LTE-M functionality should ok on develop branch with this
fix. Tested with uBlox SARA-R4 (QCOM chipset)
2022-05-30 16:19:35 +02:00
Robert Schmidt
ac9e47ba68
Merge remote-tracking branch 'origin/cleanup-2022-mai-UEid-management' into integration_2022_wk21b
2022-05-30 12:02:58 +02:00
Laurent THOMAS
236f7d56e5
Remove UEid in the MAC
...
After this commit, only the RNTI is used as an identifier in the MAC.
Further, it removes some module_id, but a lot of them remain (the goal
to remove all is still far from us)
2022-05-28 16:37:26 +02:00
rmagueta
6bca31c7e3
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2022-05-27 10:18:13 +01:00
francescomani
92ba8cb9d0
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
2022-05-27 10:46:15 +02:00
Robert Schmidt
21a820b061
Merge remote-tracking branch 'origin/support-15-kHz-SCS' into integration_2022_wk21b
2022-05-27 10:05:57 +02:00
Robert Schmidt
360d4b3a81
Merge remote-tracking branch 'origin/k2-slot0-fix' into integration_2022_wk21
2022-05-24 17:57:58 +02:00
Roberto Louro Magueta
ab1df8bbc4
Revert CSI configuration from update_cellGroupConfig to fill_initial_SpCellConfig
2022-05-24 13:45:35 +01:00
francescomani
fac44b15e8
adding option for CSI slot
2022-05-23 16:13:20 +02:00
francescomani
d3f90a90fe
removing calculate_preferred_ul_tda
2022-05-23 15:57:27 +02:00
francescomani
276b2d5e0c
removing calculate_preferred_dl_tda
2022-05-23 15:48:29 +02:00
Robert Schmidt
9354d4305b
Set k2=2 also in 5ms TDD periods
...
In the past, setting k2=2 for 5ms TDD periods resulted in increased ping
RTT and/or reestablishment requests. These problems do not appear
anymore, and we can allow k2=2.
2022-05-23 15:11:27 +02:00
francescomani
2ba71e748d
using bwp id to configure coreset id
2022-05-23 13:39:56 +02:00
Robert Schmidt
7bf5f018a1
Refactor DRB configuration in function
2022-05-19 18:40:54 +02:00
Robert Schmidt
a5d0615048
Harmonize SRB configuration in function
2022-05-19 18:28:55 +02:00
KARIM BOUTIBA
b46077c22d
add multiple pdu session support (tested with 2 pdu sessions)
2022-05-19 18:28:55 +02:00
Roberto Louro Magueta
3d5cfb6642
Update the spatialRelationInfoToAddModList for dedicated UL-BWPs
2022-05-18 17:00:05 +01:00
Roberto Louro Magueta
436eb2d5a9
Fix PUCCH config in fill_default_uplinkBWP to consider the enabled CSI-RS
2022-05-18 16:05:38 +01:00
francescomani
03e869ee36
applying harmonization function also to multiple BWP option
2022-05-18 11:54:15 +02:00
francescomani
1e4f509805
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
2022-05-18 11:41:07 +02:00
Thomas Schlichter
e639e79220
Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS
2022-05-18 10:51:19 +02:00
Roberto Louro Magueta
8ac68929bc
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-05-17 19:13:38 +01:00
Thomas Schlichter
44a98a85c5
Merge remote-tracking branch 'origin/develop' into 5g-nr-low-snr-performance
2022-05-17 17:38:59 +02:00
luis_pereira87
486e9e2381
Merge remote-tracking branch 'origin/Dedicated-BWPs' into integration_2022_wk19b
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-13 15:58:56 +01:00
luis_pereira87
9f51b3f8b1
Harmonize and reuse the nr_rrc_config_dl_tda function to prepare PDSCH-TimeDomainResourceAllocation list
2022-05-12 14:42:47 +01:00
luis_pereira87
270c540c3c
Minor clean up in function mac_rrc_nr_data_req
2022-05-12 10:06:00 +01:00
luis_pereira87
3c4ba50281
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-11 14:49:59 +01:00
Roberto Louro Magueta
5c754f2300
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-05-11 14:19:33 +01:00
Roberto Louro Magueta
4c1b432718
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
...
# Conflicts:
# openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
2022-05-11 13:45:56 +01:00
luis_pereira87
5031649c47
Improvements on BWP switch procedures and harmonize it with RRC processing timer
2022-05-06 16:06:31 +01:00
rmagueta
b8cd9ef167
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/rrc_gNB_nsa.c
2022-05-06 15:41:10 +01:00
luis_pereira87
02d49ed3b6
Fixes after merge
2022-05-06 11:56:11 +01:00
Roberto Louro Magueta
87e79e5eb8
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.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/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
# targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2022-05-06 11:32:36 +01:00
luis_pereira87
a8e6bf9bd5
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/GNB_APP/gnb_config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.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/nr_rrc_defs.h
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-06 11:29:55 +01:00
francescomani
68fc56ad74
calling config_csiim also in sa
2022-05-06 12:17:18 +02:00
francescomani
b4abb204bd
Merge remote-tracking branch 'origin/develop' into NR_CSI_IM_harmonization
2022-05-06 12:07:30 +02:00
francescomani
2bbfe501c2
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
2022-05-06 12:02:00 +02:00
Robert Schmidt
e1e8a49b76
Fix UP traffic in NSA
2022-05-05 19:06:29 +02:00
Robert Schmidt
aebabbcc0c
Merge remote-tracking branch 'origin/fixes-code-ci' into integration_2022_wk18
2022-05-04 15:16:14 +02:00
Robert Schmidt
f99f2be7bd
Merge remote-tracking branch 'origin/Avoid_gNB_exit_when_UE_release' into integration_2022_wk18
2022-05-04 15:11:43 +02:00