francescomani
64e42cacf2
implementation of handling csi and harq in the same pucch2
2021-05-04 11:47:48 +02:00
Robert Schmidt
2319b4e76f
Introduce configuration for maximum UE ULSCH inactivity
2021-04-30 16:40:59 +02:00
Robert Schmidt
6c162e3808
Remove unused variables
2021-04-27 08:36:43 +02:00
Robert Schmidt
821a5e5dfe
Correct T310 & N310 to avoid RA
2021-04-27 08:30:33 +02:00
Robert Schmidt
74fa01463c
Do PUCCH TPC only if Acknack or positive SR
...
otherwise, if we only have a (negative) SR, the UE did not send
anything, and the PUCCH CQI is invalid
2021-04-27 08:30:33 +02:00
Robert Schmidt
8187361615
Schedule UE periodically every 10 frames in UL
2021-04-27 08:30:33 +02:00
imad
800330e41c
Call nr_sr_reporting
2021-04-27 08:30:33 +02:00
Robert Schmidt
cba2d9e413
Schedule UEs on SR or BSR
2021-04-27 08:30:33 +02:00
imad
a8149b5e0e
Add functions for SR scheduling
2021-04-27 08:30:33 +02:00
imad
27bfe23c9b
Add schedulingRequestResourceConfig
2021-04-27 08:30:33 +02:00
imad
50ac9ef252
Add schedulingRequestConfig
2021-04-27 08:30:33 +02:00
Robert Schmidt
51e844e19f
Bugfix ul preproc: check correct slot for UL
2021-04-27 08:30:33 +02:00
Robert Schmidt
f73e8e0459
Bugfixes in nr_acknack_scheduling()
...
1: there can be 2bits AckNack + SR in PUCCH F0
2: when allocating csi_pucch, zero out struct
3: Make unfree resources a warning
4: When asserting, explain the issue
2021-04-27 08:30:33 +02:00
Robert Schmidt
4f4e25852f
Reduce sched_pucch array length, we only need two entries
2021-04-27 08:30:33 +02:00
Robert Schmidt
b005f9594b
Statically allocate PUCCH F0 resource index 0 for AckNack
2021-04-27 08:30:33 +02:00
Robert Schmidt
c2d16eb8d5
Configure secondaryCellGroup: dedicated PUCCH, CSI, Preamble
...
- Configure PUCCH Format 0 to be in separate RBs (each UE has dedicated
resources)
- Configure RA preamble to be different per UE
- Configure CSI offset such that no two UEs have their report in the
same frame
2021-04-27 08:30:31 +02:00
Robert Schmidt
f39b97a9e8
Execute nr_schedule_pucch() only in UL slots
2021-04-27 08:29:55 +02:00
Robert Schmidt
84e57113c8
initial_csi_index depends on local_uid
...
Nb_ue is not unique among UEs: consider 2 UEs present. The last UE has
CSI idx "2". Now the first UE disconnects, and a new UE connects. It
will also get CSI idx "2", and I assume this is not what we want.
2021-04-27 08:29:55 +02:00
Robert Schmidt
26b6d87fa3
Merge branch 'develop' into integration_2021_wk13_b
2021-04-25 16:34:30 +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
hardy
0ca618a68a
Merge remote-tracking branch 'origin/fixgtpu' into integration_2021_wk16
2021-04-22 19:45:31 +02:00
Laurent THOMAS
2784cd484e
revert default values for 5GS
2021-04-21 10:37:55 +02:00
hardy
5c137e1590
Merge remote-tracking branch 'origin/gnb-realtime-hotfix' into integration_2021_wk16
2021-04-21 10:21:21 +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
Sakthivel Velumani
cf87873f21
Calling ul indication after L1 RX
2021-04-16 17:48:47 +02:00
Sakthivel Velumani
bf8b621995
Adding timing stats for ul indication and scheduler
2021-04-16 17:36:48 +02:00
Robert Schmidt
b548f9a3d2
Correctly check for used symbols in UL phytest scheduler
2021-04-16 16:46:46 +02:00
Sakthivel Velumani
b7ad0ec21d
Add cmd line options for DL&UL phytest scheduling
...
Add parameters: MCS, Bandwidth (in PRBs), slot scheduling bitmap
Conflicts:
executables/nr-softmodem.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
2021-04-16 16:45:15 +02:00
luis_pereira87
1d7a8a2da2
Fix SA SIB1 segmentation fault [reapplied after merge]
2021-04-16 16:00:32 +02:00
Robert Schmidt
e0780320fa
Fix to make nrUE compile
2021-04-16 07:27:11 +02:00
Robert Schmidt
c3796c044f
Merge branch 'develop' into integration_2021_wk13_b
2021-04-16 07:23:46 +02:00
luis_pereira87
d3719fece9
Fix SA SIB1 segmentation fault
2021-04-15 16:09:13 +01:00
hardy
b5ffe11bd8
Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15
...
Conflicts:
openair1/PHY/TOOLS/nr_phy_scope.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-04-14 15:14:03 +02:00
hardy
c4745c3e46
Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/TOOLS/time_meas.h
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
hardy
246afc7ccb
Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15
2021-04-14 14:37:09 +02:00
Robert Schmidt
71ecec6744
Fix: mark delayed HARQ feedback as free
2021-04-14 12:19:12 +02:00
Robert Schmidt
b10ba9f88c
Fix: don't go beyond 3rd retx
2021-04-14 12:19:12 +02:00
Robert Schmidt
8edacdede4
UL Scheduler: Check vrb_map_UL against symb map
2021-04-14 12:19:04 +02:00
Laurent THOMAS
86881b1463
merge again develop
2021-04-13 22:45:41 +02:00
Laurent THOMAS
86f1c69f26
Fix code review remarks, merge develop, revert some merge errors
2021-04-13 22:28:02 +02:00
rmagueta
3c59974b23
Fix phy-test DL traffic
2021-04-13 15:26:44 +01:00
Robert Schmidt
e04affbc7c
UL scheduler: use correct TDA
2021-04-13 13:15:59 +02:00
Robert Schmidt
aca57eb969
DL scheduler: correctly calculate mixed slot TDA, check TDA before scheduling
2021-04-13 13:15:59 +02:00
rmagueta
e8f8297892
Fix search space and coreset for Msg2 and Msg4 at gNB
2021-04-12 19:20:23 +01:00
Robert Schmidt
7f774d5fbc
Merge branch 'develop' into integration_2021_wk13_b
2021-04-12 17:23:21 +02:00
rmagueta
a8ca37a782
Add support for InitialBWP in nr_configure_pdcch
2021-04-12 13:48:47 +01:00
rmagueta
ddfc737c65
Fix search space for Msg2 and Msg4 at gNB
2021-04-09 19:46:35 +01:00
Laurent Thomas
ab3ac5b29e
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sim-channels
2021-04-09 14:49:48 +02:00
Laurent Thomas
7c6ece0f51
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into new-gtpu
2021-04-09 12:39:36 +02:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00