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
Laurent THOMAS
d40486b100
fix again RU compilation case
2021-05-19 12:08:51 +02:00
Laurent THOMAS
b719f5712e
fix constant in weird case 'NO_RRC', linked to 'RU' compilation case
2021-05-19 09:52:09 +02:00
hardy
ca60a69fc6
Merge remote-tracking branch 'origin/NR_multiplexing_HARQ_CSI_PUCCH' into integration_2021_wk20_a
2021-05-17 10:13:39 +02:00
hardy
568af88807
Merge remote-tracking branch 'origin/fix-compile' into integration_2021_wk20_a
2021-05-17 10:12:27 +02:00
Laurent THOMAS
b5bbfdade3
after merge, remain compile errors
2021-05-16 23:57:35 +02:00
hardy
a362493cce
Merge remote-tracking branch 'origin/NR_cleanup_PUCCH_resources' into integration_2021_wk20_a
2021-05-16 21:24:38 +02:00
Francesco Mani
e15231264a
Update description of function nr_acknack_scheduling
2021-05-14 07:10:40 +00:00
francescomani
052f254306
fix in a condition for pucch2
2021-05-12 10:23:58 +02:00
hardy
681beefd76
Merge remote-tracking branch 'origin/nr-dmrs-fixes' into integration_2021_wk19
2021-05-10 21:41:44 +02:00
Raymond Knopp
83ccc50f18
Merge remote-tracking branch 'origin/develop' into oairu
2021-05-10 00:39:55 +02:00
francescomani
74e2ea96cf
Merge remote-tracking branch 'origin/develop' into NR_multiplexing_HARQ_CSI_PUCCH
2021-05-08 11:39:04 +02:00
Sakthivel Velumani
2a6442096c
Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
2021-05-05 14:34:14 +02:00
francescomani
13acbd1d82
Merge remote-tracking branch 'origin/develop' into NR_cleanup_PUCCH_resources
2021-05-04 12:00:19 +02:00
francescomani
64e42cacf2
implementation of handling csi and harq in the same pucch2
2021-05-04 11:47:48 +02:00
Thomas Schlichter
0ac5fcbfad
Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes
2021-05-04 11:32:07 +02:00
francescomani
ad10ef0dfe
to remove unused PUCCH resources and extend PUSCH tda allocation to 13 symbols
2021-05-03 17:59:08 +02:00
hardy
c2acb9e9e5
Merge remote-tracking branch 'origin/NR_FR2_initsync_fixes' into integration_2021_wk18_a
2021-05-03 15:45:39 +02:00
hardy
010d39c9ab
Merge remote-tracking branch 'origin/NR_scheduling_request' into integration_2021_wk18_a
2021-05-03 15:44:31 +02:00
hardy
4525e10257
Merge remote-tracking branch 'origin/hack-exit-gnb-when-no-enb-nsa' into integration_2021_wk18_a
2021-05-03 15:44:05 +02:00
Robert Schmidt
2319b4e76f
Introduce configuration for maximum UE ULSCH inactivity
2021-04-30 16:40:59 +02:00
hardy
af1735059e
Merge remote-tracking branch 'origin/NR_UE_CONFIG_REQ_FIXES' into integration_2021_wk17_b
2021-04-29 11:54:37 +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
francescomani
b08037d6d1
Merge remote-tracking branch 'origin/develop' into multiple_ssb_sib1_bugfix
2021-04-27 16:14:43 +02:00
Raymond Knopp
d88ce5b9bf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-27 11:58:31 +02:00
Thomas Schlichter
0da9ec9cfb
Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes
2021-04-27 10:27:31 +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
francescomani
ff87164011
bugfixes in FR2 scheduling of ssbs
2021-04-26 16:31:20 +02:00
Thomas Schlichter
626ab8aa3a
NR_UE: adjust some LOG levels
2021-04-26 14:58:01 +02:00
Sakthivel Velumani
33021bd826
Adding offset divisor parameter to all config files
2021-04-26 13:32:02 +02:00
Thomas Schlichter
b6a564369f
Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes
2021-04-26 09:42:10 +02:00
Sakthivel Velumani
215f263a69
Making sample offset as cmd line parameter
...
for gNB its in L1 section of config file
for UE its a cmd line paramenter
2021-04-26 03:09:17 +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
Raghavendra Dinavahi
5edee9b546
Mapping type A enabled in PUSCH dmrs mask calculation
...
- Procedure get_l_prime is modified
- Single and double symbol DMRS are handled in Type A and Type B
2021-04-23 10:33:56 +02:00