diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-06 10:52:29 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-06 10:52:29 -0500 |
| commit | 43c5b002c181d3d270d0cf91591c086d896086aa (patch) | |
| tree | a390e7fb3abde4386aee76fb033c43520031ff32 /gnuradio-core/src/lib/general | |
| parent | be45281798f35b7e2ec2380503b97590d6b754b4 (diff) | |
| parent | ac631948603583392189722d0e9b8654a2324670 (diff) | |
Merge branch 'master' into next
Merges fastnoise_source from master and reorganizes it to gr-analog.
Conflicts:
gnuradio-core/src/lib/general/CMakeLists.txt
gnuradio-core/src/lib/general/general.i
gnuradio-core/src/lib/gengen/CMakeLists.txt
gnuradio-core/src/lib/hier/gr_channel_model.cc
gnuradio-core/src/lib/hier/gr_channel_model.h
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_random_pdu.cc | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt index 6d67b333b9..26dab910c9 100644 --- a/gnuradio-core/src/lib/general/CMakeLists.txt +++ b/gnuradio-core/src/lib/general/CMakeLists.txt @@ -169,6 +169,7 @@ set(gr_core_general_triple_threats gr_pa_2x2_phase_combiner gr_peak_detector2_fb gr_prefs + gr_random_pdu gr_regenerate_bb gr_remez gr_rms_cf diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 4e483500ee..e379c40867 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -40,6 +40,7 @@ #include <gr_endian_swap.h> #include <gr_firdes.h> #include <gr_delay.h> +#include <gr_random_pdu.h> #include <gr_rms_cf.h> #include <gr_rms_ff.h> #include <gr_fake_channel_coder_pp.h> @@ -89,6 +90,7 @@ %include "gr_endian_swap.i" %include "gr_firdes.i" %include "gr_delay.i" +%include "gr_random_pdu.i" %include "gr_rms_cf.i" %include "gr_rms_ff.i" %include "gr_fake_channel_coder_pp.i" diff --git a/gnuradio-core/src/lib/general/gr_random_pdu.cc b/gnuradio-core/src/lib/general/gr_random_pdu.cc index 9f692c72be..61332c0715 100644 --- a/gnuradio-core/src/lib/general/gr_random_pdu.cc +++ b/gnuradio-core/src/lib/general/gr_random_pdu.cc @@ -74,8 +74,8 @@ void gr_random_pdu::output_random(){ } // send the vector - pmt::pmt_t vecpmt( pmt::pmt_make_blob( vec, len ) ); - pmt::pmt_t pdu( pmt::pmt_cons( pmt::PMT_NIL, vecpmt ) ); + pmt::pmt_t vecpmt( pmt::make_blob( vec, len ) ); + pmt::pmt_t pdu( pmt::cons( pmt::PMT_NIL, vecpmt ) ); message_port_pub( pmt::mp("pdus"), pdu ); std::cout << "sending new random vector of length " << len << "\n"; |