diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-02 10:06:09 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-02 10:06:09 -0700 |
| commit | 9f376ff32edd2e0d0132029111c9bdff9654d1b2 (patch) | |
| tree | 2c6a791e162977b11fbde34e24958bfa9d91f059 /gr-digital | |
| parent | 49dadf282dff3ab144ced916add4ef148b7378ba (diff) | |
| parent | 747b6702a112ccb4644904e1c965221c2de157f8 (diff) | |
Merge branch 'master' into next
Conflicts are from moving gr_channel_model into
filter::channel_model.
Conflicts:
gnuradio-core/src/lib/hier/gr_channel_model.h
gnuradio-core/src/lib/hier/gr_channel_model.i
gr-digital/examples/narrowband/benchmark_add_channel.py
gr-digital/examples/ofdm/benchmark_add_channel.py
Diffstat (limited to 'gr-digital')
| -rwxr-xr-x | gr-digital/examples/narrowband/benchmark_add_channel.py | 3 | ||||
| -rwxr-xr-x | gr-digital/examples/ofdm/benchmark_add_channel.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gr-digital/examples/narrowband/benchmark_add_channel.py b/gr-digital/examples/narrowband/benchmark_add_channel.py index 8f2e544fdb..0ee0058059 100755 --- a/gr-digital/examples/narrowband/benchmark_add_channel.py +++ b/gr-digital/examples/narrowband/benchmark_add_channel.py @@ -43,8 +43,9 @@ class my_top_block(gr.top_block): self.src = gr.file_source(gr.sizeof_gr_complex, ifile) #self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate) + self.channel = filter.channel_model(noise_voltage, frequency_offset, - time_offset, noise_seed=random.randint(0,100000)) + time_offset, noise_seed=-random.randint(0,100000)) self.phase = gr.multiply_const_cc(complex(math.cos(phase_offset), math.sin(phase_offset))) self.snk = gr.file_sink(gr.sizeof_gr_complex, ofile) diff --git a/gr-digital/examples/ofdm/benchmark_add_channel.py b/gr-digital/examples/ofdm/benchmark_add_channel.py index 77862e753f..5c7a3ae501 100755 --- a/gr-digital/examples/ofdm/benchmark_add_channel.py +++ b/gr-digital/examples/ofdm/benchmark_add_channel.py @@ -45,8 +45,9 @@ class my_top_block(gr.top_block): self.src = gr.file_source(gr.sizeof_gr_complex, ifile) #self.throttle = gr.throttle(gr.sizeof_gr_complex, options.sample_rate) + self.channel = filter.channel_model(noise_voltage, frequency_offset, - time_offset, noise_seed=random.randint(0,100000)) + time_offset, noise_seed=-random.randint(0,100000)) self.phase = gr.multiply_const_cc(complex(math.cos(phase_offset), math.sin(phase_offset))) self.snk = gr.file_sink(gr.sizeof_gr_complex, ofile) |