Robert Schmidt
dc5d5f8d99
Merge remote-tracking branch 'origin/fix-gNB-ID-config' into integration_2022_wk38
2022-09-22 18:58:38 +02:00
luis_pereira87
2931884d07
Fix ulprbbl based on SRS
2022-09-21 08:38:30 +01:00
Robert Schmidt
a549bc62a9
Correct set gNB_ID, gNB_CU_ID does not exist
2022-09-20 15:13:59 +02:00
Robert Schmidt
0a6075844a
Merge remote-tracking branch 'origin/fix-sst-sd' into integration_2022_wk36b
2022-09-08 20:43:37 +02:00
Robert Schmidt
1d4d22e37e
Merge remote-tracking branch 'origin/astro-develop-patch-97937' into integration_2022_wk36b
2022-09-08 20:42:35 +02:00
Robert Schmidt
8e4c7a1115
Merge remote-tracking branch 'origin/sa_conf_and_fixes_for_mu0' into integration_2022_wk36b
2022-09-08 20:42:21 +02:00
Robert Schmidt
c859c233f7
Simplify NSSAI configuration in all configuration files
2022-09-05 16:09:38 +02:00
Robert Schmidt
203ac17833
Merge remote-tracking branch 'origin/by-core-thread-pool' into integration_2022_wk35b
2022-09-04 21:46:04 +02:00
Robert Schmidt
609c2716c7
Merge remote-tracking branch 'origin/ldpc_offload_t1_mr' into integration_2022_wk35b
2022-09-04 21:37:44 +02:00
Abdelrahman Astro
f06fc314c6
quick fix for gnb.sa.band41.fr1.106PRB.usrpb210.conf
2022-09-03 09:08:48 +00:00
laurent
aa2a36768c
simplify thread pool configuration
...
fix segv
fix bug redeclaration of same struct in phy sim
Apply 1 suggestion(s) to 1 file(s)
code reveiw comments
2022-09-02 11:36:47 +02:00
luis_pereira87
f3781c4353
Add band n77 configuration file for N300 with 100 MHz
...
Band n78 is widely used by mobile network operators, we want to transmit over the air without interfere with them, so we set the allocation in this configuration file outside of band n78
2022-08-25 16:48:08 +01:00
Thomas Schlichter
ef46fe8ba8
Add and harmonize configuration files for 5, 10, 40 MHz FDD with USRP X300
2022-08-25 14:40:36 +02:00
Thomas Schlichter
ae2e8060ea
update band 66 configuration files for USRP X300 and N300
2022-08-25 14:40:36 +02:00
luis_pereira87
015a4d945b
Enable 2 Downlink layers MIMO and other minor improvements in default configuration files
2022-08-25 13:27:29 +01:00
Hongzhi Wang
31acfdea58
Merge branch 'develop' into ldpc_offload_t1_mr
...
Conflicts:
openair1/SCHED_NR/phy_procedures_nr_gNB.c
2022-08-18 17:38:55 +02:00
Roberto Louro Magueta
86755bc495
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-06-27 11:06:55 +01:00
Robert Schmidt
b37050ac6e
Merge remote-tracking branch 'origin/F1_interop_ACC_n78' into integration_2022_wk25
2022-06-23 14:09:33 +02:00
francescomani
a4e2c2b799
addressing review
2022-06-20 11:58:06 +02:00
francescomani
fb6fa64bc7
Merge remote-tracking branch 'origin/develop' into NR_remove_ssb_offset_from_configfile
2022-06-20 09:33:50 +02:00
Hongzhi Wang
b7295ab45f
Merge branch 'develop' into ldpc_offload_t1_mr
...
Conflicts:
executables/nr-gnb.c
openair1/PHY/CODING/nrLDPC_defs.h
openair1/PHY/INIT/nr_init.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-06-17 14:49:54 +02:00
Cedric Roux
1ad8f254c2
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
2022-06-13 16:59:59 +02:00
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
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
Robert Schmidt
12c0f52fea
Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
2022-06-08 19:45:17 +02:00
Sakthivel Velumani
b2b84caeb5
Made PRB averaging channel est as default
...
fixed indendation
updated ulsim CI test parameters
2022-06-08 21:32:07 +05:30
Sakthivel Velumani
1d99c8e695
LDPC iterations as command line parameter
2022-06-08 21:32:07 +05:30
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
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
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
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
Thomas Schlichter
e639e79220
Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS
2022-05-18 10:51:19 +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
Roberto Louro Magueta
8ac68929bc
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-05-17 19:13:38 +01: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
luis_pereira87
0217cd50de
Update in documentation
2022-05-12 10:06:00 +01:00
Roberto Louro Magueta
08975e451f
Update the ul_prbblacklist based on SRS measurements and an ul_prbblack_SNR_threshold
2022-05-10 14:03:24 +01:00
francescomani
a037987b47
remove ssb subcarrier offset from config file
2022-05-09 18:28:56 +02:00
luis_pereira87
c587fe366d
Improve log and cosmetic changes
2022-05-06 16:06:31 +01: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
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
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
Roberto Louro Magueta
70cfd057ec
Add do_SRS flag in gnb.sa.band78.fr1.106PRB.usrpb210.conf
2022-05-04 15:09:59 +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
luis_pereira87
952a216b92
Remove sib1_tda from configuration files to use default value
2022-05-04 12:49:23 +01:00
luis_pereira87
d059c71754
Clean up and minor improvements in configuration files
2022-05-03 16:08: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
4b7b621f00
Minor improvements and cleanup in 5G NR SA configuration files
2022-05-02 12:03:55 +01:00