rmagueta
fdce62f799
Add cyclic_prefix in csirs_config_pdu at UE
2022-02-23 18:05:45 +00:00
rmagueta
5bae6dd6f3
Add missing fiels in fapi_nr_dl_config_csirs_pdu_rel15_t
2022-02-23 16:11:13 +00:00
rmagueta
4d17364142
Fix build warnings
2022-02-23 14:16:58 +00:00
rmagueta
0e0526e367
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_dlsch.c
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/RRC/NR/rrc_gNB_nsa.c
2022-02-23 13:51:31 +00:00
rmagueta
ed6aa9f505
Replace AssertFatal with a LOG in nr_get_csi_payload at UE
2022-02-22 20:09:58 +00:00
rmagueta
0ced14a56d
Fix in nr_set_pdsch_semi_static
2022-02-22 20:02:15 +00:00
rmagueta
bb82697819
Fix segmentation fault at UE in nr_schedule_csi_for_im and nr_schedule_csirs_reception
2022-02-22 19:14:17 +00:00
rmagueta
cf284d76f0
Fix build after merge
2022-02-22 17:49:59 +00:00
rmagueta
6f19524e95
Merge remote-tracking branch 'origin/CSI-SA' into develop-CSI
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_dlsch.c
# openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_gNB/config.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_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_nsa.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-22 15:10:20 +00:00
rmagueta
4f58d66972
Merge remote-tracking branch 'origin/nr_csirs_rrc_harmonization' into develop-CSI
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_nsa.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-22 13:14:12 +00:00
francescomani
edb32cad99
fix in config_csirs
2022-02-22 13:37:39 +01:00
rmagueta
2b108cdded
Merge remote-tracking branch 'origin/NR_UE_CSIRS_scheduling' into develop-CSI
2022-02-22 10:09:51 +00:00
rmagueta
580f56c869
Revert "Implementation of fill_default_csi_MeasConfig"
...
This reverts commit 777074ff79
2022-02-22 10:08:39 +00:00
rmagueta
777074ff79
Implementation of fill_default_csi_MeasConfig
2022-02-21 20:23:27 +00:00
Robert Schmidt
a5fd5c3e6b
Merge remote-tracking branch 'origin/multiple-ues-min-prbs-bug-fix' into integration_2022_wk08
2022-02-21 20:06:55 +01:00
Robert Schmidt
86c4882245
Merge remote-tracking branch 'origin/NR_2port_CSIRS' into integration_2022_wk08
2022-02-20 19:48:34 +01:00
Robert Schmidt
72a4ed80da
Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08
2022-02-19 19:43:11 +01:00
Robert Schmidt
21f862641c
Merge remote-tracking branch 'origin/cleanup-20220125' into integration_2022_wk08
2022-02-19 19:34:01 +01:00
francescomani
d0228cf18a
Merge branch 'NR_2port_CSIRS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_2port_CSIRS
2022-02-18 13:39:02 +01:00
francescomani
0a59bffbb1
fix phy-test check
2022-02-18 13:38:45 +01:00
Robert Schmidt
6569fd7614
Do not prematurely overwrite scheduler information
...
Overwriting sched_pusch information at that stage would in particular
lose information on the current frame/slot. Overwriting sched_pusch with
the retInfo structure is already done at the end of
allocate_ul_retransmission(), and is therefore not necessary at this
stage.
2022-02-18 12:52:59 +01:00
Robert Schmidt
63989e8a69
Fix for F1 RFsim fail
...
We compute the preferred DL TDAs when receiving the cellGroup from the
RRC. However, in F1 and the RFsim, it seems that the scheduler tries to
access the preferred DL TDAs before they have been set after receiving
the cellGroup. In this commit, add a simple check to verify the
preferred TDA has been set up.
2022-02-18 12:16:08 +01:00
Robert Schmidt
e890cee31c
Reduce max_num_ue after successful PUCCH alloc
2022-02-17 13:58:27 +01:00
Robert Schmidt
fd40aa2666
Make nr_find_nb_rb() take minimum RBsize
...
Fixes a bug when scheduling multiple UEs
2022-02-17 13:58:24 +01:00
Robert Schmidt
ff0fb53056
Merge remote-tracking branch 'origin/nr-fdd-scheduling' into integration_2022_wk07_c
2022-02-17 09:32:44 +01:00
Robert Schmidt
b97d26cb86
Merge remote-tracking branch 'origin/NR_SA_UID' into integration_2022_wk07_c
2022-02-17 09:02:16 +01:00
Robert Schmidt
9a7154f3d4
Merge remote-tracking branch 'origin/fairRR-sched-debug' into integration_2022_wk07_c
2022-02-16 10:34:36 +01:00
francescomani
c645c12db4
using uid also in SA
2022-02-14 20:28:05 +01:00
francescomani
f1260a09e6
some fixes for phy-test mode
2022-02-14 17:40:57 +01:00
francescomani
de88c3f45c
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-14 08:57:52 +01:00
francescomani
67efa202e2
call to config_csirs also in sa
2022-02-11 19:32:40 +01:00
francescomani
9237cb545c
passing UECAP structure to RRC reconfiguration functions
2022-02-11 18:57:48 +01:00
francescomani
d2a559f91e
improvements in config_csirs
2022-02-11 18:35:26 +01:00
Robert Schmidt
7e92d44fc2
Merge remote-tracking branch 'origin/oai-ue-time-meas' into integration_2022_wk06_a
2022-02-10 18:57:28 +01:00
Robert Schmidt
a36555b254
Merge remote-tracking branch 'origin/develop-SRS' into integration_2022_wk06_a
2022-02-08 18:06:53 +01:00
francescomani
9ff39f0d92
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-08 16:48:20 +01:00
Robert Schmidt
8e6e4d8237
Log inactivity timer
2022-02-08 14:45:05 +01:00
Robert Schmidt
5bdaeb5718
Stop scheduling DL on UL failure or out of sync
2022-02-08 14:45:05 +01:00
Robert Schmidt
388cfafea8
Stop scheduling in UL after ul_failure_timer
2022-02-08 14:45:05 +01:00
Robert Schmidt
eca14f6ec9
Schedule UL 5 RBs at MCS 10 on inactivity
2022-02-08 14:45:00 +01:00
rmagueta
e8657ec854
Merge remote-tracking branch 'origin/develop' into develop-SRS
...
# Conflicts:
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2022-02-08 09:31:32 +00:00
francescomani
90bc226ac0
Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling
2022-02-08 08:48:04 +01:00
Laurent THOMAS
ef2fedfc5b
fix existing bug in pucchsim.c and in random_channel.c
2022-02-07 23:50:01 +01:00
Robert Schmidt
9594e422bc
Merge remote-tracking branch 'origin/NR_pdcch_improvements' into integration_2022_wk06
2022-02-07 18:48:52 +01:00
Robert Schmidt
ce9d1bd7c5
Always schedule PUCCH to prevent stale PUCCH config
2022-02-07 14:23:17 +01:00
Robert Schmidt
b13ea677a2
Give warning when UL Failure on NR link
2022-02-07 14:23:17 +01:00
francescomani
8dcf0d011d
two bugfixes: local pdcch_pdu in ul and wrong initialization place in find_candidate
2022-02-07 13:40:15 +01:00
Robert Schmidt
c14d9a3c2a
Merge remote-tracking branch 'origin/thread_pool_size' into integration_2022_wk05_b
2022-02-04 19:13:48 +01:00
Robert Schmidt
66137d2bf9
Merge remote-tracking branch 'origin/bler_txoptim' into integration_2022_wk05_b
2022-02-04 19:11:33 +01:00
Robert Schmidt
0b39690044
Merge remote-tracking branch 'origin/episys-remove-log-minimal' into integration_2022_wk05_b
2022-02-04 19:07:09 +01:00
rmagueta