diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-01 10:50:10 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-01 10:50:10 -0400 |
| commit | 1b83549181135e79ad00b9bae0d11ab27efa4148 (patch) | |
| tree | 6b036dd9d26423528f49bad563c199a25a33f646 /gr-digital | |
| parent | bbe599e4606b728c9610a17285b1e50f9e9d4dcb (diff) | |
analog: removing PLL blocks. Also moved blks2impl files that used PLLs to gr-analog.
This probably impacts a lot of examples; once we've removed all files in gnuradio-core, we'll need to retest.
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-digital/python/generic_mod_demod.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gr-digital/python/CMakeLists.txt b/gr-digital/python/CMakeLists.txt index fdb5acd819..4ea656e29c 100644 --- a/gr-digital/python/CMakeLists.txt +++ b/gr-digital/python/CMakeLists.txt @@ -73,6 +73,8 @@ foreach(py_qa_test_file ${py_qa_test_files}) ${CMAKE_BINARY_DIR}/gr-digital/swig ${CMAKE_BINARY_DIR}/gr-filter/python ${CMAKE_BINARY_DIR}/gr-filter/swig + ${CMAKE_BINARY_DIR}/gr-analog/python + ${CMAKE_BINARY_DIR}/gr-analog/swig ) set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/generic_mod_demod.py index f8e4c27fa4..b71118ebcb 100644 --- a/gr-digital/python/generic_mod_demod.py +++ b/gr-digital/python/generic_mod_demod.py @@ -25,7 +25,7 @@ Generic modulation and demodulation. """ -from gnuradio import gr, analog +from gnuradio import gr from modulation_utils import extract_kwargs_from_options_for_class from utils import mod_codes import digital_swig as digital @@ -36,6 +36,11 @@ try: except ImportError: import filter_swig as filter +try: + from gnuradio import analog +except ImportError: + import analog_swig as analog + # default values (used in __init__ and add_options) _def_samples_per_symbol = 2 _def_excess_bw = 0.35 |