diff options
| author | jcorgan | 2009-07-28 23:01:46 +0000 |
|---|---|---|
| committer | jcorgan | 2009-07-28 23:01:46 +0000 |
| commit | 46aadbb2e9ca5aaccec4698824c2016772f3e1f7 (patch) | |
| tree | 8932a74c8d3b7d81cad869243beea658adb20afd /gnuradio-examples/python/usrp | |
| parent | 2b02833217cf0632c98478756b571aab5fc7002b (diff) | |
| download | gnuradio-46aadbb2e9ca5aaccec4698824c2016772f3e1f7.tar.gz gnuradio-46aadbb2e9ca5aaccec4698824c2016772f3e1f7.tar.bz2 gnuradio-46aadbb2e9ca5aaccec4698824c2016772f3e1f7.zip | |
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')
9 files changed, 35 insertions, 2 deletions
diff --git a/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py b/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py index b11355985..60f6c5825 100755 --- a/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py @@ -44,7 +44,10 @@ def pick_subdevice(u): usrp_dbid.LF_RX, usrp_dbid.TV_RX, usrp_dbid.TV_RX_REV_2, - usrp_dbid.TV_RX_REV_3)) + 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)) class wfm_rx_block (stdgui2.std_top_block): diff --git a/gnuradio-examples/python/usrp/usrp_tv_rcv.py b/gnuradio-examples/python/usrp/usrp_tv_rcv.py index 537e339be..4e13a83ab 100755 --- a/gnuradio-examples/python/usrp/usrp_tv_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_tv_rcv.py @@ -62,6 +62,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)) diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py index 098897cfe..fba2a1210 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.") diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py index 0103982b8..edfbc3657 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py @@ -51,6 +51,10 @@ 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)) diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_fmdet.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_fmdet.py index 82c521d56..30744ee01 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_fmdet.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_fmdet.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)) class wfm_rx_block (stdgui2.std_top_block): diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py index 44f868855..217f207c5 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py @@ -40,6 +40,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)) diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py index 84992955a..0d52ed7ee 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.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)) class wfm_rx_block (stdgui2.std_top_block): diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py index 75bbc0acd..39547b3ae 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py @@ -72,6 +72,10 @@ 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)) diff --git a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py b/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py index 11b8c431f..b356702a6 100755 --- a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_wxapt_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)) |