[Commit-gnuradio] r10877 - gnuradio/trunk/gnuradio-examples/python/multi-antenna

[eb]

Author: eb
Date: 2009-04-17 20:24:06 -0600 (Fri, 17 Apr 2009)
New Revision: 10877

Modified:
   gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_fft.py
   gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_file.py
   gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_scope.py
Log:
Updated to work with old or new handling of Basic Rx daugherboard subdevs.



Modified: gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_fft.py
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_fft.py  
2009-04-18 02:14:30 UTC (rev 10876)
+++ gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_fft.py  
2009-04-18 02:24:06 UTC (rev 10877)
@@ -64,7 +64,7 @@
 
         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')

Modified: gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_file.py
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_file.py 
2009-04-18 02:14:30 UTC (rev 10876)
+++ gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_file.py 
2009-04-18 02:24:06 UTC (rev 10877)
@@ -70,7 +70,7 @@
 
         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')

Modified: gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_scope.py
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_scope.py        
2009-04-18 02:14:30 UTC (rev 10876)
+++ gnuradio/trunk/gnuradio-examples/python/multi-antenna/multi_scope.py        
2009-04-18 02:24:06 UTC (rev 10877)
@@ -64,7 +64,7 @@
 
         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')