diff options
| author | Max <ikj1234i@yahoo.com> | 2021-12-07 15:34:07 -0500 |
|---|---|---|
| committer | Max <ikj1234i@yahoo.com> | 2021-12-07 15:34:07 -0500 |
| commit | ddd70bdd07befa34b6a90d40500d199aea64951a (patch) | |
| tree | d7ad8fe2767b920087aa3946a9a87e927fce2b47 /op25/gr-op25_repeater/apps/rx.py | |
| parent | 13a3bccb9e69b336e83ccf34611d999583b88fd6 (diff) | |
audio-if updates
Diffstat (limited to 'op25/gr-op25_repeater/apps/rx.py')
| -rwxr-xr-x | op25/gr-op25_repeater/apps/rx.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/op25/gr-op25_repeater/apps/rx.py b/op25/gr-op25_repeater/apps/rx.py index c671120..34fcc04 100755 --- a/op25/gr-op25_repeater/apps/rx.py +++ b/op25/gr-op25_repeater/apps/rx.py @@ -273,7 +273,7 @@ class p25_rx_block (gr.top_block): else: # complex input # local osc self.lo_freq = self.options.offset - if self.options.audio_if or self.options.ifile or self.options.input: + if self.options.ifile or self.options.input: self.lo_freq += self.options.calibration self.demod = p25_demodulator.p25_demod_cb( input_rate = capture_rate, demod_type = self.options.demod_type, @@ -283,7 +283,8 @@ class p25_rx_block (gr.top_block): gain_mu = self.options.gain_mu, costas_alpha = self.options.costas_alpha, excess_bw = self.options.excess_bw, - symbol_rate = self.symbol_rate) + symbol_rate = self.symbol_rate, + use_old_decim = True if self.options.audio_if else False) num_ambe = 0 if self.options.phase2_tdma: @@ -639,13 +640,17 @@ class p25_rx_block (gr.top_block): "source-dev": "AUDIO", "source-decim": 1 } self.audio_source = audio.source(capture_rate, audio_input_filename) + self.null_source = blocks.null_source (gr.sizeof_float) self.audio_cvt = blocks.float_to_complex() - self.connect((self.audio_source, 0), (self.audio_cvt, 0)) - self.connect((self.audio_source, 1), (self.audio_cvt, 1)) + self.connect(self.audio_source, (self.audio_cvt, 0)) + self.connect(self.null_source, (self.audio_cvt, 1)) self.source = blocks.multiply_const_cc(gain) self.connect(self.audio_cvt, self.source) self.__set_rx_from_audio(capture_rate) + rc = self.demod.set_relative_frequency(self.options.calibration) + sys.stderr.write('open_audio_c: set_relative_frequency %d: %s\n' % (self.options.calibration, rc)) + def open_audio(self, capture_rate, gain, audio_input_filename): self.info = { "capture-rate": capture_rate, |