Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
Conflicts: executables/nr-softmodem.c executables/nr-ue.c executables/softmodem-common.c openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c openair1/SCHED_NR/phy_procedures_nr_gNB.c openair1/SIMULATION/NR_PHY/dlsim.c openair1/SIMULATION/NR_PHY/ulsim.c openair2/LAYER2/NR_MAC_UE/mac_proto.h openair2/NR_PHY_INTERFACE/NR_IF_Module.c openair2/RRC/NR/MESSAGES/asn1_msg.c openair2/RRC/NR/MESSAGES/asn1_msg.h openair2/RRC/NR/nr_rrc_config.c openair2/RRC/NR/nr_rrc_defs.h openair2/RRC/NR/nr_rrc_proto.h openair2/RRC/NR/rrc_gNB.c
Showing
- ci-scripts/main.py 2 additions, 1 deletionci-scripts/main.py
- ci-scripts/reportTestLocally.sh 6 additions, 6 deletionsci-scripts/reportTestLocally.sh
- ci-scripts/runTestOnVM.sh 30 additions, 8 deletionsci-scripts/runTestOnVM.sh
- cmake_targets/CMakeLists.txt 16 additions, 15 deletionscmake_targets/CMakeLists.txt
- cmake_targets/tools/build_helper 5 additions, 5 deletionscmake_targets/tools/build_helper
- common/utils/LOG/log.h 0 additions, 10 deletionscommon/utils/LOG/log.h
- common/utils/LOG/vcd_signal_dumper.c 0 additions, 5 deletionscommon/utils/LOG/vcd_signal_dumper.c
- common/utils/T/local_tracer.c 7 additions, 9 deletionscommon/utils/T/local_tracer.c
- common/utils/telnetsrv/DOC/telnetarch.md 14 additions, 4 deletionscommon/utils/telnetsrv/DOC/telnetarch.md
- common/utils/telnetsrv/DOC/telnetusage.md 1 addition, 1 deletioncommon/utils/telnetsrv/DOC/telnetusage.md
- common/utils/telnetsrv/telnetsrv.c 15 additions, 5 deletionscommon/utils/telnetsrv/telnetsrv.c
- common/utils/telnetsrv/telnetsrv.h 1 addition, 1 deletioncommon/utils/telnetsrv/telnetsrv.h
- common/utils/telnetsrv/telnetsrv_CMakeLists.txt 19 additions, 7 deletionscommon/utils/telnetsrv/telnetsrv_CMakeLists.txt
- common/utils/telnetsrv/telnetsrv_enb_measurements.c 179 additions, 0 deletionscommon/utils/telnetsrv/telnetsrv_enb_measurements.c
- common/utils/telnetsrv/telnetsrv_enb_phycmd.c 60 additions, 79 deletionscommon/utils/telnetsrv/telnetsrv_enb_phycmd.c
- common/utils/telnetsrv/telnetsrv_measurements.c 18 additions, 122 deletionscommon/utils/telnetsrv/telnetsrv_measurements.c
- common/utils/telnetsrv/telnetsrv_measurements.h 17 additions, 6 deletionscommon/utils/telnetsrv/telnetsrv_measurements.h
- executables/nr-gnb.c 3 additions, 5 deletionsexecutables/nr-gnb.c
- executables/nr-softmodem-common.h 2 additions, 4 deletionsexecutables/nr-softmodem-common.h
- executables/nr-softmodem.c 38 additions, 21 deletionsexecutables/nr-softmodem.c
Loading
Please register or sign in to comment