rmagueta
4301582f88
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-15 15:29:03 +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
Raymond Knopp
cee0f9451d
intermediate commit. up to Msg4 ACK and DCI_0_0 reception verified with COTS UE (Quectel).
...
- first PUSCH containing RRCSetupComplete not programmed for reception in PHY for some reason. DCI_0_0 received by UE.
- if RA fails, on the second attempt there is usually a crash (sometimes in L2_interface.c when getting UE context (added AssertFatal on this now).
2021-04-14 12:15:59 +02:00
Laurent THOMAS
86f1c69f26
Fix code review remarks, merge develop, revert some merge errors
2021-04-13 22:28:02 +02:00
Raymond Knopp
42d4c6c195
reduced logging
2021-04-12 18:56:50 +02:00
Raymond Knopp
1236f4c389
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
cmake_targets/build_oai
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2021-04-12 16:03:09 +02:00
Raymond Knopp
1e60fbd49f
Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
...
Conflicts:
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-04-12 10:21:25 +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
francescomani
0818e4b986
ssb start subcarrier in ssb indication for reception of sib1
2021-04-08 14:31:16 +02:00
Raymond Knopp
2473a25ca1
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-06 16:38:37 +02:00
Laurent OpenCells
4511e70fac
fix from ci results
2021-04-05 12:56:52 +02:00
Raymond Knopp
0f98cad8db
UE Configuration after SIB1 ok, RAR configuraiton/reception ok, Msg3 transmission / reception ok, CU fails when needing to at SRB1
2021-04-04 13:20:38 +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
Raymond Knopp
13a9e49d65
additional DMRS for CoreSet0 back in gNB/UE resource allocations
2021-03-31 10:05:27 +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
Raymond Knopp
2913757461
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
executables/nr-softmodem.c
executables/nr-ue.c
openair2/GNB_APP/gnb_app.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-03-31 03:14:48 +02:00
Raymond Knopp
cbe2da1c46
OAI UE and eNB SA configuration up to reception of SIB1 and configuration of UE L1/L2 stack
2021-03-31 00:43:52 +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
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
Raymond Knopp
df05672a4c
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_nsa.c
2021-03-30 04:48:51 +02:00
Raymond Knopp
707c20dd74
changes in UE to start configuration from Initial/MIB/SIB1/RRCSetup
2021-03-30 03:44:58 +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
hardy
74d2a6bbab
Merge remote-tracking branch 'origin/fix_rb_corruption' into integration_2021_wk13_a
2021-03-29 10:31:15 +02:00
Thomas Schlichter
fe191c7d0a
gNB: fix corruption of RBs not used by PDSCH in nr_generate_pdsch()
...
A memcpy() introduced to optimize for the case of no precoding corrupted RBs which are not allocated to PDSCH in the common txdataF array.
So instead fall back to memcpy() for each PDSCH RB.
2021-03-29 10:10:08 +02:00