comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-01 21:54:39 -04:00
Code Issues Projects Releases Wiki Activity

Spectrum averaging control now functional

Browse Source
This commit is contained in:
Charles J. Cliffe
2015-08-12 22:14:14 -04:00
parent 1d5a2f1ac7
commit b345dc7516
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/process/SpectrumVisualProcessor.cpp
+8 -4
View File
@@ -15,6 +15,7 @@ SpectrumVisualProcessor::SpectrumVisualProcessor() : lastInputBandwidth(0), last
fft_ceil_ma = fft_ceil_maa = 100.0;
fft_floor_ma = fft_floor_maa = 0.0;
desiredInputSize = 0;
fft_average_rate = 0.65;
}
SpectrumVisualProcessor::~SpectrumVisualProcessor() {
@@ -29,6 +30,9 @@ void SpectrumVisualProcessor::setView(bool bView) {
is_view.store(bView);
}
void SpectrumVisualProcessor::setFFTAverageRate(float fftAverageRate) {
this->fft_average_rate = fftAverageRate;
}
void SpectrumVisualProcessor::setCenterFrequency(long long centerFreq_in) {
centerFreq.store(centerFreq_in);
@@ -260,11 +264,11 @@ void SpectrumVisualProcessor::process() {
for (int i = 0, iMax = fftSize; i < iMax; i++) {
if (is_view.load()) {
fft_result_maa[i] += (fft_result_ma[i] - fft_result_maa[i]) * 0.65;
fft_result_ma[i] += (fft_result[i] - fft_result_ma[i]) * 0.65;
fft_result_maa[i] += (fft_result_ma[i] - fft_result_maa[i]) * fft_average_rate;
fft_result_ma[i] += (fft_result[i] - fft_result_ma[i]) * fft_average_rate;
} else {
fft_result_maa[i] += (fft_result_ma[i] - fft_result_maa[i]) * 0.65;
fft_result_ma[i] += (fft_result[i] - fft_result_ma[i]) * 0.65;
fft_result_maa[i] += (fft_result_ma[i] - fft_result_maa[i]) * fft_average_rate;
fft_result_ma[i] += (fft_result[i] - fft_result_ma[i]) * fft_average_rate;
}
if (fft_result_maa[i] > fft_ceil) {
src/process/SpectrumVisualProcessor.h
+3
View File
@@ -21,6 +21,8 @@ public:
bool isView();
void setView(bool bView);
void setFFTAverageRate(float fftAverageRate);
void setCenterFrequency(long long centerFreq_in);
long long getCenterFrequency();
@@ -50,6 +52,7 @@ private:
float fft_ceil_ma, fft_ceil_maa;
float fft_floor_ma, fft_floor_maa;
float fft_average_rate;
std::vector<float> fft_result;
std::vector<float> fft_result_ma;