Commit Graph
4449 Commits
Author SHA1 Message Date
matzakos a19f2e3254 Merge remote-tracking branch 'origin/aw2s-n41' into F1_interop_ACC 2022-01-24 15:11:50 +01:00
Raymond Knopp 90c66bb7b1 Merge remote-tracking branch 'origin/develop' into aw2s-n41
Conflicts:
	executables/nr-softmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-01-24 11:11:46 +01:00
hardy bbe79b5b3a Merge remote-tracking branch 'origin/NR_UE_Capabilities' into integration_2022_wk03_b 2022-01-19 15:40:43 +01:00
matzakos e5899e2f74 Merge remote-tracking branch 'origin/develop' into F1C_extensions_develop 2022-01-17 13:19:45 +01:00
Laurent THOMAS a5c5264ef3 merge develop 2022-01-14 21:09:02 +01:00
Laurent THOMAS 3f2dd17191 code review comments + re-test 2022-01-13 16:04:16 +01:00
hardy 6029248937 Merge remote-tracking branch 'origin/rfsim-chan-mod-bug' into integration_2022_wk02 2022-01-12 14:26:14 +01:00
Laurent THOMAS bc05bd882d cleaning after big merge 2022-01-10 11:44:45 +01:00
francescomani 7b490f330c Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities 2022-01-10 10:11:55 +01:00
Laurent THOMAS 0ec9d171d7 fix bug in rfsimulator channel simulation model change 2022-01-05 13:26:07 +01:00
Laurent THOMAS 154f9b6acd fix bug in rfsimulator channel simulation model change 2022-01-05 13:19:52 +01:00
Laurent THOMAS f20d280426 add clean log+exit when radio board can't start 2021-12-31 11:44:49 +01:00
francescomani 562013fa32 Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities 2021-12-30 14:59:50 +01:00
Robert Schmidt 6c823168fe Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d 2021-12-24 10:13:27 +01:00
Laurent THOMAS 792b6b4e0b merge develop 2021-12-23 22:52:36 +01:00
Raymond Knopp 50629a83a2 first set of changes to AW2S ORI/eCPRI driver for n78 2021-12-20 21:24:52 +01:00
Laurent THOMAS 0f00e57148 merge develop 2021-12-17 16:29:53 +01:00
francescomani f3bf2cf2e7 Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities 2021-12-16 17:23:55 +01:00
francescomani 220e568c81 xml file that works, thanks to Cedric 2021-12-16 17:18:20 +01:00
francescomani 9ad38c421a removing tda from other config files 2021-12-14 17:48:09 +01:00
francescomani 018ac0616b Merge remote-tracking branch 'origin/develop' into NR_RRC_configuration_functions 2021-12-07 09:27:27 +01:00
Melissa Elkadi 118bd8b36f Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-06 13:23:21 -08:00
Raymond Knopp 6fb731ea5d Merge remote-tracking branch 'origin/NR_2port_CSIRS' into CSI-SA
Conflicts:
	ci-scripts/xml_files/fr1_sa_quectel.xml
	executables/nr-gnb.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.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_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
2021-12-01 14:51:10 +01:00
Melissa Elkadi 4f9c2bd869 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-29 14:33:23 -08:00
francescomani 9a863691a2 Merge remote-tracking branch 'origin/develop' into NR_RRC_configuration_functions 2021-11-29 09:47:27 +01:00
francescomani fa2ce6e680 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-11-26 11:34:22 +01:00
Laurent THOMAS 1d0abb9077 merge develop, fix a existing memory overlap 2021-11-25 15:53:04 +01:00
francescomani b9dd8d3f28 function for rrc ul tda (removed from config files) 2021-11-25 14:44:22 +01:00
luis_pereira87 d0861b6dfd Merge remote-tracking branch 'origin/develop' into handling-Msg4-Ack-failure 2021-11-25 12:46:05 +00:00
francescomani 83e1b2f850 function for rrc dl tda (removed from config files) 2021-11-24 13:44:18 +01:00
hardy dc4d243b6c Merge remote-tracking branch 'origin/develop-aw2sori' into integration_2021_wk47_b 2021-11-24 09:42:56 +01:00
luis_pereira87 1c49bdec1a Update SA default configuration files 2021-11-22 05:22:15 +00:00
luis_pereira87 f81cec7215 Merge remote-tracking branch 'origin/develop' into handling-Msg4-Ack-failure 2021-11-22 04:59:35 +00:00
Melissa Elkadi 236f980ba0 Merge branch 'episys/master-nsa' into episys/5gcn_traffic_testing 2021-11-17 15:12:59 -08:00
Laurent THOMAS 66073d50fc merge develop 2021-11-15 10:25:52 +01:00
Raymond Knopp e51cd863fe Merge branch 'bler_txoptim' into F1C_extensions_develop
Conflicts:
	cmake_targets/CMakeLists.txt
	common/utils/nr/nr_common.c
	openair1/PHY/INIT/nr_parms.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/ocp-gtpu/gtp_itf.cpp
	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-11-14 21:18:50 +01:00
Melissa Elkadi 368977b3bb The NRUE and gNB are connected to the 5GCN!
When IP traffic is started on the NRUE, the
gNB immediately crashes
2021-11-12 09:03:47 -08:00
luis_pereira87 32e7b7b83f Update SA default configuration files 2021-11-12 16:39:16 +00:00
matzakos 40263348f9 Merge with NR_F1C_F1U_extensions and resolve conflicts 2021-11-12 17:01:27 +01:00
matzakos a8bfb20121 Update du config file after update with develop 2021-11-12 16:16:33 +01:00
David Kim 01c2f79f9e Fixed build error in eNB ocp. 2021-11-11 12:43:26 -08:00
francescomani 2eac9f53c7 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-11-11 16:35:46 +01:00
Melissa Elkadi 046258f1ba Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-09 15:17:58 -08:00
hardy 4c2c7f92a5 Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b 2021-11-08 13:12:52 +01:00
Laurent THOMAS 9d1fe78e2e merge develop, no working yet 2021-11-04 12:53:01 +01:00
Melissa Elkadi e8f965d010 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-03 06:32:38 -07:00
luis_pereira87 72e188935f Minor updates in default SA configuration files 2021-11-02 08:47:20 +00:00
francescomani 3556423cf0 read uecap file in nr_rrc_ue_process_ueCapabilityEnquiry 2021-10-26 13:55:29 +02:00
Melissa Elkadi e4ad4a6b17 Merge branch 'episys/master-nsa' into origin-episys-merge-nsa 2021-10-25 10:46:36 -07:00
Melissa Elkadi b56c8ac3ce Merge remote-tracking branch 'eurecom/develop' into origin-episys-merge-nsa 2021-10-25 10:27:11 -07:00