laurent
|
23f49bd013
|
merge-develop-and-conflicts
|
2022-09-20 14:03:25 +02:00 |
|
Robert Schmidt
|
8e4c7a1115
|
Merge remote-tracking branch 'origin/sa_conf_and_fixes_for_mu0' into integration_2022_wk36b
|
2022-09-08 20:42:21 +02:00 |
|
francescomani
|
0a992c604a
|
Merge remote-tracking branch 'origin/develop' into ul-phr
|
2022-09-05 14:35:50 +02:00 |
|
francescomani
|
cf6ac388fd
|
addressing review comments
|
2022-08-29 17:10:08 +02:00 |
|
francescomani
|
1e39dd777d
|
fix physical simulators
|
2022-08-29 16:45:14 +02:00 |
|
francescomani
|
51483a3223
|
add option for limited buffer rate-matching for UL
|
2022-08-26 09:01:48 +02:00 |
|
Thomas Schlichter
|
8f6d084c80
|
small cleanup in get_type0_PDCCH_CSS_config_parameters()
|
2022-08-25 14:40:36 +02:00 |
|
Raymond Knopp
|
2ed7e89bd2
|
Merge remote-tracking branch 'origin/develop' into if5_ECPRI_rework
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
|
2022-08-08 07:25:13 +02:00 |
|
Raymond Knopp
|
87a51c9e18
|
Merge remote-tracking branch 'origin/develop' into if5_ECPRI_rework
Conflicts:
openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
|
2022-08-05 07:21:09 +02:00 |
|
francescomani
|
cbff9df713
|
Merge remote-tracking branch 'origin/develop' into NR_BWP_config
|
2022-08-03 10:59:12 +02:00 |
|
Raymond Knopp
|
3760ffa4af
|
Merge remote-tracking branch 'origin/develop' into if5_ECPRI_rework
|
2022-07-30 19:36:27 +02:00 |
|
francescomani
|
d71658d373
|
Merge remote-tracking branch 'origin/develop' into NR_BWP_config
|
2022-06-20 11:20:19 +02:00 |
|
rmagueta
|
607561af6c
|
Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
|
2022-06-13 10:32:21 +01:00 |
|
francescomani
|
e592045d8f
|
improvements in using genericParameters and other stuff
|
2022-06-10 18:18:57 +02:00 |
|
Roberto Louro Magueta
|
d11705260f
|
Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
|
2022-06-09 00:33:12 +01:00 |
|
francescomani
|
4ffef42472
|
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
|
2022-06-08 13:39:39 +02:00 |
|
francescomani
|
0b55910c48
|
possible fix in type setting of Y for coreset
|
2022-06-06 16:40:09 +02:00 |
|
Robert Schmidt
|
7b3191d1a6
|
Merge remote-tracking branch 'origin/NR_SS0_config_fix' into integration_2022_wk22
|
2022-06-04 10:08:25 +02:00 |
|
Roberto Louro Magueta
|
98f5478f7d
|
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.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/LAYER2/NR_MAC_gNB/mac_proto.h
|
2022-06-01 12:29:34 +01:00 |
|
francescomani
|
13ed1200b4
|
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
|
2022-06-01 08:45:35 +02:00 |
|
rmagueta
|
2f3079b808
|
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/nr_rrc_config.c
|
2022-05-27 11:13:02 +01:00 |
|
francescomani
|
92ba8cb9d0
|
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
|
2022-05-27 10:46:15 +02:00 |
|
Robert Schmidt
|
21a820b061
|
Merge remote-tracking branch 'origin/support-15-kHz-SCS' into integration_2022_wk21b
|
2022-05-27 10:05:57 +02:00 |
|
francescomani
|
09ecb8a33c
|
bugfix in fill_searchSpaceZero
|
2022-05-25 10:35:26 +02:00 |
|
Raymond Knopp
|
d0be523f6c
|
corrections for 20 and 40 MHz n38. Some assertions were wrong.
|
2022-05-23 22:06:23 +02:00 |
|
Raymond Knopp
|
44a3a60183
|
commented useless call to function which creates an assert with band n38
|
2022-05-23 10:57:22 +02:00 |
|
Roberto Louro Magueta
|
23dab34e7c
|
Fix CSI bitlen for rank = 2
|
2022-05-21 01:15:26 +01:00 |
|
Roberto Louro Magueta
|
7018b7c841
|
Fixes after merge
|
2022-05-19 13:38:22 +01:00 |
|
Roberto Louro Magueta
|
9887982e00
|
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
# openair2/RRC/NR/MESSAGES/asn1_msg.c
|
2022-05-19 13:21:00 +01:00 |
|
francescomani
|
1e4f509805
|
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
|
2022-05-18 11:41:07 +02:00 |
|
Thomas Schlichter
|
e639e79220
|
Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS
|
2022-05-18 10:51:19 +02:00 |
|
francescomani
|
1f49b73eac
|
Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv
|
2022-05-18 08:55:40 +02:00 |
|
luis_pereira87
|
486e9e2381
|
Merge remote-tracking branch 'origin/Dedicated-BWPs' into integration_2022_wk19b
# Conflicts:
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
|
2022-05-13 15:58:56 +01:00 |
|
luis_pereira87
|
af377945c3
|
Fix hardcoded coreset and assignment from wrong array position
|
2022-05-12 13:12:45 +01:00 |
|
francescomani
|
c4c93cc498
|
Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv
|
2022-05-12 08:56:45 +02:00 |
|
luis_pereira87
|
3c4ba50281
|
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
|
2022-05-11 14:49:59 +01:00 |
|
Roberto Louro Magueta
|
0ddd8c2586
|
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_config.h
|
2022-05-11 14:36:21 +01:00 |
|
Roberto Louro Magueta
|
4c1b432718
|
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
# Conflicts:
# openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
|
2022-05-11 13:45:56 +01:00 |
|
rmagueta
|
b8cd9ef167
|
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/rrc_gNB_nsa.c
|
2022-05-06 15:41:10 +01:00 |
|
francescomani
|
020c4c52ec
|
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
|
2022-05-06 15:27:20 +02:00 |
|
luis_pereira87
|
a8e6bf9bd5
|
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
# Conflicts:
# openair2/GNB_APP/gnb_config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# openair2/RRC/NR/nr_rrc_defs.h
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
|
2022-05-06 11:29:55 +01:00 |
|
francescomani
|
2bbfe501c2
|
Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization
|
2022-05-06 12:02:00 +02:00 |
|
francescomani
|
999f5d67e3
|
bugfixes and improvements in handling dci candidates
|
2022-05-04 11:03:26 +02:00 |
|
rmagueta
|
d01cd03ad3
|
Merge branch 'NR_RRC_processing_timer' into Dedicated-BWPs
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
|
2022-04-30 16:40:58 +01:00 |
|
rmagueta
|
751335765f
|
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
# openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
# openair1/PHY/NR_TRANSPORT/pucch_rx.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
# openair2/RRC/NR/nr_rrc_config.c
|
2022-04-30 15:52:48 +01:00 |
|
Thomas Schlichter
|
7815293443
|
Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS
|
2022-04-29 10:15:15 +02:00 |
|
francescomani
|
3ec401f2f6
|
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
|
2022-04-28 17:26:33 +02:00 |
|
francescomani
|
3547940e3f
|
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
|
2022-04-28 14:26:24 +02:00 |
|
francescomani
|
b6016cfc49
|
Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv
|
2022-04-28 14:12:11 +02:00 |
|
francescomani
|
d05f2b3add
|
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
|
2022-04-28 11:54:51 +02:00 |
|