From e418e45fd3069a02537a0d8883722a72e7325c35 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Thu, 16 Jun 2022 16:27:53 +0000 Subject: [PATCH] - TimingGnerator has omega and takes dOmega git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@1001 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- radio/interpolation/TimingGenerator.cpp | 12 +++++++++--- radio/interpolation/TimingGenerator.hpp | 5 ++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/radio/interpolation/TimingGenerator.cpp b/radio/interpolation/TimingGenerator.cpp index a8cfffb..7a0c5f4 100644 --- a/radio/interpolation/TimingGenerator.cpp +++ b/radio/interpolation/TimingGenerator.cpp @@ -6,7 +6,8 @@ namespace Radio namespace Interpolation { TimingGenerator::TimingGenerator() -: m_mu(0) +: m_omega(0) +, m_mu(0) , m_adv(0) { } @@ -16,15 +17,20 @@ TimingGenerator::~TimingGenerator() } +void TimingGenerator::setOmega(radio_float_t omega) +{ + m_omega = omega; +} + void TimingGenerator::process(ComplexScalar const &iq) { (void)iq; update(1.0); } -void TimingGenerator::update(radio_float_t omega) +void TimingGenerator::update(radio_float_t dOmega) { - m_mu += omega; + m_mu += (m_omega + dOmega); m_adv = (size_t)m_mu; m_mu -= m_adv; } diff --git a/radio/interpolation/TimingGenerator.hpp b/radio/interpolation/TimingGenerator.hpp index 63c3505..c5bf71b 100644 --- a/radio/interpolation/TimingGenerator.hpp +++ b/radio/interpolation/TimingGenerator.hpp @@ -22,10 +22,13 @@ public: radio_float_t getMu() const; virtual void process(ComplexScalar const &iq); + void setOmega(radio_float_t omega); -protected: +private: + radio_float_t m_omega; radio_float_t m_mu; size_t m_adv; +protected: void update(radio_float_t omega); };