diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-08-10 19:48:37 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-08-10 19:48:37 -0400 |
| commit | 5aaea26d457b7ed4c19096072b46b15b4e3f54b4 (patch) | |
| tree | 35777dffb8de293af23ecfdad1c1a37612697315 /gr-digital/examples/example_fll.py | |
| parent | b7cf0bf00b404c37214e3b617bf53862741f76e7 (diff) | |
| parent | a61ddc223da190476b38f891ea425f44d8c5f269 (diff) | |
Merge remote-tracking branch 'jcorgan/wip/filter-rm-next' into digital_impl
Conflicts:
gnuradio-core/src/lib/filter/CMakeLists.txt
gnuradio-core/src/lib/filter/dotprod_ccf_armv7_a.c
gnuradio-core/src/lib/filter/dotprod_fff_armv7_a.c
gr-digital/include/digital_clock_recovery_mm_cc.h
gr-digital/include/digital_clock_recovery_mm_ff.h
gr-digital/include/digital_cma_equalizer_cc.h
gr-digital/lib/CMakeLists.txt
gr-digital/lib/binary_slicer_fb_impl.h
gr-digital/lib/digital_clock_recovery_mm_cc.cc
gr-digital/lib/digital_clock_recovery_mm_ff.cc
gr-digital/lib/digital_cma_equalizer_cc.cc
gr-digital/swig/CMakeLists.txt
Diffstat (limited to 'gr-digital/examples/example_fll.py')
| -rwxr-xr-x | gr-digital/examples/example_fll.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-digital/examples/example_fll.py b/gr-digital/examples/example_fll.py index 3b75b5a758..93535f4175 100755 --- a/gr-digital/examples/example_fll.py +++ b/gr-digital/examples/example_fll.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from gnuradio import gr, digital +from gnuradio import gr, digital, filter from gnuradio import eng_notation from gnuradio.eng_option import eng_option from optparse import OptionParser @@ -28,8 +28,8 @@ class example_fll(gr.top_block): data = scipy.exp(1j*poffset) * data self.src = gr.vector_source_c(data.tolist(), False) - self.rrc = gr.interp_fir_filter_ccf(sps, rrc_taps) - self.chn = gr.channel_model(noise, foffset, toffset) + self.rrc = filter.interp_fir_filter_ccf(sps, rrc_taps) + self.chn = filter.channel_model(noise, foffset, toffset) self.fll = digital.fll_band_edge_cc(sps, rolloff, ntaps, bw) self.vsnk_src = gr.vector_sink_c() |