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
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
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
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
Thomas Schlichter
e639e79220
Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS
2022-05-18 10:51:19 +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
0ddd8c2586
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_config.h
2022-05-11 14:36:21 +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
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
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
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
Robert Schmidt
aebabbcc0c
Merge remote-tracking branch 'origin/fixes-code-ci' into integration_2022_wk18
2022-05-04 15:16:14 +02: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
luis_pereira87
8569a47bc6
Remove sib1_tda from configuration files to use default value
2022-05-02 12:03:55 +01:00
francescomani
6b6528cc94
revert H_awgn_mimo in simulator
2022-05-02 10:41:42 +02:00
rmagueta
d01cd03ad3
Merge branch 'NR_RRC_processing_timer' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-30 16:40:58 +01:00
rmagueta
2ddb68754e
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-04-30 16:22:09 +01:00
rmagueta
751335765f
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
# openair1/PHY/NR_TRANSPORT/pucch_rx.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/nr_rrc_config.c
2022-04-30 15:52:48 +01:00
rmagueta
4b3aa7233e
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-04-30 15:14:20 +01:00
Thomas Schlichter
7815293443
Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS
2022-04-29 10:15:15 +02:00
francescomani
3ec401f2f6
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
2022-04-28 17:26:33 +02:00
francescomani
3054102200
targets config file cleanup
2022-04-28 14:01:20 +02:00
francescomani
d05f2b3add
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-28 11:54:51 +02:00
Robert Schmidt
5dc87bdcad
Merge remote-tracking branch 'origin/rename_frame_type' into integration_2022_wk17
2022-04-26 15:16:24 +02:00
Robert Schmidt
28c3205f22
Merge remote-tracking branch 'origin/fix-rfsim-ue4G-sync' into integration_2022_wk17
...
Conflicts:
targets/ARCH/rfsimulator/simulator.c
2022-04-26 15:16:09 +02:00
francescomani
33663e68b0
rename frame_type
2022-04-19 18:37:14 +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
7b5d8de65f
Remove sib1_tda from configuration files to use the default value
2022-04-14 15:52:54 +01:00
Laurent THOMAS
2373b02150
review remarks
2022-04-12 20:52:40 +02:00
rmagueta
1d86347587
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_TRANSPORT/nr_dci.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-04-12 14:48:08 +01:00
rmagueta
d6072cb5d2
Fix build after merge
2022-04-12 14:31:39 +01:00
Laurent THOMAS
4ad71064b8
review comments
2022-04-11 19:29:45 +02:00
Laurent THOMAS
b738f8a6a9
tackle code review remarks
2022-04-11 17:27:11 +02:00
Laurent THOMAS
421603534c
fix regression
2022-04-11 10:52:53 +02:00