diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-06 11:10:59 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-06 11:10:59 -0500 |
| commit | 6167cf58f167fc65999237d1502461e5cc39c986 (patch) | |
| tree | 6c4217946a56c8f2bd103fb0027d15b074feda0c /gr-analog/python | |
| parent | a99beca4b60869f7d8ae1743ba4d72fd71461ad0 (diff) | |
analog: fixing Python files to install and be usable as part of gr-analog.
Diffstat (limited to 'gr-analog/python')
| -rw-r--r-- | gr-analog/python/fm_demod.py | 9 | ||||
| -rw-r--r-- | gr-analog/python/nbfm_rx.py | 8 | ||||
| -rw-r--r-- | gr-analog/python/nbfm_tx.py | 6 | ||||
| -rw-r--r-- | gr-analog/python/wfm_rcv.py | 9 | ||||
| -rw-r--r-- | gr-analog/python/wfm_rcv_fmdet.py | 9 | ||||
| -rw-r--r-- | gr-analog/python/wfm_rcv_pll.py | 9 | ||||
| -rw-r--r-- | gr-analog/python/wfm_tx.py | 6 |
7 files changed, 44 insertions, 12 deletions
diff --git a/gr-analog/python/fm_demod.py b/gr-analog/python/fm_demod.py index c14ed1682e..1976a076ca 100644 --- a/gr-analog/python/fm_demod.py +++ b/gr-analog/python/fm_demod.py @@ -19,10 +19,15 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, analog, filter -from gnuradio.blks2impl.fm_emph import fm_deemph +from gnuradio import gr, filter +from fm_emph import fm_deemph from math import pi +try: + from gnuradio import analog +except ImportError: + import analog_swig as analog + class fm_demod_cf(gr.hier_block2): """ Generalized FM demodulation block with deemphasis and audio diff --git a/gr-analog/python/nbfm_rx.py b/gr-analog/python/nbfm_rx.py index 1d307328b1..e87cc84796 100644 --- a/gr-analog/python/nbfm_rx.py +++ b/gr-analog/python/nbfm_rx.py @@ -22,8 +22,12 @@ import math from gnuradio import gr from gnuradio import filter -from gnuradio import analog -import fm_deemph +from fm_emph import fm_deemph + +try: + from gnuradio import analog +except ImportError: + import analog_swig as analog class nbfm_rx(gr.hier_block2): def __init__(self, audio_rate, quad_rate, tau=75e-6, max_dev=5e3): diff --git a/gr-analog/python/nbfm_tx.py b/gr-analog/python/nbfm_tx.py index a108aac49e..eed5bc08d0 100644 --- a/gr-analog/python/nbfm_tx.py +++ b/gr-analog/python/nbfm_tx.py @@ -21,9 +21,13 @@ import math from gnuradio import gr, filter -from gnuradio import analog from fm_emph import fm_preemph +try: + from gnuradio import analog +except ImportError: + import analog_swig as analog + class nbfm_tx(gr.hier_block2): def __init__(self, audio_rate, quad_rate, tau=75e-6, max_dev=5e3): """ diff --git a/gr-analog/python/wfm_rcv.py b/gr-analog/python/wfm_rcv.py index addbb1d258..d35d219275 100644 --- a/gr-analog/python/wfm_rcv.py +++ b/gr-analog/python/wfm_rcv.py @@ -19,10 +19,15 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, analog, filter -from gnuradio.blks2impl.fm_emph import fm_deemph +from gnuradio import gr, filter +from fm_emph import fm_deemph import math +try: + from gnuradio import analog +except ImportError: + import analog_swig as analog + class wfm_rcv(gr.hier_block2): def __init__ (self, quad_rate, audio_decimation): """ diff --git a/gr-analog/python/wfm_rcv_fmdet.py b/gr-analog/python/wfm_rcv_fmdet.py index 68c7a3a1d7..0fc9de1b88 100644 --- a/gr-analog/python/wfm_rcv_fmdet.py +++ b/gr-analog/python/wfm_rcv_fmdet.py @@ -19,10 +19,15 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, filter, analog -from gnuradio.blks2impl.fm_emph import fm_deemph +from gnuradio import gr, filter +from fm_emph import fm_deemph import math +try: + from gnuradio import analog +except ImportError: + import analog_swig as analog + class wfm_rcv_fmdet(gr.hier_block2): def __init__ (self, demod_rate, audio_decimation): """ diff --git a/gr-analog/python/wfm_rcv_pll.py b/gr-analog/python/wfm_rcv_pll.py index 953cd538f1..c26dfb4928 100644 --- a/gr-analog/python/wfm_rcv_pll.py +++ b/gr-analog/python/wfm_rcv_pll.py @@ -19,10 +19,15 @@ # Boston, MA 02110-1301, USA. # -from gnuradio import gr, filter, analog -from gnuradio.blks2impl.fm_emph import fm_deemph +from gnuradio import gr, filter +from fm_emph import fm_deemph import math +try: + from gnuradio import analog +except ImportError: + import analog_swig as analog + class wfm_rcv_pll(gr.hier_block2): def __init__(self, demod_rate, audio_decimation): """ diff --git a/gr-analog/python/wfm_tx.py b/gr-analog/python/wfm_tx.py index 4c074b5317..be662310db 100644 --- a/gr-analog/python/wfm_tx.py +++ b/gr-analog/python/wfm_tx.py @@ -22,9 +22,13 @@ import math from gnuradio import gr from gnuradio import filter -from gnuradio import analog from fm_emph import fm_preemph +try: + from gnuradio import analog +except ImportError: + import analog_swig as analog + class wfm_tx(gr.hier_block2): def __init__(self, audio_rate, quad_rate, tau=75e-6, max_dev=75e3): """ |