- cleaned up

git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@996 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
2022-06-16 13:32:58 +00:00
parent 0a1d31a0d9
commit cacc5bb11f
+7 -7
View File
@@ -120,7 +120,7 @@ class TimingGeneratorGardner : public Interpolation::TimingGenerator
if (is_time)
{
// @1 x symbolrate
cout << "Vd = " << vd << ", omega = " << m_omega << ", mu = " << m_mu << endl;
cout << "Vd = " << vd << ", omega = " << m_omega << ", mu = " << getMu() << endl;
m_omega = LeadLagProcess(&loop_filter_str, &str_loopfilter_coeff, vd);
}
is_time = not is_time;
@@ -143,8 +143,7 @@ void test()
// Setup IQ data
WAVEHEADER header;
// CVec iq_in = wavLoad("m2_12k_12k_i_q_short_2sps.wav", header);
// CVec iq_in = wavLoad("sine_12k_ef_1_percent.wav", header);
CVec iq_in = wavLoad("sine_12k_s.wav", header);
CVec iq_in = wavLoad("sine.wav", header);
CVec iq_out;
iq_out.reserve(8*iq_in.size());
@@ -163,14 +162,15 @@ void test()
n += numFed;
remain -= numFed;
farrow.process_new(timingGenerator);
while(farrow.getOutputBuffer().len())
farrow.process(timingGenerator);
Processor::Buffer<ComplexScalar>& buf_farrow = farrow.getOutputBuffer();
while(buf_farrow.len())
{
size_t size = std::min(BLOCKSIZE, farrow.getOutputBuffer().len());
size_t size = std::min(BLOCKSIZE, buf_farrow.len());
iq_out.resize(k+size);
for (size_t i=0; i < size; i++)
{
iq_out[k++] = farrow.getOutputBuffer().readAt(0);
iq_out[k++] = buf_farrow.readAt(0);
}
}
}