Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gnuradio-examples / python / digital / benchmark_rx2.py

diff --git a/gnuradio-examples/python/digital/benchmark_rx2.py b/gnuradio-examples/python/digital/benchmark_rx2.py
old mode 100644 (file)
new mode 100755 (executable)
index 458279e..fe422be
--- a/gnuradio-examples/python/digital/benchmark_rx2.py
+++ b/gnuradio-examples/python/digital/benchmark_rx2.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005,2006,2007,2009 Free Software Foundation, Inc.
+# Copyright 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,7 +20,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-from gnuradio import gr, gru, modulation_utils
+from gnuradio import gr, gru, modulation_utils2
 from gnuradio import usrp
 from gnuradio import eng_notation
 from gnuradio.eng_option import eng_option
@@ -42,7 +42,7 @@ class my_top_block(gr.top_block):
         gr.top_block.__init__(self)
 
         # Set up receive path
-        self.rxpath = usrp_receive_path.usrp_receive_path(demodulator, rx_callback, options) 
+        self.rxpath = usrp_receive_path2.usrp_receive_path(demodulator, rx_callback, options) 
 
         self.connect(self.rxpath)
 
@@ -69,18 +69,18 @@ def main():
             ok, pktno, n_rcvd, n_right)
 
 
-    demods = modulation_utils.type_1_demods()
+    demods = modulation_utils2.type_1_demods()
 
     # Create Options Parser:
     parser = OptionParser (option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
 
     parser.add_option("-m", "--modulation", type="choice", choices=demods.keys(), 
-                      default='gmsk',
+                      default='dbpsk2',
                       help="Select modulation from: %s [default=%%default]"
                             % (', '.join(demods.keys()),))
 
-    usrp_receive_path.add_options(parser, expert_grp)
+    usrp_receive_path2.add_options(parser, expert_grp)
 
     for mod in demods.values():
         mod.add_options(expert_grp)