francescomani
2959b34704
2 port CSI configuration
2021-06-02 12:37:43 +02:00
francescomani
9460c27589
current implementation does not allow 2 csi report in a frame, moving second one in the following frame
2021-05-28 18:58:51 +02:00
francescomani
dd92d7b651
rrc configuration for SSB and CSI RSRP measurements
2021-05-27 17:36:54 +02:00
francescomani
a1e3b5476b
Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge
2021-05-27 11:52:12 +02:00
francescomani
bccd61a262
adding non-PMI-portindication to config
2021-05-20 19:02:39 +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
Raymond Knopp
83ccc50f18
Merge remote-tracking branch 'origin/develop' into oairu
2021-05-10 00:39:55 +02:00
francescomani
638f1b8203
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-05-04 14:11:29 +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
francescomani
ad10ef0dfe
to remove unused PUCCH resources and extend PUSCH tda allocation to 13 symbols
2021-05-03 17:59:08 +02:00
francescomani
e39e2dbafd
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-04-29 14:46:19 +02:00
Raymond Knopp
d88ce5b9bf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-27 11:58:31 +02:00
Robert Schmidt
821a5e5dfe
Correct T310 & N310 to avoid RA
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
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
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
773ebbb63b
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-04-22 14:36:32 +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
Robert Schmidt
c3796c044f
Merge branch 'develop' into integration_2021_wk13_b
2021-04-16 07:23:46 +02: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
Laurent THOMAS
86f1c69f26
Fix code review remarks, merge develop, revert some merge errors
2021-04-13 22:28:02 +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
Raymond Knopp
f7f8935ce3
minor wqupdates after merge with develop
2021-04-10 23:28:34 +02:00
rmagueta
ddfc737c65
Fix search space for Msg2 and Msg4 at gNB
2021-04-09 19:46:35 +01:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
Raymond Knopp
0b59ce4faf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-07 15:50:46 +02:00
rmagueta
79864d001b
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
2021-04-06 11:38:33 +01:00
Laurent Thomas
89598e3bad
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sanitize-v1
2021-04-06 12:11:29 +02:00
Laurent OpenCells
4511e70fac
fix from ci results
2021-04-05 12:56:52 +02:00
Laurent OpenCells
c0ef3e6f88
fix gcc reported issues
2021-04-03 23:37:58 +02:00
francescomani
db25430922
csirep configuration for cri_RI_CQI
2021-04-01 10:40:52 +02:00
francescomani
5498e2b84a
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-04-01 09:18:23 +02:00
Cedric Roux
46c1aff489
fix: do NR only if at least one gNB is connected to the eNB
...
We used to set 'does_nr' of an UE if we detect ENDC supported in the
UE capabilities.
Then we activate NR measurements if 'does_nr' is true.
The problem is that if the eNB is not connected to a gNB but the UE
reports some NR measurements (because a gNB is running somewhere near)
then the eNB will crash when starting the switch to NR.
A (quick) solution is to set 'does_nr' only if there is a gNB connected to
the eNB.
Maybe not the best solution. To be changed if needed.
2021-03-31 16:39:30 +02:00
Laurent THOMAS
c2257d8687
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1
2021-03-30 19:46:45 +02:00
rmagueta
feb2651ea7
Fix issues due to merge
2021-03-30 12:38:31 +01:00
rmagueta
b55b11b125
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2021-03-30 11:51:56 +01:00
Robert Schmidt
576df55450
Merge remote-tracking branch 'origin/fix_NR_DLUL_PF' into integration_2021_wk12
2021-03-30 10:48:57 +02:00
rmagueta
b43c054f02
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2021-03-29 15:51:37 +01:00
Laurent THOMAS
738728142f
merge develop
2021-03-29 15:33:45 +02:00
hardy
ddf3f9e88c
Merge remote-tracking branch 'origin/NR_FAPI_beamindex_SSB_RO' into integration_2021_wk13_a
2021-03-29 10:02:51 +02:00
hardy
a84b1b4340
Merge remote-tracking branch 'origin/fix-quectel' into integration_2021_wk12_b
2021-03-28 21:36:45 +02:00
Laurent THOMAS
818c9b2c88
first pass
2021-03-25 20:13:50 +01:00
Raymond Knopp
08b781ebfe
Merge remote-tracking branch 'origin/develop' into oairu
2021-03-25 06:44:11 +01:00