maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,543 Commits 5 Branches 0 Tags
d6072cb5d2c5d296bc1673bd96c06cf5bf2155d4
Commit Graph
62 Commits
Author SHA1 Message Date
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
rmagueta bbe806a870 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/nr_rrc_config.c
#	openair2/RRC/NR/nr_rrc_config.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2022-03-07 13:10:40 +00:00
francescomani 1dac24844b Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv 2022-03-07 09:47:19 +01:00
francescomani c61a0dd223 Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-02-23 10:11:04 +01:00
rmagueta cf284d76f0 Fix build after merge 2022-02-22 17:49:59 +00:00
rmagueta 6f19524e95 Merge remote-tracking branch 'origin/CSI-SA' into develop-CSI 
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SCHED_NR_UE/fapi_nr_ue_l1.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
#	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/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_nsa.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-02-22 15:10:20 +00:00
francescomani d12eb8efc4 Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv 2022-02-21 10:38:23 +01:00
francescomani 4329051120 Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-02-14 09:20:22 +01:00
francescomani de88c3f45c Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2022-02-14 08:57:52 +01:00
Robert Schmidt a36555b254 Merge remote-tracking branch 'origin/develop-SRS' into integration_2022_wk06_a 2022-02-08 18:06:53 +01:00
francescomani 9ff39f0d92 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2022-02-08 16:48:20 +01:00
francescomani 46ca8cc2d0 Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-02-08 16:01:59 +01:00
francescomani 434ee15ba0 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2022-02-03 11:38:14 +01:00
francescomani e62dd069dd Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-01-18 09:32:53 +01:00
francescomani 350b750c33 Merge remote-tracking branch 'origin/NR_pdcch_improvements' into NR_UL_VRB_MAP_improv 2022-01-14 19:19:21 +01:00
francescomani b9384917b3 Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv 2022-01-14 19:05:18 +01:00
francescomani 98e8b74331 Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements 2022-01-10 10:13:18 +01:00
rmagueta cf8f6fdeed Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/RRC/NR/L2_nr_interface.c
 2022-01-08 12:11:56 +00:00
Laurent THOMAS 2615a6722a fix get_nr_table_idx to make same as develop branch 2022-01-03 19:32:47 +01:00
francescomani 6f38108635 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-12-30 10:58:37 +01:00
Laurent THOMAS 31d9da3f73 cleanup nr_band() function 2021-12-27 17:10:19 +01:00
rmagueta 97962f4635 Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	common/utils/nr/nr_common.h
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2021-12-24 11:53:25 +00:00
francescomani 3aa0c8654d Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements 2021-12-24 09:33:51 +01:00
hardy 0b4d3d92a2 Merge remote-tracking branch 'origin/NR_RRC_configuration_functions' into integration_2021_wk51_c 2021-12-23 10:44:42 +01:00
francescomani ae29f64419 adapting function for dl 256 qam 2021-12-21 10:57:35 +01:00
francescomani 909f0ad44f changing the name of a function 2021-12-15 09:43:08 +01:00
francescomani bdf5d26b82 changing the name of a function 2021-12-15 08:44:53 +01:00
francescomani 7cb3739cf6 bitmap occupation function 2021-12-07 14:54:48 +01:00
francescomani 82dc3430f7 function for bitmap from start symbol and length 2021-12-06 11:20:51 +01:00
rmagueta 75057be8ef Add missing configuration for NSA 2021-12-03 16:17:20 +00:00
francescomani b9dd8d3f28 function for rrc ul tda (removed from config files) 2021-11-25 14:44:22 +01:00
francescomani 83e1b2f850 function for rrc dl tda (removed from config files) 2021-11-24 13:44:18 +01:00
francescomani 2eac9f53c7 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-11-11 16:35:46 +01:00
Raymond Knopp 88e0c12f25 some adjustments after merge with develop 2021-11-11 08:43:10 +01:00
Raymond Knopp 95343c6658 Merge remote-tracking branch 'origin/develop' into tx-proc-optim 
Conflicts:
	common/utils/nr/nr_common.h
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
 2021-11-11 08:34:06 +01:00
Raymond Knopp 07d735f93c step-by-step merging from tx-proc-optim-lts. Everything except NR_TRANSPORT merged. Some issues with 64QAM modulation 2021-11-11 08:28:10 +01:00
hardy 9c1336157e Merge remote-tracking branch 'origin/NR_SA_band_96' into integration_2021_wk45_b 2021-11-08 13:12:28 +01:00
francescomani 4d21ec23df Merge remote-tracking branch 'origin/develop' into NR_SA_band_96 2021-10-27 14:21:02 +02:00
francescomani d4c4f092b4 Merge remote-tracking branch 'origin/develop' into NR_cset_bwp_fixes 2021-10-27 14:06:25 +02:00
francescomani a8d2265a9d Merge remote-tracking branch 'origin/develop' into NR_cleanup_MACPHY 2021-10-20 15:50:18 +02:00
francescomani 773d55f422 some cleanup of MAC and PHY cross compilation 2021-09-27 17:29:17 +02:00
francescomani 1dd512873f adding band 96 in bandtable 2021-09-14 11:19:48 +02:00
francescomani 10c4e95704 moving get_coreset_rballoc to nr_common 2021-09-10 11:55:57 +02:00
francescomani 17c0268775 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-09-07 17:17:35 +02:00
francescomani e083bd4330 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-13 15:09:52 +02:00
francescomani 0f4e765991 add get_dmrs_port function for ul 2021-07-24 16:20:54 +02:00
francescomani ed54f59818 handling dl dmrs ports at phy 2021-06-22 18:29:22 +02:00
francescomani 1051c94cf6 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA 2021-04-15 11:53:16 +02:00
Raymond Knopp 1e60fbd49f Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS 
Conflicts:
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
 2021-04-12 10:21:25 +02:00
francescomani 62b68e788c init frame parms ue sa 2021-03-23 15:47:46 +01:00