From be870d66ad27359591db52f86e477db648ca3394 Mon Sep 17 00:00:00 2001 From: Xavier Arteaga Date: Thu, 7 Oct 2021 16:30:03 +0200 Subject: [PATCH] More relaxed SSB measure assertions and reorder SSB test --- lib/src/phy/sync/test/CMakeLists.txt | 12 ++++++------ lib/src/phy/sync/test/ssb_measure_test.c | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/src/phy/sync/test/CMakeLists.txt b/lib/src/phy/sync/test/CMakeLists.txt index acbde2454..95e9d1644 100644 --- a/lib/src/phy/sync/test/CMakeLists.txt +++ b/lib/src/phy/sync/test/CMakeLists.txt @@ -133,14 +133,14 @@ target_link_libraries(ssb_measure_test srsran_phy) add_executable(ssb_decode_test ssb_decode_test.c) target_link_libraries(ssb_decode_test srsran_phy) -# For each supported SSB subcarrier spacing -foreach (SSB_SCS 15 30) +# For 1.0 GHz and 3.5 GHz Center frequencies +foreach (CELL_FREQ 1000000000 3500000000) # For each supported Cell/Carrier subcarrier spacing foreach (CELL_SCS 15 30) - # For 1.0 GHz and 3.5 GHz Center frequencies - foreach (CELL_FREQ 1000000000 3500000000) - # For SSB centered at -960, 0 and 960 kHz from the center frequency - foreach (SSB_OFFSET_FREQ -960000 +0 +960000) + # For SSB centered at -960, 0 and 960 kHz from the center frequency + foreach (SSB_OFFSET_FREQ -960000 +0 +960000) + # For each supported SSB subcarrier spacing + foreach (SSB_SCS 15 30) # For patterns A, B, C foreach (SSB_PATTERN A B C) # Calculate Actual SSB center frequency diff --git a/lib/src/phy/sync/test/ssb_measure_test.c b/lib/src/phy/sync/test/ssb_measure_test.c index b202c743d..e5210af3d 100644 --- a/lib/src/phy/sync/test/ssb_measure_test.c +++ b/lib/src/phy/sync/test/ssb_measure_test.c @@ -27,7 +27,7 @@ static double ssb_freq_hz = 3.5e9; static srsran_ssb_patern_t ssb_pattern = SRSRAN_SSB_PATTERN_A; // Channel parameters -static int32_t delay_n = 1; +static int32_t delay_n = 2; static float cfo_hz = 100.0f; static float n0_dB = -30.0f; @@ -40,8 +40,8 @@ static cf_t* buffer = NULL; // Base-band buffer #define RSRP_MAX_ERROR 1.0f #define EPRE_MAX_ERROR 1.0f -#define N0_MAX_ERROR 2.5f -#define SNR_MAX_ERROR 2.5f +#define N0_MAX_ERROR 3.0f +#define SNR_MAX_ERROR 3.0f #define CFO_MAX_ERROR (cfo_hz * 0.3f) #define DELAY_MAX_ERROR (delay_us * 0.1f) @@ -235,6 +235,7 @@ int main(int argc, char** argv) if (test_case_1(&ssb) != SRSRAN_SUCCESS) { ERROR("test case failed"); + goto clean_exit; } ret = SRSRAN_SUCCESS;