From 971a7502aa63ed1b84aa98bdce608fd2e05583f2 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 8 Sep 2018 16:01:23 -0400 Subject: [PATCH] add new demod method --- op25/gr-op25_repeater/apps/p25_demodulator.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/op25/gr-op25_repeater/apps/p25_demodulator.py b/op25/gr-op25_repeater/apps/p25_demodulator.py index 1d8e87d..31f28ec 100644 --- a/op25/gr-op25_repeater/apps/p25_demodulator.py +++ b/op25/gr-op25_repeater/apps/p25_demodulator.py @@ -111,6 +111,19 @@ class p25_demod_base(gr.hier_block2): _mu, _gain_mu, _def_omega_relative_limit) self.slicer = digital.binary_slicer_fb() + elif filter_type == 'fsk4mm': + self.symbol_filter = filter.fir_filter_fff(1, coeffs) + _omega = sps + _gain_mu = _def_gmsk_mu + _mu = _def_mu + if not _gain_mu: + _gain_mu = 0.0175 + _gain_omega = .25 * _gain_mu * _gain_mu # critically damped + self.fsk4_demod = digital.clock_recovery_mm_ff(_omega, _gain_omega, + _mu, _gain_mu, + _def_omega_relative_limit) + levels = [ -2.0, 0.0, 2.0, 4.0 ] + self.slicer = op25_repeater.fsk4_slicer_fb(levels) else: self.symbol_filter = filter.fir_filter_fff(1, coeffs) autotuneq = gr.msg_queue(2)