diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-28 19:03:55 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-28 19:03:55 +0000 |
| commit | 5ede0e2b1457d7c28ad29c5f2322305621a3b26a (patch) | |
| tree | 37301199a3a33780186b147ea304caa63eca6173 /gnuradio-examples/python | |
| parent | 2869e85809d37ab4a2c01a18c4b348f7f28ee9b0 (diff) | |
Added reference scaling to fftsink2. Default behavior is unchanged.
The new parameter 'ref_scale', defaulting to 1.0, represents a 0 dB
y-axis value.
Updated usrp_fft.py to display dBFS by setting ref_scale to 32768.0
and ref_level to 0. This results in the full 100 dB of dynamic range
being displayed.
Updated some gnuradio-examples to use the new parameter.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7863 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-examples/python')
| -rwxr-xr-x | gnuradio-examples/python/audio/audio_fft.py | 3 | ||||
| -rwxr-xr-x | gnuradio-examples/python/usrp/usrp_am_mw_rcv.py | 5 | ||||
| -rwxr-xr-x | gnuradio-examples/python/usrp/usrp_nbfm_rcv.py | 2 | ||||
| -rwxr-xr-x | gnuradio-examples/python/usrp/usrp_wfm_rcv.py | 3 | ||||
| -rwxr-xr-x | gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py | 3 | ||||
| -rwxr-xr-x | gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py | 3 | ||||
| -rwxr-xr-x | gnuradio-examples/python/usrp/usrp_wxapt_rcv.py | 3 |
7 files changed, 14 insertions, 8 deletions
diff --git a/gnuradio-examples/python/audio/audio_fft.py b/gnuradio-examples/python/audio/audio_fft.py index f7f1c2e8c0..960e0f94d5 100755 --- a/gnuradio-examples/python/audio/audio_fft.py +++ b/gnuradio-examples/python/audio/audio_fft.py @@ -61,7 +61,8 @@ class app_top_block(stdgui2.std_top_block): elif options.oscilloscope: self.scope = scopesink2.scope_sink_f(panel, sample_rate=sample_rate) else: - self.scope = fftsink2.fft_sink_f (panel, fft_size=1024, sample_rate=sample_rate, fft_rate=30) + self.scope = fftsink2.fft_sink_f (panel, fft_size=1024, sample_rate=sample_rate, fft_rate=30, + ref_scale=1.0, ref_level=0, y_divs=12) self.src = audio.source (sample_rate, options.audio_input) diff --git a/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py b/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py index c99fb3072c..b113559850 100755 --- a/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_am_mw_rcv.py @@ -178,7 +178,8 @@ class wfm_rx_block (stdgui2.std_top_block): if 1: self.src_fft = fftsink2.fft_sink_c(self.panel, title="Data from USRP", - fft_size=512, sample_rate=usrp_rate) + fft_size=512, sample_rate=usrp_rate, + ref_scale=32768.0, ref_level=0.0, y_divs=12) self.connect (self.u, self.src_fft) vbox.Add (self.src_fft.win, 4, wx.EXPAND) @@ -198,7 +199,7 @@ class wfm_rx_block (stdgui2.std_top_block): if 1: audio_fft = fftsink2.fft_sink_f(self.panel, title="Audio", fft_size=512, sample_rate=audio_rate, - y_per_div=10, ref_level=-20) + y_per_div=10, ref_level=20) self.connect (self.audio_filt, audio_fft) vbox.Add (audio_fft.win, 4, wx.EXPAND) diff --git a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py b/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py index 7aa45575d6..4c66fc9708 100755 --- a/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_nbfm_rcv.py @@ -102,7 +102,7 @@ class my_top_block (stdgui2.std_top_block): if 1 and not(no_gui): self.src_fft = fftsink2.fft_sink_c(self.panel, title="Data from USRP", fft_size=512, sample_rate=self.rxpath.if_rate, - ref_level=80, y_per_div=20) + ref_scale=32768.0, ref_level=0, y_per_div=10, y_divs=12) self.connect (self.rxpath.u, self.src_fft) vbox.Add (self.src_fft.win, 4, wx.EXPAND) if 1 and not(no_gui): diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py index 40e4d8384e..5655d19b50 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv.py @@ -150,7 +150,8 @@ class wfm_rx_block (stdgui2.std_top_block): if 1: self.src_fft = fftsink2.fft_sink_c(self.panel, title="Data from USRP", - fft_size=512, sample_rate=usrp_rate) + fft_size=512, sample_rate=usrp_rate, + ref_scale=32768.0, ref_level=0, y_divs=12) self.connect (self.u, self.src_fft) vbox.Add (self.src_fft.win, 4, wx.EXPAND) diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py index a85bcdbf4e..bc79fb8109 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py @@ -167,7 +167,8 @@ class wfm_rx_block (stdgui2.std_top_block): if 1: self.src_fft = fftsink2.fft_sink_c(self.panel, title="Data from USRP", - fft_size=512, sample_rate=usrp_rate) + fft_size=512, sample_rate=usrp_rate, + ref_scale=32768.0, ref_level=0, y_divs=12) self.connect (self.u, self.src_fft) vbox.Add (self.src_fft.win, 4, wx.EXPAND) diff --git a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py index 1d39c7691b..75bbc0acd6 100755 --- a/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py +++ b/gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py @@ -228,7 +228,8 @@ class wfm_rx_sca_block (stdgui2.std_top_block): if 1: self.src_fft = fftsink2.fft_sink_c(self.panel, title="Data from USRP", - fft_size=512, sample_rate=usrp_rate) + fft_size=512, sample_rate=usrp_rate, + ref_scale=32768.0, ref_level=0, y_divs=12) self.connect (self.u, self.src_fft) vbox.Add (self.src_fft.win, 4, wx.EXPAND) diff --git a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py b/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py index 983e3ec98d..11b8c431f2 100755 --- a/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py +++ b/gnuradio-examples/python/usrp/usrp_wxapt_rcv.py @@ -148,7 +148,8 @@ class wxapt_rx_block (stdgui2.std_top_block): if 1: self.src_fft = fftsink2.fft_sink_c (self.panel, title="Data from USRP", - fft_size=512, sample_rate=usrp_rate) + fft_size=512, sample_rate=usrp_rate, + ref_scale=32768.0, ref_level=0, y_divs=12) self.connect (self.u, self.src_fft) vbox.Add (self.src_fft.win, 4, wx.EXPAND) |