diff options
author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-07-28 23:01:46 +0000 |
---|---|---|
committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-07-28 23:01:46 +0000 |
commit | 46aadbb2e9ca5aaccec4698824c2016772f3e1f7 (patch) | |
tree | 8932a74c8d3b7d81cad869243beea658adb20afd /gnuradio-examples/python/usrp/usrp_wfm_rcv.py | |
parent | 2b02833217cf0632c98478756b571aab5fc7002b (diff) |
Merged -r11480:11507, r11508 from nldudok1/tvrx_mimo_merge_with_trunk into trunk. This branch was created with a corrupted merge tracking database, so manual merge and remove of merge info properties was needed.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11513 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python/usrp/usrp_wfm_rcv.py')
-rwxr-xr-x | gnuradio-examples/python/usrp/usrp_wfm_rcv.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py index 098897cfe2..fba2a12107 100755 --- 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.") |