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/include/channels/channel_model.h | |
| 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/include/channels/channel_model.h')
| -rw-r--r-- | gr-channels/include/channels/channel_model.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-channels/include/channels/channel_model.h b/gr-channels/include/channels/channel_model.h index e509933af0..2fe73da90b 100644 --- a/gr-channels/include/channels/channel_model.h +++ b/gr-channels/include/channels/channel_model.h @@ -65,10 +65,10 @@ namespace gr { * \param noise_seed A random number generator seed for the noise source. */ static sptr make(double noise_voltage=0.0, - double frequency_offset=0.0, - double epsilon=1.0, - const std::vector<gr_complex> &taps=std::vector<gr_complex>(1,1), - double noise_seed=0); + double frequency_offset=0.0, + double epsilon=1.0, + const std::vector<gr_complex> &taps=std::vector<gr_complex>(1,1), + double noise_seed=0); virtual void set_noise_voltage(double noise_voltage) = 0; virtual void set_frequency_offset(double frequency_offset) = 0; |