francescomani
b6ef23a395
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-25 15:01:40 +02:00
francescomani
a1595c3109
setting ulsch inactivity timer from slots to frames and removing it from config files (default 10 frames)
2021-08-24 18:02:54 +02:00
Eurecom
bafd82a935
Merge remote-tracking branch 'origin/NR_UE_SA' into bandwidth-testing
...
Conflicts:
executables/nr-ru.c
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair2/LAYER2/NR_MAC_gNB/config.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_primitives.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_reconfig.c
2021-08-21 07:48:04 +02:00
Eurecom
f41890b3f5
testing in SA, initialBWP
2021-08-20 14:17:37 +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
francescomani
834af3d5c6
Merge remote-tracking branch 'origin/fix-513-duplicate-complex-structure' into integration_2021_w33
2021-08-19 08:33:00 +02:00
Laurent THOMAS
c310d246bb
merge develop
2021-08-18 11:20:39 +02:00
Sakthivel Velumani
7f5009d7cc
fixed SA issues
2021-08-17 17:59:41 +05:30
Eurecom
dc92538744
DCI formats 1_1/0_1 on initialBWP
2021-08-17 13:44:50 +02:00
Sakthivel Velumani
cdbdba5631
fixed merge
2021-08-17 16:10:40 +05:30
Abhijith
f2a1023d8e
Merge remote-tracking branch 'origin/develop' into scs_60_iisc
2021-08-16 23:01:31 +05:30
Sakthivel Velumani
a87dca8691
Merge branch 'develop' into prb_based_dl_channel_estimation
2021-08-16 18:59:29 +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
francescomani
e083bd4330
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-13 15:09:52 +02:00
Rahul Gottipati
540d2e2977
Rebase to latest develop
2021-08-12 15:20:16 +05:30
Laurent THOMAS
89eb5850cf
merge develop, no big issue, we are sync
2021-08-12 10:08:25 +02: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
Raphael Defosseux
5f9e0a235d
Merge remote-tracking branch 'origin/code-cleanup-20210716' into integration_2021_w32
2021-08-09 10:07:45 +02:00
Rodolphe BERTOLINI
387223eea6
removed duplicate structure, changed 'x' to 'r' and 'y' to 'i'
2021-08-09 09:59:38 +02:00
Mahesh
557b5445d3
PNF config file pusch_proc_threads update
2021-08-08 12:23:15 +05:30
magounaki
4ba8ef3a60
n310 config file
2021-08-06 20:23:10 +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
Melissa Elkadi
745241bd63
Merge branch 'episys/nsa_epc_gnb_updates' into episys/david/multiUE_with_crnti_checking
...
Also, lots of debugging logs added
2021-08-04 16:24:27 -07:00
Laurent THOMAS
7fcd5e3e29
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_F1C_F1U_extensions
2021-08-04 13:49:43 +02:00
Eurecom
969a7a08fe
Merge remote-tracking branch 'origin/develop' into bandwidth-testing
...
Conflicts:
openair2/GNB_APP/MACRLC_nr_paramdef.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-08-04 12:09:42 +02:00
Sakthivel Velumani
6050776f55
Merge branch 'develop' into prb_based_dl_channel_estimation
2021-08-02 12:17:03 +02:00
Laurent OpenCells
d649434be9
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into code-cleanup-20210716
2021-07-29 22:29:52 +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
francescomani
3c7796adaa
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-07-27 11:00:29 +02:00
Laurent OpenCells
0f1d787a90
fix obsolete system call
2021-07-26 15:47:57 +02:00
Laurent OpenCells
a03ee3548f
merge latest develop
2021-07-26 15:03:47 +02:00
francescomani
5c70aa96c4
Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures
2021-07-26 07:39:57 +02: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
magounaki
d1dec5ed0e
for testing with another machine.
2021-07-23 15:53:49 +02:00
francescomani
bd816e5175
Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures
2021-07-23 13:51:41 +02:00
Shruthi
6fa460dd2d
Merge remote-tracking branch 'origin/develop' into scs_60_iisc
2021-07-23 13:06:12 +05:30
hardy
fad5fbda34
Merge remote-tracking branch 'origin/NR_CSIRS_tomerge' into integration_2021_wk30
2021-07-23 09:18:33 +02:00
Laurent OpenCells
f62b7e1f9e
nfapi work around (missing malloc)
2021-07-22 15:32:09 +02:00
Laurent OpenCells
39c63eb158
move function declaration in not duplicated files (.h instead of .c)
2021-07-22 13:19:37 +02:00
luis_pereira87
7c61f6d969
Fix pusch_TargetSNRx10 and pucch_TargetSNRx10 in configuration files
2021-07-22 11:13:14 +01:00
francescomani
227529c129
Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures
2021-07-21 17:49:33 +02:00
Laurent OpenCells
3f436e3e2f
merge develop (was in conflict)
2021-07-20 17:26:15 +02:00
francescomani
bff2251242
Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge
2021-07-20 07:03:24 +02:00
David Kim
4f23fa2f61
added queues between VNF and MAC to handle indications.
2021-07-19 18:55:02 -07:00
rmagueta
3ea6d6f878
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ru.c
2021-07-19 13:51:38 +01:00
Laurent OpenCells
78da843624
code-cleanup-20210716
2021-07-16 17:16:15 +02:00
luis_pereira87
ff7cc7ec1b
Add ulsch_max_slots_inactivity to SA config files
2021-07-15 12:59:15 +01:00