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 9b2a163ebb5ea828e149
2022-06-08 15:48:24 +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
7b3191d1a6
Merge remote-tracking branch 'origin/NR_SS0_config_fix' into integration_2022_wk22
2022-06-04 10:08:25 +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
KARIM BOUTIBA
cd4bc84bd8
small fix in nr_sdap_get_entity
2022-06-02 08:05:21 +00: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
Francesco Mani
426bc2f088
fix in get_ul_tda call for rtx
2022-05-31 09:36:39 +00: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
df8f632ae3
Make sched_csirs common to all UEs
2022-05-30 14:52:50 +02:00
Robert Schmidt
23c8336a37
Fix warning
2022-05-30 14:50:55 +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
16e8154d71
Handle full UL TTI Req list more gracefully
2022-05-28 16:44:50 +02:00
Laurent THOMAS
9ba33d4dec
Correctly format code to avoid warnings/ambiguities
2022-05-28 16:44:49 +02:00
Robert Schmidt
b6adb32989
Delete commented code
2022-05-28 16:37:47 +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
Robert Schmidt
21a820b061
Merge remote-tracking branch 'origin/support-15-kHz-SCS' into integration_2022_wk21b
2022-05-27 10:05:57 +02:00
francescomani
9228f12d92
bugfix
2022-05-26 13:47:17 +02:00
francescomani
09ecb8a33c
bugfix in fill_searchSpaceZero
2022-05-25 10:35:26 +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
Robert Schmidt
103e21a05c
Merge remote-tracking branch 'origin/NR_removing_calculate_preferred_tda' into integration_2022_wk21
2022-05-24 17:56:38 +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
3c753aec71
fix in calling get_ul_tda
2022-05-23 18:41:10 +02:00
Robert Schmidt
3b28264374
Merge remote-tracking branch 'origin/fix-ra-on-frame-1023' into integration_2022_wk21
2022-05-23 17:18:39 +02:00
Robert Schmidt
ba73075ccd
Merge remote-tracking branch 'origin/ul-dl-bler' into integration_2022_wk21
2022-05-23 17:17:47 +02:00
francescomani
3a0bccde30
fix for msg2 tda
2022-05-23 16:13:20 +02:00
francescomani
fac44b15e8
adding option for CSI slot
2022-05-23 16:13:20 +02:00
francescomani
25086576e5
simplyfying tda functions according to review
2022-05-23 16:07:10 +02:00
francescomani
c6498ccf58
addressing review
2022-05-23 16:07:10 +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
Robert Schmidt
00d021c66b
In TDD: enable slot 0
...
In the past, activation of slot 0 (i.e., after the switch UL->DL)
resulted in many retransmissions. This does not seem to be the case
anymore, and we can therefore activate slot 0 also in TDD.
2022-05-23 14:33:08 +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
francescomani
d56f2c8e12
addressing review comments
2022-05-18 17:36:32 +02: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
Robert Schmidt
3ca4cb708c
Select UL MCS from BLER
2022-05-18 16:44:54 +02:00
Robert Schmidt
34b821433b
Add UL BLER options and read from config
2022-05-18 16:44:54 +02:00
Robert Schmidt
17cbc4dbf4
Generalize get_mcs_from_bler()
2022-05-18 16:44:54 +02:00
Robert Schmidt
26c2c0add8
MAC stats: group UL&DL common stats
2022-05-18 16:44:54 +02:00
Robert Schmidt
61d434339e
DL MCS: switch back to 9 on inactivity
2022-05-18 16:44:54 +02:00
Robert Schmidt
1fbf968676
Set DL MCS when receiving CQI report
...
- Introduce generic get_mcs_from_cqi() that gets MCS for a particular
CQI
- Set MCS after receiving CQI
- Distinguish "global" max MCS from UE-measured max MCS
2022-05-18 16:44:53 +02:00
Roberto Louro Magueta
e5c4e0f3d3
Address review comments
2022-05-18 12:59:24 +01:00
Roberto Louro Magueta
f94a479829
Fix warning after merge
2022-05-18 12:51:18 +01:00
Robert Schmidt