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

- removed profiling -pg

Browse Source 
- receiver uses Downsampler, PolyPhase, Farrow
- removed Lagrange


git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@98 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2014-12-21 11:09:47 +00:00
parent 91552cffe9
commit 3546b6bd3a
5 changed files with 49 additions and 770 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Receiver.h
+7 -17
View File
@@ -27,11 +27,10 @@ using namespace Radio;
#define MODE_PROCESS_BASEBAND 1
#define RCF_TYPE_POLYPHASE_DISCRETE 0
#define RCF_TYPE_POLYPHASE_FARROW 1
#define RCF_TYPE_LAGRANGE 2
#define EQ_ENABLE 1
#define MODULATION_TYPE MAP_MODE_QAM
#define RCF_TYPE RCF_TYPE_POLYPHASE_FARROW
#define RCF_TYPE RCF_TYPE_POLYPHASE_DISCRETE
#define MAX_NUMBITS_PERSYM 16
// ---------------------------------------------------
enum eq_mode
@@ -286,6 +285,9 @@ private:
CriticalSection m_lock;
cpx_t *m_pPassbandBuffer;
cpx_t *m_pBasebandBuffer;
CVec m_passbandBuffer;
CVec m_basebandBuffer;
sym_err_t *m_pSymbolBuffer;
uint32_t m_numSymsInBuffer;
uint32_t m_bufsize;
@@ -294,23 +296,12 @@ private:
pfd_t m_pfdCpr;
cpx_t m_trackers_[4];
cpx_t m_trackers[4];
// Filter
uint32_t m_narm;
uint32_t m_nrcf;
radio_float_t *m_stateArm_I;
radio_float_t *m_stateArm_Q;
radio_float_t *m_coefArm;
radio_float_t *m_coefRCF;
fir_cpx_t *m_pFirArm;
fir_cpx_multirate_t *m_pFirDownArm;
fir_cpx_t *m_pFirRcf;
Interpolation::DownSampler m_firArmDown;
// Interpolators
ppip_cpx_t *m_pPolyphaseInterpolator;
lgip_cpx_t *m_pLagrangeInterpolator;
Interpolation::PolyPhase m_polyPhase;
Interpolation::Farrow m_farrow;
// NCOs
@@ -340,7 +331,6 @@ private:
// Blind EQ
Equalizer::Cma m_cma2;
// Symbol demapper
sym_map_t *m_pSymMapper;