maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,877 Commits 5 Branches 0 Tags
6ce4d78c1908a0640dec9e72bd0a9720ecc8d616
Commit Graph
4341 Commits
Author SHA1 Message Date
rmagueta 7b770042ad Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/main.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-06-13 12:00:11 +01:00
rmagueta 607561af6c Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-06-13 10:32:21 +01:00
francescomani 045de837ab Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources 2022-06-13 10:25:05 +02:00
luis_pereira87 131db89dfc Merge remote-tracking branch 'origin/develop' into NR_RRC_MAC_CellGroup 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
 2022-06-13 08:19:39 +01:00
Robert Schmidt b193ccf6ee Merge remote-tracking branch 'origin/develop' into 5g-nr-low-snr-performance 2022-06-10 13:50:47 +02:00
francescomani 5fa3be8091 Merge remote-tracking branch 'origin/NR_RRC_MAC_CellGroup' into NR_BWP_config 2022-06-10 10:17:00 +02:00
luis_pereira87 e7a491415c Improvements on RRC passing CellGroup to MAC to get COTS UE working 2022-06-09 10:08:28 +01:00
francescomani 0aec0d91c6 temporary workaround for RRC passing CG to MAC (forced encoding of message at MAC) 2022-06-09 09:35:42 +01:00
Robert Schmidt 894c45eae5 Add comment to fix fill_mastercellGroupConfig() 2022-06-09 10:20:39 +02:00
Roberto Louro Magueta a333dddeaa Merge remote-tracking branch 'origin/develop-SRS-MIMO' into develop-SRS-feedback 2022-06-09 01:29:01 +01:00
Roberto Louro Magueta 87d69126af Merge remote-tracking branch 'origin/develop-SRS-Measurements' into develop-SRS-MIMO 2022-06-09 01:13:44 +01:00
Roberto Louro Magueta 8c577ff253 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.sa.band78.fr1.106PRB.usrpb210.conf
 2022-06-09 00:56:55 +01:00
Roberto Louro Magueta 55e943c347 Remove obsolete code after merge 2022-06-09 00:48:39 +01:00
Roberto Louro Magueta d11705260f Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-06-09 00:33:12 +01:00
Robert Schmidt 12c0f52fea Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78 2022-06-08 19:45:17 +02:00
Cedric Roux f71766c3ee Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78 
Conflicts:
	openair2/F1AP/f1ap_du_ue_context_management.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/rrc_gNB.c
	openair3/ocp-gtpu/gtp_itf.cpp

There were some important conflicts in openair3/ocp-gtpu/gtp_itf.cpp
I rewrote a bit the function Gtpv1uHandleGpdu(). It might have been
done wrongly.
To be tested and fixed if needed.

To redo the merge, if needed:
git checkout 9b2a163ebb
git merge 5ea828e149
 2022-06-08 15:48:24 +02:00
francescomani bc1227f9a0 Merge remote-tracking branch 'origin/develop' into NR_remove_ssb_offset_from_configfile 2022-06-08 14:52:47 +02:00
francescomani 539e5e89f3 Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources 2022-06-08 14:45:33 +02:00
francescomani 4ffef42472 Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization 2022-06-08 13:39:39 +02:00
francescomani 6c69393eda genericParameters in the new structure 2022-06-08 12:22:16 +02:00
francescomani b5583d47de temporary workaround for RRC passing CG to MAC (forced encoding of message at MAC) 2022-06-06 11:52:12 +02:00
Robert Schmidt 5f37ab35b4 Merge remote-tracking branch 'origin/develop-CSI' into integration_2022_wk22 2022-06-04 10:08:38 +02:00
Robert Schmidt 4e34462488 Merge remote-tracking branch 'origin/preambleTransMax_CE_rel13-in-configuration' into integration_2022_wk22 2022-06-04 10:08:31 +02:00
Robert Schmidt 6e7160ac03 Merge remote-tracking branch 'origin/multiple_pdu_MR' into integration_2022_wk22 2022-06-04 10:08:10 +02:00
Roberto Louro Magueta 0a496f44c4 Add comment about 3GPP TS 38.133 - Section 8 - Table 8.2.1.2.7-2 2022-06-02 19:41:53 +01:00
Roberto Louro Magueta 319bef7c87 Use UE capability to select the the number of SRS ports 2022-06-02 19:28:48 +01:00
Roberto Louro Magueta b8f68c81fb Merge remote-tracking branch 'origin/develop-SRS-Measurements' into develop-SRS-MIMO 2022-06-01 17:30:33 +01:00
Roberto Louro Magueta 1bb0ce90cc Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_srs.c
#	openair2/LAYER2/NR_MAC_gNB/main.c
 2022-06-01 15:46:37 +01:00
Roberto Louro Magueta 98f5478f7d Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# 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/LAYER2/NR_MAC_gNB/mac_proto.h
 2022-06-01 12:29:34 +01:00
Roberto Louro Magueta 2c3eb996a4 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	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
 2022-06-01 11:06:49 +01:00
francescomani 9a43678ed0 Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources 2022-06-01 09:06:57 +02:00
francescomani 13ed1200b4 Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization 2022-06-01 08:45:35 +02:00
Raymond Knopp 83d40a9b7c Add missing parameter preambleTransMax_CE_rel13 
To SIB2 and its passing to RRC. Parameter was read but not transfered
before. Basic LTE-M functionality should ok on develop branch with this
fix. Tested with uBlox SARA-R4 (QCOM chipset)
 2022-05-30 16:19:35 +02:00
Robert Schmidt ac9e47ba68 Merge remote-tracking branch 'origin/cleanup-2022-mai-UEid-management' into integration_2022_wk21b 2022-05-30 12:02:58 +02:00
Laurent THOMAS 236f7d56e5 Remove UEid in the MAC 
After this commit, only the RNTI is used as an identifier in the MAC.
Further, it removes some module_id, but a lot of them remain (the goal
to remove all is still far from us)
 2022-05-28 16:37:26 +02:00
rmagueta e6446392b2 Merge remote-tracking branch 'origin/develop-SRS-Measurements' into develop-SRS-MIMO 2022-05-27 11:55:31 +01:00
rmagueta 628a11cde5 Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/GNB_APP/MACRLC_nr_paramdef.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
 2022-05-27 11:38:32 +01:00
rmagueta 2f3079b808 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/nr_rrc_config.c
 2022-05-27 11:13:02 +01:00
rmagueta 6bca31c7e3 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
 2022-05-27 10:18:13 +01:00
francescomani 92ba8cb9d0 Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization 2022-05-27 10:46:15 +02:00
Robert Schmidt 21a820b061 Merge remote-tracking branch 'origin/support-15-kHz-SCS' into integration_2022_wk21b 2022-05-27 10:05:57 +02:00
Roberto Louro Magueta e1198b3d96 Add debug logs and comment update for nrofSRS_Ports 2022-05-25 17:30:17 +01:00
Robert Schmidt 360d4b3a81 Merge remote-tracking branch 'origin/k2-slot0-fix' into integration_2022_wk21 2022-05-24 17:57:58 +02:00
Roberto Louro Magueta 6e5b77baf3 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-05-24 14:55:22 +01:00
Roberto Louro Magueta ab1df8bbc4 Revert CSI configuration from update_cellGroupConfig to fill_initial_SpCellConfig 2022-05-24 13:45:35 +01:00
Roberto Louro Magueta 58102d24d8 Configuration of nrofSRS_Ports based on UE capability 2022-05-23 20:33:12 +01:00
francescomani fac44b15e8 adding option for CSI slot 2022-05-23 16:13:20 +02:00
francescomani d3f90a90fe removing calculate_preferred_ul_tda 2022-05-23 15:57:27 +02:00
francescomani 276b2d5e0c removing calculate_preferred_dl_tda 2022-05-23 15:48:29 +02:00
Robert Schmidt 9354d4305b Set k2=2 also in 5ms TDD periods 
In the past, setting k2=2 for 5ms TDD periods resulted in increased ping
RTT and/or reestablishment requests. These problems do not appear
anymore, and we can allow k2=2.
 2022-05-23 15:11:27 +02:00