maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,377 Commits 5 Branches 0 Tags
ad5a3e8d9475d92d22c19ecea86f86d0d85ec5a8
Commit Graph
4713 Commits
Author SHA1 Message Date
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
Laurent THOMAS 738728142f merge develop 2021-03-29 15:33:45 +02:00
Laurent THOMAS 68a81f65b2 merge develop 2021-03-29 11:24:34 +02:00
Florian Kaltenberger 5e9248938a applying new TDA to benetel config file 2021-03-29 10:35:17 +02:00
Florian Kaltenberger 2e9ac3672d removing annoying printf 2021-03-29 10:35:00 +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 fbf39eecc1 cppcheck fixes 2021-03-26 16:32:20 +01:00
Laurent THOMAS 818c9b2c88 first pass 2021-03-25 20:13:50 +01:00
Thomas Schlichter f9410f7a69 gNB: update ssPBCH_BlockPower to -25 dBm/RE in all USRP conf files 2021-03-25 09:20:08 +01:00
Raymond Knopp e6ead93ad1 removed 3 warnings in lte-softmodem 2021-03-25 07:32:58 +01:00
Raymond Knopp 08b781ebfe Merge remote-tracking branch 'origin/develop' into oairu 2021-03-25 06:44:11 +01:00
Luis Pereira e82915c4b1 Revert "Fix msg1-FrequencyStart in config files for SA" 
This reverts commit b067406097
 2021-03-22 15:28:15 +01:00
Melissa Elkadi eb3436c01c Added comment in configs for networking help 2021-03-19 10:54:35 -07:00
francescomani 70a1556c51 Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS 2021-03-19 18:50:59 +01:00
Melissa Elkadi 6b0a173007 Updated configuration files 2021-03-19 09:53:30 -07: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
francescomani d76c50e34a Merge remote-tracking branch 'origin/develop' into nr_power_measurement_fixes 2021-03-19 11:22:18 +01:00
Laurent THOMAS 0009fefce2 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-19 11:19:58 +01: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 91168581a5 small fix for basic simulator in TDD 2021-03-18 20:35:17 +01:00
luis_pereira87 b067406097 Fix msg1-FrequencyStart in config files for SA 2021-03-18 18:49:16 +00:00
francescomani 0274e09690 internal clock in testing conf files 2021-03-18 13:54:55 +01:00
francescomani a1f1d53cb5 another tentative fix for gnb initialization crashes 2021-03-18 13:09:36 +01:00
Robert Schmidt decd654ad0 Change initial{D,U}LBWPlocationAndBandwidth for quectel to connect in testing_gnb.conf files 2021-03-18 09:16:36 +01:00
David Kim b90c0680ec adding x2c setting with epc 2021-03-17 21:08:41 -07:00
Laurent THOMAS 0827488303 noise power 2021-03-17 19:34:27 +01:00
rmagueta 27f0414e60 Fill pusch_proc_threads in config files 2021-03-16 16:49:30 +00: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
hardy 9abc8a6425 Merge remote-tracking branch 'origin/ptrs_rrc_config' into integration_2021_wk11 2021-03-16 16:28:31 +01:00
Thomas Schlichter b7ef903cb4 Merge remote-tracking branch 'develop' into NR_10MHz 2021-03-16 16:13:17 +01:00
Thomas Schlichter 8768deaf74 Merge remote-tracking branch 'develop' into ptrs_rrc_config 2021-03-16 14:01:32 +01: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
Raymond Knopp 94085a41cd Merge remote-tracking branch 'origin/develop' into oairu 2021-03-16 08:07:16 +01:00
Raymond Knopp a3f6fe4260 L2 emulator seems ok now 2021-03-15 22:45:54 +01:00
David Kim 2948a2445e Merge branch 'episys/master' into episys/david/episys-merge-2nd-x2c 2021-03-15 11:05:35 -07:00
Florian Kaltenberger 544f47bdb0 increasing initial[DL|UL]BWPlocationAndBandwidth for benetel config file to support newer handsets 2021-03-15 15:00:34 +01:00
Robert Schmidt 9dd8572359 Change initial{D,U}LBWPlocationAndBandwidth for quectel to connect 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
Laurent THOMAS d659ceb849 merge develop 
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels
 2021-03-15 09:44:33 +01:00
Michael Cook 8120c7978c Merge branch 'episys-merge-future' into episys/master 2021-03-14 09:17:34 -07:00
Michael Cook 092caec8ca Merge branch 'episys-merge' into episys/trial-merge-to-master 2021-03-14 10:58:46 -04:00
David Kim 94c9866b7e adding nfapi_nr_develop_new changes 2021-03-13 13:09:34 -08:00
Raymond Knopp 7f5dc92265 testing with multi-RU 2021-03-13 21:43:00 +01:00
Raymond Knopp 74a44d686d minor changes 2021-03-13 21:27:39 +01:00