jens/mpsk_rx_gui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use Farrow block

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@1018 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-06-17 10:05:00 +00:00
parent d80de98fad
commit 2a002d2b9c
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Receiver.cpp
+12 -14
View File
@@ -46,6 +46,8 @@ Receiver::Receiver(LogHandler *pLogHandler)
, m_pSymbolBuffer(0)
, m_ReceiverEnable(false)
, m_pDataListener(0)
, m_timingGenerator()
, m_farrow(m_timingGenerator)
, m_frameReceiver(this)
, m_pSymMapper(0)
{
@@ -100,6 +102,7 @@ void Receiver::setBufSize(uint32 size)
}
m_bufsize = size;
init();
m_bb_buffer.resize(size);
}
uint32 Receiver::getNumSoftSym()
@@ -205,6 +208,9 @@ void Receiver::init()
// Gardner Symbol Timing Recovery
initSTR();
// Interpolation
m_farrow.buffer_out_add(&m_bb_buffer);
// Symbol demapper
initSymbolMapper();
@@ -455,40 +461,32 @@ void Receiver::processBaseband(CVec const &iq, uint32_t len)
// Blind AGC gain adjustment
// @2 x symbolrate
Processor::Buffer<ComplexScalar> &next_buf_in = m_farrow.getInputBuffer();
auto *next_buf_in = dynamic_cast<Processor::Buffer<ComplexScalar>*>(m_farrow.buffer_in());
for (n = 0; n < len; n++)
{
// AGC Blind gain adjustments
ComplexScalar iq_agc = toComplexScalar(CpxScaleRealS(toCpx(iq[n]), AGC_GetWeight(&agcBlind)));
next_buf_in.write(&iq_agc, 1);
next_buf_in->write(&iq_agc, 1);
}
// Matched filtering and symbol timing recovery
// @2 x symbolrate
Processor::Buffer<ComplexScalar> *buf_ip = nullptr;
if (RCF_TYPE == RCF_TYPE_POLYPHASE_FARROW)
{
// Farrow interpolation
m_farrow.process(m_timingGenerator);
buf_ip = &m_farrow.getOutputBuffer();
m_farrow.process();
}
if (RCF_TYPE == RCF_TYPE_POLYPHASE_DISCRETE)
{
// Polyphase interpolation
// m_polyPhase.process(m_timingGenerator);
// buf_ip = &m_polyPhase.getOutputBuffer();
}
if (buf_ip == nullptr)
{
return;
// m_polyPhase.process();
}
// Further BB processing
// @2 x symbolrate
while(buf_ip->len())
while(m_bb_buffer.len())
{
ComplexScalar iq_mf = buf_ip->readAt(0);
ComplexScalar iq_mf = m_bb_buffer.readAt(0);
// -----------------------------------------------------
// Carrier Derotator
Source/Receiver.hpp
+5 -4
View File
@@ -360,6 +360,9 @@ private:
// Filter
Interpolation::DownSampler m_firArmDown;
// Gardner Symbol Timing Recovery
TimingGeneratorGardner m_timingGenerator;
// Interpolators
Interpolation::PolyPhase m_polyPhase;
Interpolation::Farrow m_farrow;
@@ -372,9 +375,6 @@ private:
lead_lag_filter_t m_loop_filter_str;
lead_lag_filter_t m_loop_filter_cpr;
// Gardner Symbol Timing Recovery
TimingGeneratorGardner m_timingGenerator;
// AGC
// Blind
agc_t agcBlind;
@@ -398,7 +398,8 @@ private:
FrameReceiver m_frameReceiver;
params_t m_params;
Processor::Buffer<ComplexScalar> m_bb_buffer;
void timerCallback();
void processBaseband(CVec const &iq, uint32_t len);
void minMaxInit(minmax_t *pObj, radio_float_t min_initial, radio_float_t max_initial)