t/gr-foo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some clean up

Browse Source
This commit is contained in:
Bastian Bloessl
2016-04-23 11:07:52 +02:00
parent d182ea5a96
commit 842db2eeea
8 changed files with 45 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grc/CMakeLists.txt
+3 -10
View File
@@ -17,13 +17,6 @@
# the Free Software Foundation, Inc., 51 Franklin Street, # the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA. # Boston, MA 02110-1301, USA.
install(FILES file(GLOB xml_files "*.xml")
foo_burst_tagger.xml
foo_packet_dropper.xml install(FILES ${xml_files} DESTINATION share/gnuradio/grc/blocks )
foo_packet_pad.xml
foo_packet_pad2.xml
foo_periodic_msg_source.xml
foo_rtt_measure.xml
foo_wireshark_connector.xml
foo_random_periodic_msg_source.xml DESTINATION share/gnuradio/grc/blocks
)
include/foo/CMakeLists.txt
+3 -2
View File
@@ -27,7 +27,8 @@ install(FILES
packet_pad.h packet_pad.h
packet_pad2.h packet_pad2.h
periodic_msg_source.h periodic_msg_source.h
wireshark_connector.h random_periodic_msg_source.h
rtt_measure.h rtt_measure.h
random_periodic_msg_source.h DESTINATION include/foo wireshark_connector.h
DESTINATION include/foo
) )
lib/CMakeLists.txt
+3 -3
View File
@@ -34,12 +34,12 @@ link_directories(
list(APPEND foo_sources list(APPEND foo_sources
burst_tagger_impl.cc burst_tagger_impl.cc
packet_dropper_impl.cc packet_dropper_impl.cc
packet_pad_impl.cc
packet_pad2.cc packet_pad2.cc
packet_pad_impl.cc
periodic_msg_source_impl.cc periodic_msg_source_impl.cc
wireshark_connector_impl.cc
rtt_measure_impl.cc
random_periodic_msg_source_impl.cc random_periodic_msg_source_impl.cc
rtt_measure_impl.cc
wireshark_connector_impl.cc
) )
set(PACKAGE_FIND_VERSION_MAJOR 0) set(PACKAGE_FIND_VERSION_MAJOR 0)
lib/periodic_msg_source_impl.cc
-1
View File
@@ -151,4 +151,3 @@ periodic_msg_source::sptr
periodic_msg_source::make(pmt::pmt_t msg, float interval, int num_msg, bool quit, bool debug) { periodic_msg_source::make(pmt::pmt_t msg, float interval, int num_msg, bool quit, bool debug) {
return gnuradio::get_initial_sptr(new periodic_msg_source_impl(msg, interval, num_msg, quit, debug)); return gnuradio::get_initial_sptr(new periodic_msg_source_impl(msg, interval, num_msg, quit, debug));
} }
lib/random_periodic_msg_source_impl.cc
-1
View File
@@ -171,4 +171,3 @@ random_periodic_msg_source::make(int msg_len, float interval, int num_msg,
bool quit, bool debug,int seed) { bool quit, bool debug,int seed) {
return gnuradio::get_initial_sptr(new random_periodic_msg_source_impl(msg_len, interval, num_msg, quit, debug, seed)); return gnuradio::get_initial_sptr(new random_periodic_msg_source_impl(msg_len, interval, num_msg, quit, debug, seed));
} }
lib/random_periodic_msg_source_impl.h
+1 -1
View File
@@ -39,8 +39,8 @@ namespace foo {
boost::thread *d_thread; boost::thread *d_thread;
gr::thread::mutex d_mutex; gr::thread::mutex d_mutex;
boost::mt19937 d_rng; boost::mt19937 d_rng;
boost::uniform_int<> d_brange;
boost::variate_generator< boost::mt19937, boost::uniform_int<> > d_randbytes; boost::variate_generator< boost::mt19937, boost::uniform_int<> > d_randbytes;
boost::uniform_int<> d_brange;
public: public:
random_periodic_msg_source_impl(int msg_len, random_periodic_msg_source_impl(int msg_len,
swig/foo_swig.i
+6 -6
View File
@@ -11,9 +11,9 @@
#include "foo/packet_pad.h" #include "foo/packet_pad.h"
#include "foo/packet_pad2.h" #include "foo/packet_pad2.h"
#include "foo/periodic_msg_source.h" #include "foo/periodic_msg_source.h"
#include "foo/wireshark_connector.h"
#include "foo/rtt_measure.h"
#include "foo/random_periodic_msg_source.h" #include "foo/random_periodic_msg_source.h"
#include "foo/rtt_measure.h"
#include "foo/wireshark_connector.h"
%} %}
@@ -22,15 +22,15 @@
%include "foo/packet_pad.h" %include "foo/packet_pad.h"
%include "foo/packet_pad2.h" %include "foo/packet_pad2.h"
%include "foo/periodic_msg_source.h" %include "foo/periodic_msg_source.h"
%include "foo/wireshark_connector.h"
%include "foo/rtt_measure.h"
%include "foo/random_periodic_msg_source.h" %include "foo/random_periodic_msg_source.h"
%include "foo/rtt_measure.h"
%include "foo/wireshark_connector.h"
GR_SWIG_BLOCK_MAGIC2(foo, burst_tagger); GR_SWIG_BLOCK_MAGIC2(foo, burst_tagger);
GR_SWIG_BLOCK_MAGIC2(foo, packet_dropper); GR_SWIG_BLOCK_MAGIC2(foo, packet_dropper);
GR_SWIG_BLOCK_MAGIC2(foo, packet_pad); GR_SWIG_BLOCK_MAGIC2(foo, packet_pad);
GR_SWIG_BLOCK_MAGIC2(foo, packet_pad2); GR_SWIG_BLOCK_MAGIC2(foo, packet_pad2);
GR_SWIG_BLOCK_MAGIC2(foo, periodic_msg_source); GR_SWIG_BLOCK_MAGIC2(foo, periodic_msg_source);
GR_SWIG_BLOCK_MAGIC2(foo, wireshark_connector);
GR_SWIG_BLOCK_MAGIC2(foo, rtt_measure);
GR_SWIG_BLOCK_MAGIC2(foo, random_periodic_msg_source); GR_SWIG_BLOCK_MAGIC2(foo, random_periodic_msg_source);
GR_SWIG_BLOCK_MAGIC2(foo, rtt_measure);
GR_SWIG_BLOCK_MAGIC2(foo, wireshark_connector);