Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-examples / python / multi-antenna / multi_file.py

diff --git a/gnuradio-examples/python/multi-antenna/multi_file.py b/gnuradio-examples/python/multi-antenna/multi_file.py
index e2a6e04f6842cd032724614a0e1967838c88ac37..87d9085e3128d89d850bd42ab793d9ba269c2871 100755 (executable)
--- a/gnuradio-examples/python/multi-antenna/multi_file.py
+++ b/gnuradio-examples/python/multi-antenna/multi_file.py
@@ -6,9 +6,7 @@ from gnuradio.eng_option import eng_option
 from gnuradio import eng_notation
 from gnuradio import optfir
 from optparse import OptionParser
-from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider
-import wx
-import usrp_dbid
+from usrpm import usrp_dbid
 import time
 import os.path
 import sys
@@ -16,10 +14,10 @@ import sys
 # required FPGA that can do 4 rx channels.
 
 
-class my_graph(gr.flow_graph):
+class my_graph(gr.top_block):
 
     def __init__(self):
-        gr.flow_graph.__init__(self)
+        gr.top_block.__init__(self)
 
         parser = OptionParser (option_class=eng_option)
         #parser.add_option("-S", "--subdev", type="subdev", default=(0, None),
@@ -56,9 +54,9 @@ class my_graph(gr.flow_graph):
             sw_decim = 1
 
         self.u = usrp.source_c(0, options.decim, fpga_filename="std_4rx_0tx.rbf")
-        if self.u.nddc() < nchan:
+        if self.u.nddcs() < nchan:
             sys.stderr.write('This code requires an FPGA build with %d DDCs.  This FPGA has only %d.\n' % (
-                nchan, self.u.nddc()))
+                nchan, self.u.nddcs()))
             raise SystemExit
                              
         if not self.u.set_nchannels(nchan):
@@ -70,11 +68,11 @@ class my_graph(gr.flow_graph):
         sink_data_rate = input_rate/sw_decim
         print "Scope data rate = %s" % (eng_notation.num_to_str(sink_data_rate),)
 
-        self.subdev = self.u.db[0] + self.u.db[1]
+        self.subdev = self.u.db(0) + self.u.db(1)
 
-        if (len(self.subdev) != 4 or
-            self.u.db[0][0].dbid() != usrp_dbid.BASIC_RX or
-            self.u.db[1][0].dbid() != usrp_dbid.BASIC_RX):
+        if (len(self.subdev) < 4 or
+            self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX or
+            self.u.db(1, 0).dbid() != usrp_dbid.BASIC_RX):
             sys.stderr.write('This code requires a Basic Rx board on Sides A & B\n')
             sys.exit(1)