From 385cc8ecd88cec5422706e7212cb5e1f117705fd Mon Sep 17 00:00:00 2001
From: Xavier Arteaga <xavier@softwareradiosystems.com>
Date: Fri, 6 Mar 2020 20:00:50 +0100
Subject: [PATCH] tweaked I_offset_ack in enb_phy_test

---
 srsenb/test/phy/CMakeLists.txt  | 21 ++++++++++-----------
 srsenb/test/phy/enb_phy_test.cc |  1 +
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/srsenb/test/phy/CMakeLists.txt b/srsenb/test/phy/CMakeLists.txt
index bea30dd1d..4bacc2f36 100644
--- a/srsenb/test/phy/CMakeLists.txt
+++ b/srsenb/test/phy/CMakeLists.txt
@@ -33,22 +33,21 @@ target_link_libraries(enb_phy_test
         ${CMAKE_THREAD_LIBS_INIT}
         ${Boost_LIBRARIES})
 
+set(ENB_PHY_TEST_DURATION 128)
+
 # Basic eNb PHY test:
-#  - 128 Frames
 #  - 1 eNb cell/carrier (no carrier aggregation)
 #  - maximum bandwidth 100
-#add_test(enb_phy_test_1cell enb_phy_test --duration=128 --cell.nof_prb=100 )
+add_test(enb_phy_test_base enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --cell.nof_prb=100 )
 
-# Two carrier aggregation using PUCCH3
-#  - 128 frames
-#  - 3 eNb cell/carrier (only using 2 aggregated)
-#  - minimum bandwidth to reduce memcheck time
-#  - PUCCH format 3 ACK/NACK feedback mode
-add_test(enb_phy_test_3cell enb_phy_test --duration=128 --nof_enb_cells=3 --ue_cell_list=2,0 --ack_mode=pucch3 --cell.nof_prb=6 )
+# Five carrier aggregation using PUCCH3
+#  - 6 eNb cell/carrier (only using 5 aggregated)
+#  - 6 PRB
+#  - PUCCH format 3 ACK/NACK feedback mode and more than 2 ACK/NACK bits in PUSCH
+add_test(enb_phy_test_ca_pucch3 enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=3,4,0,1,2 --ack_mode=pucch3 --cell.nof_prb=6 )
 
 # Two carrier aggregation using Channel Selection
-#  - 128 frames
 #  - 6 eNb cell/carrier (only using 2 aggregated)
-#  - minimum bandwidth to reduce memcheck time
+#  - 6 PRB
 #  - PUCCH format 1b with Channel selection ACK/NACK feedback mode
-add_test(enb_phy_test_6cell enb_phy_test --duration=128 --nof_enb_cells=6 --ue_cell_list=5,4 --ack_mode=cs --cell.nof_prb=6 )
+add_test(enb_phy_test_cs enb_phy_test --duration=${ENB_PHY_TEST_DURATION} --nof_enb_cells=6 --ue_cell_list=5,4 --ack_mode=cs --cell.nof_prb=6 )
diff --git a/srsenb/test/phy/enb_phy_test.cc b/srsenb/test/phy/enb_phy_test.cc
index 6e7c748eb..63f14f0ce 100644
--- a/srsenb/test/phy/enb_phy_test.cc
+++ b/srsenb/test/phy/enb_phy_test.cc
@@ -1094,6 +1094,7 @@ public:
     dedicated.dl_cfg.cqi_report.periodic_configured = true;
     dedicated.dl_cfg.cqi_report.pmi_idx             = 25;
     dedicated.dl_cfg.cqi_report.periodic_mode       = SRSLTE_CQI_MODE_20;
+    dedicated.ul_cfg.pusch.uci_offset.I_offset_ack  = 7;
 
     // Configure UE PHY
     bool activation[SRSLTE_MAX_CARRIERS] = {}; ///< Activation/Deactivation vector