Fix ULSCH slot scheduling inconsistency between nrUE and gNB

openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c

@@ -466,6 +466,9 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
   }
 
   //}
+  NR_UL_UE_HARQ_t *harq_process_ulsch=NULL;
+  harq_process_ulsch = UE->ulsch[thread_id][gNB_id][0]->harq_processes[harq_pid];
+  harq_process_ulsch->status = SCH_IDLE;
 
   ///////////
   ////////////////////////////////////////////////////////////////////////

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -144,6 +144,7 @@ int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
           memcpy(pusch_pdu, pusch_config_pdu, sizeof(nfapi_nr_ue_pusch_pdu_t));
 
           ulsch0->f_pusch = pusch_config_pdu->absolute_delta_PUSCH;
+          ulsch0->harq_processes[current_harq_pid]->status = ACTIVE;
         break;
 
         case (FAPI_NR_UL_CONFIG_TYPE_PUCCH):

openair1/SCHED_NR_UE/phy_procedures_nr_ue.c

@@ -2233,8 +2233,10 @@ void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue,
 #endif
 
   if (ue->UE_mode[gNB_id] == PUSCH || get_softmodem_params()->phy_test == 1){
+    if (ue->ulsch[thread_id][gNB_id][0]->harq_processes[harq_pid]->status == ACTIVE)
       nr_ue_ulsch_procedures(ue, harq_pid, frame_tx, slot_tx, thread_id, gNB_id);
 
+
 /*
   if (ue->UE_mode[eNB_id] == PUSCH) {
     // check if we need to use PUCCH 1a/1b

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -755,7 +755,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
         }
       */
     }
-  } else if (ul_info) {
+  } else if (ul_info && ul_info->slot_tx == 8) {
     module_id_t mod_id    = ul_info->module_id;
     uint32_t gNB_index    = ul_info->gNB_index;
     int cc_id             = ul_info->cc_id;