brmlab/osmo-tetra
4
0
Fork 0
mirror of https://github.com/brmlab/osmo-tetra.git synced 2025-06-08 09:54:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'm0mik/master'

Browse source 
Mike Jameson 	updated uhd-tetra_demod.py and cqpsk.py for GNU Radio v3.74 compatibility

Conflicts:
	src/demod/python/cqpsk.py
This commit is contained in:
luckyhacky 2014-11-13 19:41:36 +01:00
commit 698bbe70be
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/demod/python/cqpsk.py
View file

@ -27,7 +27,7 @@
differential PI/4 CQPSK modulation and demodulation. differential PI/4 CQPSK modulation and demodulation.
""" """
from gnuradio import gr, gru, blocks, analog, filter from gnuradio import gr, gru, blocks, analog, filter, digital
from gnuradio.filter import firdes from gnuradio.filter import firdes
from math import pi, sqrt from math import pi, sqrt
#import psk #import psk

11
src/demod/python/uhd-tetra_demod.py
View file

@ -2,8 +2,9 @@
import sys import sys
import math import math
from gnuradio import gr, gru, audio, eng_notation, blks2, optfir from gnuradio import gr, gru, audio, eng_notation, filter, blocks
from gnuradio import uhd from gnuradio import uhd
from gnuradio.filter import firdes
from gnuradio.eng_option import eng_option from gnuradio.eng_option import eng_option
from optparse import OptionParser from optparse import OptionParser
@ -63,9 +64,9 @@ class my_top_block(gr.top_block):
sys.stderr.write('Failed to set center frequency\n') sys.stderr.write('Failed to set center frequency\n')
raise SystemExit, 1 raise SystemExit, 1
channel_taps = gr.firdes.low_pass(1.0, sample_rate, options.low_pass, options.low_pass * 0.1, gr.firdes.WIN_HANN) channel_taps = firdes.low_pass(1.0, sample_rate, options.low_pass, options.low_pass * 0.1, firdes.WIN_HANN)
FILTER = gr.freq_xlating_fir_filter_ccf(1, channel_taps, options.calibration, sample_rate) FILTER = filter.freq_xlating_fir_filter_ccf(1, channel_taps, options.calibration, sample_rate)
sys.stderr.write("sample rate: %d\n" %(sample_rate)) sys.stderr.write("sample rate: %d\n" %(sample_rate))
@ -78,11 +79,11 @@ class my_top_block(gr.top_block):
log=options.log, log=options.log,
verbose=options.verbose) verbose=options.verbose)
OUT = gr.file_sink(gr.sizeof_float, options.output_file) OUT = blocks.file_sink(gr.sizeof_float, options.output_file)
r = float(sample_rate) / float(new_sample_rate) r = float(sample_rate) / float(new_sample_rate)
INTERPOLATOR = gr.fractional_interpolator_cc(0, r) INTERPOLATOR = filter.fractional_interpolator_cc(0, r)
self.connect(self._u, FILTER, INTERPOLATOR, DEMOD, OUT) self.connect(self._u, FILTER, INTERPOLATOR, DEMOD, OUT)