diff options
| -rw-r--r-- | gnuradio-core/src/guile/tests/general_ctors.test | 22 | ||||
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/gr/Makefile.am | 1 | ||||
| -rw-r--r-- | gr-digital/include/Makefile.am | 1 | ||||
| -rw-r--r-- | gr-digital/python/Makefile.am | 3 | ||||
| -rwxr-xr-x | gr-digital/python/qa_ofdm_insert_preamble.py (renamed from gnuradio-core/src/python/gnuradio/gr/qa_ofdm_insert_preamble.py) | 5 |
5 files changed, 6 insertions, 26 deletions
diff --git a/gnuradio-core/src/guile/tests/general_ctors.test b/gnuradio-core/src/guile/tests/general_ctors.test index a0e39855c..ca4d60460 100644 --- a/gnuradio-core/src/guile/tests/general_ctors.test +++ b/gnuradio-core/src/guile/tests/general_ctors.test @@ -209,28 +209,6 @@ ;;; ./general/gr_null_source.h (pass-if (true? (gr:null-source 1))) -;;; ./general/gr_ofdm_cyclic_prefixer.h -(pass-if (true? (gr:ofdm-cyclic-prefixer 1 1))) - -;;; ./general/gr_ofdm_frame_acquisition.h -(pass-if (true? (gr:ofdm-frame-acquisition 1 1 1 #(1+3i 23+5i) 1))) - -;;; ./general/gr_ofdm_frame_sink.h -(pass-if (true? (gr:ofdm-frame-sink #(1+3i 23+5i) #(0 1) (gr:msg-queue) 128 0.25 0))) - -;;; ./general/gr_ofdm_insert_preamble.h FIXME: "Wrong type argument in position ~A: ~S" -;;; WONTFIX: Need vector<vector<complex<float>>> -;;(pass-if (true? (gr:ofdm-insert-preamble 2 #(#(1+3i 23+5i) #(1+3i 23+5i))))) - -;;; ./general/gr_ofdm_mapper_bcv.h -(pass-if (true? (gr:ofdm-mapper-bcv #(0+1i 0-1i) 1 100 128))) -(pass-if-throw "confirm throw gr:ofdm-mapper-bcv" #t - (true? (gr:ofdm-mapper-bcv #(0+1i 0-1i) 1 10 128))) - - -;;; ./general/gr_ofdm_sampler.h -(pass-if (true? (gr:ofdm-sampler 1 1 1))) - ;;; ./general/gr_pa_2x2_phase_combiner.h (pass-if (true? (gr:pa-2x2-phase-combiner))) diff --git a/gnuradio-core/src/python/gnuradio/gr/Makefile.am b/gnuradio-core/src/python/gnuradio/gr/Makefile.am index 7bf1c0827..0960323dc 100644 --- a/gnuradio-core/src/python/gnuradio/gr/Makefile.am +++ b/gnuradio-core/src/python/gnuradio/gr/Makefile.am @@ -79,7 +79,6 @@ noinst_PYTHON = \ qa_mute.py \ qa_nlog10.py \ qa_noise.py \ - qa_ofdm_insert_preamble.py \ qa_packed_to_unpacked.py \ qa_pipe_fittings.py \ qa_pll_carriertracking.py \ diff --git a/gr-digital/include/Makefile.am b/gr-digital/include/Makefile.am index c881e244f..ce9e67efb 100644 --- a/gr-digital/include/Makefile.am +++ b/gr-digital/include/Makefile.am @@ -42,6 +42,7 @@ grinclude_HEADERS = \ digital_ofdm_frame_acquisition.h \ digital_ofdm_frame_sink.h \ digital_ofdm_insert_preamble.h \ + digital_ofdm_mapper_bcv.h \ digital_ofdm_sampler.h \ digital_gmskmod_bc.h \ digital_cpmmod_bc.h diff --git a/gr-digital/python/Makefile.am b/gr-digital/python/Makefile.am index 9c7d557ca..1216ab514 100644 --- a/gr-digital/python/Makefile.am +++ b/gr-digital/python/Makefile.am @@ -44,7 +44,8 @@ noinst_PYTHON = \ qa_crc32.py \ qa_fll_band_edge.py \ qa_lms_equalizer.py \ - qa_mpsk_receiver.py + qa_mpsk_receiver.py \ + qa_ofdm_insert_preamble.py digital_PYTHON = \ __init__.py \ diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_ofdm_insert_preamble.py b/gr-digital/python/qa_ofdm_insert_preamble.py index d69f5ca5b..c45893fa3 100755 --- a/gnuradio-core/src/python/gnuradio/gr/qa_ofdm_insert_preamble.py +++ b/gr-digital/python/qa_ofdm_insert_preamble.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2007,2010 Free Software Foundation, Inc. +# Copyright 2007,2010,2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -22,6 +22,7 @@ from gnuradio import gr, gr_unittest from pprint import pprint +import digital_swig class test_ofdm_insert_preamble (gr_unittest.TestCase): @@ -40,7 +41,7 @@ class test_ofdm_insert_preamble (gr_unittest.TestCase): # print "len(v) = %d" % (len(v)) - op = gr.ofdm_insert_preamble(fft_length, preamble) + op = digital_swig.ofdm_insert_preamble(fft_length, preamble) v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fft_length) dst0 = gr.vector_sink_c() |