diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 12:23:05 -0500 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 12:23:05 -0500 |
commit | a770feec38cd8a188a4c4c88f34d513155b4b539 (patch) | |
tree | ac5a0263daf24c8a78868a307df68a30c9890b0b /gnuradio-core/src/lib/general | |
parent | a08afb0b0166cab961982f174a5cf672393b5198 (diff) |
blocks: removing blocks moved into gr-blocks:
message_strobe, message_debug, message_source, message_sink, message_burst_source, peak_detector, moving_average.
Diffstat (limited to 'gnuradio-core/src/lib/general')
-rw-r--r-- | gnuradio-core/src/lib/general/CMakeLists.txt | 1 | ||||
-rw-r--r-- | gnuradio-core/src/lib/general/general.i | 2 | ||||
-rw-r--r-- | gnuradio-core/src/lib/general/gr_message_strobe.cc | 75 | ||||
-rw-r--r-- | gnuradio-core/src/lib/general/gr_message_strobe.h | 62 | ||||
-rw-r--r-- | gnuradio-core/src/lib/general/gr_message_strobe.i | 30 |
5 files changed, 0 insertions, 170 deletions
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt index 12e0bf0346..de1ad59092 100644 --- a/gnuradio-core/src/lib/general/CMakeLists.txt +++ b/gnuradio-core/src/lib/general/CMakeLists.txt @@ -174,7 +174,6 @@ set(gr_core_general_triple_threats gr_annotator_raw gr_burst_tagger gr_tag_debug - gr_message_strobe ) if(ENABLE_GR_CTRLPORT) diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 04d524ee5c..030dce92a2 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -56,7 +56,6 @@ #include <gr_burst_tagger.h> #include <gr_vector_map.h> #include <gr_tag_debug.h> -#include <gr_message_strobe.h> %} %include "gri_control_loop.i" @@ -94,7 +93,6 @@ %include "gr_vector_map.i" %include "gr_tag_debug.i" %include "gr_block_gateway.i" -%include "gr_message_strobe.i" #ifdef GR_CTRLPORT diff --git a/gnuradio-core/src/lib/general/gr_message_strobe.cc b/gnuradio-core/src/lib/general/gr_message_strobe.cc deleted file mode 100644 index 6a9f807d18..0000000000 --- a/gnuradio-core/src/lib/general/gr_message_strobe.cc +++ /dev/null @@ -1,75 +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. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <gr_message_strobe.h> -#include <gr_io_signature.h> -#include <cstdio> -#include <errno.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <stdexcept> -#include <string.h> -#include <iostream> - -// public constructor that returns a shared_ptr - -gr_message_strobe_sptr -gr_make_message_strobe (pmt::pmt_t msg, float period_ms) -{ - return gnuradio::get_initial_sptr(new gr_message_strobe(msg, period_ms)); -} - -gr_message_strobe::gr_message_strobe (pmt::pmt_t msg, float period_ms) - : gr_block("message_strobe", - gr_make_io_signature(0, 0, 0), - gr_make_io_signature(0, 0, 0)), - d_finished(false), - d_period_ms(period_ms), - d_msg(msg) -{ - message_port_register_out(pmt::mp("strobe")); - d_thread = boost::shared_ptr<boost::thread>(new boost::thread(boost::bind(&gr_message_strobe::run, this))); - - message_port_register_in(pmt::mp("set_msg")); - set_msg_handler(pmt::mp("set_msg"), boost::bind(&gr_message_strobe::set_msg, this, _1)); -} - -gr_message_strobe::~gr_message_strobe() -{ - d_finished = true; - d_thread->interrupt(); - d_thread->join(); -} - -void gr_message_strobe::run(){ - while(!d_finished) { - boost::this_thread::sleep(boost::posix_time::milliseconds(d_period_ms)); - if(d_finished){ return; } - - message_port_pub( pmt::mp("strobe"), d_msg ); - } -} diff --git a/gnuradio-core/src/lib/general/gr_message_strobe.h b/gnuradio-core/src/lib/general/gr_message_strobe.h deleted file mode 100644 index 89046ffc05..0000000000 --- a/gnuradio-core/src/lib/general/gr_message_strobe.h +++ /dev/null @@ -1,62 +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_GR_MESSAGE_STROBE_H -#define INCLUDED_GR_MESSAGE_STROBE_H - -#include <gr_core_api.h> -#include <gr_block.h> -#include <gr_message.h> -#include <gr_msg_queue.h> - -class gr_message_strobe; -typedef boost::shared_ptr<gr_message_strobe> gr_message_strobe_sptr; - -GR_CORE_API gr_message_strobe_sptr gr_make_message_strobe (pmt::pmt_t msg, float period_ms); - -/*! - * \brief Send message at defined interval - * \ingroup msg_blk - */ -class GR_CORE_API gr_message_strobe : public gr_block -{ - private: - friend GR_CORE_API gr_message_strobe_sptr - gr_make_message_strobe(pmt::pmt_t msg, float period_ms); - - boost::shared_ptr<boost::thread> d_thread; - bool d_finished; - float d_period_ms; - pmt::pmt_t d_msg; - - void run(); - - protected: - gr_message_strobe (pmt::pmt_t msg, float period_ms); - - public: - ~gr_message_strobe (); - - void set_msg(pmt::pmt_t msg){ d_msg = msg; } -}; - -#endif /* INCLUDED_GR_MESSAGE_STROBE_H */ diff --git a/gnuradio-core/src/lib/general/gr_message_strobe.i b/gnuradio-core/src/lib/general/gr_message_strobe.i deleted file mode 100644 index 490aa8e8a1..0000000000 --- a/gnuradio-core/src/lib/general/gr_message_strobe.i +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2005 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,message_strobe); - -%{ -#include <gr_message_strobe.h> -%} - -%include "gr_message_strobe.h" - |