Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gnuradio-examples / python / usrp / usrp_wfm_rcv.py

diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
index 098897cfe2345d73bf745b03419ab3b67b3272b0..fba2a12107f2a84b0a89e7d57119ad6e0d2b0ea8 100755 (executable)
--- a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
+++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py
@@ -43,6 +43,9 @@ def pick_subdevice(u):
     return usrp.pick_subdev(u, (usrp_dbid.TV_RX,
                                 usrp_dbid.TV_RX_REV_2,
                                usrp_dbid.TV_RX_REV_3,
+                               usrp_dbid.TV_RX_MIMO,
+                                usrp_dbid.TV_RX_REV_2_MIMO,
+                               usrp_dbid.TV_RX_REV_3_MIMO,
                                 usrp_dbid.BASIC_RX))
 
 
@@ -97,7 +100,11 @@ class wfm_rx_block (stdgui2.std_top_block):
         if not (dbid == usrp_dbid.BASIC_RX or
                 dbid == usrp_dbid.TV_RX or
                 dbid == usrp_dbid.TV_RX_REV_2 or
-                dbid == usrp_dbid.TV_RX_REV_3):
+                dbid == usrp_dbid.TV_RX_REV_3 or
+                dbid == usrp_dbid.TV_RX_MIMO or
+                dbid == usrp_dbid.TV_RX_REV_2_MIMO or
+                dbid == usrp_dbid.TV_RX_REV_3_MIMO
+):
             print "This daughterboard does not cover the required frequency range"
             print "for this application.  Please use a BasicRX or TVRX daughterboard."
             raw_input("Press ENTER to continue anyway, or Ctrl-C to exit.")