Updated to work with old or new handling of Basic Rx daugherboard subdevs.
authoreb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Sat, 18 Apr 2009 02:24:06 +0000 (02:24 +0000)
committereb <eb@221aa14e-8319-0410-a670-987f0aec2ac5>
Sat, 18 Apr 2009 02:24:06 +0000 (02:24 +0000)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10877 221aa14e-8319-0410-a670-987f0aec2ac5

gnuradio-examples/python/multi-antenna/multi_fft.py
gnuradio-examples/python/multi-antenna/multi_file.py
gnuradio-examples/python/multi-antenna/multi_scope.py

index 54d8286d43987a30c8047e9f8d2e70980f8f67fc..54444586046eaec8727739c0990cd8a7d82a8e22 100755 (executable)
@@ -64,7 +64,7 @@ class my_graph(stdgui2.std_top_block):
 
         self.subdev = self.u.db(0) + self.u.db(1)
 
-        if (len (self.subdev) != 4 or
+        if (len (self.subdev) < 4 or
             self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX or
             self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX):
             sys.stderr.write('This code requires a Basic Rx board on Sides A & B\n')
index 6f09546eafcf4dffeb676db3d6bd50c3cd007d8d..87d9085e3128d89d850bd42ab793d9ba269c2871 100755 (executable)
@@ -70,7 +70,7 @@ class my_graph(gr.top_block):
 
         self.subdev = self.u.db(0) + self.u.db(1)
 
-        if (len(self.subdev) != 4 or
+        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')
index 5d6b1e920c21c4bccd2c291d5f4fe822fa2910b5..d1e28ad18b2a98c666a69ba67ff61696deb77b34 100755 (executable)
@@ -64,7 +64,7 @@ class my_top_block(stdgui2.std_top_block):
 
         self.subdev = self.u.db(0) + self.u.db(1)
 
-        if (len(self.subdev) != 4 or
+        if (len(self.subdev) < 4 or
             self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX or
             self.u.db(0, 0).dbid() != usrp_dbid.BASIC_RX):
             sys.stderr.write('This code requires a Basic Rx board on Sides A & B\n')