Thomas Schlichter
b7ef903cb4
Merge remote-tracking branch 'develop' into NR_10MHz
2021-03-16 16:13:17 +01:00
Remi Hardy
c12dd11d6e
Merge remote-tracking branch 'origin/develop-SA-RA' into integration_2021_wk10
2021-03-12 11:07:25 +01:00
Turker YILMAZ
c56a7e2037
Very minor update to test git on new the machine
2021-03-10 19:30:23 +01:00
Thomas Schlichter
4e87bc3c96
add missing parameter 'pusch_proc_threads' to configuration files
...
also harmonize configuration files some more
2021-03-10 10:45:31 +01:00
francescomani
97ed2dfe5b
Merge remote-tracking branch 'origin/develop' into NR_10MHz
2021-03-02 14:31:12 +01:00
rmagueta
5f66269a8b
Merge remote-tracking branch 'origin/develop' into develop-SA-RA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:01:11 +00:00
hardy
8d05695722
Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b
2021-02-26 16:09:05 +01:00
rmagueta
910154c7af
Merge branch 'develop' into develop-SA-RA
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:04:01 +00:00
hardy
accae67113
Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08
2021-02-23 09:31:05 +01:00
hardy
3199b81584
Merge remote-tracking branch 'origin/enhance-rfsim' into integration_2021_wk08
2021-02-23 09:30:42 +01:00
hardy
90d6a57a3c
Merge remote-tracking branch 'origin/NR_UL_SCFDMA_100MHz' into integration_2021_wk08
2021-02-23 09:30:22 +01:00
Gokul Srinivasan
880096cc95
Delete create_nr_tasks.c
2021-02-21 18:40:51 +01:00
Florian Kaltenberger
30aaa0dc44
reducing UL target power for Benetel 5G RRU and adding missing parameter for PUSCH multi thread processing
2021-02-19 11:47:25 +01:00
Florian Kaltenberger
670c807a56
Merge remote-tracking branch 'origin/develop' into benetel_driver_update
2021-02-19 11:46:41 +01:00
Cedric Roux
73f3a458cf
NSA: finalize nea2 security for gNB
...
- a new section in the configuration file to select security algorithms,
with new code to deal with it
- cleanup CG-ConfigInfo: specs seem to indicate that we must not
add mcg_RB_Config; the gNB has to deal with that
- as a consequence, modify fill_default_rbconfig() that is called in
every cases and needs security and bearer parameters
The new section in the configuration file looks like:
security = {
# preferred ciphering algorithms
# the first one of the list that an UE supports in chosen
# valid values: nea0, nea1, nea2, nea3
ciphering_algorithms = ( "nea0", "nea2" );
# preferred integrity algorithms
# the first one of the list that an UE supports in chosen
# valid values: nia0, nia1, nia2, nia3
integrity_algorithms = ( "nia0" );
};
2021-02-15 15:25:52 +01:00
Mahesh
f69af6abaf
merge MR978 (5G nFAPI) into develop
2021-02-12 16:26:22 +05:30
rmagueta
7011b04b75
Code clean up and minor correction in RA for SA
2021-02-12 00:24:31 +00:00
Mahesh
eb19e02cf3
Merging MR978 with develop
2021-02-11 22:50:25 +05:30
rmagueta
c5ab33ffd9
Merge remote-tracking branch 'origin/develop' into develop-SA-RA
...
# Conflicts:
# openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-02-11 12:27:06 +00:00
Laurent Thomas
c93482c4c6
trivial merge with develop"
2021-02-11 13:27:00 +01:00
Laurent Thomas
b3e21ad87b
only a printf
2021-02-10 17:58:10 +01:00
Laurent Thomas
2c5bd9fa8c
improve rfsim
2021-02-10 17:49:14 +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
Thomas Schlichter
28f739bb70
add 10 MHz configuration file for USRP X300
2021-02-09 17:50:32 +01:00
dir
cfebcd19bd
Corrections to 217RBs, 273RB configuration files. RFSIM works with these changes
2021-02-09 17:32:51 +02:00
Florian Kaltenberger
04a4a6f451
Merge remote-tracking branch 'origin/develop' into benetel_driver_update
2021-02-09 11:13:01 +01:00
Florian Kaltenberger
12517f02e2
Reverting shifting the TX 4 bits to the left to exploit dynamic range.
...
adapted ssb_block_power to measured value
This partially reverts commit 857f9179f3 .
Conflicts:
targets/ARCH/ETHERNET/benetel/5g/benetel.c
2021-02-09 11:10:58 +01:00
rmagueta
03b52cec84
Merge remote-tracking branch 'origin/develop' into develop-SA-RA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_UE/rar_tools_nrUE.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/RRC/NR_UE/rrc_UE.c
2021-02-08 15:17:12 +00:00
Sakthivel Velumani
8902902706
Merge branch 'develop' into ue-fixes
2021-02-08 15:06:17 +01:00
Thomas Schlichter
3743ead91a
Merge remote-tracking branch 'develop' into NR_10MHz
2021-02-08 14:20:20 +01:00
Mahesh
0e6f1e6ad6
Merge conflicts resolved
2021-02-08 18:05:29 +05:30
Cedric Roux
b7ea4e0f6d
benetel 5g: support for two antennas
2021-02-05 16:48:30 +01:00
hardy
663dd1251c
Merge remote-tracking branch 'origin/NR_RA_cleanup' into integration_2021_wk05
2021-02-05 12:00:38 +01:00
Cedric Roux
a9f57407c7
benetel 4g: support two antennas
2021-02-03 17:07:18 +01:00
hardy
c00b44028b
Merge remote-tracking branch 'origin/develop-sib1-update' into integration_2021_wk05
2021-02-02 15:40:22 +01:00
rmagueta
76b974508b
Merge branch 'develop' into develop-sib1-update-ue
...
# Conflicts:
# cmake_targets/CMakeLists.txt
2021-02-02 12:10:12 +00:00
Mahesh
ae422aca1f
Merge conficts resolved
2021-02-02 09:36:49 +05:30
luis_pereira87
6885668273
Fix AssertFatal in replay_node when file size is not a multiple of block size
2021-02-01 20:55:58 +00:00
Sakthivel Velumani
c9dcff3d7e
Merge branch 'develop' into ue-fixes
2021-02-01 16:07:58 +01:00
Sakthivel Velumani
f44dc35bfd
Reducing RX gain at gNB
...
1. Changed rx gain at gNB from 75 to 50. PUCCH works again with OAI-UE.
2. Disabling MAC layer retransmission logs.
2021-02-01 16:00:33 +01:00
Florian Kaltenberger
857f9179f3
shifting also the TX 4 bits to the left to exploit dynamic range. adapted ssb_block_power but proper calibration still necessary.
2021-02-01 10:24:22 +01:00
Florian Kaltenberger
a5b5d6f9b0
fixing RRC power levels at 5G side to avoid saturation
2021-02-01 10:24:22 +01:00
Florian Kaltenberger
0f57529b48
fixing benetel4g driver by setting ru->has_ctrl_prt =1 and thus starting the RU control thread, which is required for the 4G RRU. In the future we should revisit this and harmonize with the 5G version.
2021-02-01 10:24:22 +01:00
Thomas Schlichter
bca9f74e66
Merge remote-tracking branch 'develop' into NR_RA_cleanup
2021-01-29 18:52:37 +01:00
Sakthivel Velumani
0eb2e06725
Moved pusch thread parameter to L1 in config file
2021-01-29 13:14:14 +01:00
francescomani
8af407250d
Merge remote-tracking branch 'origin/develop' into NR_10MHz
2021-01-29 12:16:43 +01:00
hardy
9c810b311d
Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b
2021-01-29 07:40:07 +01:00
rmagueta
62bc47c820
Minor update in SIB1 contents. do_SIB1_NR() only if SA.
2021-01-28 16:04:41 +00:00
rmagueta
6e917c539f
Fill SIB1 with more contents
2021-01-25 23:18:35 +00:00