maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,745 Commits 5 Branches 0 Tags
fc5632eeb96b316076ac58442a396aba36569dc4
Commit Graph
4621 Commits
Author SHA1 Message Date
Roberto Louro Magueta fc5632eeb9 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
#	openair1/PHY/NR_TRANSPORT/nr_dci.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.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_pdcp/nr_pdcp_oai_api.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
 2022-05-06 13:16:48 +01:00
Roberto Louro Magueta 87e79e5eb8 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.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/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
 2022-05-06 11:32:36 +01:00
Robert Schmidt aebabbcc0c Merge remote-tracking branch 'origin/fixes-code-ci' into integration_2022_wk18 2022-05-04 15:16:14 +02:00
Robert Schmidt 94aeb43847 Merge remote-tracking branch 'origin/NR_RRC_processing_timer' into integration_2022_wk18 2022-05-04 12:26:01 +02:00
luis_pereira87 4b7b621f00 Minor improvements and cleanup in 5G NR SA configuration files 2022-05-02 12:03:55 +01:00
luis_pereira87 8569a47bc6 Remove sib1_tda from configuration files to use default value 2022-05-02 12:03:55 +01:00
rmagueta 751335765f Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/nr_rrc_config.c
 2022-04-30 15:52:48 +01:00
rmagueta 4b3aa7233e Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
 2022-04-30 15:14:20 +01:00
francescomani 3ec401f2f6 Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 2022-04-28 17:26:33 +02:00
francescomani 3054102200 targets config file cleanup 2022-04-28 14:01:20 +02:00
Robert Schmidt 5dc87bdcad Merge remote-tracking branch 'origin/rename_frame_type' into integration_2022_wk17 2022-04-26 15:16:24 +02:00
Robert Schmidt 28c3205f22 Merge remote-tracking branch 'origin/fix-rfsim-ue4G-sync' into integration_2022_wk17 
Conflicts:
	targets/ARCH/rfsimulator/simulator.c
 2022-04-26 15:16:09 +02:00
francescomani 33663e68b0 rename frame_type 2022-04-19 18:37:14 +02:00
Laurent THOMAS 2373b02150 review remarks 2022-04-12 20:52:40 +02:00
rmagueta 1d86347587 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_TRANSPORT/nr_dci.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-04-12 14:48:08 +01:00
rmagueta d6072cb5d2 Fix build after merge 2022-04-12 14:31:39 +01:00
Laurent THOMAS 4ad71064b8 review comments 2022-04-11 19:29:45 +02:00
Laurent THOMAS b738f8a6a9 tackle code review remarks 2022-04-11 17:27:11 +02:00
Laurent THOMAS 421603534c fix regression 2022-04-11 10:52:53 +02:00
Laurent THOMAS b860d76cd6 fix lte-ue.c main loop with 5G common vars 2022-04-11 09:39:16 +02:00
Raymond Knopp 86b5b9db3d Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 
Conflicts:
	openair2/GNB_APP/gnb_config.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-04-09 19:44:26 +02:00
Laurent THOMAS 2cdc7304f1 merge develop 2022-04-07 10:00:41 +02:00
Laurent THOMAS 293a53e373 code review remarks, cannot perform full test (develop bugged) 2022-04-06 17:07:25 +02:00
rmagueta 4ee6005a50 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
 2022-04-06 13:30:04 +01:00
rmagueta 4f29c73bb6 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
 2022-04-06 10:11:49 +01:00
rmagueta 2deec7fa09 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-04-01 19:36:57 +01:00
Robert Schmidt 5d63a756e6 Merge remote-tracking branch 'origin/fix-initialBWP-procedures' into integration_2022_wk13b 2022-04-01 18:40:30 +02:00
rmagueta c83df1b677 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	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
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
 2022-04-01 15:56:47 +01:00
rmagueta fba2df7557 Fix config files after merge 2022-03-30 19:27:24 +01:00
rmagueta 4c0427ea6c Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/GNB_APP/gnb_paramdef.h
#	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
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
 2022-03-30 19:23:22 +01:00
Raymond Knopp b7389ab3d1 Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
 2022-03-29 22:57:56 +02:00
Robert Schmidt 69fcab9243 Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into integration_2022_wk13 2022-03-29 22:09:34 +02:00
francescomani 6e48ec9266 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-28 18:32:59 +02:00
rmagueta 1d1aaa30e7 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
 2022-03-28 15:06:23 +01:00
rmagueta 0abcf3d9c4 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_REFSIG/nr_gold.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
 2022-03-28 13:32:46 +01:00
Robert Schmidt 404bcf7880 Merge remote-tracking branch 'origin/Bug_Fix_RIV_162_PRBs' into integration_2022_wk13 2022-03-28 14:11:28 +02:00
Laurent THOMAS c0568a997a fix bugs, delete dead code 2022-03-28 12:05:18 +02:00
rmagueta 495b3f39c5 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
 2022-03-28 10:12:29 +01:00
Laurent THOMAS a7e7d05da3 fix difficult to read code 2022-03-24 14:38:17 +01:00
Laurent THOMAS ed1c87b598 commit before rebase 2022-03-24 14:05:30 +01:00
luis_pereira87 408c9ec7c2 Fix RIV value for 162 PRBs 2022-03-23 22:17:03 +00:00
rmagueta a47861628b Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_REFSIG/nr_gold.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.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/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
 2022-03-22 17:18:22 +00:00
Robert Schmidt de824b7b19 Merge remote-tracking branch 'origin/remove-basic-sim' into integration_2022_wk12_a 2022-03-22 17:42:15 +01:00
francescomani 12f9dd95eb Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-22 09:44:40 +01:00
Raymond Knopp d840ca0dee Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
 2022-03-22 07:03:40 +01:00
luis_pereira87 eb8e4b4999 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures 
# Conflicts:
#	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
 2022-03-22 05:47:56 +00:00
rmagueta f0f8acb06a Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
 2022-03-21 10:10:21 +00:00
Robert Schmidt a530166b45 Merge remote-tracking branch 'origin/fix-legacy-errors-lte' into integration_2022_wk11 2022-03-18 16:43:25 +01:00
Robert Schmidt 57cfd7bc32 Remove basic simulator 
The basic simulator can be replaced with the RF simulator. Use option
--rfsim.
 2022-03-17 08:25:16 +01:00
francescomani 8ef72fb939 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-17 07:51:35 +01:00