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

- compile clean for gcc

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@11 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2014-07-19 13:02:37 +00:00
parent 00ecb0a6c1
commit 18b4fa3b5c
15 changed files with 143 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Receiver.cpp
+11 -4
View File
@@ -1,9 +1,12 @@
#include <cmath>
#include "Receiver.h"
#include "MinMaxLemire.h"
#include "Frame.hpp"
#include <radio/Frame.hpp>
#if 0
#include <radio/ComplexVector.hpp>
#include <radio/RealVector.hpp>
#endif
/***************************************************************/
const uint32_t LPF_OVERSAMPLING = 32; // Arm-Filter: oversampling
@@ -161,6 +164,7 @@ void Receiver::initDefaultParams()
m_params.eqMuDfe = DFE_MU;
}
#if 0
void UpdateWeigths(ComplexVector &x, ComplexVector &e, ComplexVector &w, ComplexVector &w_conj, radio_float_t mu)
{
@@ -174,6 +178,7 @@ void UpdateWeigths(ComplexVector &x, ComplexVector &e, ComplexVector &w, Complex
w_conj.print("w*");
}
#endif
void Receiver::init()
{
@@ -364,7 +369,6 @@ void Receiver::init()
UnitFrameTransmitter tx(10, &rx);
tx.process();
#endif
//---------------------------
// ComplexVector
//---------------------------
@@ -820,6 +824,7 @@ void Receiver::init()
rv1.print("v1");
rv2.print("v2");
rv3.print("v3");
#endif
TraceOpen(&m_trace, "D:\\home\\jens\\Dokumente\\trace.txt");
@@ -1312,7 +1317,7 @@ cpx_t Receiver::processMatchedFilter(cpx_t x, int32_t m, radio_float_t mu)
return y;
}
int Receiver::Farrow_open_coeff(ppip_farrow_cpx_t *pObj, char *filename)
int Receiver::Farrow_open_coeff(ppip_farrow_cpx_t *pObj, const char *filename)
{
int i;
FILE *pFile;
@@ -1440,7 +1445,7 @@ void Receiver::initFilterRcf()
}
m_pFarrowInterpolator = new ppip_farrow_cpx_t();
Farrow_open_coeff(m_pFarrowInterpolator, "D:\\home\\jens\\work\\develope\\win32\\Projects\\radio\\farrow_coeff.dat");
Farrow_open_coeff(m_pFarrowInterpolator, "/home/jens/farrow_coeff.dat");
m_log.log("Farrow filter coefficients loaded (L=%d, M=%d, N=%d)", m_pFarrowInterpolator->L, m_pFarrowInterpolator->M, m_pFarrowInterpolator->N);
}
@@ -1502,6 +1507,8 @@ void Receiver::setSamplerate(float samplerate_hz)
const ScopedLock sl (m_lock);
m_params.samplerate = samplerate_hz;
m_params.symbolrate = samplerate_hz/4;
m_params.ddc_freq = samplerate_hz/4;
initDDC();
initFilterArm();