Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements
# Conflicts: # openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
No related branches found
No related tags found
Showing
- cmake_targets/tools/build_helper 2 additions, 2 deletionscmake_targets/tools/build_helper
- executables/nr-gnb.c 1 addition, 1 deletionexecutables/nr-gnb.c
- executables/nr-ue.c 4 additions, 2 deletionsexecutables/nr-ue.c
- executables/softmodem-common.c 3 additions, 0 deletionsexecutables/softmodem-common.c
- executables/softmodem-common.h 4 additions, 0 deletionsexecutables/softmodem-common.h
- nfapi/oai_integration/nfapi_vnf.c 2 additions, 2 deletionsnfapi/oai_integration/nfapi_vnf.c
- openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c 17 additions, 17 deletionsopenair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
- openair1/PHY/LTE_TRANSPORT/dci_tools.c 2 additions, 2 deletionsopenair1/PHY/LTE_TRANSPORT/dci_tools.c
- openair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/defs_NB_IoT.h
- openair1/PHY/MODULATION/nr_modulation.c 13 additions, 13 deletionsopenair1/PHY/MODULATION/nr_modulation.c
- openair1/PHY/MODULATION/ofdm_mod.c 22 additions, 22 deletionsopenair1/PHY/MODULATION/ofdm_mod.c
- openair1/PHY/MODULATION/slot_fep_nr.c 22 additions, 22 deletionsopenair1/PHY/MODULATION/slot_fep_nr.c
- openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c 11 additions, 12 deletionsopenair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
- openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c 11 additions, 12 deletionsopenair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
- openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h 1 addition, 1 deletionopenair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
- openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c 9 additions, 11 deletionsopenair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
- openair1/PHY/TOOLS/calibration_scope.c 2 additions, 2 deletionsopenair1/PHY/TOOLS/calibration_scope.c
- openair1/PHY/TOOLS/cmult_sv.c 25 additions, 222 deletionsopenair1/PHY/TOOLS/cmult_sv.c
- openair1/PHY/TOOLS/nr_phy_scope.c 2 additions, 2 deletionsopenair1/PHY/TOOLS/nr_phy_scope.c
- openair1/PHY/TOOLS/tools_defs.h 7 additions, 15 deletionsopenair1/PHY/TOOLS/tools_defs.h
Loading
Please register or sign in to comment