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
This commit is contained in:
rmagueta
2021-12-20 11:06:34 +00:00
40 changed files with 665 additions and 640 deletions
@@ -57,6 +57,7 @@
/// UL_CONFIG_REQ
#define FAPI_NR_UL_CONFIG_LIST_NUM 10
#define FAPI_NR_UL_CONFIG_TYPE_DONE 0x00
#define FAPI_NR_UL_CONFIG_TYPE_PRACH 0x01
#define FAPI_NR_UL_CONFIG_TYPE_PUCCH 0x02
#define FAPI_NR_UL_CONFIG_TYPE_PUSCH 0x03