hardy
b5ffe11bd8
Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15
...
Conflicts:
openair1/PHY/TOOLS/nr_phy_scope.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-04-14 15:14:03 +02:00
hardy
c4745c3e46
Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/TOOLS/time_meas.h
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
rmagueta
a8a34df01f
Fix compilation warning in oai_usrpdevif
2021-04-14 00:28:41 +01:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
rmagueta
7c37794513
Revert code indentation in usrp_lib
2021-04-08 14:56:05 +01:00
Laurent OpenCells
4511e70fac
fix from ci results
2021-04-05 12:56:52 +02:00
Laurent Thomas
9ce7f94518
record/replay for 5G, nrscope bug fix
2021-02-28 21:39:53 +01:00
Thomas Schlichter
75cd4c79d9
update tx_sample_advance for 40 MHz and USRP X300 (3/4 sampling)
...
Testing RA with OAI gNB and UE both using X300 via PCIe link indicated a value of 15 was way too small.
The correct value for this setup seems to be 65.
2021-02-09 18:09:11 +01:00
Thomas Schlichter
b9e99f1e64
update tx_sample_advance for 10 MHz and USRP X300
...
Tests with our USRP X300, connected via PCIe, show that tx_sample_advance of 45 is slightly too much.
Unfortunately, transmitting the PRACH preamble too early is very bad, slightly too late is no problem.
So change this value from 45 to 40. This helps receiving the PRACH preamble reliably.
2021-02-09 17:51:33 +01:00
Laurent Thomas
75ad3da9d9
start new gtpu
2021-01-21 15:51:30 +01:00
Rakesh
5f7c30fb8c
fix for get_slot_from_timestamp
2020-10-01 17:47:17 +02:00
Rakesh
8ab1c0b9d4
Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration_FR2
2020-09-16 11:56:07 +02:00
Rakesh
42fe39ece5
moving gpio control to the rx
2020-09-08 22:43:42 +02:00
Florian Kaltenberger
627da47786
fixing adc inpput shift and gain table for N310. adding pps sync.
2020-09-03 13:49:41 +02:00
Laurent
427b223136
small fiwes
2020-07-27 16:08:31 +02:00
Rakesh
24bdbde2a1
bugfix
2020-07-07 16:53:13 +02:00
Rakesh
e6713b7467
Merge remote-tracking branch 'origin/develop' into nr_vcd
2020-07-07 15:29:30 +02:00
WANG Tsu-Han
68366cb686
adding executional option for usrp trx thread and adding null device function for device other than usrp
2020-06-11 18:03:05 +02:00
WANG Tsu-Han
a85a39048d
Merge branch 'develop' into NR_RRCConfiguration_trx_thread
2020-05-20 09:50:05 +02:00
WANG Tsu-Han
f0116d6bba
fixes for return value for not using usrp write thread
2020-04-07 11:55:27 +02:00
WANG Tsu-Han
a6e1b2a9f8
Merge branch 'develop' into NR_RRCConfiguration_trx_thread
...
Conflicts:
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2020-04-02 13:02:31 +02:00
WANG Tsu-Han
669cc161f0
adding second_addr in config file
2020-03-24 11:22:17 +01:00
Florian Kaltenberger
897ca561f5
adding time_source command line parameter and removing duplications of clock_source
...
ignoring command line paramters clock_source and time_source in lte-softmodem and harmonizing it with nr-softmodem
time_source and clock_source handled separately in usrp_lib.cpp
2020-03-23 17:45:48 +01:00
Raymond Knopp
914e17b57b
Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
...
Conflicts:
executables/nr-softmodem.c
executables/nr-ue.c
executables/softmodem-common.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/nr_rrc_config.c
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB.c
2020-03-14 12:45:02 +01:00
WANG Tsu-Han
5cdfcc4cb5
bugfix after merge
2020-03-05 19:24:40 +01:00
WANG Tsu-Han
e08b5c1c38
Merge branch 'trx_write_thread' into NR_RRCConfiguration_trx_thread
...
Conflicts:
executables/nr-ru.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2020-03-05 18:31:21 +01:00
WANG Tsu-Han
cc4a0c742e
adding debug message
2020-03-05 17:38:47 +01:00
WANG Tsu-Han
bd672c5f0f
renaming of variable
2020-02-26 14:47:24 +01:00
WANG Tsu-Han
d30a28c368
adding check for overflow, removing prints and parameter setting fix
2020-02-25 16:49:39 +01:00
WANG Tsu-Han
c2b3867f8a
fix for not using pointer to stash
2020-02-25 15:16:18 +01:00
WANG Tsu-Han
61a24472db
assertion removal and debuging message adding
2020-02-25 14:07:01 +01:00
WANG Tsu-Han
d83c935e42
add trx write thread
2020-02-21 16:19:43 +01:00
frtabu
6014ca42ac
ENABLE_ITTI macro removal, modified telnet server to support all executables, modified record player to finalize switch to run-time option and allow usage with any device
2020-02-12 19:05:44 +01:00
Florian Kaltenberger
87d4443c0b
adding support for beamforming (control of GPIO) for FR2
2020-02-10 09:23:24 +01:00
Florian Kaltenberger
2027942710
Merge remote-tracking branch 'origin/NR_RRC_TA' into NR_RRCConfiguration
2020-02-04 15:33:57 +01:00
cig
7344d87567
Merge branch 'fhg-ta' into fhg-ra
2020-02-03 10:45:29 +01:00
Florian Kaltenberger
538e08d0a5
Revert "adding support for beam selection in usrp_lib"
...
This reverts commit 615f365b37 .
2020-01-29 22:05:54 +01:00
Florian Kaltenberger
615f365b37
adding support for beam selection in usrp_lib
2020-01-27 11:13:06 +01:00
WANG Tsu-Han
92c100bb5a
remove uhd_set_thread_priority function
2020-01-16 11:30:27 +01:00
Raphael Defosseux
e156e232fc
HOTFIX: missing UHD set_thread_priority_safe call (based on Cedric's feedback)
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-01-08 16:57:46 +01:00
Florian Kaltenberger
1bde69c032
Merge remote-tracking branch 'origin/fix-clock-source' into integration-develop-nr-2019w51
2019-12-19 09:50:16 +01:00
frtabu
69a7658c54
USRP device cleanup including record player as config option + some cppcheck warning/errors fixes
2019-12-16 17:53:22 +01:00
Florian Kaltenberger
320e3f1f14
Merge remote-tracking branch 'origin/develop-nr' into fix-clock-source
2019-12-13 16:42:04 +01:00
Florian Kaltenberger
e104d640e0
Merge remote-tracking branch 'origin/ru-parallel-beamforming-merge' into integration-develop-nr-2019w50
2019-12-12 12:49:55 +01:00
Florian Kaltenberger
3566ef991e
programming pin 5 of GPIO to "Shutdown LNA" (high -> TX, low -> RX)
2019-12-10 12:46:42 +01:00
Florian Kaltenberger
a78b5da529
fixes an issue with clock source
...
- command line paramter --clock-source can only be set at UE (removed this option from gNB)
- at gNB use clock_source from RU section in config file
- in both cases if clock_source is present in usrp_args, it will override clock_source
2019-12-06 08:54:17 +01:00
Thomas Schlichter
602d025e89
fix tx_sample_advance in usrp_lib for 46.08MSps
2019-12-03 18:31:51 +01:00
Wang Tsu-Han
d252696b14
Merge branch 'develop-nr' into ru-parallel-beamforming
...
Conflicts:
common/utils/T/T_defs.h
executables/nr-ru.c
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
openair1/PHY/defs_RU.h
openair1/SCHED_NR/nr_ru_procedures.c
openair1/SCHED_NR/sched_nr.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_common.c
2019-11-05 15:43:19 +01:00
Raphael Defosseux
96b59d07a3
fixing a typo in usrp_lib.cpp
2019-10-23 10:46:17 +02:00
WANG Tsu-Han
d88ab2f9c0
fix for having 4 physical antennas and adding timing measument for local trx write
2019-10-08 15:28:57 +02:00