francescomani
3c766d29f3
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-09-12 09:38:38 +02:00
Raymond Knopp
ae2ccb4e7b
further fix for UE DCI candidate enumeration
2021-09-12 00:01:48 +02:00
Raymond Knopp
c8d2932172
small fix in dci handling in UE for multiple aggregation levels.
2021-09-11 20:07:36 +02:00
Melissa Elkadi
3abc7f93e7
Preparing UCIs after we have recevied PDSCH PDU
...
In this commit, we introduced a new global to save
the harq_pid from the PDCCH that comes down in the
DCI message so that we can use the harq_pid in the
PDSCH. Now, the UCI ind will be filled after we
have recevied the PDSCH in the tx_request.
2021-09-10 14:34:48 -07:00
rmagueta
705a627756
Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-10 16:13:05 +01:00
Eurecom
18e51299aa
minor changes for testing
2021-09-10 16:51:50 +02:00
francescomani
c5feda8613
Merge remote-tracking branch 'origin/develop' into scs_60_iisc
2021-09-10 14:59:10 +02:00
francescomani
503eba46ce
fix compilation issue
2021-09-10 13:39:50 +02:00
francescomani
10c4e95704
moving get_coreset_rballoc to nr_common
2021-09-10 11:55:57 +02:00
rmagueta
eb99d98ccf
Fix issues after merge
2021-09-10 10:42:02 +01:00
Laurent Thomas
62f2d43f75
merge develop
2021-09-10 11:11:20 +02:00
rmagueta
b898981109
Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2021-09-10 10:03:22 +01:00
hardy
157a975bab
Merge remote-tracking branch 'origin/minor-t-tracer-w36' into integration_2021_wk36
2021-09-09 15:56:20 +02:00
hardy
ddf2d0027d
Merge remote-tracking branch 'origin/fix-physim-run-script-on-cluster' into integration_2021_wk36
2021-09-09 15:55:22 +02:00
rmagueta
722505f22d
Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs
...
# Conflicts:
# openair1/PHY/MODULATION/slot_fep_nr.c
# openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
# openair1/PHY/NR_TRANSPORT/pucch_rx.c
# openair2/LAYER2/NR_MAC_UE/config_ue.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-08 17:05:01 +01:00
rmagueta
204bffbc7a
Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
...
# Conflicts:
# executables/nr-uesoftmodem.c
# executables/nr-uesoftmodem.h
# executables/softmodem-common.h
# openair2/LAYER2/NR_MAC_UE/mac_proto.h
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.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_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-08 16:31:24 +01:00
francescomani
17c0268775
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-09-07 17:17:35 +02:00
Laurent Thomas
7b2f3440e9
merge develop
2021-09-07 16:51:30 +02:00
Cedric Roux
5ac4ae361a
minor: T tracer: be more verbose for DLSCH DCI
2021-09-07 13:33:45 +02:00
Laurent Thomas
16ea018601
fix a abort() call let in the source
2021-09-07 11:57:58 +02:00
Sakthivel Velumani
76b0aa1fa6
Logging fixes in ulsim
2021-09-07 08:18:11 +05:30
Sakthivel Velumani
81a1ed703b
Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
2021-09-06 16:36:10 +05:30
Eurecom
15c5ea07bc
Merge remote-tracking branch 'origin/develop' into bandwidth-testing
...
Conflicts:
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.h
executables/softmodem-common.h
openair2/LAYER2/NR_MAC_UE/mac_proto.h
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_uci.c
2021-09-06 11:53:56 +02:00
Eurecom
eceb0d79bc
Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
...
Conflicts:
executables/nr-uesoftmodem.c
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.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-06 11:22:30 +02:00
Sakthivel Velumani
6fc6b7d120
Updated nr_ulsim for multi antenna support
2021-09-06 14:15:53 +05:30
Sakthivel Velumani
3be476c84d
Improved logging of PUSCH rx
2021-09-06 14:14:38 +05:30
Eurecom
4624a94d48
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-06 10:34:14 +02:00
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
Eurecom
efed5abbfe
commit before merge with develop
2021-09-04 22:42:32 +02:00
Raymond Knopp
8e4763bf94
small change in ulsch_decoder to allow segment even if parity-check fails but CRC passes.
2021-09-04 21:36:41 +02:00
hardy
12b1cb8fde
Merge remote-tracking branch 'origin/NR_UE_SA' into integration_2021_wk35
2021-09-02 23:11:40 +02:00
rmagueta
5765d0e508
Fix build after merge
2021-09-02 18:57:14 +01:00
rmagueta
5e1065e88f
Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
...
# 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/SCHED_NR/fapi_nr_l1.c
# openair1/SCHED_NR_UE/phy_procedures_nr_ue.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-02 17:57:48 +01:00
Raymond Knopp
98ef919502
Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-pucch
...
Conflicts:
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/pucchsim.c
2021-09-02 13:34:36 +02:00
rmagueta
5836ab1927
Fix build warnings
2021-09-01 14:03:28 +01:00
rmagueta
a45eb42fca
Change log levels
2021-09-01 12:57:01 +01:00
Eurecom
33cd8cafbb
after merge with abs
2021-09-01 10:27:13 +02:00
francescomani
af87ccffa9
Merge remote-tracking branch 'origin/develop' into fix-physim-run-script-on-cluster
2021-09-01 06:57:35 +02:00
Raymond Knopp
248fdfbd2c
merge with abs
2021-08-31 23:18:14 +02:00
Raymond Knopp
cf3b3f889c
Merge remote-tracking branch 'origin/bandwidth-testing-abs' into bandwidth-testing
2021-08-31 22:12:24 +02:00
Raymond Knopp
ee301a5acb
commit before merge
2021-08-31 22:12:12 +02:00
rmagueta
e621c3533c
Change log levels
2021-08-31 18:27:27 +01:00
Laurent THOMAS
0f033d99ff
merge develop
2021-08-31 13:29:28 +02:00
Laurent THOMAS
0976f3e988
bug fix
2021-08-31 13:26:29 +02:00
francescomani
2f5af6008b
Merge remote-tracking branch 'origin/develop' into NR_msg4_retransmission
2021-08-30 18:06:06 +02:00
francescomani
6a2352f843
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-30 17:55:38 +02:00
Raymond Knopp
3243f881b7
Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
2021-08-30 14:55:02 +02:00
Raymond Knopp
5d760e5cab
Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
...
Conflicts:
executables/nr-ru.c
openair1/PHY/NR_TRANSPORT/nr_dci.c
openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
2021-08-30 14:54:54 +02:00
Eurecom
07b89315ab
changes for debugging. switching to another marchine
2021-08-30 14:52:40 +02:00
Abhijith
28394b96af
Merge branch 'scs_60_iisc' of gitlab.eurecom.fr:oai/openairinterface5g into scs_60_iisc
2021-08-30 17:27:25 +05:30