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/ControlComponent.cpp
+2 -2
View File
@@ -2104,8 +2104,8 @@ BEGIN_JUCER_METADATA
virtualName="" explicitFocusOrder="0" pos="720 408 64 24" buttonText="Reset"
connectedEdges="0" needsCallback="1" radioGroupId="0"/>
<SLIDER name="CarrierPhaseSlider" id="b4edfd1dcd6a20c6" memberName="m_sliderCarrierPhase"
virtualName="" explicitFocusOrder="0" pos="568 480 150 24" min="-3.1415926535900001"
max="3.1415926535900001" int="0.001" style="RotaryVerticalDrag"
virtualName="" explicitFocusOrder="0" pos="568 480 150 24" min="-3.1415926535900000616"
max="3.1415926535900000616" int="0.0010000000000000000208" style="RotaryVerticalDrag"
textBoxPos="TextBoxLeft" textBoxEditable="1" textBoxWidth="80"
textBoxHeight="20" skewFactor="1"/>
<TEXTBUTTON name="CPR Reset button" id="42a7b272b9dba592" memberName="m_buttonResetCPR"
Source/GraphComponent.h
+1 -1
View File
@@ -21,7 +21,7 @@
#define __GRAPH_COMPONENT__
//[Headers] -- You can add your own extra header files here --
#include "JuceHeader.h"
#include <JuceHeader.h>
#include "Receiver.h"
//[/Headers]
Source/IQPlaneComponent.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ void IQPlaneComponent::pointAdd(sym_err_t *pPoint, uint32_t numPoints)
if (m_numPoints >= m_maxNumPoints)
return;
numFill = (uint32_t)__min(m_maxNumPoints-m_numPoints, numPoints);
numFill = (uint32_t)dmin(m_maxNumPoints-m_numPoints, numPoints);
for (i=0; i < numFill; i++)
{
m_pPointArray[m_numPoints++] = pPoint[i];
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();
Source/Receiver.h
+28 -28
View File
@@ -9,10 +9,10 @@
#include <radio/statistics.h>
#include <radio/equalizer.h>
#include <radio/agc.h>
#include <radio/Frame.hpp>
#include "JuceHeader.h"
#include "Logcomponent.h"
#include "Frame.hpp"
#include "LogComponent.h"
// ---------------------------------------------------
#define NUM_PASSBAND_SAMPLES_PER_SYM 4
@@ -160,13 +160,13 @@ typedef struct _params_t
bool strAutoControlEnable;
bool cprAutoControlEnable;
bool agcAutoControlEnable;
str_mode str_mode;
cpr_mode cpr_mode;
agc_mode agc_mode;
eq_mode eq_mode;
cma_type cmaType;
cma_mode cmaMode;
dfe_mode dfeMode;
enum str_mode str_mode;
enum cpr_mode cpr_mode;
enum agc_mode agc_mode;
enum eq_mode eq_mode;
enum cma_type cmaType;
enum cma_mode cmaMode;
enum dfe_mode dfeMode;
lead_lag_coeff_t str_loopfilter_coeff[2];
uint32_t str_loopfilter_coeff_index;
lead_lag_coeff_t cpr_loopfilter_coeff[2];
@@ -177,9 +177,9 @@ typedef struct _params_t
float agcMu[2];
uint32_t agcMu_index;
str_state strState;
cpr_state cprState;
agc_state agc_state;
enum str_state strState;
enum cpr_state cprState;
enum agc_state agc_state;
} params_t;
@@ -292,7 +292,7 @@ private:
uint32_t m_numSymsInBuffer;
uint32_t m_bufsize;
bool m_ReceiverEnable;
clock_t m_symClock;
sample_clock_t m_symClock;
pfd_t m_pfdCpr;
cpx_t m_trackers_[4];
cpx_t m_trackers[4];
@@ -354,7 +354,7 @@ private:
void timerCallback();
void processBaseband(cpx_t *pIF, uint32_t len);
cpx_t processMatchedFilter(cpx_t x, int32_t m, radio_float_t mu);
int Farrow_open_coeff(ppip_farrow_cpx_t *pObj, char *filename);
int Farrow_open_coeff(ppip_farrow_cpx_t *pObj, const char *filename);
void minMaxInit(minmax_t *pObj, radio_float_t min_initial, radio_float_t max_initial)
{
pObj->min = min_initial;
@@ -402,19 +402,19 @@ private:
void initDDC();
// Interface
void Receiver::setSamplerate(float samplerate_hz) override;
void Receiver::setParams(const params_t &params) override;
params_t& Receiver::getParams() override;
status_t& Receiver::getStatus() override;
void Receiver::reset() override;
void Receiver::strReset() override;
void Receiver::cprReset() override;
void Receiver::dfeReset() override;
void Receiver::cmaReset() override;
void Receiver::statisticsReset() override;
void Receiver::dfeOffUpdateFromCma() override;
void Receiver::dfeOnUpdateFromDfeOff() override;
cpx_t& Receiver::getTracker(uint32 index) override;
void setSamplerate(float samplerate_hz) override;
void setParams(const params_t &params) override;
params_t& getParams() override;
status_t& getStatus() override;
void reset() override;
void strReset() override;
void cprReset() override;
void dfeReset() override;
void cmaReset() override;
void statisticsReset() override;
void dfeOffUpdateFromCma() override;
void dfeOnUpdateFromDfeOff() override;
cpx_t& getTracker(uint32 index) override;
void onData(void *pData, uint32_t size) override
{
@@ -447,4 +447,4 @@ private:
trace_t m_trace;
};
#endif // _RECEIVER_H_
#endif // _RECEIVER_H_
Source/Transmitter.h
+3 -3
View File
@@ -5,10 +5,10 @@
#include <radio/symbol.h>
#include <radio/nco.h>
#include <radio/interpolation.h>
#include <radio/Frame.hpp>
#include "JuceHeader.h"
#include "Logcomponent.h"
#include "Frame.hpp"
#include "LogComponent.h"
#define TRANSMITTER_RCF_OVERSAMPLING ((uint32_t)32)
#define TRANSMITTER_RCF_ROLLOFF ((radio_float_t)0.35)
@@ -248,4 +248,4 @@ private:
}
};
#endif // _TRANSMITTER_H_
#endif // _TRANSMITTER_H_