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

[feat](trx-rs): add HF APRS decoder (300 baud, 1600/1800 Hz AFSK)

Browse Source 
Adds a second APRS demodulator path tuned for the HF APRS standard
(300 baud Bell 103-style AFSK, mark=1600 Hz / space=1800 Hz), active
on RigMode::DIG.  Shares AX.25 framing, APRS parsing, APRS-IS uplink,
and frontend display with the existing VHF stack.

- trx-aprs: parameterise Demodulator::new(); add AprsDecoder::new_hf()
- trx-core: HfAprs variant in DecodedMessage; hf_aprs_decode_enabled /
  hf_aprs_decode_reset_seq in RigState/RigSnapshot; SetHfAprsDecodeEnabled
  and ResetHfAprsDecoder commands; handlers.rs fallback arm updated
- trx-protocol: client command variants + bidirectional mapping; test
  fixture updated
- trx-server: run_hf_aprs_decoder() task (activates on DIG mode);
  hf_aprs history in DecoderHistories; rig_task command dispatch;
  aprsfi uplink forwards HfAprs via OR-pattern
- trx-frontend: hf_aprs_history in FrontendRuntimeContext
- trx-frontend-http: prune/record/snapshot/clear helpers; SSE history
  replay; toggle_hf_aprs_decode + clear_hf_aprs_decode endpoints;
  /hf-aprs.js endpoint; HF APRS tab in web UI

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Stan Grams <sjg@haxx.space>
This commit is contained in:
Stan Grams
2026-03-08 20:17:37 +01:00
parent ee821a71b1
commit 19d6d2e50b
19 changed files with 740 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/decoders/trx-aprs/src/lib.rs
+17 -9
View File
@@ -44,9 +44,6 @@ fn crc16ccitt(bytes: &[u8]) -> u16 {
// Correlation demodulator (one instance)
// ---------------------------------------------------------------------------
const BAUD: f32 = 1200.0;
const MARK: f32 = 1200.0;
const SPACE: f32 = 2200.0;
const TWO_PI: f32 = std::f32::consts::TAU;
const PLL_GAIN: f32 = 0.4;
@@ -98,9 +95,9 @@ struct RawFrame {
}
impl Demodulator {
fn new(sample_rate: u32, window_factor: f32) -> Self {
fn new(sample_rate: u32, baud: f32, mark_hz: f32, space_hz: f32, window_factor: f32) -> Self {
let sr = sample_rate as f32;
let samples_per_bit = sr / BAUD;
let samples_per_bit = sr / baud;
let corr_len = (samples_per_bit * window_factor).round().max(2.0) as usize;
let energy_window = (sr * 0.05).round() as usize;
@@ -111,8 +108,8 @@ impl Demodulator {
energy_window,
mark_phase: 0.0,
space_phase: 0.0,
mark_phase_inc: TWO_PI * MARK / sr,
space_phase_inc: TWO_PI * SPACE / sr,
mark_phase_inc: TWO_PI * mark_hz / sr,
space_phase_inc: TWO_PI * space_hz / sr,
corr_len,
mark_i_buf: vec![0.0; corr_len],
mark_q_buf: vec![0.0; corr_len],
@@ -541,11 +538,22 @@ pub struct AprsDecoder {
}
impl AprsDecoder {
/// VHF APRS: Bell 202, 1200 baud, mark=1200 Hz, space=2200 Hz.
pub fn new(sample_rate: u32) -> Self {
Self {
demodulators: vec![
Demodulator::new(sample_rate, 1.0),
Demodulator::new(sample_rate, 0.5),
Demodulator::new(sample_rate, 1200.0, 1200.0, 2200.0, 1.0),
Demodulator::new(sample_rate, 1200.0, 1200.0, 2200.0, 0.5),
],
}
}
/// HF APRS: 300 baud, mark=1600 Hz, space=1800 Hz (200 Hz shift).
pub fn new_hf(sample_rate: u32) -> Self {
Self {
demodulators: vec![
Demodulator::new(sample_rate, 300.0, 1600.0, 1800.0, 1.0),
Demodulator::new(sample_rate, 300.0, 1600.0, 1800.0, 0.5),
],
}
}