From 1fee40a5906067a84de2542df8b003b2205fcad0 Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@eurecom.fr>
Date: Mon, 6 Jul 2020 10:38:36 +0200
Subject: [PATCH 1/2] fix in pucchsim

---
 openair1/SIMULATION/NR_PHY/pucchsim.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openair1/SIMULATION/NR_PHY/pucchsim.c b/openair1/SIMULATION/NR_PHY/pucchsim.c
index e1ffe7eb6c..004a7b8de8 100644
--- a/openair1/SIMULATION/NR_PHY/pucchsim.c
+++ b/openair1/SIMULATION/NR_PHY/pucchsim.c
@@ -479,7 +479,7 @@ int main(int argc, char **argv)
     for (trial=0; trial<n_trials; trial++) {
       bzero(txdataF[aa],frame_parms->ofdm_symbol_size*sizeof(int));
       if(format==0){
-        nr_generate_pucch0(UE,txdataF,frame_parms,UE->pucch_config_dedicated,amp,nr_tti_tx,m0,mcs,nrofSymbols,startingSymbolIndex,startingPRB);
+        nr_generate_pucch0(UE,txdataF,frame_parms,PUCCH_GroupHopping,hopping_id,amp,nr_tti_tx,m0,mcs,nrofSymbols,startingSymbolIndex,startingPRB);
       }
       else if (format == 1){
         nr_generate_pucch1(UE,txdataF,frame_parms,UE->pucch_config_dedicated,actual_payload,amp,nr_tti_tx,m0,nrofSymbols,startingSymbolIndex,startingPRB,startingPRB_intraSlotHopping,0,nr_bit);	

From 64e9629b8ce177a1c9faaff5160b4abc4bfbc530 Mon Sep 17 00:00:00 2001
From: Francesco Mani <francesco.mani@eurecom.fr>
Date: Mon, 6 Jul 2020 14:37:31 +0200
Subject: [PATCH 2/2] patch for pucch in ulsim

---
 cmake_targets/autotests/test_case_list.xml  | 8 +++-----
 openair1/SCHED_NR_UE/phy_procedures_nr_ue.c | 4 ++--
 openair1/SIMULATION/NR_PHY/ulsim.c          | 2 ++
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index e110f14c7c..786002e982 100644
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -1071,9 +1071,9 @@
       <main_exec> $OPENAIR_DIR/targets/bin/nr_pbchsim.Rel15</main_exec>
       <main_exec_args>-s0 -S1 -n1000 -R106
                       -s0 -S1 -n10 -I -R106
-		              -s0 -S1 -n1000 -R217
+		      -s0 -S1 -n1000 -R217
                       -s0 -S1 -n10 -I -R217
-		              -s0 -S1 -n1000 -R273
+		      -s0 -S1 -n1000 -R273
                       -s0 -S1 -n10 -I -R273</main_exec_args>
       <tags>nr_pbchsim.test1 nr_pbchsim.test2 nr_pbchsim.test3 nr_pbchsim.test4 nr_pbchsim.test5 nr_pbchsim.test6</tags>
       <search_expr_true>PBCH test OK</search_expr_true>
@@ -1114,8 +1114,7 @@
                   -n100 -e16 -s10 
                   -n100 -s1 -t25
                   -n100 -s1 -t33
-                  -n100 -s1 -t50
-      </main_exec_args>
+                  -n100 -s1 -t50</main_exec_args>
       <tags>nr_dlsim.test1 nr_dlsim.test2 nr_dlsim.test3 nr_dlsim.test4 nr_dlsim.test5 nr_dlsim.test6 nr_dlsim.test7 nr_dlsim.test8 nr_dlsim.test9 nr_dlsim.test10 nr_dlsim.test11 nr_dlsim.test12 nr_dlsim.test13</tags>
       <search_expr_true>PDSCH test OK</search_expr_true>
       <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
@@ -1224,7 +1223,6 @@
 		      -R 106 -i 1 -P 2 -b 11 -s6 -n1000
 		      -R 106 -i 1 -P 2 -q8 -b 12 -s-3 -n1000
 		      -R 106 -i 1 -P 2 -q8 -b 19 -s-3 -n1000
-		      -R 106 -i 1 -P 2 -q8 -b 19 -s-3 -n1000
 		      -R 106 -i 1 -P 2 -q8 -b 32 -s-3 -n1000
 		      -R 106 -i 1 -P 2 -q16 -b 32 -s-3 -n1000
 		      -R 106 -i 1 -P 2 -q16 -b 64 -s-3 -n1000</main_exec_args>
diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
index dae6229657..c40358b8f9 100644
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -2249,13 +2249,13 @@ void phy_procedures_nrUE_TX(PHY_VARS_NR_UE *ue,
   } // UE_mode==PUSCH
 */
 
-    if (get_softmodem_params()->do_ra==1) {
+   if (get_softmodem_params()->usim_test==0) {
       LOG_D(PHY, "Sending PUCCH\n");
       pucch_procedures_ue_nr(ue,
                              gNB_id,
                              proc,
                              TRUE);
-    }
+   }
 
     LOG_D(PHY, "Sending data \n");
     nr_ue_pusch_common_procedures(ue,
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index 0da7db5029..8e378709f8 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -386,6 +386,8 @@ int main(int argc, char **argv)
 
   get_softmodem_params()->phy_test = 1;
   get_softmodem_params()->do_ra = 0;
+  get_softmodem_params()->usim_test = 1;
+
 
   if (snr1set == 0)
     snr1 = snr0 + 10;