Eurecom c834f40186 Merge remote-tracking branch 'origin/develop' into bandwidth-testing ...

Conflicts:
	executables/nr-uesoftmodem.c
	executables/nr-uesoftmodem.h
	executables/softmodem-common.h
	openair1/PHY/MODULATION/slot_fep_nr.c
	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/TOOLS/abstraction.c
	openair1/SIMULATION/TOOLS/random_channel.c
	openair2/LAYER2/NR_MAC_UE/mac_proto.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c

2021-09-05 15:37:11 +02:00

..

dlschsim.c

Merge remote-tracking branch 'origin/develop' into oairu

2021-04-27 11:58:31 +02:00

dlsim.c

Merge remote-tracking branch 'origin/develop' into bandwidth-testing

2021-09-05 15:37:11 +02:00

nr_dummy_functions_prach.c

Merge remote-tracking branch 'origin/develop' into NR_msg3_retransmission

2021-08-25 16:02:31 +02:00

nr_dummy_functions.c

Rebase to latest develop

2021-08-12 15:20:16 +05:30

nr_unitary_defs.h

Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO

2021-03-19 10:06:20 +01:00

pbchsim.c

Merge remote-tracking branch 'origin/develop' into bandwidth-testing

2021-09-05 15:37:11 +02:00

prachsim.c

Merge remote-tracking branch 'origin/develop' into bandwidth-testing

2021-09-05 15:37:11 +02:00

pucchsim.c

Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-pucch

2021-09-02 13:34:36 +02:00

reconfig.raw

added default NR Serving Cell Configuration

2020-01-01 21:23:38 +01:00

ulschsim.c

Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation

2021-05-22 16:33:44 +02:00

ulsim.c

Merge remote-tracking branch 'origin/develop' into bandwidth-testing

2021-09-05 15:37:11 +02:00