diff options
Diffstat (limited to 'gr-zeromq/examples/loop.py')
| -rwxr-xr-x | gr-zeromq/examples/loop.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-zeromq/examples/loop.py b/gr-zeromq/examples/loop.py index d2c822b8f7..2d6d750e99 100755 --- a/gr-zeromq/examples/loop.py +++ b/gr-zeromq/examples/loop.py @@ -24,7 +24,7 @@ ############################################################################### # Imports ############################################################################### -import zmqblocks +from gnuradio import zeromq from gnuradio import gr from gnuradio import blocks from gnuradio import analog @@ -71,14 +71,14 @@ class top_block(gr.top_block): self.gr_sig_source = analog.sig_source_f(samp_rate, analog.GR_SIN_WAVE , 1000, 1, 0) self.null_source = blocks.null_source(gr.sizeof_float) self.throttle = blocks.throttle(gr.sizeof_float, samp_rate) - self.zmq_source = zmqblocks.source_pushpull_feedback(gr.sizeof_float,source_adr) + self.zmq_source = zeromq.source_pushpull_feedback(gr.sizeof_float,source_adr) self.mult_a = blocks.multiply_const_ff(1) self.mult_b = blocks.multiply_const_ff(0.5) self.add = blocks.add_ff(1) - #self.zmq_sink = zmqblocks.sink_reqrep_nopoll(gr.sizeof_float, sink_adr) - #self.zmq_sink = zmqblocks.sink_reqrep(gr.sizeof_float, sink_adr) - self.zmq_sink = zmqblocks.sink_pushpull(gr.sizeof_float, sink_adr) - self.zmq_probe = zmqblocks.sink_pushpull(gr.sizeof_float, probe_adr_fg) + #self.zmq_sink = zeromq.sink_reqrep_nopoll(gr.sizeof_float, sink_adr) + #self.zmq_sink = zeromq.sink_reqrep(gr.sizeof_float, sink_adr) + self.zmq_sink = zeromq.sink_pushpull(gr.sizeof_float, sink_adr) + self.zmq_probe = zeromq.sink_pushpull(gr.sizeof_float, probe_adr_fg) #self.null_sink = blocks.null_sink(gr.sizeof_float) # connects @@ -89,7 +89,7 @@ class top_block(gr.top_block): self.connect(self.throttle, self.zmq_probe) # ZeroMQ - self.rpc_manager = zmqblocks.rpc_manager() + self.rpc_manager = zeromq.rpc_manager() self.rpc_manager.set_reply_socket(rpc_adr_reply) self.rpc_manager.add_interface("start_fg",self.start_fg) self.rpc_manager.add_interface("stop_fg",self.stop_fg) |