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
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
657b525efc
merge develop
2021-04-09 14:31:02 +02:00
Laurent Thomas
7c6ece0f51
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into new-gtpu
2021-04-09 12:39:36 +02:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
rmagueta
2efe75130d
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
2021-04-08 14:10:14 +01:00
Thomas Schlichter
650645f883
NR_UE: send tick to RLC and PDCP every ms
2021-04-07 14:21:00 +00:00
Laurent Thomas
04f2ec2352
merge develop, documentation fix
2021-04-06 21:33:13 +02:00
Laurent Thomas
873e42612a
merge develop, documentation fix
2021-04-06 21:32:19 +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
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
Thomas Schlichter
ca963e68ff
gNB: fix allocation of RC.gNB[] array
...
If the array of pointers is allocated using malloc(), it is not guaranteed that the pointers are NULL, so the actual PHY_VARS_gNB might nit be allocated correctly!
Also replace a malloc() + memset() combination by just a calloc().
2021-03-30 14:05:40 +02: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
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
Laurent THOMAS
68a81f65b2
merge develop
2021-03-29 11:24:34 +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
818c9b2c88
first pass
2021-03-25 20:13:50 +01:00
Raymond Knopp
4840b895dd
adding PRACH signal to T tracer
2021-03-24 16:09:48 +01:00
Laurent THOMAS
1cb33aa7de
code review fixes, merge latest develop
2021-03-22 09:46:24 +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
0009fefce2
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels
2021-03-19 11:19:58 +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
francescomani
f0d6298475
new attempt at improving call to RC L1 config
2021-03-19 09:55:18 +01:00
francescomani
a1f1d53cb5
another tentative fix for gnb initialization crashes
2021-03-18 13:09:36 +01:00
rmagueta
9456542678
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
2021-03-16 16:04:23 +00:00
Thomas Schlichter
b7ef903cb4
Merge remote-tracking branch 'develop' into NR_10MHz
2021-03-16 16:13:17 +01:00
Thomas Schlichter
3152df445e
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-03-16 13:37:07 +01:00
hardy
ee398c7610
solved merge conflicts related to CI scripts
2021-03-16 11:55:23 +01:00
frtabu
98c354fedd
Set path for libconfig include directive, so that all config files could be located in the same directory. minor fixes in softmodem-common
2021-03-15 23:26:09 +01:00
frtabu
d118e7e60b
Merge branch 'sim-channels' of https://gitlab.eurecom.fr/oai/openairinterface5g into sim-channels
2021-03-15 12:53:36 +01:00
frtabu
8ad4895f55
Add common option telnetclt
2021-03-15 12:51:49 +01:00
francescomani
dd1b8b64cf
tentative fix for RC.gNB[inst] allocation
2021-03-12 13:15:48 +01:00
Remi Hardy
51c55f6f6a
Merge remote-tracking branch 'origin/gnb-threadpool' into integration_2021_wk10
2021-03-09 16:13:09 +01:00
Florian Kaltenberger
deb19f19fa
Revert "temporarily enabling beamforming also for FR1 + some logs (revert this commit before MR)"
...
This reverts commit 87a8a94ae9 .
2021-03-05 21:09:38 +01:00
Thomas Schlichter
2266d4611a
NR_UE: move OFDM symbol cut position handling to nr_slot_fep()
...
this slightly cleans up nr_initial_sync() and UE_thread()
2021-03-05 15:02:18 +01:00
Laurent THOMAS
a0922cef2f
merge develop
2021-03-04 14:49:38 +01:00
Laurent THOMAS
6c7dc65981
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into gnb-threadpool
2021-03-04 12:05:01 +01:00
Thomas Schlichter
7a6f789aed
Merge remote-tracking branch 'develop' into NR_FDD_FIX
2021-03-03 17:59:17 +01:00
cig
f2bc1012be
Minor cleanup UE
...
- removed commented out code
- improved logging in UL channel estimation
- minor fixes according to OAI coding guidelines
- moving fetching TDD configuration parameters in nr-ue.c only in TDD case
2021-03-03 17:58:07 +01:00
luis_pereira87
d0b9146cd0
Msg4 transmitted from MAC to RRC through ITTI (TASK_RRC_NRUE created)
2021-03-03 01:27:50 +00:00
francescomani
97ed2dfe5b
Merge remote-tracking branch 'origin/develop' into NR_10MHz
2021-03-02 14:31:12 +01:00