GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-13 09:17:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix RTL RMS so it does't return Jank Values;

Browse Source
This commit is contained in:
lwvmobile
2023-08-07 03:43:39 -04:00
parent 9b3a2d96e3
commit 83e3fa1061
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dsd_ncurses.c
View File

@@ -2319,7 +2319,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
printw (" Gain: %idB;", opts->rtl_gain_value);
printw (" PPM: %i;", opts->rtlsdr_ppm_error);
printw (" SQ: %i;", opts->rtl_squelch_level);
printw (" RMS: %04i;", opts->rtl_rms);
printw (" RMS: %04li;", opts->rtl_rms);
printw (" BW: %i kHz;", opts->rtl_bandwidth);
printw (" FRQ: %i;", opts->rtlsdr_center_freq);
if (opts->rtl_udp_port != 0) printw ("\n| External Tuning on UDP Port: %i", opts->rtl_udp_port);

19
src/rtl_sdr_fm.cpp
View File

@@ -463,11 +463,14 @@ void dc_block_filter(struct demod_state *fm)
}
fm->dc_avg = avg;
}
int rms(int16_t *samples, int len, int step)
//TODO: Fix This so we don't get random negative values in Cygwin (or 32-bit builds?)
//Fixed -- I honestly think the issue is Cygwin can't keep up and if it can't run enough samples in the other thread,
//then it reports some jank values, really unsure, I've never seen the issue in Linux side though
long int rms(int16_t *samples, int len, int step)
/* largely lifted from rtl_power */
{
int i;
long int rms;
long p, t, s;
double dc, err;
@@ -481,7 +484,10 @@ int rms(int16_t *samples, int len, int step)
dc = (double)(t*step) / (double)len;
err = t * 2 * dc - dc * dc * len;
return (int)sqrt((p-err) / len);
rms = (long int)sqrt((p-err) / len);
//going with a value that's easy to figure out when its done the thing
if (rms < 0){ rms = 999; } //need to text nxdn with this setup to make sure it isn't broken in Windows Cygwin now
return rms;
}
void full_demod(struct demod_state *d)
@@ -1108,13 +1114,10 @@ void rtl_dev_tune(dsd_opts * opts, long int frequency)
}
//return RMS value (root means square) power level -- used as soft squelch inside of framesync
int rtl_return_rms()
long int rtl_return_rms()
{
int sr = 0;
long int sr = 0;
sr = rms(demod.lowpassed, demod.lp_len, 1);
// 'Fix' potential negative value overflow from the rms function -- Observed in Windows builds
sr = abs(sr);
if (sr > 9999) sr = 9999;
return (sr);
}