comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Re-align spectrum view 

DC spike now showing?
This commit is contained in:
Charles J. Cliffe 2014-10-31 19:10:53 -04:00
parent 62a8c13be7
commit c4099cb690
3 changed files with 55 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CubicSDRDefs.h
View File

@ -1,6 +1,6 @@
#pragma once
#define BUF_SIZE ((16 * 32 * 512)/4)
#define BUF_SIZE (16 * 32 * 512)
#define SRATE 2500000
#define FFT_SIZE 8192

80
src/PrimaryGLContext.cpp
View File

@ -98,15 +98,15 @@ TestGLCanvas::TestGLCanvas(wxWindow *parent, int *attribList) :
wxGLCanvas(parent, wxID_ANY, attribList, wxDefaultPosition, wxDefaultSize,
wxFULL_REPAINT_ON_RESIZE) {
int in_block_size = BUF_SIZE/2;
int in_block_size = BUF_SIZE / 2;
int out_block_size = FFT_SIZE;
in = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * in_block_size);
out[0] = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * out_block_size);
out[1] = (fftw_complex*) fftw_malloc(sizeof(fftw_complex) * out_block_size);
plan[0] = fftw_plan_dft_1d(out_block_size, in, out[0], FFTW_FORWARD, FFTW_MEASURE);
plan[1] = fftw_plan_dft_1d(out_block_size, in, out[1], FFTW_BACKWARD, FFTW_MEASURE);
}
plan[0] = fftw_plan_dft_1d(out_block_size, in, out[0], FFTW_BACKWARD, FFTW_MEASURE);
plan[1] = fftw_plan_dft_1d(out_block_size, in, out[1], FFTW_FORWARD, FFTW_MEASURE);
}
void TestGLCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
wxPaintDC dc(this);
@ -142,11 +142,10 @@ void TestGLCanvas::OnKeyDown(wxKeyEvent& event) {
void TestGLCanvas::setData(std::vector<signed char> *data) {
if (data && data->size()) {
if (points.size() < FFT_SIZE*4) {
points.resize(FFT_SIZE*4);
if (points.size() < FFT_SIZE * 2) {
points.resize(FFT_SIZE * 2);
}
for (int i = 0; i < BUF_SIZE / 2; i++) {
@ -154,47 +153,56 @@ void TestGLCanvas::setData(std::vector<signed char> *data) {
in[i][1] = (double) (*data)[i * 2 + 1] / 127.0f;
}
fftw_execute(plan[0]);
fftw_execute(plan[1]);
double result[FFT_SIZE*2];
double result[FFT_SIZE];
double fft_floor, fft_ceil;
for (int j = 0; j < 2; j++) {
for (int i = 0, iMax = FFT_SIZE; i < iMax; i++) {
double a = out[j][i][0];
double b = out[j][i][1];
for (int i = 0, iMax = FFT_SIZE / 2; i < iMax; i++) {
double a = out[j][i][0];
double b = out[j][i][1];
double c = sqrt(a*a+b*b);
if (i==1) {
fft_floor=fft_ceil=c;
} else if (i<FFT_SIZE-1) {
if (c<fft_floor) {
fft_floor = c;
}
if (c>fft_ceil) {
fft_ceil = c;
}
}
double c = sqrt(a * a + b * b);
if (i == 1) {
fft_floor = fft_ceil = c;
} else if (i < FFT_SIZE - 1) {
if (c < fft_floor) {
fft_floor = c;
}
if (c > fft_ceil) {
fft_ceil = c;
}
}
if (j) {
result[FFT_SIZE*2 - 1 - i] = c;
} else {
result[FFT_SIZE*2 - 1 - (FFT_SIZE+(FFT_SIZE-1-i))] = c;
}
}
}
if (fft_ceil-fft_floor < 1.0) {
fft_ceil = fft_floor + 1.0;
if (!j) {
result[((FFT_SIZE/2)-1) - i] = c;
} else {
result[(FFT_SIZE/2) + i] = c;
}
/*
if (!j) {
result[(FFT_SIZE/2) + ((FFT_SIZE/2)-1) - i] = c;
} else {
result[i] = c;
}
*/
}
}
for (int i = 0, iMax = FFT_SIZE*2; i < iMax; i++) {
points[i * 2 + 1] = (result[i]-fft_floor)/(fft_ceil-fft_floor);
if (fft_ceil - fft_floor < 10.0) {
fft_ceil = fft_floor + 10.0;
}
for (int i = 0, iMax = FFT_SIZE; i < iMax; i++) {
points[i * 2 + 1] = (result[i] - fft_floor) / (fft_ceil - fft_floor);
points[i * 2] = ((double) i / (double) iMax);
}
}
}

12
src/SDRThread.cpp
View File

@ -85,11 +85,19 @@ void SDRThread::enumerate_rtl() {
wxThread::ExitCode SDRThread::Entry() {
signed char *buf = (signed char *) malloc(BUF_SIZE);
int use_my_dev = 1;
int dev_count = rtlsdr_get_device_count();
if (use_my_dev > dev_count-1) {
use_my_dev = 0;
}
enumerate_rtl();
rtlsdr_open(&dev, 0);
rtlsdr_open(&dev, use_my_dev);
rtlsdr_set_sample_rate(dev, SRATE);
rtlsdr_set_center_freq(dev, 98000000);
rtlsdr_set_center_freq(dev, 105700000);
rtlsdr_set_agc_mode(dev, 1);
rtlsdr_set_offset_tuning(dev, 1);
rtlsdr_reset_buffer(dev);