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.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_