diff options
author | Josh Blum | 2011-10-11 21:35:35 -0700 |
---|---|---|
committer | Josh Blum | 2011-10-11 21:35:35 -0700 |
commit | 1259a01a9479071bd1729a9c9496444f0a72509b (patch) | |
tree | 55350454454a119fb230cdbaadfb27d361f191ec /gr-wxgui/grc | |
parent | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff) | |
parent | 06860c309153890a6a42babfbedf230eb24f0042 (diff) | |
download | gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.gz gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.bz2 gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.zip |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gr-digital/include/digital_constellation.h
Diffstat (limited to 'gr-wxgui/grc')
-rw-r--r-- | gr-wxgui/grc/wxgui_constellationsink2.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-wxgui/grc/wxgui_constellationsink2.xml b/gr-wxgui/grc/wxgui_constellationsink2.xml index c200790f9..f9df9d4ac 100644 --- a/gr-wxgui/grc/wxgui_constellationsink2.xml +++ b/gr-wxgui/grc/wxgui_constellationsink2.xml @@ -18,7 +18,7 @@ constsink_gl.const_sink_c( const_size=$const_size, M=$M, theta=$theta, - alpha=$alpha, + loop_bw=$loop_bw, fmax=$fmax, mu=$mu, gain_mu=$gain_mu, @@ -71,9 +71,9 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos())))) <type>real</type> </param> <param> - <name>Alpha</name> - <key>alpha</key> - <value>0.005</value> + <name>Loop Bandwidth</name> + <key>loop_bw</key> + <value>6.28/100.0</value> <type>real</type> </param> <param> |