From 967741deeb37764c4b570bce939bf8ddefbfba99 Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Thu, 6 Jun 2024 18:04:15 +0930 Subject: [PATCH] Rebase dft_detect, bump beta version --- auto_rx/autorx/__init__.py | 2 +- scan/dft_detect.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/auto_rx/autorx/__init__.py b/auto_rx/autorx/__init__.py index 348e57d..961d8ae 100644 --- a/auto_rx/autorx/__init__.py +++ b/auto_rx/autorx/__init__.py @@ -12,7 +12,7 @@ from queue import Queue # MINOR - New sonde type support, other fairly big changes that may result in telemetry or config file incompatability issus. # PATCH - Small changes, or minor feature additions. -__version__ = "1.7.3-beta15" +__version__ = "1.7.3-beta16" # Global Variables diff --git a/scan/dft_detect.c b/scan/dft_detect.c index ea39222..701196f 100644 --- a/scan/dft_detect.c +++ b/scan/dft_detect.c @@ -1018,9 +1018,12 @@ static int init_buffers() { float f_lp; // dec_lowpass: lowpass_bw/2 float t_bw; // dec_lowpass: transition_bw int taps; // dec_lowpass: taps + int wideIF = 0; if (set_lpIQ > IF_sr) IF_sr = set_lpIQ; + wideIF = IF_sr > 60e3; + sr_base = sample_rate; if (option_min) IF_sr = IF_SAMPLE_RATE_MIN; @@ -1030,8 +1033,13 @@ static int init_buffers() { decM = sr_base / IF_sr; } - f_lp = (IF_sr+20e3)/(4.0*sr_base); + f_lp = (IF_sr+20e3)/(4.0*sr_base); // IF=48k t_bw = (IF_sr-20e3)/*/2.0*/; + if (wideIF) { // IF=96k + f_lp = (IF_sr+60e3)/(4.0*sr_base); + t_bw = (IF_sr-60e3)/*/2.0*/; + } + else if (option_min) { t_bw = (IF_sr-12e3); }