diff options
author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-03-07 01:43:43 +0000 |
---|---|---|
committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-03-07 01:43:43 +0000 |
commit | 224434889bf564a4456011180c62a58e0ca55c8f (patch) | |
tree | fbbbff591fa6a7a9987a6b0b4022ea5f88ab4a3b /gnuradio-examples/python | |
parent | 511ddd6cbfd7788f8a2cb3634d898d7c5fdd29fb (diff) |
Merged eb/usrp-install r4723:4727 into trunk.
This moves usrp related .py files from the top-level of site-packages
into site-packages/usrpm.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python')
16 files changed, 16 insertions, 16 deletions
diff --git a/gnuradio-examples/python/apps/hf_radio/input.py b/gnuradio-examples/python/apps/hf_radio/input.py index 3a62a68cc7..a7c8712878 100644 --- a/gnuradio-examples/python/apps/hf_radio/input.py +++ b/gnuradio-examples/python/apps/hf_radio/input.py @@ -7,7 +7,7 @@ from gnuradio import gr, gru, optfir from gnuradio import usrp -import usrp_dbid +from usrpm import usrp_dbid import math # Put special knowlege of usrp here. diff --git a/gnuradio-examples/python/multi-antenna/multi_fft.py b/gnuradio-examples/python/multi-antenna/multi_fft.py index ca9c614a88..3a8d481956 100755 --- a/gnuradio-examples/python/multi-antenna/multi_fft.py +++ b/gnuradio-examples/python/multi-antenna/multi_fft.py @@ -8,7 +8,7 @@ from gnuradio import optfir from optparse import OptionParser from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider import wx -import usrp_dbid +from usrpm import usrp_dbid import time import os.path import sys diff --git a/gnuradio-examples/python/multi-antenna/multi_file.py b/gnuradio-examples/python/multi-antenna/multi_file.py index e2a6e04f68..d5a5d8721e 100755 --- a/gnuradio-examples/python/multi-antenna/multi_file.py +++ b/gnuradio-examples/python/multi-antenna/multi_file.py @@ -8,7 +8,7 @@ from gnuradio import optfir from optparse import OptionParser from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider import wx -import usrp_dbid +from usrpm import usrp_dbid import time import os.path import sys diff --git a/gnuradio-examples/python/multi-antenna/multi_scope.py b/gnuradio-examples/python/multi-antenna/multi_scope.py index 43aa77b0d6..b35e916519 100755 --- a/gnuradio-examples/python/multi-antenna/multi_scope.py +++ b/gnuradio-examples/python/multi-antenna/multi_scope.py @@ -8,7 +8,7 @@ from gnuradio import optfir from optparse import OptionParser from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider import wx -import usrp_dbid +from usrpm import usrp_dbid import time import os.path import sys diff --git a/gnuradio-examples/python/usrp/fm_tx4.py b/gnuradio-examples/python/usrp/fm_tx4.py index a9201b3f4d..da887d8bfd 100755 --- a/gnuradio-examples/python/usrp/fm_tx4.py +++ b/gnuradio-examples/python/usrp/fm_tx4.py @@ -18,7 +18,7 @@ from gnuradio import audio from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import math import sys diff --git a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py b/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py index 1cb161018f..66ee9f02d6 100755 --- a/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py +++ b/gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py @@ -17,7 +17,7 @@ from gnuradio import audio from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import math import sys diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py b/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py index 9415cfab93..798c4a7eba 100755 --- a/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py +++ b/gnuradio-examples/python/usrp/usrp_nbfm_ptt.py @@ -31,7 +31,7 @@ from gnuradio import audio from gnuradio import blks from gnuradio.eng_option import eng_option from gnuradio.wxgui import stdgui, fftsink, scopesink, slider, form -import usrp_dbid +from usrpm import usrp_dbid from Numeric import convolve, array diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py b/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py index 018a5b76e8..868dee5ccb 100755 --- a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py @@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_spectrum_sense.py b/gnuradio-examples/python/usrp/usrp_spectrum_sense.py index 182d055a63..1d86e03cc1 100755 --- a/gnuradio-examples/python/usrp/usrp_spectrum_sense.py +++ b/gnuradio-examples/python/usrp/usrp_spectrum_sense.py @@ -6,7 +6,7 @@ from gnuradio import usrp from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import struct diff --git a/gnuradio-examples/python/usrp/usrp_tv_rcv.py b/gnuradio-examples/python/usrp/usrp_tv_rcv.py index e8e439b80d..8fabc2b470 100755 --- a/gnuradio-examples/python/usrp/usrp_tv_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_tv_rcv.py @@ -21,7 +21,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py index 2844387317..9ffb41fb0f 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py @@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py index 40e7dd754c..efb0448fa2 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py @@ -6,7 +6,7 @@ from gnuradio import usrp from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py index 2e9acf4dc2..9aeae1171f 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py @@ -6,7 +6,7 @@ from gnuradio import usrp from gnuradio import blks from gnuradio.eng_option import eng_option from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py index b03f0944fd..1d4fb3370c 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py @@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form, scopesink from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py index 640ffe872c..4daa401f7a 100644 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py @@ -59,7 +59,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx diff --git a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py b/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py index dd56519677..39ad688e1e 100755 --- a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py @@ -8,7 +8,7 @@ from gnuradio.eng_option import eng_option from gnuradio.wxgui import slider, powermate from gnuradio.wxgui import stdgui, fftsink, form from optparse import OptionParser -import usrp_dbid +from usrpm import usrp_dbid import sys import math import wx |