Commit Graph
4878 Commits
Author SHA1 Message Date
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
Florian Kaltenberger f85ccaa007 Revert "making SFN dependent on GPS time (when available)"
This reverts commit 5679e4a3b3.
2022-03-28 12:22:11 +02:00
rmagueta 9daef4e587 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2022-03-28 11:17:00 +01:00
Florian Kaltenberger 24594d993a adding case for 8 bit alignment in usrp rx 2022-03-28 12:08:48 +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
Sagar Parsawar 984830505b 256-bit alignment fix in trx_usrp_write/trx_usrp_write_thread functions 2022-03-28 10:58:41 +02: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
Thomas Schlichter 88c0028757 Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS 2022-03-24 11:39:22 +01:00
luis_pereira87 5d6d25c972 Fix RIV value for 162 PRBs, update and synchronization of configuration files 2022-03-23 22:34:32 +00:00
luis_pereira87 9c45ee05bb Fix RIV value for 162 PRBs 2022-03-23 22:27:48 +00: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 fb118a76a8 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-03-22 13:21:43 +01:00
rmagueta 7ae5abfbeb Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-22 12:07:14 +00:00
Florian Kaltenberger 5679e4a3b3 making SFN dependent on GPS time (when available) 2022-03-22 11:10:07 +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 4ce795186b Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 2022-03-21 11:23:08 +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
rmagueta b59b84e904 Merge remote-tracking branch 'origin/develop' into develop-CSI 2022-03-17 01:03:35 +00:00
Thomas Schlichter cbf57d7b3c Add configuration file for 15 kHz SCS, 5 MHz BW, band 66, FDD 2022-03-14 16:39:17 +01:00
Raymond Knopp 070b663a54 intermediate commit 2022-03-14 13:29:16 +01:00
luis_pereira87 e23e863e0f Merge remote-tracking branch 'origin/Dedicated-BWPs' into Dedicated-BWPs 2022-03-14 09:33:20 +00:00
luis_pereira87 3114060a38 Add configuration files for 217 PRBs (80 MHz) and 273 PRBs (100 MHz) BW in a Dedicated BWP 2022-03-14 09:32:33 +00:00
Raymond Knopp e71578e7d0 Merge branch 'tdd25period_for_MR' into tdd2_5period_withRLCupdate
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	targets/ARCH/AW2SORI/oaiori.c
2022-03-13 07:30:44 +01:00
Hongzhi Wang 89ac71ef25 fix warnings and revert commented logs 2022-03-11 11:31:33 +01:00
luis_pereira87 b04957b57c Add configuration files for 217 PRBs (80 MHz) and 273 PRBs (100 MHz) BW in a Dedicated BWP 2022-03-10 13:19:40 +00:00
Raymond Knopp 6abb1e362d Merge remote-tracking branch 'origin/tdd25period_for_MR' into F1_interop_ACC
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SIMULATION/NR_PHY/dlschsim.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/main.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair3/ocp-gtpu/gtp_itf.cpp
	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
2022-03-09 19:16:23 +01:00
Hongzhi Wang fc78d01508 adding sa n310 config file 2022-03-09 16:15:14 +01:00
Hongzhi Wang 65b0e7a8ea reducing some logs and fixing some vcd traces 2022-03-09 16:09:35 +01:00
Hongzhi Wang 1749595217 bug fixes and removing warnings 2022-03-09 15:30:54 +01:00
Hongzhi Wang aeb987bb0a using temporarily one l1tx thread and soft ldpc for small mcs 2022-03-09 15:25:39 +01:00
Hongzhi Wang a8bee7ae21 Update ldpc offload decoder input and output 2022-03-09 14:32:49 +01:00
Hongzhi Wang 030aa253e8 adding temporarily bbdev testsuite in ldpc_decoder_offload to check t1 card connection 2022-03-09 14:32:26 +01:00
Hongzhi Wang ec25a03fbb adding dpdk library and ldpc offload library 2022-03-09 14:25:02 +01:00
Robert Schmidt b63c7b0e54 Merge remote-tracking branch 'origin/usrp_x400-rebase' into integration_2022_wk10 2022-03-09 10:24:35 +01:00