diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-03-02 16:01:23 -0500 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-02 16:01:23 -0500 |
commit | 47e6a7a0cdd65136735b2ae89fe86990431d230f (patch) | |
tree | 9be2d3437be6b629dd0673b24f8e618e5f694483 /gnuradio-core/src | |
parent | 521a811c8bf8d2ed4a8222d62b478b47f9760a38 (diff) |
blocks: removing mute, probe_signal, probe_signal_v, and sample_and_hold.
Diffstat (limited to 'gnuradio-core/src')
-rw-r--r-- | gnuradio-core/src/lib/general/general_generated.i | 28 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/CMakeLists.txt | 4 | ||||
-rwxr-xr-x | gnuradio-core/src/lib/gengen/generate_common.py | 6 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t | 79 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_mute_XX.h.t | 56 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_mute_XX.i.t | 37 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_probe_signal_X.cc.t | 59 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_probe_signal_X.h.t | 58 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_probe_signal_X.i.t | 32 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_probe_signal_vX.cc.t | 59 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_probe_signal_vX.h.t | 62 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_probe_signal_vX.i.t | 32 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t | 62 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.h.t | 58 | ||||
-rw-r--r-- | gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.i.t | 33 | ||||
-rwxr-xr-x | gnuradio-core/src/python/gnuradio/gr/qa_mute.py | 89 |
16 files changed, 0 insertions, 754 deletions
diff --git a/gnuradio-core/src/lib/general/general_generated.i b/gnuradio-core/src/lib/general/general_generated.i index 900237214e..c3f67e0d47 100644 --- a/gnuradio-core/src/lib/general/general_generated.i +++ b/gnuradio-core/src/lib/general/general_generated.i @@ -2,20 +2,6 @@ // This file is machine generated. All edits will be overwritten // %{ -#include <gr_mute_cc.h> -#include <gr_mute_ff.h> -#include <gr_mute_ii.h> -#include <gr_mute_ss.h> -#include <gr_probe_signal_b.h> -#include <gr_probe_signal_s.h> -#include <gr_probe_signal_i.h> -#include <gr_probe_signal_f.h> -#include <gr_probe_signal_c.h> -#include <gr_probe_signal_vb.h> -#include <gr_probe_signal_vs.h> -#include <gr_probe_signal_vi.h> -#include <gr_probe_signal_vf.h> -#include <gr_probe_signal_vc.h> #include <gr_vector_sink_b.h> #include <gr_vector_sink_c.h> #include <gr_vector_sink_f.h> @@ -28,20 +14,6 @@ #include <gr_vector_source_s.h> %} -%include <gr_mute_cc.i> -%include <gr_mute_ff.i> -%include <gr_mute_ii.i> -%include <gr_mute_ss.i> -%include <gr_probe_signal_b.i> -%include <gr_probe_signal_s.i> -%include <gr_probe_signal_i.i> -%include <gr_probe_signal_f.i> -%include <gr_probe_signal_c.i> -%include <gr_probe_signal_vb.i> -%include <gr_probe_signal_vs.i> -%include <gr_probe_signal_vi.i> -%include <gr_probe_signal_vf.i> -%include <gr_probe_signal_vc.i> %include <gr_vector_sink_b.i> %include <gr_vector_sink_c.i> %include <gr_vector_sink_f.i> diff --git a/gnuradio-core/src/lib/gengen/CMakeLists.txt b/gnuradio-core/src/lib/gengen/CMakeLists.txt index a3134b278e..b3852973e3 100644 --- a/gnuradio-core/src/lib/gengen/CMakeLists.txt +++ b/gnuradio-core/src/lib/gengen/CMakeLists.txt @@ -84,13 +84,9 @@ endmacro(expand_h_cc_i) expand_h_cc_i(gr_vector_source_X b s i f c) expand_h_cc_i(gr_vector_insert_X b) expand_h_cc_i(gr_vector_sink_X b s i f c) -expand_h_cc_i(gr_probe_signal_X b s i f c) -expand_h_cc_i(gr_probe_signal_vX b s i f c) -expand_h_cc_i(gr_mute_XX ss ii ff cc) expand_h_cc_i(gr_moving_average_XX ss ii ff cc) -expand_h_cc_i(gr_sample_and_hold_XX bb ss ii ff) expand_h_cc_i(gr_peak_detector_XX fb ib sb) add_custom_target(gengen_generated DEPENDS diff --git a/gnuradio-core/src/lib/gengen/generate_common.py b/gnuradio-core/src/lib/gengen/generate_common.py index 7dfd36b663..4d9c56dc00 100755 --- a/gnuradio-core/src/lib/gengen/generate_common.py +++ b/gnuradio-core/src/lib/gengen/generate_common.py @@ -32,21 +32,17 @@ ss_signatures = ['s', 'i', 'f', 'c'] ss_roots = [ 'gr_vector_source_X', 'gr_vector_sink_X', - 'gr_probe_signal_X', - 'gr_probe_signal_vX' ] # regular blocks reg_signatures = ['ss', 'ii', 'ff', 'cc'] reg_roots = [ - 'gr_mute_XX', 'gr_moving_average_XX', ] # other blocks others = ( - ('gr_sample_and_hold_XX', ('bb','ss','ii','ff')), ('gr_peak_detector_XX', ('fb','ib','sb')), ) @@ -63,8 +59,6 @@ def expand_h_cc_i (root, sig): def generate (): expand_h_cc_i ('gr_vector_sink_X', 'b') expand_h_cc_i ('gr_vector_source_X', 'b') - expand_h_cc_i ('gr_probe_signal_X', 'b') - expand_h_cc_i ('gr_probe_signal_vX', 'b') for r in ss_roots: for s in ss_signatures: expand_h_cc_i (r, s) diff --git a/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t deleted file mode 100644 index 4b8ff8415d..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_XX.cc.t +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2010 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. - */ - -// @WARNING@ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <@NAME@.h> -#include <gr_io_signature.h> -#include <string.h> - - -@SPTR_NAME@ -gr_make_@BASE_NAME@ (bool mute) -{ - return gnuradio::get_initial_sptr (new @NAME@ (mute)); -} - -@NAME@::@NAME@ (bool mute) - : gr_sync_block ("@BASE_NAME@", - gr_make_io_signature (1, 1, sizeof (@I_TYPE@)), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@))), - d_mute (mute) -{ -} - -int -@NAME@::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - @I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0]; - @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - - int size = noutput_items; - - if (d_mute){ - memset (optr, 0, noutput_items * sizeof(@O_TYPE@)); - } - else { - while (size >= 8){ - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - *optr++ = *iptr++; - size -= 8; - } - - while (size-- > 0) - *optr++ = *iptr++; - } - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_mute_XX.h.t b/gnuradio-core/src/lib/gengen/gr_mute_XX.h.t deleted file mode 100644 index ca23904e9d..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_XX.h.t +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// @WARNING@ - -#ifndef @GUARD_NAME@ -#define @GUARD_NAME@ - -#include <gr_core_api.h> -#include <gr_sync_block.h> - -class @NAME@; -typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; - -GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (bool mute=false); - -/*! - * \brief output = input or zero if muted. - * \ingroup level_blk - */ -class GR_CORE_API @NAME@ : public gr_sync_block -{ - friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (bool mute); - - bool d_mute; - @NAME@ (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } - - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_mute_XX.i.t b/gnuradio-core/src/lib/gengen/gr_mute_XX.i.t deleted file mode 100644 index ffcfac8a65..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_mute_XX.i.t +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004 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. - */ - -// @WARNING@ - -GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@) - -@SPTR_NAME@ gr_make_@BASE_NAME@(bool mute=false); - -class @NAME@ : public gr_sync_block -{ - private: - @NAME@ (bool mute); - - public: - bool mute () const { return d_mute; } - void set_mute (bool mute) { d_mute = mute; } -}; diff --git a/gnuradio-core/src/lib/gengen/gr_probe_signal_X.cc.t b/gnuradio-core/src/lib/gengen/gr_probe_signal_X.cc.t deleted file mode 100644 index 9a10bab596..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_probe_signal_X.cc.t +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2005,2010,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. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#include <@NAME@.h> -#include <gr_io_signature.h> - -@NAME@_sptr -gr_make_@BASE_NAME@() -{ - return gnuradio::get_initial_sptr(new @NAME@()); -} - -@NAME@::@NAME@ () -: gr_sync_block ("@BASE_NAME@", - gr_make_io_signature(1, 1, sizeof(@TYPE@)), - gr_make_io_signature(0, 0, 0)), - d_level(0) -{ -} - -@NAME@::~@NAME@() -{ -} - - -int -@NAME@::work(int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const @TYPE@ *in = (const @TYPE@ *) input_items[0]; - - if (noutput_items > 0) - d_level = in[noutput_items-1]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_probe_signal_X.h.t b/gnuradio-core/src/lib/gengen/gr_probe_signal_X.h.t deleted file mode 100644 index 936f437f1c..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_probe_signal_X.h.t +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2005, 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 @GUARD_NAME@ -#define @GUARD_NAME@ - -#include <gr_core_api.h> -#include <gr_sync_block.h> - -class @NAME@; -typedef boost::shared_ptr<@NAME@> @NAME@_sptr; - -GR_CORE_API @NAME@_sptr -gr_make_@BASE_NAME@ (); - -/*! - * \brief Sink that allows a sample to be grabbed from Python. - * \ingroup sink_blk - */ -class GR_CORE_API @NAME@ : public gr_sync_block -{ - @TYPE@ d_level; - - friend GR_CORE_API @NAME@_sptr - gr_make_@BASE_NAME@(); - - @NAME@(); - -public: - ~@NAME@(); - - int work(int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - @TYPE@ level() const { return d_level; } - -}; - -#endif /* @GUARD_NAME@ */ diff --git a/gnuradio-core/src/lib/gengen/gr_probe_signal_X.i.t b/gnuradio-core/src/lib/gengen/gr_probe_signal_X.i.t deleted file mode 100644 index ec96436864..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_probe_signal_X.i.t +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2005, 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. - */ - -GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@); - -@NAME@_sptr -gr_make_@BASE_NAME@ (); - -class @NAME@ : public gr_sync_block -{ -public: - @TYPE@ level (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_probe_signal_vX.cc.t b/gnuradio-core/src/lib/gengen/gr_probe_signal_vX.cc.t deleted file mode 100644 index 1aedca4ec4..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_probe_signal_vX.cc.t +++ /dev/null @@ -1,59 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2005,2010,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. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#include <@NAME@.h> -#include <gr_io_signature.h> -#include <iostream> - -@NAME@_sptr -gr_make_@BASE_NAME@(size_t size) -{ - return gnuradio::get_initial_sptr(new @NAME@(size)); -} - -@NAME@::@NAME@ (size_t size) -: gr_sync_block ("@BASE_NAME@", - gr_make_io_signature(1, 1, size*sizeof(@TYPE@)), - gr_make_io_signature(0, 0, 0)), - d_level(size, 0), d_size(size) -{ -} - -@NAME@::~@NAME@() -{ -} - -int -@NAME@::work(int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - const @TYPE@ *in = (const @TYPE@ *) input_items[0]; - - for (size_t i=0; i<d_size; i++) - d_level[i] = in[(noutput_items-1)*d_size+i]; - - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_probe_signal_vX.h.t b/gnuradio-core/src/lib/gengen/gr_probe_signal_vX.h.t deleted file mode 100644 index ee673c14ab..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_probe_signal_vX.h.t +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2005, 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 @GUARD_NAME@ -#define @GUARD_NAME@ - -#include <vector> - -#include <gr_core_api.h> -#include <gr_sync_block.h> - -class @NAME@; -typedef boost::shared_ptr<@NAME@> @NAME@_sptr; - -GR_CORE_API @NAME@_sptr -gr_make_@BASE_NAME@ (size_t size); - -/*! - * \brief Sink that allows a sample to be grabbed from Python. - * \ingroup sink_blk - */ -class GR_CORE_API @NAME@ : public gr_sync_block -{ - std::vector<@TYPE@> d_level; - - friend GR_CORE_API @NAME@_sptr - gr_make_@BASE_NAME@(size_t size); - - @NAME@(size_t size); - - size_t d_size; - -public: - ~@NAME@(); - - int work(int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); - - std::vector<@TYPE@> level() const { return d_level; } - -}; - -#endif /* @GUARD_NAME@ */ diff --git a/gnuradio-core/src/lib/gengen/gr_probe_signal_vX.i.t b/gnuradio-core/src/lib/gengen/gr_probe_signal_vX.i.t deleted file mode 100644 index b7de091259..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_probe_signal_vX.i.t +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2005, 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. - */ - -GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@); - -@NAME@_sptr -gr_make_@BASE_NAME@ (size_t size); - -class @NAME@ : public gr_sync_block -{ -public: - std::vector<@TYPE@> level (); -}; diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t deleted file mode 100644 index 68f4d544ea..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.cc.t +++ /dev/null @@ -1,62 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007,2010 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. - */ - -// @WARNING@ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <@NAME@.h> -#include <gr_io_signature.h> - -@SPTR_NAME@ -gr_make_@BASE_NAME@ () -{ - return gnuradio::get_initial_sptr (new @NAME@ ()); -} - -@NAME@::@NAME@ () - : gr_sync_block ("@BASE_NAME@", - gr_make_io_signature2 (2, 2, sizeof (@I_TYPE@), sizeof(char)), - gr_make_io_signature (1, 1, sizeof (@O_TYPE@))), - d_data(0) -{ -} - -int -@NAME@::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) -{ - @I_TYPE@ *iptr = (@I_TYPE@ *) input_items[0]; - const char *ctrl = (const char *) input_items[1]; - @O_TYPE@ *optr = (@O_TYPE@ *) output_items[0]; - - for (int i = 0; i < noutput_items; i++){ - if(ctrl[i]) { - d_data = iptr[i]; - } - optr[i] = d_data; - } - return noutput_items; -} diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.h.t b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.h.t deleted file mode 100644 index 0364941cbc..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.h.t +++ /dev/null @@ -1,58 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// @WARNING@ - -#ifndef @GUARD_NAME@ -#define @GUARD_NAME@ - -#include <gr_core_api.h> -#include <gr_sync_block.h> - -class @NAME@; -typedef boost::shared_ptr<@NAME@> @SPTR_NAME@; - -GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (); - -/*! - * \brief sample and hold circuit - * \ingroup level_blk - * - * Samples the data stream (input stream 0) and holds the value - * if the control signal is 1 (intput stream 1). - */ -class GR_CORE_API @NAME@ : public gr_sync_block -{ - friend GR_CORE_API @SPTR_NAME@ gr_make_@BASE_NAME@ (); - - @NAME@ (); - - private: - @O_TYPE@ d_data; - - public: - int work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); -}; - -#endif diff --git a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.i.t b/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.i.t deleted file mode 100644 index 4620b0f2c4..0000000000 --- a/gnuradio-core/src/lib/gengen/gr_sample_and_hold_XX.i.t +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2007 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. - */ - -// @WARNING@ - -GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@) - -@SPTR_NAME@ gr_make_@BASE_NAME@ (); - -class @NAME@ : public gr_sync_block -{ - private: - @NAME@ (); -}; diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_mute.py b/gnuradio-core/src/python/gnuradio/gr/qa_mute.py deleted file mode 100755 index afdfdfe135..0000000000 --- a/gnuradio-core/src/python/gnuradio/gr/qa_mute.py +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2004,2005,2007,2010 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 gnuradio import gr, gr_unittest - -class test_mute (gr_unittest.TestCase): - - def setUp (self): - self.tb = gr.top_block () - - def tearDown (self): - self.tb = None - - def help_ii (self, src_data, exp_data, op): - for s in zip (range (len (src_data)), src_data): - src = gr.vector_source_i (s[1]) - self.tb.connect (src, (op, s[0])) - dst = gr.vector_sink_i () - self.tb.connect (op, dst) - self.tb.run () - result_data = dst.data () - self.assertEqual (exp_data, result_data) - - def help_ff (self, src_data, exp_data, op): - for s in zip (range (len (src_data)), src_data): - src = gr.vector_source_f (s[1]) - self.tb.connect (src, (op, s[0])) - dst = gr.vector_sink_f () - self.tb.connect (op, dst) - self.tb.run () - result_data = dst.data () - self.assertEqual (exp_data, result_data) - - def help_cc (self, src_data, exp_data, op): - for s in zip (range (len (src_data)), src_data): - src = gr.vector_source_c (s[1]) - self.tb.connect (src, (op, s[0])) - dst = gr.vector_sink_c () - self.tb.connect (op, dst) - self.tb.run () - result_data = dst.data () - self.assertEqual (exp_data, result_data) - - def test_unmute_ii(self): - src_data = (1, 2, 3, 4, 5) - expected_result = (1, 2, 3, 4, 5) - op = gr.mute_ii (False) - self.help_ii ((src_data,), expected_result, op) - - def test_mute_ii(self): - src_data = (1, 2, 3, 4, 5) - expected_result = (0, 0, 0, 0, 0) - op = gr.mute_ii (True) - self.help_ii ((src_data,), expected_result, op) - - def test_unmute_cc (self): - src_data = (1+5j, 2+5j, 3+5j, 4+5j, 5+5j) - expected_result = (1+5j, 2+5j, 3+5j, 4+5j, 5+5j) - op = gr.mute_cc (False) - self.help_cc ((src_data,), expected_result, op) - - def test_unmute_cc (self): - src_data = (1+5j, 2+5j, 3+5j, 4+5j, 5+5j) - expected_result = (0+0j, 0+0j, 0+0j, 0+0j, 0+0j) - op = gr.mute_cc (True) - self.help_cc ((src_data,), expected_result, op) - - -if __name__ == '__main__': - gr_unittest.run(test_mute, "test_mute.xml") |