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 /gr-channels/lib | |
| 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 'gr-channels/lib')
| -rw-r--r-- | gr-channels/lib/channel_model_impl.cc | 4 | ||||
| -rw-r--r-- | gr-channels/lib/channel_model_impl.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-channels/lib/channel_model_impl.cc b/gr-channels/lib/channel_model_impl.cc index 36fbd7ed63..a7e866fbc1 100644 --- a/gr-channels/lib/channel_model_impl.cc +++ b/gr-channels/lib/channel_model_impl.cc @@ -62,8 +62,8 @@ namespace gr { d_multipath = filter::fir_filter_ccc::make(1, d_taps); d_noise_adder = blocks::add_cc::make(); - d_noise = analog::noise_source_c::make(analog::GR_GAUSSIAN, - noise_voltage, noise_seed); + d_noise = analog::fastnoise_source_c::make(analog::GR_GAUSSIAN, + noise_voltage, noise_seed); d_freq_offset = analog::sig_source_c::make(1, analog::GR_SIN_WAVE, frequency_offset, 1.0, 0.0); d_mixer_offset = blocks::multiply_cc::make(); diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h index ce79e54aae..b94555f122 100644 --- a/gr-channels/lib/channel_model_impl.h +++ b/gr-channels/lib/channel_model_impl.h @@ -27,7 +27,7 @@ #include <blocks/add_cc.h> #include <blocks/multiply_cc.h> #include <analog/sig_source_c.h> -#include <analog/noise_source_c.h> +#include <analog/fastnoise_source_c.h> #include <channels/channel_model.h> #include <filter/fractional_interpolator_cc.h> #include <filter/fir_filter_ccc.h> @@ -42,7 +42,7 @@ namespace gr { blocks::multiply_cc::sptr d_mixer_offset; analog::sig_source_c::sptr d_freq_offset; - analog::noise_source_c::sptr d_noise; + analog::fastnoise_source_c::sptr d_noise; filter::fractional_interpolator_cc::sptr d_timing_offset; filter::fir_filter_ccc::sptr d_multipath; |