laurent
ea7c4d9536
fix fix-nr-rfsim-gNB-notx-slots2to19
2019-11-12 14:35:43 +01: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
Khalid Ahmed
cd5a321895
Fixing TDD mode using USRP x300
2019-10-08 09:30:14 +02:00
Khalid Ahmed
dd0927dd55
TDD fixes in real-time environment
2019-10-08 09:30:14 +02:00
yilmazt
54899a9be1
merge of develop&develop-nr
2019-09-12 16:02:36 +02:00
Raphael Defosseux
ac711d9adf
Merge remote-tracking branch 'origin/rfsimu_config' into develop_integration_2019_w36
2019-09-03 11:19:34 +02:00
Florian Kaltenberger
517afa5a45
adding example config for rfsimulator
2019-08-26 11:54:49 +02:00
Mohamed Gamal
21e578b5e6
Add new config parameter "pusch_repetitionLevelCEmodeA_r13"
...
To control along with pusch_maxNumRepetitionCEmodeA_r13 the actual number of repetitions for PUSCH according to 36.213 table 8.2b
Scope of commit: Parsing parameter's value. The value should be used in future commits.
Signed-off-by: Mohamed Gamal <mohammed.abdelkhalek.ext@orange.com >
2019-07-28 17:04:20 +02:00
yilmazt
ff6710c898
develop-nr current as of 16.7.19
2019-07-16 17:06:20 +02:00
yilmazt
2b321fd1c7
Merging latest develop commits
2019-07-16 11:20:24 +02:00
Florian Kaltenberger
60d53688d8
Merge remote-tracking branch 'origin/uhd-priority-fix' into integration_develop-nr_2019w28
2019-07-08 15:42:52 +02:00
Rakesh
98f2736404
Adding configuration file and was able to run both gNB and nrUE on b210 without any problem
...
* To run gNB : sudo ./nr-softmodem -E -O ../../../targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpb210.conf
* To run UE : sudo ./nr-uesoftmodem -E --numerology 1 -r 106 --phy-test -C 3510000000 --ue-rxgain 90 -d
* We had done a wired test with 40dB attenuator in between gNB and nrUE.
2019-07-08 12:42:02 +02:00
Wang Tsu-Han
310359c678
adding log for priority setting and using pipeline structure
2019-07-03 16:11:57 +02:00
Raphael Defosseux
8f68d596f1
Merge remote-tracking branch 'origin/develop-entv' into develop_integration_2019_w25
2019-06-18 13:42:50 +02:00
yilmazt
ce9c9ec88f
develop and develop-nr are now current as of 14.6.19
2019-06-17 16:11:52 +02:00
yilmazt
420e6194d4
All 4 nr<e-(ue)softmodems are compiling
2019-06-16 19:46:11 +02:00
WANG Tsu-Han
bdc6aff4a0
adding tracer
2019-06-11 16:43:17 +02:00
Wang Tsu-Han
173f10e51d
adding uhd priority setting in ru_thread_tx
2019-05-27 18:05:03 +02:00
Wang Tsu-Han
6b2e064216
Merge branch 'develop' into ru_rau_enhancement_L1_renaming
...
Conflicts:
ci-scripts/xml_files/enb_ue_usrp210_band7_test_05mhz_tm1.xml
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.calisson.conf
targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.memphis.conf
targets/PROJECTS/CENTOS-LTE-EPC-INTEGRATION/CONF/enb.centos.nord.conf
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-ue.c
2019-05-23 18:29:01 +02:00
Javier Morgade
b1c1c4545a
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-23 16:51:30 +02:00
Javier Morgade
786895dcd9
Merge remote-tracking branch 'origin/develop' into develop-entv
2019-05-17 18:11:55 +02:00
yilmazt
7719314983
Merge branch 'develop' into develop-nr
2019-05-17 17:11:31 +02:00
Cedric Roux
cd667e5563
RRC: add an option to enable measurement reports
...
In the configuration file, to enable measurements, add:
enable_measurement_reports = "yes";
Note that if x2 is enabled then the option 'enable_measurement_reports'
is not taken into account and the measurements are enabled.
2019-05-13 15:52:54 +02:00
Raymond Knopp
9fb2f7365c
fronthaul bugfixes for IF4p5 2x2 antenna configuration, testing with TM2
2019-04-28 20:27:10 +02:00
Raymond Knopp
e47829af6c
removal of EXPRESS MIMO HW drivers/libraries, same for mobipass.
2019-04-28 11:11:11 +02:00
Raymond Knopp
17eb5eedaf
Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming
...
also:
removed XFORMS from lte-softmodem target and associated extra functions in lte-softmodem.c
Conflicts:
common/utils/T/T_defs.h
targets/RT/USER/lte-softmodem.c
2019-04-28 10:30:56 +02:00
Raymond Knopp
a64e7eef7d
tested compilation and execution with --simL1 and --rfsim.
2019-04-22 21:20:43 +02:00
Rakesh Mundlamuri
a531ea62fa
The changes made in this branch is to enable -E(threequarter sampling rate) option for mu=1 and 217PRB(ie; 80 MHz) to run on USRP x310.
2019-04-19 17:24:18 +05:30
Raymond Knopp
ca111641d4
Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement_L1_renaming
...
Conflicts:
cmake_targets/build_oai
cmake_targets/oaisim_build_oai/CMakeLists.template
cmake_targets/oaisim_mme_build_oai/CMakeLists.template
cmake_targets/oaisim_noS1_build_oai/CMakeLists.template
openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
openair1/PHY/impl_defs_lte.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SIMULATION/LTE_PHY/dlsim.c
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
targets/ARCH/ETHERNET/USERSPACE/LIB/eth_udp.c
targets/ARCH/ETHERNET/USERSPACE/LIB/ethernet_lib.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
2019-04-14 20:34:03 +02:00
Francesco Mani
ae02c9a6fd
conflicts resolved after merge with develop-nr
2019-03-22 10:34:34 +01:00
Florian Kaltenberger
8e5c8ad2df
adding external ref to config file
2019-03-21 15:39:44 +01:00
Robert Schmidt
1f590efe2b
Merge branch 'develop' into feature-127-protocol-split
2019-03-19 14:49:07 +01:00
Raphael Defosseux
872a99fbec
Merge remote-tracking branch 'origin/eMTC-testing' into develop_integration_2019_w11
2019-03-14 21:48:02 +01:00
Robert Schmidt
62d9b8cf36
Merge branch 'develop' into feature-127-protocol-split
2019-03-14 13:10:21 +01:00
Cedric Roux
9456fe584a
x2ap: timers, cleanup
...
This commit introduces X2AP timers (t_reloc_prep, tx2_reloc_overall).
You need to set the values in the configuration file.
X2AP can be enabled or disabled in the configuration file too (disabled
by default).
Some deadcode was removed.
2019-03-13 15:28:37 +01:00
Raphael Defosseux
d8e16e37a5
Merge remote-tracking branch 'origin/develop' into eMTC-testing
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2019-03-13 14:17:24 +01:00
Robert Schmidt
e3bb3ab7d3
Change integer based conf parameter from string
2019-03-05 18:27:54 +01:00
Robert Schmidt
1e3d0c9a16
Update F1 CU/DU configuration (tested, formatted)
2019-02-27 15:31:52 +01:00
Schultze
a89a9ae311
--build-codeblocks switch added, command line parser fixed.
2019-02-27 12:55:28 +01:00
nepes
d74f2da9a8
changes to configuration file for eMTC (pucch parameters)
2019-02-25 17:54:44 +01:00
Francesco Mani
2156ba10d5
config files changed and pdcch/pdsch enabled
2019-02-25 16:51:41 +01:00
Francesco Mani
c49f91444e
Conflicts solved after merge with develop-nr and modifications to simulators to compile
2019-02-25 15:03:32 +01:00
Robert Schmidt
030e11ba9a
Merge branch 'develop' into feature-127-protocol-split
2019-02-21 20:18:35 +01:00
Francesco Mani
a5025d4c4f
SSB positions in burst from config file
2019-02-21 15:30:09 +01:00
Francesco Mani
5c2f57369d
Implementation of SS block pattern choice
2019-02-14 16:29:35 +01:00
Raymond Knopp
e704e7ccc0
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
2019-02-07 23:58:17 +01:00
Raymond Knopp
72b5745abb
Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/defs_eNB.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair1/SIMULATION/LTE_PHY/dlsim.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-uesoftmodem.c
targets/RT/USER/rfsim.c
2019-01-26 11:54:10 +01:00
matzakos
eb92fa917b
Fixed eNB threading issues creating problems for nfapi emulator.
2019-01-17 15:29:15 +01:00
Cedric Roux
aea6b4b5a6
fix a lot of file mode
...
For whatever reason most of the files had their permission
changed from 644 to 755, which is not wanted.
2019-01-07 16:22:28 +01:00
Raymond Knopp
44a225c6b7
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
targets/RT/USER/lte-enb.c
2019-01-05 23:28:31 +01:00