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
Robert Schmidt
6fbfa3b066
Merge branch 'integration_2022_wk08' into 'develop'
...
Integration 2022 wk08
See merge request oai/openairinterface5g!1459
2022-02-23 07:19:58 +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
628726caae
Fix build after merge
2022-02-22 13:33:36 +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
27aa036f0e
Merge remote-tracking branch 'origin/iqreplay_bugfix' into integration_2022_wk08
2022-02-21 20:07:21 +01: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
d5280c679f
Merge remote-tracking branch 'origin/ci-improve-rfsim-test' into integration_2022_wk08
2022-02-21 20:05:03 +01:00
Robert Schmidt
719f82870d
Don't redirect stack trace to file
2022-02-21 19:47:14 +01:00
Robert Schmidt
b112282e2b
Suppress warning, print stacktrace to stdout
2022-02-21 19:42:45 +01:00
rmagueta
d820051397
Update config files
2022-02-21 17:46:02 +00:00
Raphael Defosseux
8981b53f83
fix(ci): changes after code review.
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2022-02-21 16:39:38 +01:00
Raphael Defosseux
4c76eb6c00
fix(ci): display state of container even when successful
...
recover the full MAGMA-MME log
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2022-02-21 16:36:34 +01:00
Raphael Defosseux
519dea7780
fix(ci): correct services in scenario files
...
fix(doc): updated the Tutorial with only MAGMA-MME references and logs
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2022-02-21 16:36:34 +01:00
Raphael Defosseux
2728ce02c8
feat(ci): switching from OAI-MME to MAGMA-MME for RF sim testing
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2022-02-21 16:36:34 +01:00
Raphael Defosseux
0b7be7466e
fix(ci): display state of container when failure, better tshark filtering, auto-undeploy if deploy went wrong
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2022-02-21 16:36:34 +01:00
Laurent Thomas
7ee3bacc34
Merge branch 'integration_2022_wk08' of https://gitlab.eurecom.fr/oai/openairinterface5g into integration_2022_wk08
2022-02-21 10:29:30 +01:00
Laurent Thomas
67b299e341
fix a warning in assertions.h, appear only with some gcc versions
2022-02-21 10:29:06 +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
Robert Schmidt
454aae1d96
Merge branch 'integration_2022_wk07_c' into 'develop'
...
integration_2022_wk07_c
See merge request oai/openairinterface5g!1451
This merges the following MRs:
- MR !1436 fairRR LTE scheduler fixes: should make the connection more stable, less UL retransmissions
- MR !1386 phy sync improvements: the 5G NR UE should sync better
- MR !1361 FDD support (no traffic): adds FDD support for the scheduler, but heavy traffic has not been tested
- MR !1447 using uid for PUCCH RRC conf: use the RRC UID to decide on PUCCH resources, should in particular avoid the "PUCCH straddles DC carrier" assert
- fix for 5G F1 RFsim test fail
2022-02-19 16:28:53 +00:00
Francois TABURET
cffb27b086
Update iqrecordplayer_usage.md
2022-02-18 17:46:08 +00:00
alblf
3d577aa0fc
doc update
2022-02-18 18:40:56 +01:00
alblf
a1aae82925
Fix duplicated memory allocation when replaying using mmap,
...
add use_mmap parameter for the record player device
fix assertion when replaying without using mmap
2022-02-18 18:22:14 +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
9b302d0432
Fix DU default config, increase 5G F1 RFsim throughput requirements
2022-02-18 12:20:06 +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
Robert Schmidt
cfa3b0caf0
Merge remote-tracking branch 'origin/ue-phy-sync-improvements' into integration_2022_wk07_c
2022-02-16 10:08:59 +01:00
Robert Schmidt
af6836d9f1
Merge branch 'integration_2022_wk07_b' into 'develop'
...
integration_2022_wk07_b
See merge request oai/openairinterface5g!1448
2022-02-15 21:18:48 +00:00
Robert Schmidt
6af9ac6c9c
Fix SA OAIUE N310 test's USRP IP address
2022-02-15 09:30:21 +01:00
hardy
71c33bec45
Merge remote-tracking branch 'origin/ue-rfsim-fix' into integration_2022_wk07_b
2022-02-15 09:26:01 +01:00
hardy
d4ce61c595
Merge remote-tracking branch 'origin/fix-macpdu2wireshark-2022-w06' into integration_2022_wk07_b
2022-02-15 09:25:38 +01:00
hardy
9cd1a06115
relaxing ping test acceptance threshold
2022-02-15 09:25:14 +01:00
hardy
d61c097e98
Merge remote-tracking branch 'origin/ci_fix_bidir_develop' into integration_2022_wk07_b
2022-02-15 09:23:57 +01:00