Roberto Louro Magueta
53f0773624
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
2022-07-05 11:07:43 +01:00
Robert Schmidt
ae54a1bd05
Merge remote-tracking branch 'origin/fix-n320' into integration_2022_wk26
2022-06-29 23:14:51 +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
0b91791f67
Use (std) bool instead of custom bool types
...
OAI is riddled with boolean_t, FALSE, TRUE, etc. This makes no sense, as
there is a standard bool type, and could lead to nasty bugs if a
definition of a bool is non-standard (0 == false, true == !false). This
commit removes all non-standard bools in the whole project.
2022-06-27 10:07:48 +02: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
Robert Schmidt
586aa46c2c
Set correct master clock rate for N320
2022-06-22 16:54:35 +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
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
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
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
Robert Schmidt
daad3da6eb
Merge remote-tracking branch 'origin/usrp-tune-offset' into integration_2022_wk21b
2022-05-27 10:06:20 +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
Florian Kaltenberger
38f7d772e6
small fix for USRP X410
2022-05-24 10:55:50 +02:00
Robert Schmidt
e1b090cfaa
Improve logging
2022-05-23 15:20:03 +02:00
Robert Schmidt
9f6b7dc6b9
Make USRP tune_offset configurable
...
UHD documentation: "A tune request instructs the implementation how to
tune the RF chain."
This commit makes this configurable, from nr-softmodem, nr-uesoftmodem,
lte-softmodem, and lte-uesoftmodem.
2022-05-23 15:20:03 +02: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
luis_pereira87
3c4ba50281
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-11 14:49:59 +01:00
Roberto Louro Magueta
5c754f2300
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-05-11 14:19:33 +01:00
Roberto Louro Magueta
4c1b432718
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
...
# Conflicts:
# openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
2022-05-11 13:45:56 +01:00
Roberto Louro Magueta
1c9ef67384
Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_config.c
# openair2/RRC/NR/nr_rrc_config.h
2022-05-11 13:27:21 +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
Robert Schmidt
eef8cf510b
Improve RFsim documentation
2022-05-06 11:20:24 +02: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
Robert Schmidt
94aeb43847
Merge remote-tracking branch 'origin/NR_RRC_processing_timer' into integration_2022_wk18
2022-05-04 12:26:01 +02: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