maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,703 Commits 5 Branches 0 Tags
8150a47ba501bcc6676c6b8de67574f63c901703
Commit Graph
624 Commits
Author SHA1 Message Date
Roberto Louro Magueta 01c6129ee1 Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-05-23 10:43:50 +01:00
Roberto Louro Magueta 9887982e00 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-05-19 13:21:00 +01:00
Robert Schmidt 17cbc4dbf4 Generalize get_mcs_from_bler() 2022-05-18 16:44:54 +02:00
Robert Schmidt 1fbf968676 Set DL MCS when receiving CQI report 
- Introduce generic get_mcs_from_cqi() that gets MCS for a particular
  CQI
- Set MCS after receiving CQI
- Distinguish "global" max MCS from UE-measured max MCS
 2022-05-18 16:44:53 +02:00
francescomani 1e4f509805 Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization 2022-05-18 11:41:07 +02:00
francescomani 085014f601 Merge remote-tracking branch 'origin/develop' into NR_remove_ssb_offset_from_configfile 2022-05-18 10:25:47 +02:00
francescomani 1f49b73eac Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv 2022-05-18 08:55:40 +02:00
luis_pereira87 486e9e2381 Merge remote-tracking branch 'origin/Dedicated-BWPs' into integration_2022_wk19b 
# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-05-13 15:58:56 +01:00
Robert Schmidt 851291ddc4 Merge remote-tracking branch 'origin/NR_handling_PMI_report' into integration_2022_wk19b 2022-05-12 17:45:59 +02:00
luis_pereira87 af377945c3 Fix hardcoded coreset and assignment from wrong array position 2022-05-12 13:12:45 +01:00
francescomani c4c93cc498 Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv 2022-05-12 08:56:45 +02:00
francescomani 6ded64f86d Merge remote-tracking branch 'origin/develop' into NR_handling_PMI_report 2022-05-11 15:14:56 +02:00
francescomani a037987b47 remove ssb subcarrier offset from config file 2022-05-09 18:28:56 +02:00
rmagueta b8cd9ef167 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2022-05-06 15:41:10 +01:00
Roberto Louro Magueta 05fffa4916 Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	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.band78.fr1.106PRB.usrpb210.conf
 2022-05-06 13:39:45 +01:00
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
luis_pereira87 a8e6bf9bd5 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/GNB_APP/gnb_config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/nr_rrc_defs.h
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-05-06 11:29:55 +01:00
francescomani 2bbfe501c2 Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization 2022-05-06 12:02:00 +02:00
Roberto Louro Magueta b106913dc0 Send SRS measurements (still empty) from PHY to MAC 2022-05-05 18:10:08 +01: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
francescomani 999f5d67e3 bugfixes and improvements in handling dci candidates 2022-05-04 11:03:26 +02:00
luis_pereira87 8641d54f4d Fix build after merge 2022-05-03 15:56:18 +01:00
luis_pereira87 7597a582f9 Merge remote-tracking branch 'origin/NR_RRC_processing_timer' into Dedicated-BWPs 
# Conflicts:
#	openair2/GNB_APP/gnb_config.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_primitives.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
 2022-05-03 14:00:57 +01:00
luis_pereira87 6db761692d Remove update_pdsch_ps and update_pusch_ps flags to use_rrc_processing_timer instead 2022-05-03 08:55:25 +01:00
francescomani 299642344a fix for ssb offset scaling issue 2022-05-02 19:08:10 +02:00
luis_pereira87 ca06668682 Handle RRC processing time at gNB 2022-05-02 12:03:55 +01:00
francescomani 5e1364f19d Merge remote-tracking branch 'origin/develop' into NR_handling_PMI_report 2022-04-28 13:57:17 +02:00
luis_pereira87 44c0c8d321 Merge branch 'NR_RRC_processing_timer' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/rrc_gNB.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.2x2.usrpn300.conf
 2022-04-19 12:39:28 +01:00
luis_pereira87 a39c310bd4 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-04-19 10:21:57 +01:00
luis_pereira87 0270b7b1fb Move RRC processing timer implementation from RRC to MAC 2022-04-14 15:49:29 +01:00
luis_pereira87 ada380d9fd Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer 2022-04-14 11:46:52 +01:00
rmagueta 40279dddf3 Get cri_bitlen, ri_bitlen, pmi_bitlen and cqi_bitlen at UE 2022-04-13 01:07:01 +01:00
francescomani e6913e5d33 Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv 2022-04-12 10:41:20 +02:00
francescomani 02b66061b1 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-12 10:14:21 +02:00
Laurent THOMAS f46240ca2b fix code review remarks 2022-04-08 18:22:38 +02:00
luis_pereira87 1a3c8e5440 Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
 2022-04-06 11:52:55 +01:00
rmagueta c65593d088 Fix build after merge 2022-04-06 11:06:55 +01:00
rmagueta 345f3056ff Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_gNB/config.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_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
 2022-04-06 10:51:43 +01:00
francescomani 4f486ce66b Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-06 11:02:53 +02:00
francescomani f0ea21476a Merge remote-tracking branch 'origin/develop' into NR_handling_PMI_report 2022-04-06 10:04:20 +02:00
luis_pereira87 6ccaaacaf0 Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer 
# Conflicts:
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2022-04-05 12:46:14 +01:00
luis_pereira87 f8af4c8b72 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-04-05 11:47:23 +01:00
francescomani 0152e8ce38 fix dlsim compilation error 2022-04-03 20:26:05 +02:00
francescomani 7901ff998d Merge remote-tracking branch 'origin/develop' into NR_handling_PMI_report 2022-04-03 16:38:32 +02:00
francescomani ed9c35a170 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-03 16:20:59 +02: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 8e5ea001b1 Fix warning after merge 2022-03-28 11:57:29 +01:00
rmagueta 3b3866feee Fix warning after merge 2022-03-28 11:17:59 +01:00
rmagueta a020c51772 Fix warning after merge 2022-03-28 10:31:50 +01:00
francescomani c6b4f97d19 coderate according to SCF and get tbs,qm,R only at MAC 2022-03-26 13:37:34 +01:00