francescomani
f4cbc50f59
bugfix for sib1 in case of ssb different from 0
2021-04-22 10:32:23 +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
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
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
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
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
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
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
Laurent THOMAS
fbf39eecc1
cppcheck fixes
2021-03-26 16:32:20 +01:00
Laurent THOMAS
364ea7685f
fix warings
2021-03-26 14:07:10 +01:00
Laurent THOMAS
818c9b2c88
first pass
2021-03-25 20:13:50 +01:00
Roberto Louro Magueta
7c2591f318
Revert "Fix PRACH msg1-FrequencyStart/k1"
...
This reverts commit b6513faa82
2021-03-23 16:04:01 +01:00
rmagueta
b6513faa82
Fix PRACH msg1-FrequencyStart/k1
2021-03-22 20:07:14 +00:00
sfn
e7da2c88b3
skip the precoding lines of the code if there is no precoding info from nfapi
2021-03-22 18:23:06 +01:00
rohan
ee4938b9f0
Update nr_prach.c: NR_PRACH_DEBUG flag disabled.
2021-03-22 14:49:24 +01:00
Rohan Patil
ad0f5ba26f
nr_du[] not filled in High Speed case for both gNB and nrUE
2021-03-22 09:38:12 -04:00
Laurent THOMAS
1cb33aa7de
code review fixes, merge latest develop
2021-03-22 09:46:24 +01:00
Laurent THOMAS
3bd3f452c2
:( remove sanitize=address option, fix some cppchecks
2021-03-21 23:48:46 +01:00
rmagueta
d37552db4c
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-03-19 15:07:08 +00:00
Laurent THOMAS
fcda7b97fe
add sanitize option, merge develop
2021-03-19 12:21:04 +01:00
francescomani
d76c50e34a
Merge remote-tracking branch 'origin/develop' into nr_power_measurement_fixes
2021-03-19 11:22:18 +01:00
Thomas Schlichter
dade64ea43
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-03-19 11:18:02 +01:00
francescomani
f659a76f43
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-03-19 10:06:20 +01:00