diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-09 22:30:01 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-10 14:39:41 -0500 |
| commit | cbc7960a4facfc50c3861ca96e51348802d457cc (patch) | |
| tree | f2b0c58eedc052ca399bde721d6bf054b4e0819b /gr-trellis | |
| parent | 6be5d93ab0e9ec205f1cb72f8d2d60006b08e7f2 (diff) | |
analog: removed noise and sig sources from core.
Fixed QA code for components that do not use gr-analog.
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/doc/gr-trellis.xml | 4 | ||||
| -rw-r--r-- | gr-trellis/src/python/CMakeLists.txt | 5 | ||||
| -rwxr-xr-x | gr-trellis/src/python/qa_trellis.py | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/gr-trellis/doc/gr-trellis.xml b/gr-trellis/doc/gr-trellis.xml index 58aa74d409..314fb2e05f 100644 --- a/gr-trellis/doc/gr-trellis.xml +++ b/gr-trellis/doc/gr-trellis.xml @@ -598,7 +598,7 @@ r_k=(rk1,rk2,...,rkD). <programlisting> 22 # CHANNEL 23 add = gr.add_ff() - 24 noise = gr.noise_source_f(gr.GR_GAUSSIAN,math.sqrt(N0/2),seed) + 24 noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed) </programlisting> @@ -815,7 +815,7 @@ The modulated symbols are filtered by the ISI channel and AWGN with appropriate 28 # CHANNEL 29 isi = gr.fir_filter_fff(1,channel) 30 add = gr.add_ff() - 31 noise = gr.noise_source_f(gr.GR_GAUSSIAN,math.sqrt(N0/2),seed) + 31 noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed) </programlisting> diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt index 7a0fba773a..5b5a35bcfc 100644 --- a/gr-trellis/src/python/CMakeLists.txt +++ b/gr-trellis/src/python/CMakeLists.txt @@ -30,10 +30,11 @@ foreach(py_qa_test_file ${py_qa_test_files}) ${CMAKE_BINARY_DIR}/gnuradio-core/src/python ${CMAKE_BINARY_DIR}/gnuradio-core/src/lib/swig ${CMAKE_BINARY_DIR}/gr-digital/swig + ${CMAKE_BINARY_DIR}/gr-analog/swig ${CMAKE_BINARY_DIR}/gr-trellis/src/lib ) - set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core gnuradio-digital - gnuradio-analog gnuradio-trellis) + set(GR_TEST_TARGET_DEPS volk gruel gnuradio-core + gnuradio-digital gnuradio-analog gnuradio-trellis) GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-trellis/src/python/qa_trellis.py b/gr-trellis/src/python/qa_trellis.py index c6ba40d11f..53dcf0d8f6 100755 --- a/gr-trellis/src/python/qa_trellis.py +++ b/gr-trellis/src/python/qa_trellis.py @@ -30,6 +30,7 @@ import trellis import os import digital_swig as digital +import analog_swig as analog fsm_args = {"awgn1o2_4": (2, 4, 4, (0, 2, 0, 2, 1, 3, 1, 3), @@ -118,7 +119,7 @@ class trellis_tb(gr.top_block): # CHANNEL add = gr.add_cc() - noise = gr.noise_source_c(gr.GR_GAUSSIAN,math.sqrt(N0/2),seed) + noise = analog.noise_source_c(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed) # RX # data preprocessing to generate metrics for Viterbi |