diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-09 18:56:00 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-10 14:39:40 -0500 |
| commit | 2f78621b74296c397143371e30707024fa33d082 (patch) | |
| tree | f66fac0be395a87a52d172cfc33547709f440bad /gr-digital | |
| parent | 988c73b0e9f012a1951cfa02b3054cf856a795dd (diff) | |
digital: fixed swig linking issue to gr-analog.
Diffstat (limited to 'gr-digital')
| -rwxr-xr-x | gr-digital/python/qa_cpm.py | 11 | ||||
| -rw-r--r-- | gr-digital/swig/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/gr-digital/python/qa_cpm.py b/gr-digital/python/qa_cpm.py index 2221d16b6f..bfeb2bcdd4 100755 --- a/gr-digital/python/qa_cpm.py +++ b/gr-digital/python/qa_cpm.py @@ -22,6 +22,7 @@ from gnuradio import gr, gr_unittest import digital_swig as digital +import analog_swig as analog import numpy class test_cpm(gr_unittest.TestCase): @@ -51,16 +52,16 @@ class test_cpm(gr_unittest.TestCase): msg="Phase shift was not correct for CPM method " + name) def test_001_lrec(self): - self.do_check_phase_shift(gr.cpm.LRC, 'LREC') + self.do_check_phase_shift(analog.cpm.LRC, 'LREC') def test_001_lrc(self): - self.do_check_phase_shift(gr.cpm.LRC, 'LRC') + self.do_check_phase_shift(analog.cpm.LRC, 'LRC') def test_001_lsrc(self): - self.do_check_phase_shift(gr.cpm.LSRC, 'LSRC') + self.do_check_phase_shift(analog.cpm.LSRC, 'LSRC') def test_001_ltfm(self): - self.do_check_phase_shift(gr.cpm.TFM, 'TFM') + self.do_check_phase_shift(analog.cpm.TFM, 'TFM') def test_001_lgmsk(self): sps = 2 @@ -82,7 +83,7 @@ class test_cpm(gr_unittest.TestCase): msg="Phase shift was not correct for GMSK") def test_phase_response(self): - phase_response = gr.cpm.phase_response(gr.cpm.LREC, 2, 4) + phase_response = analog.cpm.phase_response(analog.cpm.LREC, 2, 4) self.assertAlmostEqual(numpy.sum(phase_response), 1) diff --git a/gr-digital/swig/CMakeLists.txt b/gr-digital/swig/CMakeLists.txt index 8ba6b361dd..5ec34008aa 100644 --- a/gr-digital/swig/CMakeLists.txt +++ b/gr-digital/swig/CMakeLists.txt @@ -33,7 +33,7 @@ set(GR_SWIG_INCLUDE_DIRS set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/digital_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib) -set(GR_SWIG_LIBRARIES gnuradio-digital gnuradio-filter) +set(GR_SWIG_LIBRARIES gnuradio-digital gnuradio-filter gnuradio-analog) GR_SWIG_MAKE(digital_swig digital_swig.i) |