sjg/trx-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix](trx-cw): stabilize auto tone scan window

Browse Source 
Keep manual CW tone setting range at 100-10000 Hz, but limit auto-tone
scanning to 300-1200 Hz to avoid locking onto high-frequency noise.
Retain Nyquist-safe upper clamping.

Co-authored-by: Codex <codex@openai.com>
Signed-off-by: Stan Grams <sjg@haxx.space>
This commit is contained in:
Stan Grams
2026-03-04 23:09:07 +01:00
parent c1f37a320f
commit 9786030f7d
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decoders/trx-cw/src/lib.rs
+11 -9
View File
@@ -89,18 +89,20 @@ fn goertzel_energy(buf: &[f32], coeff: f32) -> f32 {
// Tone scan bins // Tone scan bins
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
const TONE_SCAN_LOW: u32 = 100; const TONE_SET_LOW: u32 = 100;
const TONE_SCAN_HIGH: u32 = 10_000; const TONE_SET_HIGH: u32 = 10_000;
const TONE_SCAN_LOW: u32 = 300;
const TONE_SCAN_HIGH: u32 = 1200;
const TONE_SCAN_STEP: u32 = 25; const TONE_SCAN_STEP: u32 = 25;
const TONE_STABLE_NEEDED: u32 = 3; const TONE_STABLE_NEEDED: u32 = 3;
const THRESHOLD: f32 = 0.05; const THRESHOLD: f32 = 0.05;
fn tone_scan_high_for_sample_rate(sample_rate: u32) -> u32 { fn tone_high_for_sample_rate(sample_rate: u32, low: u32, high: u32) -> u32 {
let nyquist = sample_rate / 2; let nyquist = sample_rate / 2;
if nyquist <= TONE_SCAN_LOW + 1 { if nyquist <= low + 1 {
TONE_SCAN_LOW low
} else { } else {
TONE_SCAN_HIGH.min(nyquist - 1) high.min(nyquist - 1)
} }
} }
@@ -161,7 +163,7 @@ impl CwDecoder {
// Build scan bins // Build scan bins
let mut tone_scan_bins = Vec::new(); let mut tone_scan_bins = Vec::new();
let mut f = TONE_SCAN_LOW; let mut f = TONE_SCAN_LOW;
let scan_high = tone_scan_high_for_sample_rate(sample_rate); let scan_high = tone_high_for_sample_rate(sample_rate, TONE_SCAN_LOW, TONE_SCAN_HIGH);
while f <= scan_high { while f <= scan_high {
let bk = (f as f32 * window_size as f32 / sample_rate as f32).round(); let bk = (f as f32 * window_size as f32 / sample_rate as f32).round();
let b_omega = (2.0 * std::f32::consts::PI * bk) / window_size as f32; let b_omega = (2.0 * std::f32::consts::PI * bk) / window_size as f32;
@@ -206,8 +208,8 @@ impl CwDecoder {
pub fn set_tone_hz(&mut self, tone_hz: u32) { pub fn set_tone_hz(&mut self, tone_hz: u32) {
let tone_hz = tone_hz.clamp( let tone_hz = tone_hz.clamp(
TONE_SCAN_LOW, TONE_SET_LOW,
tone_scan_high_for_sample_rate(self.sample_rate), tone_high_for_sample_rate(self.sample_rate, TONE_SET_LOW, TONE_SET_HIGH),
); );
self.recompute_goertzel(tone_hz); self.recompute_goertzel(tone_hz);
} }