rmagueta
a47861628b
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_REFSIG/nr_gold.c
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2022-03-22 17:18:22 +00:00
rmagueta
db0ce84aa5
Fix FAPI for CSI-RS pdu and associated procedures
2022-03-08 13:18:17 +00:00
Raymond Knopp
f99754a5ea
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/GNB_APP/gnb_config.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/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-03-05 21:12:32 +01:00
rmagueta
5bae6dd6f3
Add missing fiels in fapi_nr_dl_config_csirs_pdu_rel15_t
2022-02-23 16:11:13 +00:00
francescomani
ddfb131f68
Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling
2022-02-23 14:55:33 +01: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
2b108cdded
Merge remote-tracking branch 'origin/NR_UE_CSIRS_scheduling' into develop-CSI
2022-02-22 10:09:51 +00:00
francescomani
de88c3f45c
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-14 08:57:52 +01:00
Raymond Knopp
4756c5a167
added configurable "sf_ahead" for NR/LTE in RU section. Tested in NR with sf_ahead=2 (normally 3)
2022-02-13 22:15:48 +01:00
Raymond Knopp
5ba8b83856
Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control
...
Conflicts:
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.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
targets/ARCH/AW2SORI/oaiori.c
2022-02-13 12:24:45 +01:00
Raymond Knopp
b9b24588af
Merge remote-tracking branch 'origin/develop' into aw2s-n41
...
Conflicts:
cmake_targets/phy_simulators
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-02-11 12:21:29 +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
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
Robert Schmidt
9594e422bc
Merge remote-tracking branch 'origin/NR_pdcch_improvements' into integration_2022_wk06
2022-02-07 18:48:52 +01:00
francescomani
434ee15ba0
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-03 11:38:14 +01:00
Raymond Knopp
495f0150da
Merge branch 'NR_pdcch_improvements' into aw2s-n41
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.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
2022-02-01 10:56:20 +01:00
Raymond Knopp
7d4bdfb566
Merge remote-tracking branch 'origin/develop' into aw2s-n41
2022-02-01 10:46:13 +01:00
Melissa Elkadi
fd54f2cf76
This commit includes several nfapi bug fixes
...
-cell_config.phy_cell_id is a uint16 and was being push/pulled
as a uint8_t
-several members of the p5 message we not push/pulled
-the second member of the ssb_mask_list is causing invalid tag length
-the error code of the push response was push8 when it should have
been a push32
-packing vendor extension causes invalid tag id(0x000)
2022-01-25 16:57:44 +01:00
francescomani
e7f544e139
Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements
2022-01-24 19:08:21 +01:00
Raymond Knopp
90c66bb7b1
Merge remote-tracking branch 'origin/develop' into aw2s-n41
...
Conflicts:
executables/nr-softmodem.c
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/pucch_rx.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
2022-01-24 11:11:46 +01:00
Laurent THOMAS
b4b457345d
merge develop
2022-01-10 12:49:47 +01:00
francescomani
98e8b74331
Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements
2022-01-10 10:13:18 +01:00
rmagueta
cf8f6fdeed
Merge remote-tracking branch 'origin/develop' into develop-SRS
...
# Conflicts:
# ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
# ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/RRC/NR/L2_nr_interface.c
2022-01-08 12:11:56 +00:00
francescomani
6f38108635
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-12-30 10:58:37 +01:00
Laurent THOMAS
280533da10
merge develop
2021-12-24 16:23:51 +01:00
francescomani
3aa0c8654d
Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements
2021-12-24 09:33:51 +01:00
Melissa Elkadi
e7ef264226
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-12-21 06:02:40 -08:00
Melissa Elkadi
30c14c2f5a
nFAPI bug fix. Not properly packing/unpacking PUCCH PDU
2021-12-21 05:51:25 -08:00
rmagueta
06ec8b597e
Merge remote-tracking branch 'origin/develop' into develop-SRS
...
# Conflicts:
# openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
# openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
2021-12-20 11:06:34 +00:00
francescomani
510a9d15dd
Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling
2021-12-20 09:36:05 +01:00
mjoang
43eb8e40ac
enable running thread in parallel for RFSIM.
2021-12-17 14:09:00 -05:00
Laurent THOMAS
e0776377c4
fix phy simulators with updated threads synchro
2021-12-16 17:18:50 +01:00
Laurent THOMAS
b2b3dd1331
gNBthread flow update
2021-12-16 12:59:17 +01:00
francescomani
d6dedc1f49
handling multiple pdcch pdu at fapi and phy
2021-12-09 13:14:19 +01:00
Melissa Elkadi
4f9c2bd869
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-29 14:33:23 -08:00
mjoang
31f12b62e0
fix the race condition in UE where PUSCH could not be sent when UE sends PUCCH and PUSCH at the same slot.
2021-11-29 10:15:02 -05:00
francescomani
4a26745919
Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling
2021-11-29 09:34:57 +01:00
francescomani
fa2ce6e680
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-11-26 11:34:22 +01:00
rmagueta
fbc45b3571
Merge remote-tracking branch 'origin/develop' into develop-SRS
...
# Conflicts:
# nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
2021-11-25 11:09:20 +00:00
hardy
53692ff57a
Merge remote-tracking branch 'origin/nfapi-carriage-returns' into integration_2021_wk47_b
2021-11-24 09:43:12 +01:00
rmagueta
b3e5b83b8b
Fix build warning
2021-11-23 19:17:13 +00:00
rmagueta
71c64e023d
Merge remote-tracking branch 'origin/develop' into develop-SRS
2021-11-23 19:02:33 +00:00
rmagueta
01a260f1f9
gNB is receiving the SRS signal
2021-11-23 18:55:29 +00:00
rmagueta
37950f470b
Fix in nfapi_nr_srs_pdu_t
2021-11-23 16:51:03 +00:00
Melissa Elkadi
94d146e80b
Renaming queue.h in PHY_INTERFACE layer to queue_t.h
...
There are two queue.h files in this repository.
2021-11-23 08:05:58 -08:00
Melissa Elkadi
c08b0c2b56
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-23 06:24:33 -08:00
francescomani
1f75a9780d
scheduling of csi for im
2021-11-22 16:27:42 +01:00
francescomani
79be6685fd
changes in ue fapi handling to include csi-rs pdu
2021-11-19 17:42:24 +01:00
francescomani
f80ba3e4db
nzp csi-rs scheduling function
2021-11-19 15:48:07 +01:00