summaryrefslogtreecommitdiff
path: root/gr-digital/include/digital
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-03-18 17:38:06 -0400
committerTom Rondeau <trondeau@vt.edu>2013-03-18 17:38:06 -0400
commit04682315bf151fb2c7c24673676cd8e07ab5fe2e (patch)
treebfa4a5157719b134adc5f6f3783f790220ae2f6b /gr-digital/include/digital
parent78527080d5cfcc611646d4694ecb9a026b343652 (diff)
parent3206f12930a131914ca2c0d15969c54d8dee5775 (diff)
Merge branch 'next' of gnuradio.org:gnuradio into next
Conflicts: gr-digital/examples/ofdm/ofdm_bugsquatch.py gr-digital/include/digital/scale_tags.h gr-digital/include/digital/tagged_stream_check.h gr-digital/include/digital/ts_insert_zeros_cc.h gr-digital/python/qa_ofdm_sync_sc_cfb.py 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.txt4
-rw-r--r--gr-digital/include/digital/scale_tags.h58
-rw-r--r--gr-digital/include/digital/tagged_stream_check.h53
-rw-r--r--gr-digital/include/digital/ts_insert_zeros_cc.h53
4 files changed, 1 insertions, 167 deletions
diff --git a/gr-digital/include/digital/CMakeLists.txt b/gr-digital/include/digital/CMakeLists.txt
index 84f0ef50d0..3babcbad44 100644
--- a/gr-digital/include/digital/CMakeLists.txt
+++ b/gr-digital/include/digital/CMakeLists.txt
@@ -132,13 +132,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 dfe6f4a823..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 68509bcae6..0000000000
--- a/gr-digital/include/digital/tagged_stream_check.h
+++ /dev/null
@@ -1,53 +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 588eb300ee..0000000000
--- a/gr-digital/include/digital/ts_insert_zeros_cc.h
+++ /dev/null
@@ -1,53 +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 */
-