From c137091dc364370880a67a9ef8c040a5bb3e1225 Mon Sep 17 00:00:00 2001 From: ismagom Date: Sun, 17 Apr 2016 13:47:04 +0200 Subject: [PATCH] Not correcting CFO in non-sync subframes --- srslte/lib/sync/src/cfo.c | 2 +- srslte/lib/sync/src/sync.c | 2 +- srslte/lib/ue/src/ue_sync.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srslte/lib/sync/src/cfo.c b/srslte/lib/sync/src/cfo.c index 1d87b8b46..84997dc3f 100644 --- a/srslte/lib/sync/src/cfo.c +++ b/srslte/lib/sync/src/cfo.c @@ -85,7 +85,7 @@ void srslte_cfo_correct(srslte_cfo_t *h, cf_t *input, cf_t *output, float freq) if (fabs(h->last_freq - freq) > h->tol) { h->last_freq = freq; srslte_cexptab_gen(&h->tab, h->cur_cexp, h->last_freq, h->nsamples); - DEBUG("CFO generating new table for frequency %.4f\n", freq); + DEBUG("CFO generating new table for frequency %.4fe-6\n", freq*1e6); } srslte_vec_prod_ccc(h->cur_cexp, input, output, h->nsamples); } diff --git a/srslte/lib/sync/src/sync.c b/srslte/lib/sync/src/sync.c index 6f18591c1..bde37f0f1 100644 --- a/srslte/lib/sync/src/sync.c +++ b/srslte/lib/sync/src/sync.c @@ -418,7 +418,7 @@ srslte_sync_find_ret_t srslte_sync_find(srslte_sync_t *q, cf_t *input, uint32_t q->mean_cfo = SRSLTE_VEC_EMA(cfo, q->mean_cfo, q->cfo_ema_alpha); /* Correct CFO with the averaged CFO estimation */ - srslte_cfo_correct(&q->cfocorr, input, input, -q->mean_cfo / q->fft_size); + srslte_cfo_correct(&q->cfocorr, input, input, -q->mean_cfo / q->fft_size); } /* If integer CFO is enabled, find max PSS correlation for shifted +1/0/-1 integer versions */ diff --git a/srslte/lib/ue/src/ue_sync.c b/srslte/lib/ue/src/ue_sync.c index 0caa69f00..3c4c432dd 100644 --- a/srslte/lib/ue/src/ue_sync.c +++ b/srslte/lib/ue/src/ue_sync.c @@ -607,7 +607,7 @@ int srslte_ue_sync_zerocopy(srslte_ue_sync_t *q, cf_t *input_buffer) { srslte_cfo_correct(&q->sfind.cfocorr, input_buffer, input_buffer, - -srslte_sync_get_cfo(&q->sfind) / q->fft_size); + -srslte_sync_get_cfo(&q->strack) / q->fft_size); } }