maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,617 Commits 5 Branches 0 Tags
d2ddfa1fbd613a57b3397010578a7e11d9229bd5
Commit Graph
4056 Commits
Author SHA1 Message Date
rmagueta d2ddfa1fbd Update SA config files 2021-05-06 18:41:26 +01: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
Florian Kaltenberger 8d0b9e4cdb yet some more fixes to the benetel config files 2021-04-27 20:34:00 +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
hardy e2ab8bc54b Merge remote-tracking branch 'origin/benetel_config_file_fix' into integration_2021_wk17_a 2021-04-26 10:21:05 +02:00
Robert Schmidt 26b6d87fa3 Merge branch 'develop' into integration_2021_wk13_b 2021-04-25 16:34:30 +02:00
Robert Schmidt 089246c693 Fix Msg.2 TDA to be 1, revert DL TDA configs to two entries 2021-04-25 14:44:46 +02:00
rmagueta 45de9e7b25 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-04-24 13:27:11 +01:00
Florian Kaltenberger 1b9901953f reverting some changes in benetel-5g config files that were introduced in anticipation of MR 1079, but which has not been merged yet. 2021-04-21 12:55:01 +02:00
Florian Kaltenberger 13d5ef51ca OAI EPC 2021-04-20 18:45:22 +02:00
rmagueta 8613aeb9e6 Fixes after merge 
- No warning in RRC
- Ethernet lib fix: correct include
- fixes Msg.4
- fixes conf: the UE cannot handle mixed slots
 2021-04-18 12:42:34 +02:00
Sakthivel Velumani 6f7a3fdcd2 Laurent's change: bugfix in usrp lib 2021-04-16 18:54:35 +02:00
Robert Schmidt c3796c044f Merge branch 'develop' into integration_2021_wk13_b 2021-04-16 07:23:46 +02:00
rmagueta 131cef2b6b Fix build warnings 2021-04-15 22:59:35 +01:00
rmagueta 4301582f88 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
 2021-04-15 15:29:03 +01:00
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
Raymond Knopp cee0f9451d intermediate commit. up to Msg4 ACK and DCI_0_0 reception verified with COTS UE (Quectel). 
- first PUSCH containing RRCSetupComplete not programmed for reception in PHY for some reason. DCI_0_0 received by UE.
- if RA fails, on the second attempt there is usually a crash (sometimes in L2_interface.c when getting UE context (added AssertFatal on this now).
 2021-04-14 12:15:59 +02:00
rmagueta a8a34df01f Fix compilation warning in oai_usrpdevif 2021-04-14 00:28:41 +01:00
Laurent THOMAS 86f1c69f26 Fix code review remarks, merge develop, revert some merge errors 2021-04-13 22:28:02 +02:00
Robert Schmidt 7f774d5fbc Merge branch 'develop' into integration_2021_wk13_b 2021-04-12 17:23:21 +02:00
Raymond Knopp 1236f4c389 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS 
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
 2021-04-12 16:03:09 +02:00
Laurent THOMAS ceb96a36e7 astyle 2021-04-11 20:07:26 +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 307098da4a merge develop 2021-04-09 12:39:33 +02:00
rmagueta 7c37794513 Revert code indentation in usrp_lib 2021-04-08 14:56:05 +01:00
Laurent Thomas 873e42612a merge develop, documentation fix 2021-04-06 21:32:19 +02:00
Raymond Knopp 2473a25ca1 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS 
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
 2021-04-06 16:38:37 +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
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
rmagueta d86566d366 gNB: update ssPBCH_BlockPower to -25 dBm/RE in all USRP conf files 2021-03-31 15:52:51 +01:00
rmagueta 1175463c7e Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA 2021-03-31 15:33:48 +01:00
rmagueta 53f77219d4 Rework default PDSCH time domain resource allocation tables 2021-03-31 14:31:19 +01:00
hardy 5af77e8fb3 Merge remote-tracking branch 'origin/small_nr_bugfixes' into integration_2021_wk13_d 2021-03-31 13:49:24 +02:00
Raymond Knopp 9be7c35f68 changing config file for SA to connect to AMF 
also enabling connection to AMF only when --sa option is used.
 2021-03-31 11:44:56 +02:00
Laurent THOMAS de5e64c722 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sanitize-v1 2021-03-31 10:13:50 +02:00
Laurent THOMAS e1c73a0632 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-31 09:45:53 +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
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
hardy 1214836e75 Merge remote-tracking branch 'origin/nr_power_measurement_fixes' into integration_2021_wk13_c 2021-03-30 16:40:41 +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
Robert Schmidt 576df55450 Merge remote-tracking branch 'origin/fix_NR_DLUL_PF' into integration_2021_wk12 2021-03-30 10:48:57 +02:00
Thomas Schlichter 7848e2575c add missing pusch_AntennaPorts to conf files 2021-03-30 10:44:15 +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
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