projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.2.2
[debian/gnuradio]
/
gnuradio-examples
/
python
/
digital
/
benchmark_rx.py
diff --git
a/gnuradio-examples/python/digital/benchmark_rx.py
b/gnuradio-examples/python/digital/benchmark_rx.py
index e375bc0f5bfc35c201c5956c3cbc22f151022007..ccb0c896338c928cac63474297d4ed379be4b08e 100755
(executable)
--- a/
gnuradio-examples/python/digital/benchmark_rx.py
+++ b/
gnuradio-examples/python/digital/benchmark_rx.py
@@
-1,6
+1,6
@@
#!/usr/bin/env python
#
#!/usr/bin/env python
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006
,2007,2009
Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
#
# This file is part of GNU Radio
#
@@
-31,19
+31,20
@@
import struct
import sys
# from current dir
import sys
# from current dir
-from receive_path import receive_path
-import fusb_options
+import usrp_receive_path
#import os
#print os.getpid()
#raw_input('Attach and press enter: ')
#import os
#print os.getpid()
#raw_input('Attach and press enter: ')
+class my_top_block(gr.top_block):
+ def __init__(self, demodulator, rx_callback, options):
+ gr.top_block.__init__(self)
-class my_graph(gr.flow_graph):
+ # Set up receive path
+ self.rxpath = usrp_receive_path.usrp_receive_path(demodulator, rx_callback, options)
- def __init__(self, demod_class, rx_callback, options):
- gr.flow_graph.__init__(self)
- self.rxpath = receive_path(self, demod_class, rx_callback, options)
+ self.connect(self.rxpath)
# /////////////////////////////////////////////////////////////////////////////
# main
# /////////////////////////////////////////////////////////////////////////////
# main
@@
-79,12
+80,11
@@
def main():
help="Select modulation from: %s [default=%%default]"
% (', '.join(demods.keys()),))
help="Select modulation from: %s [default=%%default]"
% (', '.join(demods.keys()),))
- receive_path.add_options(parser, expert_grp)
+
usrp_
receive_path.add_options(parser, expert_grp)
for mod in demods.values():
mod.add_options(expert_grp)
for mod in demods.values():
mod.add_options(expert_grp)
- fusb_options.add_options(expert_grp)
(options, args) = parser.parse_args ()
if len(args) != 0:
(options, args) = parser.parse_args ()
if len(args) != 0:
@@
-98,14
+98,14
@@
def main():
# build the graph
# build the graph
-
fg = my_graph
(demods[options.modulation], rx_callback, options)
+
tb = my_top_block
(demods[options.modulation], rx_callback, options)
r = gr.enable_realtime_scheduling()
if r != gr.RT_OK:
print "Warning: Failed to enable realtime scheduling."
r = gr.enable_realtime_scheduling()
if r != gr.RT_OK:
print "Warning: Failed to enable realtime scheduling."
-
fg
.start() # start flow graph
-
fg
.wait() # wait for it to finish
+
tb
.start() # start flow graph
+
tb
.wait() # wait for it to finish
if __name__ == '__main__':
try:
if __name__ == '__main__':
try: