summaryrefslogtreecommitdiff
path: root/gr-wxgui
diff options
context:
space:
mode:
authorTom Rondeau2011-10-18 20:46:04 -0700
committerTom Rondeau2011-10-18 20:46:04 -0700
commit52b42b9e958be6908ab5279bbe4ecea8b2464ee8 (patch)
tree3340aef44ae5fd7607f659e27b9b02de3d13670e /gr-wxgui
parent3b08bd8312f7499a3ffcaba147f5fe7a66f91ba4 (diff)
parent6474548641d8b611adf6c5a08aa3da06508d77bf (diff)
downloadgnuradio-52b42b9e958be6908ab5279bbe4ecea8b2464ee8.tar.gz
gnuradio-52b42b9e958be6908ab5279bbe4ecea8b2464ee8.tar.bz2
gnuradio-52b42b9e958be6908ab5279bbe4ecea8b2464ee8.zip
Merge branch 'master' into next
Conflicts: gnuradio-core/src/lib/general/general.i
Diffstat (limited to 'gr-wxgui')
-rw-r--r--gr-wxgui/grc/wxgui_fftsink2.xml4
-rw-r--r--gr-wxgui/grc/wxgui_waterfallsink2.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/gr-wxgui/grc/wxgui_fftsink2.xml b/gr-wxgui/grc/wxgui_fftsink2.xml
index 9b35ab848..ec5501838 100644
--- a/gr-wxgui/grc/wxgui_fftsink2.xml
+++ b/gr-wxgui/grc/wxgui_fftsink2.xml
@@ -108,7 +108,7 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
<param>
<name>Ref Level (dB)</name>
<key>ref_level</key>
- <value>50</value>
+ <value>0</value>
<type>real</type>
</param>
<param>
@@ -126,7 +126,7 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
<param>
<name>Refresh Rate</name>
<key>fft_rate</key>
- <value>30</value>
+ <value>15</value>
<type>int</type>
</param>
<param>
diff --git a/gr-wxgui/grc/wxgui_waterfallsink2.xml b/gr-wxgui/grc/wxgui_waterfallsink2.xml
index 7c646c3b2..da6a8a3d1 100644
--- a/gr-wxgui/grc/wxgui_waterfallsink2.xml
+++ b/gr-wxgui/grc/wxgui_waterfallsink2.xml
@@ -80,7 +80,7 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos()))))
<param>
<name>Reference Level</name>
<key>ref_level</key>
- <value>50</value>
+ <value>0</value>
<type>real</type>
</param>
<param>