Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
Raymond Knopp
e3d13131b4
fix for last commit (removal on one line in asn1_msg.c)
2021-04-08 11:00:03 +02:00
Raymond Knopp
60e0048c29
added call to NAS for RRCSetupComplete message in UE. other minor modification in gNB/UE scheduling for SA
2021-04-08 08:40:40 +02:00
Raymond Knopp
0b59ce4faf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-07 15:50:46 +02:00
Raymond Knopp
470d0ac121
full configuration including Msg4/RRCSetup. InitialBWP handling at gNodeB
2021-04-07 10:57:00 +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
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
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
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
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
Raymond Knopp
4d0d4fcb29
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
2021-03-27 15:31:22 +01:00
Laurent THOMAS
818c9b2c88
first pass
2021-03-25 20:13:50 +01:00
Raymond Knopp
a6b24211ac
configuration of SRB1 for monolithic and CU/DU, move some parameters from RRC to MACRLC section in configuration file.
2021-03-25 14:26:28 +01:00
Raymond Knopp
08b781ebfe
Merge remote-tracking branch 'origin/develop' into oairu
2021-03-25 06:44:11 +01:00
Raymond Knopp
f6d53094c4
added DUtoCURRCContainer IE in UL INITIAL RRC MESSAGE TRANSFER
...
added generation of initial Master Cell Group Configuration for both CU/DU and monolithic gNB.
Tested until transmission of RRCSetupComplete from UE
2021-03-23 21:52:57 +01:00
francescomani
70a1556c51
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-03-19 18:50:59 +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
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
Raymond Knopp
9dd6e3bb82
Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
executables/nr-uesoftmodem.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/RRC/NR/L2_nr_interface.c
2021-03-18 07:50:08 +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
rmagueta
986a9fac1d
Fixed issues to allow coexistence of CFRA and CBRA implementations
2021-03-16 16:00:37 +00:00
hardy
9abc8a6425
Merge remote-tracking branch 'origin/ptrs_rrc_config' into integration_2021_wk11
2021-03-16 16:28:31 +01:00
hardy
dc60f04a46
Merge remote-tracking branch 'origin/NR_MAC_TCI_UCI_GlobalEdge' into integration_2021_wk11
2021-03-16 16:26:41 +01:00
Thomas Schlichter
8768deaf74
Merge remote-tracking branch 'develop' into ptrs_rrc_config
2021-03-16 14:01:32 +01:00
rmagueta
8646dd0bcb
DRB configuration for a new crnti
2021-03-16 12:51:04 +00: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
luis_pereira87
bdc97f7a56
Send MAC NR-BCCH-SL-SCH to RRC through ITTI at UE
2021-03-16 10:08:54 +00:00
francescomani
5eb86207db
Merge remote-tracking branch 'origin/develop' into NR_MAC_TCI_UCI_GlobalEdge
2021-03-16 08:49:54 +01:00
Raymond Knopp
94085a41cd
Merge remote-tracking branch 'origin/develop' into oairu
2021-03-16 08:07:16 +01:00
luis_pereira87
fd9f2b8fe7
Build errors resolved
2021-03-15 17:44:23 +00:00
Robert Schmidt
8307d79929
Make RRC buffer sufficiently large
2021-03-15 15:00:34 +01:00
luis_pereira87
5ab73a228f
Merge remote-tracking branch 'origin/NR_SA_F1AP_RFSIMULATOR_w5GCN' into develop-SA-CBRA-CUDU
...
# Conflicts:
# executables/nr-softmodem.c
# executables/nr-uesoftmodem.c
# openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/main.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# openair2/RRC/NR_UE/rrc_UE.c
2021-03-15 12:44:16 +00:00
guhan
92c9d80ce0
Reverted the changes as same as develop
2021-03-15 17:47:04 +05:30
hardy
ca3aaf700f
Merge remote-tracking branch 'origin/fix-nr-pdcp-timer' into integration_2021_wk11
2021-03-15 09:31:40 +01:00