diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 09:10:18 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 09:22:19 -0700 |
| commit | 113c4ef92819e703d24eb6a409751f2757635528 (patch) | |
| tree | 38e42b254d9d9f4367a07ffc5f1452e43a54f7b7 /gr-digital/include/digital | |
| parent | f15400470ce5cb68f5339ead7af726b8bbafd364 (diff) | |
| parent | c3d4fbf1809d6b3051a4c532d3d6bb5cadb3b6e3 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/include/digital/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
gr-digital/lib/scale_tags_impl.cc
gr-digital/lib/tagged_stream_check_impl.cc
gr-digital/lib/ts_insert_zeros_cc_impl.cc
gr-digital/python/qa_scale_tags.py
gr-digital/python/qa_ts_insert_zeros.py
gr-digital/swig/digital_swig.i
Diffstat (limited to 'gr-digital/include/digital')
| -rw-r--r-- | gr-digital/include/digital/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | gr-digital/include/digital/scale_tags.h | 58 | ||||
| -rw-r--r-- | gr-digital/include/digital/tagged_stream_check.h | 55 | ||||
| -rw-r--r-- | gr-digital/include/digital/ts_insert_zeros_cc.h | 55 |
4 files changed, 1 insertions, 171 deletions
diff --git a/gr-digital/include/digital/CMakeLists.txt b/gr-digital/include/digital/CMakeLists.txt index 06438c092b..0531e837d5 100644 --- a/gr-digital/include/digital/CMakeLists.txt +++ b/gr-digital/include/digital/CMakeLists.txt @@ -125,13 +125,11 @@ install(FILES pn_correlator_cc.h probe_density_b.h probe_mpsk_snr_est_c.h - scale_tags.h scrambler_bb.h simple_correlator.h simple_framer.h simple_framer_sync.h - tagged_stream_check.h - ts_insert_zeros_cc.h + header_payload_demux.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/digital COMPONENT "digital_devel" ) diff --git a/gr-digital/include/digital/scale_tags.h b/gr-digital/include/digital/scale_tags.h deleted file mode 100644 index 8a9e3efba4..0000000000 --- a/gr-digital/include/digital/scale_tags.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- c++ -*- */ -/* Copyright 2012 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. - */ - - -#ifndef INCLUDED_DIGITAL_SCALE_TAGS_H -#define INCLUDED_DIGITAL_SCALE_TAGS_H - -#include <digital_ofdm_equalizer_base.h> // FIXME: Error without this line. No idea why. -#include <digital/api.h> -#include <gr_sync_block.h> - -namespace gr { - namespace digital { - - /*! - * \brief <+description of block+> - * \ingroup block - * - */ - class DIGITAL_API scale_tags : virtual public gr_sync_block - { - public: - typedef boost::shared_ptr<scale_tags> sptr; - - /*! - * \brief Return a shared_ptr to a new instance of digital::scale_tags. - * - * To avoid accidental use of raw pointers, digital::scale_tags's - * constructor is in a private implementation - * class. digital::scale_tags::make is the public interface for - * creating new instances. - */ - static sptr make(size_t itemsize, const std::string&, float scale_factor); - }; - - } // namespace digital -} // namespace gr - -#endif /* INCLUDED_DIGITAL_SCALE_TAGS_H */ - diff --git a/gr-digital/include/digital/tagged_stream_check.h b/gr-digital/include/digital/tagged_stream_check.h deleted file mode 100644 index 73b44a5bb9..0000000000 --- a/gr-digital/include/digital/tagged_stream_check.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* Copyright 2012 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. - */ - - -#ifndef INCLUDED_DIGITAL_TAGGED_STREAM_CHECK_H -#define INCLUDED_DIGITAL_TAGGED_STREAM_CHECK_H - -#include <digital_ofdm_equalizer_base.h> // FIXME: Error without this line. No idea why. -#include <digital/api.h> -#include <gr_sync_block.h> - - -namespace gr { - namespace digital { - - /*! - * \brief Checks a tagged stream to make sure it's valid. - * - * \description - * Produces error messages if the tags in a tagged stream aren't where - * they should be. - * - * \ingroup digital - * - */ - class DIGITAL_API tagged_stream_check : virtual public gr_sync_block - { - public: - typedef boost::shared_ptr<tagged_stream_check> sptr; - static sptr make(size_t itemsize, const std::string &lengthtagname); - }; - - } // namespace digital -} // namespace gr - -#endif /* INCLUDED_DIGITAL_TAGGED_STREAM_CHECK_H */ - diff --git a/gr-digital/include/digital/ts_insert_zeros_cc.h b/gr-digital/include/digital/ts_insert_zeros_cc.h deleted file mode 100644 index 299062eb50..0000000000 --- a/gr-digital/include/digital/ts_insert_zeros_cc.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- c++ -*- */ -/* Copyright 2012 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. - */ - - -#ifndef INCLUDED_DIGITAL_TS_INSERT_ZEROS_CC_H -#define INCLUDED_DIGITAL_TS_INSERT_ZEROS_CC_H - -#include <digital_ofdm_equalizer_base.h> // FIXME: Error without this line. No idea why. -#include <digital/api.h> -#include <gr_block.h> -#include <string> - - -namespace gr { - namespace digital { - - /*! - * \brief Inserts zeros between the packets of a tagged stream. - * - * \description - * Outputs zeros if a packet is not yet ready at the input, otherwise - * passes packets through. - * - * \ingroup digital - * - */ - class DIGITAL_API ts_insert_zeros_cc : virtual public gr_block - { - public: - typedef boost::shared_ptr<ts_insert_zeros_cc> sptr; - static sptr make(const std::string &lengthtagname); - }; - } // namespace digital -} // namespace gr - -#endif /* INCLUDED_DIGITAL_TS_INSERT_ZEROS_CC_H */ - |