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 | |
| 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')
12 files changed, 49 insertions, 5 deletions
diff --git a/gnuradio-examples/python/apps/hf_radio/input.py b/gnuradio-examples/python/apps/hf_radio/input.py index a7c8712878..5984d8254e 100644 --- a/gnuradio-examples/python/apps/hf_radio/input.py +++ b/gnuradio-examples/python/apps/hf_radio/input.py @@ -18,7 +18,12 @@ class input: self.src = usrp.source_c( ) self.subdev = usrp.pick_subdev( self.src, (usrp_dbid.BASIC_RX, - usrp_dbid.TV_RX)) + 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)) print self.subdev diff --git a/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py b/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py index b113559850..60f6c5825b 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 537e339bef..4e13a83ab5 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 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.") diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py index 0103982b8d..edfbc36571 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 82c521d567..30744ee010 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 44f8688556..217f207c5a 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 84992955a2..0d52ed7ee3 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 75bbc0acd6..39547b3ae0 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 11b8c431f2..b356702a68 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)) diff --git a/gnuradio-examples/python/usrp2/usrp2_wfm_qt.py b/gnuradio-examples/python/usrp2/usrp2_wfm_qt.py index 0be21ceb98..0c74769211 100755 --- a/gnuradio-examples/python/usrp2/usrp2_wfm_qt.py +++ b/gnuradio-examples/python/usrp2/usrp2_wfm_qt.py @@ -194,7 +194,10 @@ class wfm_rx_block (gr.top_block): #if not (dbid == 0x0001 or #usrp_dbid.BASIC_RX # dbid == 0x0003 or #usrp_dbid.TV_RX # dbid == 0x000c or #usrp_dbid.TV_RX_REV_2 - # dbid == 0x0040): #usrp_dbid.TV_RX_REV_3 + # dbid == 0x0040 or #usrp_dbid.TV_RX_REV_3 + # dbid == 0x0043 or #usrp_dbid.TV_RX_MIMO + # dbid == 0x0044 or #usrp_dbid.TV_RX_REV_2_MIMO + # dbid == 0x0045 ): #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/usrp2/usrp2_wfm_rcv.py b/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py index 8ea5baf574..1783660d66 100755 --- a/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py +++ b/gnuradio-examples/python/usrp2/usrp2_wfm_rcv.py @@ -84,7 +84,10 @@ class wfm_rx_block (stdgui2.std_top_block): if not (dbid == 0x0001 or #usrp_dbid.BASIC_RX dbid == 0x0003 or #usrp_dbid.TV_RX dbid == 0x000c or #usrp_dbid.TV_RX_REV_2 - dbid == 0x0040): #usrp_dbid.TV_RX_REV_3 + dbid == 0x0040 or #usrp_dbid.TV_RX_REV_3 + dbid == 0x0043 or #usrp_dbid.TV_RX_MIMO + dbid == 0x0044 or #usrp_dbid.TV_RX_REV_2_MIMO + dbid == 0x0045 ): #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.") |