luis_pereira87
44c0c8d321
Merge branch 'NR_RRC_processing_timer' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/rrc_gNB.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
2022-04-19 12:39:28 +01:00
luis_pereira87
0270b7b1fb
Move RRC processing timer implementation from RRC to MAC
2022-04-14 15:49:29 +01:00
luis_pereira87
ada380d9fd
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
2022-04-14 11:46:52 +01:00
luis_pereira87
940abc3587
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
2022-04-11 13:49:40 +01:00
Robert Schmidt
d8d3106baf
Merge remote-tracking branch 'origin/episys-throughput-updates-and-downlink-siso-cm' into integration_2022_wk14
2022-04-06 23:44:59 +02:00
luis_pereira87
1a3c8e5440
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2022-04-06 11:52:55 +01:00
rmagueta
345f3056ff
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
# openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# 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_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2022-04-06 10:51:43 +01:00
luis_pereira87
345b66c77f
Merge remote-tracking branch 'origin/NR_RRC_processing_timer' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-03-23 17:21:34 +00:00
luis_pereira87
4510041aa6
Fix RRC processing time to match RRC ticks (at 1 ms) and add implementation for RRCSetup processing time
2022-03-23 17:08:36 +00:00
luis_pereira87
2706b1641e
Merge remote-tracking branch 'origin/NR_RRC_processing_timer' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-03-23 14:01:37 +00:00
luis_pereira87
6f5ea27e09
Improve nr_rrc_processing_timer procedures
2022-03-23 13:11:04 +00:00
rmagueta
bc7a404629
Move rrc_processing_timer from MAC to RRC
2022-03-22 20:18:23 +00:00
luis_pereira87
a87e99ad69
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair1/PHY/TOOLS/lte_ue_scope.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-03-08 14:21:00 +00:00
Melissa Elkadi
79cc21f6f5
Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm
2022-03-07 06:33:51 -08:00
luis_pereira87
0d92901787
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
2022-03-04 13:09:44 +00:00
Robert Schmidt
d6dc279439
Merge remote-tracking branch 'origin/NR_UE_CSIRS_scheduling' into integration_2022_wk09
2022-03-01 18:52:33 +01:00
Melissa Elkadi
2b1cc455b0
Merge branch 'episys-ul-info-cleanup' into episys/master-sa
2022-02-24 15:48:43 -08:00
francescomani
5c56bb21ce
Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz
2022-02-23 15:08:52 +01:00
francescomani
ddfb131f68
Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling
2022-02-23 14:55:33 +01:00
luis_pereira87
47fc4750e1
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.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-23 11:34:37 +00:00
luis_pereira87
8238c40ce9
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-23 10:48:49 +00:00
luis_pereira87
fb6936fe27
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
# openair2/RRC/NR/rrc_gNB.c
2022-02-21 11:00:27 +00:00
luis_pereira87
5b1dfb8bc9
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-21 10:20:42 +00:00
francescomani
3b7430a745
Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz
2022-02-21 09:12:21 +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
ff0fb53056
Merge remote-tracking branch 'origin/nr-fdd-scheduling' into integration_2022_wk07_c
2022-02-17 09:32:44 +01:00
luis_pereira87
47592d53aa
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
2022-02-16 11:17:24 +00:00
Melissa Elkadi
5e7de1cdfc
Fixing typo and adding .h files for linking
2022-02-14 11:41:22 -08:00
Melissa Elkadi
987363b8a8
Clean up for MR
2022-02-14 10:34:23 -08:00
luis_pereira87
6436f77aa0
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
2022-02-14 10:20:42 +00:00
francescomani
de88c3f45c
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-14 08:57:52 +01:00
Melissa Elkadi
60a9d41bc6
UCI ACK/NACK most of the way working
...
We have gotten rid of filling the ACK/NACK with
the DLSCH and now only fill with the PUCCH. This
assumes that the MAC layer is properly decoding the
dl_tti_req and tx_data_req and allows us to
simply use the MAC layers scheduled SNF/Slot
to return the ACK NACK. There are some hacks added
in this commit which ensure that the PDCP packet
has the correct header (1st byte = 80) and now with
15Mbps we are seeing about 20% packet loss and
a gNB bug on the edge case (current frame is 1023
and the gNB schduler wants an ACK in frame 0 but the
scheduled UL_TTI_REQ has a frame of 1023).
2022-02-09 07:59:10 -08:00
Melissa
8c2a067a22
Merge branch 'episys/david/checking_downlink_siso_model' into 'episys/master-nsa'
...
Downlink SISO modeling
See merge request aburger/openairinterface5g!104
2022-02-08 14:51:55 -08:00
Melissa Elkadi
9da3cbc9ec
Cherry picking UCI multiplexing for CSI reports
2022-02-08 13:03:13 -08:00
francescomani
37a517edb7
Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz
2022-02-08 16:18:27 +01:00
luis_pereira87
e39ad834c0
Fix dci size for formats 1_0 and 0_0 and improve procedures when using Coreset0
2022-02-04 15:20:24 +00:00
francescomani
434ee15ba0
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-03 11:38:14 +01:00
luis_pereira87
0166cd05d6
To use ServingCellConfigCommonSIB when ServingCellConfigCommon is NULL
2022-02-02 15:15:18 +00:00
luis_pereira87
4f6938839a
Remove hardcoded controlResourceSetId
2022-01-11 18:24:52 +00:00
luis_pereira87
87c75ebccd
Merge remote-tracking branch 'origin/develop' into scs_60_iisc
...
# 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_procedures.c
2022-01-11 10:20:20 +00:00
francescomani
8202180a18
Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling
2022-01-10 10:39:44 +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
d385c2126b
fixes for TDA in case of double symbol pdcch
2022-01-06 09:30:42 +01:00
francescomani
37a2d7af57
changes to allow pdsch typeb in sib1
2021-12-31 12:00:28 +01:00
francescomani
6f38108635
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-12-30 10:58:37 +01:00
luis_pereira87
4549104238
Merge remote-tracking branch 'origin/develop' into scs_60_iisc
...
# Conflicts:
# openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
# openair1/SIMULATION/NR_PHY/dlsim.c
2021-12-27 11:13:27 +00:00
Melissa Elkadi
e7ef264226
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-12-21 06:02:40 -08:00
francescomani
510a9d15dd
Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling
2021-12-20 09:36:05 +01:00
francescomani
64b7741c16
Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling
2021-12-17 09:18:17 +01:00
rmagueta
ec8ec353b6
Merge remote-tracking branch 'origin/develop' into develop-SRS
2021-12-16 10:10:53 +00:00