Change slot_ahead to process ack/nack after pdsch

executables/nr-ue.c

@@ -286,7 +286,7 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)
     int slot = NFAPI_SFNSLOT2SLOT(sfn_slot);
     nr_uplink_indication_t ul_info;
     int slots_per_frame = 20; //30 kHZ subcarrier spacing
-    int slot_ahead = 6; // Melissa lets make this dynamic
+    int slot_ahead = 2; // Melissa lets make this dynamic
     ul_info.cc_id = CC_id;
     ul_info.gNB_index = gNB_id;
     ul_info.module_id = mod_id;

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -1960,6 +1960,8 @@ uint8_t get_downlink_ack(NR_UE_MAC_INST_t *mac,
               pucch->n_CCE = current_harq->n_CCE;
               pucch->N_CCE = current_harq->N_CCE;
               pucch->delta_pucch = current_harq->delta_pucch;
+              current_harq->active = false;
+              current_harq->ack_received = false;
             }
           }
         }

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -526,7 +526,7 @@ static void check_and_process_dci(nfapi_nr_dl_tti_request_t *dl_tti_request,
     nr_uplink_indication_t ul_info;
     memset(&ul_info, 0, sizeof(ul_info));
     int slots_per_frame = 20; //30 kHZ subcarrier spacing
-    int slot_ahead = 6; // Melissa lets make this dynamic
+    int slot_ahead = 2; // Melissa lets make this dynamic
     ul_info.frame_rx = frame;
     ul_info.slot_rx = slot;
     ul_info.slot_tx = (slot + slot_ahead) % slots_per_frame;

openair2/RRC/NR/rrc_gNB_reconfig.c

@@ -945,7 +945,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
  long *delay[8];
  for (int i=0;i<8;i++) {
    delay[i] = calloc(1,sizeof(*delay[i]));
-   *delay[i] = (i<6) ? (i+2) : 0;
+   *delay[i] = i + 6;
    ASN_SEQUENCE_ADD(&pucch_Config->dl_DataToUL_ACK->list,delay[i]);
  }
  pucch_Config->spatialRelationInfoToAddModList = calloc(1,sizeof(*pucch_Config->spatialRelationInfoToAddModList));