Robert Schmidt
4674cddb71
Merge remote-tracking branch 'origin/fix-nrsoftmodem-stop' into integration_2022_wk33
2022-08-19 18:22:23 +02:00
Robert Schmidt
fffb2d14de
Close rfsimulator sockets
2022-08-16 14:44:22 +02:00
Robert Schmidt
649e059f90
RFsim: Mark FD non-blocking once; show errno on problem
2022-08-16 14:44:22 +02:00
Florian Kaltenberger
7e82f2f4e8
sending small end-of-burst TX packet when exiting softmodem
2022-08-16 14:44:22 +02:00
Robert Schmidt
69cf59f32d
Stop USRP write thread if necessary
2022-08-16 14:44:21 +02:00
Robert Schmidt
e28bd9ff2a
Free USRP objects in trx_usrp_end()
2022-08-16 14:43:59 +02:00
laurent
65b399fcd7
fix bugs in config module and config usage
...
fix bug from this MR
fix bug from this MR
stupid-mistake
2022-08-16 09:22:15 +02:00
Roberto Louro Magueta
85802b828f
Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-07-05 10:19:52 +01:00
Robert Schmidt
ae54a1bd05
Merge remote-tracking branch 'origin/fix-n320' into integration_2022_wk26
2022-06-29 23:14:51 +02: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
586aa46c2c
Set correct master clock rate for N320
2022-06-22 16:54:35 +02: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
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
Robert Schmidt
daad3da6eb
Merge remote-tracking branch 'origin/usrp-tune-offset' into integration_2022_wk21b
2022-05-27 10:06:20 +02:00
Florian Kaltenberger
38f7d772e6
small fix for USRP X410
2022-05-24 10:55:50 +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
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
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
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
Robert Schmidt
eef8cf510b
Improve RFsim documentation
2022-05-06 11:20:24 +02:00
francescomani
6b6528cc94
revert H_awgn_mimo in simulator
2022-05-02 10:41:42 +02: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
francescomani
3ec401f2f6
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
2022-04-28 17:26:33 +02:00
francescomani
d05f2b3add
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-28 11:54:51 +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
Laurent THOMAS
4ad71064b8
review comments
2022-04-11 19:29:45 +02:00
Raymond Knopp
86b5b9db3d
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.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
openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-09 19:44:26 +02:00
Laurent THOMAS
293a53e373
code review remarks, cannot perform full test (develop bugged)
2022-04-06 17:07:25 +02:00
francescomani
ed9c35a170
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-03 16:20:59 +02:00
rmagueta
c83df1b677
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair2/GNB_APP/gnb_config.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# 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
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-04-01 15:56:47 +01:00
rmagueta
4c0427ea6c
Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair2/GNB_APP/gnb_config.c
# openair2/GNB_APP/gnb_paramdef.h
# 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
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-03-30 19:23:22 +01:00
Raymond Knopp
b7389ab3d1
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-03-29 22:57:56 +02:00
francescomani
6e48ec9266
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-28 18:32:59 +02:00
rmagueta
1d1aaa30e7
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-03-28 15:06:23 +01:00
rmagueta
0abcf3d9c4
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_REFSIG/nr_gold.c
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-28 13:32:46 +01:00
Laurent THOMAS
c0568a997a
fix bugs, delete dead code
2022-03-28 12:05:18 +02:00
Laurent THOMAS
a7e7d05da3
fix difficult to read code
2022-03-24 14:38:17 +01:00
rmagueta
a47861628b
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_REFSIG/nr_gold.c
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair1/PHY/defs_nr_common.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/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2022-03-22 17:18:22 +00:00
francescomani
fb118a76a8
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-03-22 13:21:43 +01:00
Raymond Knopp
d840ca0dee
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-22 07:03:40 +01:00
Robert Schmidt
57cfd7bc32
Remove basic simulator
...
The basic simulator can be replaced with the RF simulator. Use option
--rfsim.
2022-03-17 08:25:16 +01:00
francescomani
8ef72fb939
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-17 07:51:35 +01:00
rmagueta
b59b84e904
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-03-17 01:03:35 +00:00
Robert Schmidt
d03a8b387f
Set kernel parameters when loading N300
2022-03-07 18:01:03 +01:00
Robert Schmidt
4d9ee5d11c
Add X400 to devtype_names, make char* array
2022-03-07 18:01:03 +01:00
Florian Kaltenberger
473328a057
Add support for USRP X400
2022-03-07 18:00:57 +01:00
Raymond Knopp
3402ea00cc
build for NR UE
2022-03-06 09:40:36 +01:00