- refactored

git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@980 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
2022-06-15 10:40:48 +00:00
parent b5fa2c41c2
commit a0b9ea8e4f
+6 -6
View File
@@ -6,7 +6,7 @@
#include <cpp/radio/Vector.hpp> #include <cpp/radio/Vector.hpp>
#include <cpp/radio/FirComplex.hpp> #include <cpp/radio/FirComplex.hpp>
#include <cpp/radio/processor/src/Buffer.hpp> #include <cpp/radio/processor/src/Buffer.hpp>
#include <cpp/radio/interpolation/Interpolator.hpp> #include <cpp/radio/interpolation/TimingGenerator.hpp>
#include <iostream> #include <iostream>
@@ -71,7 +71,7 @@ public:
return m_bufferIn.write(x, size); return m_bufferIn.write(x, size);
} }
bool process_new(RealScalar dmu) bool process_new(TimingGenerator &timingGenerator)
{ {
#if 0 #if 0
while(m_bufferIn.len()) while(m_bufferIn.len())
@@ -87,8 +87,8 @@ public:
#else #else
while(true) while(true)
{ {
size_t adv = m_interpolator.getAdv(); size_t adv = timingGenerator.getAdv();
radio_float_t mu = m_interpolator.getMu(); radio_float_t mu = timingGenerator.getMu();
if (m_bufferIn.len() < adv) if (m_bufferIn.len() < adv)
{ {
@@ -109,7 +109,7 @@ public:
ComplexScalar yout = horner(mu); ComplexScalar yout = horner(mu);
m_bufferOut.write(&yout, 1); m_bufferOut.write(&yout, 1);
m_interpolator.process(dmu); timingGenerator.process(yout);
} }
#endif #endif
@@ -206,7 +206,7 @@ private:
CVec m_fifo; CVec m_fifo;
Processor::Buffer<ComplexScalar> m_bufferIn; Processor::Buffer<ComplexScalar> m_bufferIn;
Processor::Buffer<ComplexScalar> m_bufferOut; Processor::Buffer<ComplexScalar> m_bufferOut;
Interpolator m_interpolator; TimingGenerator m_timing;
ComplexScalar horner(RealScalar mu) ComplexScalar horner(RealScalar mu)
{ {