francescomani
64e42cacf2
implementation of handling csi and harq in the same pucch2
2021-05-04 11:47:48 +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
26b6d87fa3
Merge branch 'develop' into integration_2021_wk13_b
2021-04-25 16:34:30 +02:00
hardy
0ca618a68a
Merge remote-tracking branch 'origin/fixgtpu' into integration_2021_wk16
2021-04-22 19:45:31 +02:00
Laurent THOMAS
df56f5d345
fix4 T_IDs.h
2021-04-21 15:28:48 +02:00
Sakthivel Velumani
3e411abb7c
Fixed compiler warning
2021-04-16 18:37:57 +02:00
Sakthivel Velumani
bf8b621995
Adding timing stats for ul indication and scheduler
2021-04-16 17:36:48 +02:00
Sakthivel Velumani
b56bfa7dbe
fixed max print
2021-04-16 17:07:56 +02:00
Sakthivel Velumani
8185060b09
printing max
2021-04-16 17:07:56 +02:00
Sakthivel Velumani
8656b12210
Added L1 stats to softmodem
2021-04-16 17:07:56 +02:00
Sakthivel Velumani
dc65173b69
Fixed RX proc perf stat
2021-04-16 17:07:56 +02:00
Sakthivel Velumani
21948e89c0
Always do PUSCH decoding in phy_test mode
2021-04-16 16:45:54 +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
hardy
246afc7ccb
Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15
2021-04-14 14:37:09 +02:00
Laurent THOMAS
86f1c69f26
Fix code review remarks, merge develop, revert some merge errors
2021-04-13 22:28:02 +02:00
Robert Schmidt
7f774d5fbc
Merge branch 'develop' into integration_2021_wk13_b
2021-04-12 17:23:21 +02:00
Roberto Louro Magueta
cd14ba9667
Revert "Revert "Revert RA preamble shift at gNB""
...
This reverts commit e06c727604
2021-04-10 13:51:51 +02: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
307098da4a
merge develop
2021-04-09 12:39:33 +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
Laurent OpenCells
fed90543bc
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1
2021-04-02 18:43:28 +02:00
Laurent THOMAS
0317d6725b
sanitize, calibration tool kickoff
2021-04-02 10:12:13 +02:00
Laurent THOMAS
55315b8fae
revert removal of a dirty workaround
2021-04-01 21:43:47 +02:00
rmagueta
d964cf60b8
Fix for RA when Msg3 fails
2021-04-01 18:45:29 +01:00
rmagueta
1aab76a48d
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_bch.c
2021-04-01 11:19:28 +01:00
rmagueta
1175463c7e
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
2021-03-31 15:33:48 +01:00
hardy
5af77e8fb3
Merge remote-tracking branch 'origin/small_nr_bugfixes' into integration_2021_wk13_d
2021-03-31 13:49:24 +02:00
hardy
d5f8a6161f
Merge remote-tracking branch 'origin/NRPRACH_highSpeed_saankhya' into integration_2021_wk13_d
2021-03-31 13:48:45 +02:00
hardy
4896e80e2c
Merge remote-tracking branch 'origin/NR_MAC_SSB' into integration_2021_wk13_d
2021-03-31 13:47:58 +02:00
Laurent THOMAS
de5e64c722
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1
2021-03-31 10:13:50 +02:00
Laurent THOMAS
58d372d3a2
one cppcheck, merge develop
2021-03-31 10:01:11 +02:00
Laurent THOMAS
e1c73a0632
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels
2021-03-31 09:45:53 +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
Laurent THOMAS
29dd729a93
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels
2021-03-30 19:45:10 +02:00
hardy
f76ec27726
Merge remote-tracking branch 'origin/fft_bench_hotfix' into integration_2021_wk13_c
2021-03-30 16:41:24 +02:00
hardy
1214836e75
Merge remote-tracking branch 'origin/nr_power_measurement_fixes' into integration_2021_wk13_c
2021-03-30 16:40:41 +02:00
francescomani
579f0290f6
Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB
2021-03-30 15:10:28 +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
Thomas Schlichter
9916076fbd
gNB: fix pucch indexing in fill_ul_rb_mask()
2021-03-30 10:45:03 +02:00
francescomani
d65af6d8ca
Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB
2021-03-30 09:35:18 +02:00
Laurent THOMAS
f5022585d9
format astyle only
2021-03-29 21:50:06 +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
Thomas Schlichter
104aa7eed5
gNB: fix precoding matrix related compile error
2021-03-29 14:59:58 +02:00
Laurent THOMAS
68a81f65b2
merge develop
2021-03-29 11:24:34 +02:00