FreeDV
/
rtl-sdr-blog
mirror of https://github.com/drowe67/rtl-sdr-blog.git
1
0
Fork 0
Code Issues Releases Wiki Activity

rtl_power: fix dBm math 

Signed-off-by: Steve Markgraf <steve@steve-m.de>
master
Kyle Keen 2014-01-23 07:31:34 -05:00 committed by Steve Markgraf
parent 835bd23542
commit f459214894
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/rtl_power.c
View File

@ -623,6 +623,12 @@ void downsample_iq(int16_t *data, int length)
//remove_dc(data+1, length-1); //remove_dc(data+1, length-1);
} }
long real_conj(int16_t real, int16_t imag)
/* real(n * conj(n)) */
{
return ((long)real*(long)real + (long)imag*(long)imag);
}
void scanner(void) void scanner(void)
{ {
int i, j, j2, f, n_read, offset, bin_e, bin_len, buf_len, ds, ds_p; int i, j, j2, f, n_read, offset, bin_e, bin_len, buf_len, ds, ds_p;
@ -691,11 +697,11 @@ void scanner(void)
fix_fft(fft_buf+offset, bin_e); fix_fft(fft_buf+offset, bin_e);
if (!peak_hold) { if (!peak_hold) {
for (j=0; j<bin_len; j++) { for (j=0; j<bin_len; j++) {
ts->avg[j] += (long) abs(fft_buf[offset+j*2]); ts->avg[j] += real_conj(fft_buf[offset+j*2], fft_buf[offset+j*2+1]);
} }
} else { } else {
for (j=0; j<bin_len; j++) { for (j=0; j<bin_len; j++) {
ts->avg[j] = MAX((long) abs(fft_buf[offset+j*2]), ts->avg[j]); ts->avg[j] = MAX(real_conj(fft_buf[offset+j*2], fft_buf[offset+j*2+1]), ts->avg[j]);
} }
} }
ts->samples += ds; ts->samples += ds;