summaryrefslogtreecommitdiff
path: root/gr-digital/python/gfsk.py
diff options
context:
space:
mode:
Diffstat (limited to 'gr-digital/python/gfsk.py')
-rw-r--r--gr-digital/python/gfsk.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/gr-digital/python/gfsk.py b/gr-digital/python/gfsk.py
index 09f12ebc30..c69dd4d7d8 100644
--- a/gr-digital/python/gfsk.py
+++ b/gr-digital/python/gfsk.py
@@ -2,7 +2,7 @@
# GFSK modulation and demodulation.
#
#
-# Copyright 2005,2006,2007 Free Software Foundation, Inc.
+# Copyright 2005-2007,2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -25,6 +25,7 @@
# See gnuradio-examples/python/digital for examples
from gnuradio import gr
+from gnuradio import analog
import modulation_utils
import digital_swig as digital
from math import pi
@@ -102,7 +103,7 @@ class gfsk_mod(gr.hier_block2):
# Form Gaussian filter
# Generate Gaussian response (Needs to be convolved with window below).
- self.gaussian_taps = gr.firdes.gaussian(
+ self.gaussian_taps = filter.firdes.gaussian(
1.0, # gain
samples_per_symbol, # symbol_rate
bt, # bandwidth * symbol time
@@ -114,7 +115,7 @@ class gfsk_mod(gr.hier_block2):
self.gaussian_filter = filter.interp_fir_filter_fff(samples_per_symbol, self.taps)
# FM modulation
- self.fmmod = gr.frequency_modulator_fc(sensitivity)
+ self.fmmod = frequency.frequency_modulator_fc(sensitivity)
# small amount of output attenuation to prevent clipping USRP sink
self.amp = gr.multiply_const_cc(0.999)
@@ -230,7 +231,7 @@ class gfsk_demod(gr.hier_block2):
# Demodulate FM
#sensitivity = (pi / 2) / samples_per_symbol
- self.fmdemod = gr.quadrature_demod_cf(1.0 / sensitivity)
+ self.fmdemod = analog.quadrature_demod_cf(1.0 / sensitivity)
# the clock recovery block tracks the symbol clock and resamples as needed.
# the output of the block is a stream of soft symbols (float)