From 55d3e4a47958be287648a2021f7e92d81086b2d9 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Fri, 21 Dec 2012 15:11:39 -0500
Subject: blocks: removes blocks moved to gr-blocks from gnuradio-core.
Also fixes up some other missing moves.
---
gr-analog/examples/fmtest.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
(limited to 'gr-analog/examples/fmtest.py')
diff --git a/gr-analog/examples/fmtest.py b/gr-analog/examples/fmtest.py
index ca02ee5729..294fa0d425 100755
--- a/gr-analog/examples/fmtest.py
+++ b/gr-analog/examples/fmtest.py
@@ -20,7 +20,9 @@
# Boston, MA 02110-1301, USA.
#
-from gnuradio import gr, filter
+from gnuradio import gr
+from gnuradio import blocks
+from gnuradio import filter
from gnuradio import analog
import sys, math, time
@@ -53,7 +55,7 @@ class fmtx(gr.hier_block2):
lo_freq, # frequency
1.0, # amplitude
0) # DC Offset
- mixer = gr.multiply_cc()
+ mixer = blocks.multiply_cc()
self.connect(self, fmtx, (mixer, 0))
self.connect(lo, (mixer, 1))
@@ -75,7 +77,7 @@ class fmtest(gr.top_block):
self._if_rate = 4*self._N*self._audio_rate
# Create a signal source and frequency modulate it
- self.sum = gr.add_cc()
+ self.sum = blocks.add_cc()
for n in xrange(self._N):
sig = analog.sig_source_f(self._audio_rate, analog.GR_SIN_WAVE, freq[n], 0.5)
fm = fmtx(f_lo[n], self._audio_rate, self._if_rate)
--
cgit v1.2.3