Merge remote-tracking branch 'origin/preamble-index-logs' into integration_2025_w04 (!3220)
Improve RA logs Modify existing LOG entries to include preamble index, timing advance and estimated distance from the gNB. This makes mapping RA attempts to physical/simulated UEs easier via sent/received preamble index or physical distance from the gNB in scenarios with >1 UE.
This commit is contained in:
@@ -227,7 +227,7 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, int frame, uint8_t
|
||||
|
||||
LOG_I(PHY,
|
||||
"PRACH [UE %d] in frame.slot %d.%d, placing PRACH in position %d, Msg1/MsgA-Preamble frequency start %d (k1 %d), "
|
||||
"preamble_offset %d, first_nonzero_root_idx %d\n",
|
||||
"preamble_offset %d, first_nonzero_root_idx %d, preambleIndex = %d\n",
|
||||
Mod_id,
|
||||
frame,
|
||||
slot,
|
||||
@@ -235,7 +235,8 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, int frame, uint8_t
|
||||
n_ra_prb,
|
||||
nrUE_config->prach_config.num_prach_fd_occasions_list[fd_occasion].k1,
|
||||
preamble_offset,
|
||||
first_nonzero_root_idx);
|
||||
first_nonzero_root_idx,
|
||||
prach_pdu->ra_PreambleIndex);
|
||||
|
||||
// Ncp and dftlen here is given in terms of T_s wich is 30.72MHz sampling
|
||||
if (prach_sequence_length == 0) {
|
||||
|
||||
@@ -1538,15 +1538,25 @@ static void nr_generate_Msg2(module_id_t module_idP,
|
||||
pdsch_pdu_rel15->precodingAndBeamforming.prgs_list[0].pm_idx = 0;
|
||||
pdsch_pdu_rel15->precodingAndBeamforming.prgs_list[0].dig_bf_interface_list[0].beam_idx = ra->beam_id;
|
||||
|
||||
// Distance calculation according to SCF222.10.02 RACH.indication (table 3-74) and 38.213 4.2/38.211 4.3.1
|
||||
// T_c according to 38.211 4.1
|
||||
float T_c_ns = 0.509;
|
||||
int numerology = ra->UL_BWP.scs;
|
||||
float rtt_ns = T_c_ns * 16 * 64 / (1 << numerology) * ra->timing_offset;
|
||||
float speed_of_light_in_meters_per_second = 299792458.0f;
|
||||
float distance_in_meters = speed_of_light_in_meters_per_second * rtt_ns / 1000 / 1000 / 1000 / 2;
|
||||
LOG_A(NR_MAC,
|
||||
"UE %04x: %d.%d Generating RA-Msg2 DCI, RA RNTI 0x%x, state %d, CoreSetType %d, RAPID %d\n",
|
||||
"UE %04x: %d.%d Generating RA-Msg2 DCI, RA RNTI 0x%x, state %d, CoreSetType %d, preamble_index(RAPID) %d, "
|
||||
"timing_offset = %d (estimated distance %.1f [m])\n",
|
||||
ra->rnti,
|
||||
frameP,
|
||||
slotP,
|
||||
ra->RA_rnti,
|
||||
ra->ra_state,
|
||||
pdcch_pdu_rel15->CoreSetType,
|
||||
ra->preamble_index);
|
||||
ra->preamble_index,
|
||||
ra->timing_offset,
|
||||
distance_in_meters);
|
||||
|
||||
// SCF222: PDU index incremented for each PDSCH PDU sent in TX control message. This is used to associate control
|
||||
// information to data and is reset every slot.
|
||||
|
||||
Reference in New Issue
Block a user