David Kim
eef6ca5037
updated configuration file location for ci test.
2021-10-01 10:21:42 -07:00
David Kim
bab9c42e59
Added some config files after restoring original config files.
2021-09-30 17:07:44 -07:00
Melissa
3eafdff63a
Syncing our OAI merge branch with our internal NSA master branch
2021-09-30 23:16:46 +00:00
Melissa Elkadi
6a8e4e2883
Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_develop_cfra_working
2021-09-14 07:34:58 -07:00
francescomani
6a2352f843
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-30 17:55:38 +02:00
hardy
b798755347
Merge remote-tracking branch 'origin/prb_based_dl_channel_estimation' into integration_2021_wk34
2021-08-26 14:33:33 +02:00
francescomani
b6ef23a395
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-25 15:01:40 +02:00
Melissa Elkadi
0ee8f20d54
Updated gNB conf file & last RRC msg in LTE/NR UE
2021-08-19 13:53:12 -07:00
Sakthivel Velumani
38d1782f9b
minor fixes (review comments)
2021-08-19 13:40:12 +05:30
Sakthivel Velumani
7f5009d7cc
fixed SA issues
2021-08-17 17:59:41 +05:30
Sakthivel Velumani
cdbdba5631
fixed merge
2021-08-17 16:10:40 +05:30
Melissa Elkadi
2a979f4e2f
Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop
2021-08-13 10:27:30 -07:00
Melissa Elkadi
9b16c1d860
Merge branch 'eurecom-develop' into episys/merge_nsa_w_develop
...
At this point we are successfully able to build.
Additionally, we can run the scenario,
however, it does not pass. It seems that the gNB
is not connecting to the proxy correctly. Just
wanted to push the progress so far. FYI, the items
that had to be changed to correct the linking issues
were the following:
- mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue
- rrc_data_req vs. nr_rrc_data_req
- mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue
- rrc_data_req_ue vs. rrc_data_req_nr_ue
- rrc_data_req vs. nr_rrc_data_req
The listed functions should be declard in the LTE/NR
UE directory depending on the functionality. Several
were mixed. i.e.: LTE functions being called in NR UE.
Also, removing siWindowLength, siWindowLength_int,
SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC.
These variable were not used in the NR UE and are defined
for LTE only.
Lastly, in the NR_IF_Module.c of the NR UE, the global
variable def_dci_pdu_rel15 is not accessible. Need to
revisit this. For not it is commented out.
2021-08-11 10:23:42 -07:00
Rahul Gottipati
78f3bca19a
CSI-RS handling in nFAPI
2021-08-09 16:36:27 +05:30
Mahesh
557b5445d3
PNF config file pusch_proc_threads update
2021-08-08 12:23:15 +05:30
francescomani
2daa9144c4
Merge remote-tracking branch 'origin/NR_SA_tempfix_coreset' into NR_UE_SA
2021-08-06 09:26:17 +02:00
Sakthivel Velumani
6050776f55
Merge branch 'develop' into prb_based_dl_channel_estimation
2021-08-02 12:17:03 +02:00
Melissa Elkadi
97a648e35f
IP Traffic not working, tun if established by NRUE
...
Updated the configuration files. Added a sleep to
ensure that the LTE UE gets attached to the EPC
before the bearer is modified to be gNB. Updated
the ifconfig tunnel up command to be brought up
by the NR UE socket when in NSA mode. Lastly,
started the gNB PDCP layer in S1 mode.
2021-07-28 15:36:11 -07:00
hardy
c93a9497db
Merge remote-tracking branch 'origin/develop-NSA_SA_fixes' into integration_2021_wk30_b
2021-07-24 17:56:38 +02:00
francescomani
ef84130e7c
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-07-23 16:01:43 +02:00
hardy
fad5fbda34
Merge remote-tracking branch 'origin/NR_CSIRS_tomerge' into integration_2021_wk30
2021-07-23 09:18:33 +02:00
luis_pereira87
7c61f6d969
Fix pusch_TargetSNRx10 and pucch_TargetSNRx10 in configuration files
2021-07-22 11:13:14 +01:00
luis_pereira87
ff7cc7ec1b
Add ulsch_max_slots_inactivity to SA config files
2021-07-15 12:59:15 +01:00
francescomani
2fe8dd7657
Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into NR_UE_SA
2021-07-14 10:35:09 +02:00
luispereira87
8743f58d23
Improve schedule msg3 and fix tda for mixed slots
2021-07-07 18:25:31 +01:00
francescomani
38ad4bbfbc
Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge
2021-07-01 15:23:28 +02:00
rmagueta
160cb0b930
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# cmake_targets/build_oai
# cmake_targets/tools/build_helper
# executables/nr-gnb.c
# openair1/PHY/INIT/nr_init_ru.c
# openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.h
# openair2/F1AP/f1ap_du_task.c
# openair2/GNB_APP/gnb_app.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
# openair2/RRC/LTE/rrc_eNB_GTPV1U.c
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_NGAP.c
# openair2/RRC/NR_UE/rrc_UE.c
# openair3/NAS/NR_UE/nr_nas_msg_sim.c
# openair3/ocp-gtpu/gtp_itf.cpp
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-06-30 17:00:30 +01:00
rmagueta
b98cf717e5
Fix worker_config
2021-06-02 19:11:04 +01:00
Melissa Elkadi
2949d3008e
Updating gNB configuration for EMANE
2021-06-01 15:57:41 -07:00
francescomani
a1e3b5476b
Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge
2021-05-27 11:52:12 +02:00
Melissa Elkadi
005c2e0121
Creating seprate proxy config files
2021-05-25 11:57:33 -07:00
Raymond Knopp
1c4fef02dd
Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
...
Conflicts:
cmake_targets/autotests/test_case_list.xml
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/SIMULATION/NR_PHY/ulsim.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
2021-05-22 16:33:44 +02:00
luis_pereira87
a7cb146dce
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# ci-scripts/cls_oaicitest.py
2021-05-21 10:41:34 +01:00
francescomani
f84d6767c3
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA
2021-05-20 16:13:46 +02:00
Laurent THOMAS
9130197657
add wireshark header files
2021-05-19 10:26:26 +02:00
rmagueta
cf605f4c77
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# cmake_targets/build_oai
# openair1/PHY/INIT/nr_init_ru.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/COMMON/platform_constants.h
# openair2/ENB_APP/enb_config.c
# openair2/F1AP/f1ap_cu_interface_management.c
# openair2/F1AP/f1ap_cu_rrc_message_transfer.c
# openair2/F1AP/f1ap_cu_ue_context_management.c
# openair2/F1AP/f1ap_du_interface_management.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_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_primitives.c
# openair2/RRC/LTE/rrc_eNB.c
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR_UE/rrc_UE.c
2021-05-17 01:36:39 +01:00
hardy
a362493cce
Merge remote-tracking branch 'origin/NR_cleanup_PUCCH_resources' into integration_2021_wk20_a
2021-05-16 21:24:38 +02:00
rmagueta
d2ddfa1fbd
Update SA config files
2021-05-06 18:41:26 +01:00
Sakthivel Velumani
2a6442096c
Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
2021-05-05 14:34:14 +02:00
francescomani
638f1b8203
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-05-04 14:11:29 +02:00
Thomas Schlichter
0ac5fcbfad
Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes
2021-05-04 11:32:07 +02:00
rmagueta
948df0e034
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# executables/softmodem-common.h
# openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
# openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/prachsim.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2021-05-03 19:50:30 +01:00
francescomani
ad10ef0dfe
to remove unused PUCCH resources and extend PUSCH tda allocation to 13 symbols
2021-05-03 17:59:08 +02:00
francescomani
d6c70f85d2
sib1 tda from config file
2021-05-03 14:30:58 +02:00
Melissa Elkadi
f434a8ded9
Updating conf files. DL messages from gNB working.
...
NR UE is ending early. LTE is not passing at all.
X2 interface is not working either.
2021-04-30 11:03:30 -07:00
David Kim
2c40332482
showing dl_tti msg
2021-04-29 15:10:33 -07:00
francescomani
e39e2dbafd
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-04-29 14:46:19 +02:00
Florian Kaltenberger
8d0b9e4cdb
yet some more fixes to the benetel config files
2021-04-27 20:34:00 +02:00
Thomas Schlichter
da799243d5
Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
2021-04-27 16:55:29 +02:00
rmagueta
0a3f128e27
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# 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_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
# openair2/RRC/LTE/rrc_eNB_GTPV1U.c
2021-04-27 15:46:18 +01:00