Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed FFT bin reordering bug in hackrf_sweep

Browse Source
This commit is contained in:
Michael Ossmann
2017-02-07 17:48:24 -07:00
parent 0c45d65dc3
commit 813f540e94
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
host/hackrf-tools/src/hackrf_sweep.c
View File

@ -230,11 +230,7 @@ int rx_callback(hackrf_transfer* transfer) {
buf += fftSize * 2; buf += fftSize * 2;
fftwf_execute(fftwPlan); fftwf_execute(fftwPlan);
for (i=0; i < fftSize; i++) { for (i=0; i < fftSize; i++) {
// Start from the middle of the FFTW array and wrap pwr[i] = logPower(fftwOut[i], 1.0f / fftSize);
// to rearrange the data
//FIXME only works when fftSize = 2**n
int k = i ^ (fftSize >> 1);
pwr[i] = logPower(fftwOut[k], 1.0f / fftSize);
} }
if(binary_output) { if(binary_output) {
float_freq = frequency; float_freq = frequency;
@ -251,7 +247,7 @@ int rx_callback(hackrf_transfer* transfer) {
(uint64_t)(frequency+DEFAULT_SAMPLE_RATE_HZ/4), (uint64_t)(frequency+DEFAULT_SAMPLE_RATE_HZ/4),
(float)fft_bin_width, (float)fft_bin_width,
fftSize); fftSize);
for(i=1+fftSize/8; (1+(fftSize*3)/8) > i; i++) { for(i=1+(fftSize*5)/8; (1+(fftSize*7)/8) > i; i++) {
printf(", %.2f", pwr[i]); printf(", %.2f", pwr[i]);
} }
printf("\n"); printf("\n");
@ -261,7 +257,7 @@ int rx_callback(hackrf_transfer* transfer) {
(uint64_t)(frequency+((DEFAULT_SAMPLE_RATE_HZ*3)/4)), (uint64_t)(frequency+((DEFAULT_SAMPLE_RATE_HZ*3)/4)),
(float)fft_bin_width, (float)fft_bin_width,
fftSize); fftSize);
for(i=1+(fftSize*5)/8; (1+(fftSize*7)/8) > i; i++) { for(i=1+fftSize/8; (1+(fftSize*3)/8) > i; i++) {
printf(", %.2f", pwr[i]); printf(", %.2f", pwr[i]);
} }
printf("\n"); printf("\n");