Raymond Knopp
8911335fc3
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
2019-12-20 02:01:39 +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
Florian Kaltenberger
4143cb16f9
Merge remote-tracking branch 'origin/ru-parallel-beamforming-fix' into integration-develop-nr-2019w51
2019-12-19 09:45:46 +01:00
Francesco Mani
272140cd5d
Merge remote-tracking branch 'origin/ru-parallel-beamforming-fix' into NR_RRCConfiguration
2019-12-18 17:27:42 +01:00
WANG Tsu-Han
3f066dec56
parameter fix
2019-12-17 17:06:17 +01:00
Francesco Mani
f88dd725b2
Merge branch 'nr_tdd_configuration' into NR_RRCConfiguration
2019-12-17 09:28:04 +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
Francesco Mani
32f4c11b96
adapting to this branch some other config files
2019-12-16 16:34:52 +01:00
Rakesh
40ecb3f72b
first test to replicate to transmmit as same as NR_RRCConfiguration branch
2019-12-16 13:07:08 +01:00
Rakesh
9c45661215
Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr_tdd_configuration
...
resolving merge conflicts
2019-12-16 12:01:36 +01:00
Raymond Knopp
e30ab2d0c6
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-ru.c
executables/nr-softmodem.c
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/phy_init.h
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/nr_ru_procedures.c
openair1/SCHED_NR/phy_procedures_nr_common.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/sched_nr.h
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/nr_rrc_defs.h
2019-12-15 22:04:40 +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
da8be6a78b
Merge remote-tracking branch 'origin/pdcp-ul-noS1-v2' into integration-develop-nr-2019w50
2019-12-12 12:52:55 +01:00
Florian Kaltenberger
5d7e7d5fe1
Merge remote-tracking branch 'origin/nr-rlc' into integration-develop-nr-2019w50
2019-12-12 12:50:49 +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
Rakesh
b398103be9
Fix for dlulperiodicity
2019-12-11 20:45:44 +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
Cedric Roux
1a46b66d74
nr rlc: first commit
...
Initial implementation.
nr_rlc/nr_rlc_oai_api.c will need some clean rewrite at some point.
More testing is also needed.
2019-12-10 10:06:17 +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
Francesco Mani
dd789dc7ba
make pbchsim compile again
2019-12-05 18:23:53 +01:00
laurent
7672257b2f
asn1 encoding memory overflow
2019-12-05 04:56:42 +01:00
Thomas Schlichter
602d025e89
fix tx_sample_advance in usrp_lib for 46.08MSps
2019-12-03 18:31:51 +01:00
Florian Kaltenberger
0e47a507d3
Merge remote-tracking branch 'origin/nr_x300_fixes' into integration-develop-nr-2019w48bis
2019-11-29 17:19:04 +01:00
Florian Kaltenberger
729498571b
Merge remote-tracking branch 'origin/nr_100mhz' into integration-develop-nr-2019w48bis
2019-11-29 17:18:47 +01:00
Francesco Mani
d5db8c1634
make lte compile again
2019-11-28 17:29:41 +01:00
Raymond Knopp
f3a27d762a
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-gnb.c
openair1/PHY/defs_gNB.h
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/phy_procedures_nr_common.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/COMMON/platform_constants.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/main.c
targets/COMMON/openairinterface5g_limits.h
2019-11-28 06:35:31 +01:00
Francesco Mani
b2ddd33577
Merge branch 'nr_beamforming_new' into ru-parallel-beamforming-merge
2019-11-27 14:34:34 +01:00
Francesco Mani
433e3edd21
fix for nr_is_ssb_slot in nr_slot_select
2019-11-26 18:31:04 +01:00
Francesco Mani
2406662e74
new config file for static beam weights
2019-11-26 11:07:43 +01:00
Francesco Mani
63375fa139
BF weights from config file for RU case
2019-11-25 16:43:15 +01:00
Wang Tsu-Han
56ecc5cfb2
Merge branch 'develop-nr' into ru-parallel-beamforming-merge
...
Conflicts:
openair1/PHY/MODULATION/nr_modulation.h
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
2019-11-22 17:00:53 +01:00
Florian Kaltenberger
dfad6a91d7
removing duplicate and erroneous malloc
2019-11-21 15:34:50 +01:00
Francesco Mani
3ddce03c65
change in 273 config file
2019-11-19 16:03:34 +01:00
Francesco Mani
2e6d4c7572
Merge branch 'develop-nr' into nr_100mhz
2019-11-19 15:57:09 +01:00
Wang Tsu-Han
6be2d8f081
using switch buffer for txdataF in L1
2019-11-18 12:33:48 +01:00
Francesco Mani
8ad07d3aef
make gNB compile for 273 PRBs and including config file
2019-11-15 12:41:02 +01:00
Florian Kaltenberger
a3379d1d10
Merge remote-tracking branch 'origin/fix-nr-rfsim-gNB-notx-slots2to19' into integration-develop-nr-2019w46
2019-11-15 09:38:54 +01:00
laurent
ea7c4d9536
fix fix-nr-rfsim-gNB-notx-slots2to19
2019-11-12 14:35:43 +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
Wang Tsu-Han
57421caae5
adding tracer for tx fronthaul
2019-11-04 15:32:25 +01:00
Raymond Knopp
930e1fde33
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-ru.c
executables/nr-softmodem.c
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
openair1/PHY/INIT/nr_init.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair1/PHY/NR_TRANSPORT/nr_tbs_tools.c
openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/SCHED_NR/nr_ru_procedures.c
openair1/SCHED_NR/phy_procedures_nr_common.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/COMMON/rrc_messages_types.h
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
2019-11-02 01:12:15 +01:00
Florian Kaltenberger
bf7d52de43
Merge remote-tracking branch 'origin/develop-nr' into nr_fapi_for_push
2019-10-30 16:33:35 +01:00
Raphael Defosseux
96b59d07a3
fixing a typo in usrp_lib.cpp
2019-10-23 10:46:17 +02:00
Raymond Knopp
868b673915
removed NUMBER_NR_UE_MAX
2019-10-18 09:00:39 +02:00
Florian Kaltenberger
c046eb66a6
Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42
...
Conflicts:
executables/nr-softmodem.c
executables/nr-softmodem.h
targets/ARCH/rfsimulator/simulator.c
2019-10-14 13:40:03 +02:00
Florian Kaltenberger
f26373c52b
Merge remote-tracking branch 'origin/develop-nr_cppcheck' into integration_develop-nr_2019w42
...
Conflicts:
executables/nr-gnb.c
openair1/PHY/NR_REFSIG/nr_dmrs_rx.c
openair1/SIMULATION/NR_PHY/ulsim.c
2019-10-14 13:34:14 +02:00
Florian Kaltenberger
76b55e9cbd
Merge remote-tracking branch 'origin/develop-nr' into nr_fapi_for_push
2019-10-11 17:26:03 +02:00
Raymond Knopp
d554707919
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-gnb.c
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_mPass.h
openair1/PHY/CODING/nrLDPC_decoder/nrLDPC_types.h
openair1/PHY/INIT/nr_init_ue.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
openair2/COMMON/rrc_messages_types.h
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/rrc_gNB.c
2019-10-10 12:29:20 +02:00
yilmazt
08eda57aca
final minor changes before the merge
2019-10-08 18:32:02 +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