diff options
| -rw-r--r-- | gr-digital/examples/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-digital/include/gnuradio/digital/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-digital/lib/CMakeLists.txt | 5 | ||||
| -rwxr-xr-x | gr-digital/python/digital/qa_ofdm_insert_preamble.py | 178 | ||||
| -rw-r--r-- | gr-digital/swig/digital_swig0.i | 15 |
5 files changed, 0 insertions, 207 deletions
diff --git a/gr-digital/examples/CMakeLists.txt b/gr-digital/examples/CMakeLists.txt index b4c6008d40..3725fa55ce 100644 --- a/gr-digital/examples/CMakeLists.txt +++ b/gr-digital/examples/CMakeLists.txt @@ -54,12 +54,8 @@ GR_PYTHON_INSTALL(PROGRAMS # OFDM GR_PYTHON_INSTALL(PROGRAMS ofdm/benchmark_add_channel.py - ofdm/benchmark_rx.py - ofdm/benchmark_tx.py - ofdm/gr_plot_ofdm.py ofdm/receive_path.py ofdm/transmit_path.py - ofdm/tunnel.py ofdm/uhd_interface.py DESTINATION ${GR_PKG_DIGITAL_EXAMPLES_DIR}/ofdm ) diff --git a/gr-digital/include/gnuradio/digital/CMakeLists.txt b/gr-digital/include/gnuradio/digital/CMakeLists.txt index 230b30bf39..2b5aa8543c 100644 --- a/gr-digital/include/gnuradio/digital/CMakeLists.txt +++ b/gr-digital/include/gnuradio/digital/CMakeLists.txt @@ -81,12 +81,7 @@ install(FILES ofdm_equalizer_base.h ofdm_equalizer_simpledfe.h ofdm_equalizer_static.h - ofdm_frame_acquisition.h ofdm_frame_equalizer_vcvc.h - ofdm_frame_sink.h - ofdm_insert_preamble.h - ofdm_mapper_bcv.h - ofdm_sampler.h ofdm_serializer_vcc.h ofdm_sync_sc_cfb.h header_format_base.h diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index 5e2435966c..e10ef0f615 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -97,12 +97,7 @@ list(APPEND digital_sources ofdm_equalizer_base.cc ofdm_equalizer_simpledfe.cc ofdm_equalizer_static.cc - ofdm_frame_acquisition_impl.cc ofdm_frame_equalizer_vcvc_impl.cc - ofdm_frame_sink_impl.cc - ofdm_insert_preamble_impl.cc - ofdm_mapper_bcv_impl.cc - ofdm_sampler_impl.cc ofdm_serializer_vcc_impl.cc ofdm_sync_sc_cfb_impl.cc header_format_base.cc diff --git a/gr-digital/python/digital/qa_ofdm_insert_preamble.py b/gr-digital/python/digital/qa_ofdm_insert_preamble.py deleted file mode 100755 index 4edd54c8c6..0000000000 --- a/gr-digital/python/digital/qa_ofdm_insert_preamble.py +++ /dev/null @@ -1,178 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2007,2010-2013 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -from pprint import pprint - -from gnuradio import gr, gr_unittest, digital, blocks - -class test_ofdm_insert_preamble(gr_unittest.TestCase): - - def setUp(self): - self.tb = gr.top_block() - - def tearDown(self): - self.tb = None - - def helper(self, v0, v1, fft_length, preamble): - tb = self.tb - src0 = blocks.vector_source_c(v0) - src1 = blocks.vector_source_b(v1) - - s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_length) - - # print "len(v) = %d" % (len(v)) - - op = digital.ofdm_insert_preamble(fft_length, preamble) - - v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_length) - dst0 = blocks.vector_sink_c() - dst1 = blocks.vector_sink_b() - - tb.connect(src0, s2v, (op, 0)) - tb.connect(src1, (op, 1)) - tb.connect((op, 0), v2s, dst0) - tb.connect((op, 1), dst1) - - tb.run() - r0 = dst0.data() - r0v = [] - for i in range(len(r0)//fft_length): - r0v.append(r0[i*fft_length:(i+1)*fft_length]) - - r1 = dst1.data() - self.assertEqual(len(r0v), len(r1)) - return (r1, r0v) - - def check_match(self, actual, expected_list): - lst = [] - map(lambda x: lst.append(x), expected_list) - self.assertEqual(actual, lst) - - - # ---------------------------------------------------------------- - - def test_000(self): - # no preamble, 1 symbol payloads - - preamble = () - fft_length = 8 - npayloads = 8 - v = [] - p = [] - for i in range(npayloads): - t = fft_length*[(i + i*1j)] - p.append(tuple(t)) - v += t - - p = tuple(p) - - r = self.helper(v, npayloads*[1], fft_length, preamble) - # pprint(r) - - self.assertEqual(r[0], tuple(npayloads*[1])) - self.check_match(r[1], (p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7])) - - - def test_001(self): - # 1 symbol preamble, 1 symbol payloads - preamble = ((100, 101, 102, 103, 104, 105, 106, 107),) - p0 = preamble[0] - fft_length = 8 - npayloads = 8 - v = [] - p = [] - for i in range(npayloads): - t = fft_length*[(i + i*1j)] - p.append(tuple(t)) - v += t - - r = self.helper(v, npayloads*[1], fft_length, preamble) - - self.assertEqual(r[0], tuple(npayloads*[1, 0])) - self.check_match(r[1], (p0, p[0], - p0, p[1], - p0, p[2], - p0, p[3], - p0, p[4], - p0, p[5], - p0, p[6], - p0, p[7])) - - def test_002(self): - # 2 symbol preamble, 1 symbol payloads - preamble = ((100, 101, 102, 103, 104, 105, 106, 107), - (200, 201, 202, 203, 204, 205, 206, 207)) - p0 = preamble[0] - p1 = preamble[1] - - fft_length = 8 - npayloads = 8 - v = [] - p = [] - for i in range(npayloads): - t = fft_length*[(i + i*1j)] - p.append(tuple(t)) - v += t - - r = self.helper(v, npayloads*[1], fft_length, preamble) - - self.assertEqual(r[0], tuple(npayloads*[1, 0, 0])) - self.check_match(r[1], (p0, p1, p[0], - p0, p1, p[1], - p0, p1, p[2], - p0, p1, p[3], - p0, p1, p[4], - p0, p1, p[5], - p0, p1, p[6], - p0, p1, p[7])) - - - def xtest_003_preamble(self): - # 2 symbol preamble, 2 symbol payloads - preamble = ((100, 101, 102, 103, 104, 105, 106, 107), - (200, 201, 202, 203, 204, 205, 206, 207)) - p0 = preamble[0] - p1 = preamble[1] - - fft_length = 8 - npayloads = 8 - v = [] - p = [] - for i in range(npayloads * 2): - t = fft_length*[(i + i*1j)] - p.append(tuple(t)) - v += t - - r = self.helper(v, npayloads*[1, 0], fft_length, preamble) - - self.assertEqual(r[0], tuple(npayloads*[1, 0, 0, 0])) - self.check_match(r[1], (p0, p1, p[0], p[1], - p0, p1, p[2], p[3], - p0, p1, p[4], p[5], - p0, p1, p[6], p[7], - p0, p1, p[8], p[9], - p0, p1, p[10], p[11], - p0, p1, p[12], p[13], - p0, p1, p[14], p[15])) - -if __name__ == '__main__': - gr_unittest.run(test_ofdm_insert_preamble, "test_ofdm_insert_preamble.xml") diff --git a/gr-digital/swig/digital_swig0.i b/gr-digital/swig/digital_swig0.i index 2ca617e293..4741cc08e5 100644 --- a/gr-digital/swig/digital_swig0.i +++ b/gr-digital/swig/digital_swig0.i @@ -61,12 +61,7 @@ #include "gnuradio/digital/ofdm_equalizer_base.h" #include "gnuradio/digital/ofdm_equalizer_simpledfe.h" #include "gnuradio/digital/ofdm_equalizer_static.h" -#include "gnuradio/digital/ofdm_frame_acquisition.h" #include "gnuradio/digital/ofdm_frame_equalizer_vcvc.h" -#include "gnuradio/digital/ofdm_frame_sink.h" -#include "gnuradio/digital/ofdm_insert_preamble.h" -#include "gnuradio/digital/ofdm_mapper_bcv.h" -#include "gnuradio/digital/ofdm_sampler.h" #include "gnuradio/digital/ofdm_serializer_vcc.h" #include "gnuradio/digital/ofdm_sync_sc_cfb.h" %} @@ -95,12 +90,7 @@ %include "gnuradio/digital/ofdm_equalizer_base.h" %include "gnuradio/digital/ofdm_equalizer_simpledfe.h" %include "gnuradio/digital/ofdm_equalizer_static.h" -%include "gnuradio/digital/ofdm_frame_acquisition.h" %include "gnuradio/digital/ofdm_frame_equalizer_vcvc.h" -%include "gnuradio/digital/ofdm_frame_sink.h" -%include "gnuradio/digital/ofdm_insert_preamble.h" -%include "gnuradio/digital/ofdm_mapper_bcv.h" -%include "gnuradio/digital/ofdm_sampler.h" %include "gnuradio/digital/ofdm_serializer_vcc.h" %include "gnuradio/digital/ofdm_sync_sc_cfb.h" @@ -123,12 +113,7 @@ GR_SWIG_BLOCK_MAGIC2(digital, lms_dd_equalizer_cc); GR_SWIG_BLOCK_MAGIC2(digital, ofdm_carrier_allocator_cvc); GR_SWIG_BLOCK_MAGIC2(digital, ofdm_chanest_vcvc); GR_SWIG_BLOCK_MAGIC2(digital, ofdm_cyclic_prefixer); -GR_SWIG_BLOCK_MAGIC2(digital, ofdm_frame_acquisition); GR_SWIG_BLOCK_MAGIC2(digital, ofdm_frame_equalizer_vcvc); -GR_SWIG_BLOCK_MAGIC2(digital, ofdm_frame_sink); -GR_SWIG_BLOCK_MAGIC2(digital, ofdm_insert_preamble); -GR_SWIG_BLOCK_MAGIC2(digital, ofdm_mapper_bcv); -GR_SWIG_BLOCK_MAGIC2(digital, ofdm_sampler); GR_SWIG_BLOCK_MAGIC2(digital, ofdm_serializer_vcc); GR_SWIG_BLOCK_MAGIC2(digital, ofdm_sync_sc_cfb); |