francescomani
0196dd6dc2
Merge remote-tracking branch 'origin/develop' into NR_RRC_harmonization_after_BWP
2022-06-27 14:44:04 +02:00
luis_pereira87
a9faf533b4
Fix SA with COTS UE in monolithic mode after merge
2022-06-24 14:51:38 +01:00
Robert Schmidt
0e04fba03d
Fix build warnings
2022-06-23 16:18:50 +02:00
Robert Schmidt
b37050ac6e
Merge remote-tracking branch 'origin/F1_interop_ACC_n78' into integration_2022_wk25
2022-06-23 14:09:33 +02:00
Robert Schmidt
644422ebec
Merge remote-tracking branch 'origin/NR_PUCCH_RRC_Resources' into integration_2022_wk25
2022-06-22 17:20:38 +02:00
Cedric Roux
d0fa56b1de
compilation fix
2022-06-20 15:15:11 +02:00
francescomani
a4e2c2b799
addressing review
2022-06-20 11:58:06 +02:00
francescomani
fb6fa64bc7
Merge remote-tracking branch 'origin/develop' into NR_remove_ssb_offset_from_configfile
2022-06-20 09:33:50 +02:00
Cedric Roux
5cd674483b
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
2022-06-19 18:41:27 +02:00
Robert Schmidt
9ff4630071
Merge remote-tracking branch 'origin/NR_RRC_MAC_CellGroup' into integration_2022_wk24
2022-06-17 12:11:37 +02:00
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
Cedric Roux
2521e46593
Merge remote-tracking branch 'origin/F1C_extensions_develop' into F1_interop_ACC_n78
...
Conflicts:
openair2/F1AP/f1ap_du_interface_management.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/rrc_gNB.c
openair3/ocp-gtpu/gtp_itf.cpp
2022-06-15 11:28:37 +02: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
luis_pereira87
ed74875025
Call rrc_mac_config_req_gNB function only when running nr-softmodem as a DU or in monolithic mode
2022-06-14 11:29:56 +01:00
Cedric Roux
1ad8f254c2
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
2022-06-13 16:59:59 +02:00
francescomani
045de837ab
Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources
2022-06-13 10:25:05 +02:00
luis_pereira87
131db89dfc
Merge remote-tracking branch 'origin/develop' into NR_RRC_MAC_CellGroup
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair2/LAYER2/NR_MAC_gNB/config.c
2022-06-13 08:19:39 +01:00
Robert Schmidt
b193ccf6ee
Merge remote-tracking branch 'origin/develop' into 5g-nr-low-snr-performance
2022-06-10 13:50:47 +02:00
luis_pereira87
e7a491415c
Improvements on RRC passing CellGroup to MAC to get COTS UE working
2022-06-09 10:08:28 +01:00
francescomani
0aec0d91c6
temporary workaround for RRC passing CG to MAC (forced encoding of message at MAC)
2022-06-09 09:35:42 +01:00
Robert Schmidt
894c45eae5
Add comment to fix fill_mastercellGroupConfig()
2022-06-09 10:20:39 +02:00
Robert Schmidt
12c0f52fea
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
2022-06-08 19:45:17 +02:00
Cedric Roux
f71766c3ee
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
...
Conflicts:
openair2/F1AP/f1ap_du_ue_context_management.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/rrc_gNB.c
openair3/ocp-gtpu/gtp_itf.cpp
There were some important conflicts in openair3/ocp-gtpu/gtp_itf.cpp
I rewrote a bit the function Gtpv1uHandleGpdu(). It might have been
done wrongly.
To be tested and fixed if needed.
To redo the merge, if needed:
git checkout 9b2a163ebb
git merge 5ea828e149
2022-06-08 15:48:24 +02:00
francescomani
bc1227f9a0
Merge remote-tracking branch 'origin/develop' into NR_remove_ssb_offset_from_configfile
2022-06-08 14:52:47 +02:00
francescomani
539e5e89f3
Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources
2022-06-08 14:45:33 +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
9a43678ed0
Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources
2022-06-01 09:06:57 +02: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
francescomani
b57a8622c0
fixes for RRC configuration in SA
2022-05-19 17:41:58 +02:00