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

report actual bin width with indicated precision instead of to the nearest Hz

Browse Source
This commit is contained in:
Michael Ossmann
2017-02-15 16:36:25 -07:00
parent 7cd8e5f7eb
commit d7a799d6f2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,7 +177,7 @@ bool one_shot = false;
volatile bool sweep_started = false; volatile bool sweep_started = false;
int fftSize = 20; int fftSize = 20;
uint32_t fft_bin_width; double fft_bin_width;
fftwf_complex *fftwIn = NULL; fftwf_complex *fftwIn = NULL;
fftwf_complex *fftwOut = NULL; fftwf_complex *fftwOut = NULL;
fftwf_plan fftwPlan = NULL; fftwf_plan fftwPlan = NULL;
@ -270,7 +270,7 @@ int rx_callback(hackrf_transfer* transfer) {
time_str, time_str,
(uint64_t)(frequency), (uint64_t)(frequency),
(uint64_t)(frequency+DEFAULT_SAMPLE_RATE_HZ/4), (uint64_t)(frequency+DEFAULT_SAMPLE_RATE_HZ/4),
(float)fft_bin_width, fft_bin_width,
fftSize); fftSize);
for(i=1+(fftSize*5)/8; (1+(fftSize*7)/8) > i; i++) { for(i=1+(fftSize*5)/8; (1+(fftSize*7)/8) > i; i++) {
fprintf(fd, ", %.2f", pwr[i]); fprintf(fd, ", %.2f", pwr[i]);
@ -280,7 +280,7 @@ int rx_callback(hackrf_transfer* transfer) {
time_str, time_str,
(uint64_t)(frequency+(DEFAULT_SAMPLE_RATE_HZ/2)), (uint64_t)(frequency+(DEFAULT_SAMPLE_RATE_HZ/2)),
(uint64_t)(frequency+((DEFAULT_SAMPLE_RATE_HZ*3)/4)), (uint64_t)(frequency+((DEFAULT_SAMPLE_RATE_HZ*3)/4)),
(float)fft_bin_width, fft_bin_width,
fftSize); fftSize);
for(i=1+fftSize/8; (1+(fftSize*3)/8) > i; i++) { for(i=1+fftSize/8; (1+(fftSize*3)/8) > i; i++) {
fprintf(fd, ", %.2f", pwr[i]); fprintf(fd, ", %.2f", pwr[i]);
@ -345,6 +345,7 @@ int main(int argc, char** argv) {
int step_count; int step_count;
uint32_t freq_min = 0; uint32_t freq_min = 0;
uint32_t freq_max = 6000; uint32_t freq_max = 6000;
uint32_t requested_fft_bin_width;
while( (opt = getopt(argc, argv, "a:f:p:l:g:d:n:w:1Br:h?")) != EOF ) { while( (opt = getopt(argc, argv, "a:f:p:l:g:d:n:w:1Br:h?")) != EOF ) {
@ -405,8 +406,8 @@ int main(int argc, char** argv) {
break; break;
case 'w': case 'w':
result = parse_u32(optarg, &fft_bin_width); result = parse_u32(optarg, &requested_fft_bin_width);
fftSize = DEFAULT_SAMPLE_RATE_HZ / fft_bin_width; fftSize = DEFAULT_SAMPLE_RATE_HZ / requested_fft_bin_width;
break; break;
case '1': case '1':
@ -497,7 +498,7 @@ int main(int argc, char** argv) {
fftSize++; fftSize++;
} }
fft_bin_width = DEFAULT_SAMPLE_RATE_HZ / fftSize; fft_bin_width = (double)DEFAULT_SAMPLE_RATE_HZ / fftSize;
fftwIn = (fftwf_complex*)fftwf_malloc(sizeof(fftwf_complex) * fftSize); fftwIn = (fftwf_complex*)fftwf_malloc(sizeof(fftwf_complex) * fftSize);
fftwOut = (fftwf_complex*)fftwf_malloc(sizeof(fftwf_complex) * fftSize); fftwOut = (fftwf_complex*)fftwf_malloc(sizeof(fftwf_complex) * fftSize);
fftwPlan = fftwf_plan_dft_1d(fftSize, fftwIn, fftwOut, FFTW_FORWARD, FFTW_MEASURE); fftwPlan = fftwf_plan_dft_1d(fftSize, fftwIn, fftwOut, FFTW_FORWARD, FFTW_MEASURE);